Changeset 887 for trunk/Common/Form/Types/GPS.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (3 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

File:

• trunk/Common/Form/Types/GPS.php (modified) (4 diffs)

trunk/Common/Form/Types/GPS.php

@@ -5 +5 @@
 class TypeGPS extends TypeBase
 {
-  function OnView($Item)
+  function OnView(array $Item): ?string
   {
-    global $Database;
-
-    $DbResult = $Database->query('SELECT * FROM `SystemGPS` WHERE `Id`='.$Item['Value']);
+    $DbResult = $this->Database->query('SELECT * FROM `SystemGPS` WHERE `Id`='.$Item['Value']);
     if ($DbResult->num_rows > 0)
     {
@@ -20 +18 @@
   }
 
-  function OnEdit($Item)
+  function OnEdit(array $Item): string
   {
-    global $Database;
-
     if ($Item['Value'] != '')
     {
-      $DbResult = $Database->query('SELECT * FROM `SystemGPS` WHERE `Id`='.$Item['Value']);
+      $DbResult = $this->Database->query('SELECT * FROM `SystemGPS` WHERE `Id`='.$Item['Value']);
       if ($DbResult->num_rows > 0)
       {
@@ -43 +39 @@
   }
 
-  function OnLoad($Item)
+  function OnLoad(array $Item): ?string
   {
-    global $Database;
-
     $Latitude = $this->Implode($_POST[$Item['Name'].'-lat-deg'], $_POST[$Item['Name'].'-lat-min'], $_POST[$Item['Name'].'-lat-sec']);
     $Longitude = $this->Implode($_POST[$Item['Name'].'-lon-deg'], $_POST[$Item['Name'].'-lon-min'], $_POST[$Item['Name'].'-lon-sec']);
-    $Database->query('INSERT INTO SystemGPS (`Latitude`, `Longitude`) VALUES ("'.$Latitude.'", "'.$Longitude.'")');
-    return $Database->insert_id;
+    $this->Database->query('INSERT INTO SystemGPS (`Latitude`, `Longitude`) VALUES ("'.$Latitude.'", "'.$Longitude.'")');
+    return $this->Database->insert_id;
   }
 
-  function Explode($Float)
+  function Explode(float $Float): array
   {
     $Degrees = intval($Float);
@@ -64 +58 @@
   }
 
-  function Implode($Degrees, $Minutes, $Seconds)
+  function Implode($Degrees, $Minutes, $Seconds): float
   {
     if ($Degrees < 0) return -(abs($Degrees) + ($Minutes + $Seconds / 60) / 60);