Changeset 873 for trunk/Modules/Map

Timestamp:

Apr 6, 2020, 11:17:40 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

Location:

trunk/Modules/Map

Files:

• Map.php (modified) (13 diffs)
• MapAPI.php (modified) (4 diffs)

trunk/Modules/Map/Map.php

@@ -13 +13 @@
   function Show()
   {
-    if(!$this->System->User->CheckPermission('Map', 'Show'))
-      return('Nemáte oprávnění');
-
-    if(count($this->System->PathItems) > 1)
-    {
-      if($this->System->PathItems[1] == 'show-position') return($this->ShowPosition());
-      else return(PAGE_NOT_FOUND);
-    } else return($this->ShowMain());
+    if (!$this->System->User->CheckPermission('Map', 'Show'))
+      return ('Nemáte oprávnění');
+
+    if (count($this->System->PathItems) > 1)
+    {
+      if ($this->System->PathItems[1] == 'show-position') return ($this->ShowPosition());
+      else return (PAGE_NOT_FOUND);
+    } else return ($this->ShowMain());
   }
 
@@ -26 +26 @@
   {
     $DbResult = $this->Database->select('MapPosition', '*', '`Id`='.$_GET['i']);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
@@ -40 +40 @@
       $MapApi->Markers[] = $Marker;
       $Output = $MapApi->ShowPage($this);
-      return($Output);
-    } else return('Položka nenalezena');
+      return ($Output);
+    } else return ('Položka nenalezena');
   }
 
@@ -59 +59 @@
     'WHERE (`NetworkDevice`.`Used`=1) AND (`NetworkDevice`.`MapPosition` IS NOT NULL) '.
     'GROUP BY `NetworkDevice`.`MapPosition`');
-    while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
     {
       $Pos = explode(';', $Device['Pos']);
@@ -69 +69 @@
 
     $DbResult = $this->Database->query('SELECT * FROM `NetworkLink` WHERE (`Interface1` <> 0) AND (`Interface2` <> 0)');
-    while($Link = $DbResult->fetch_assoc())
+    while ($Link = $DbResult->fetch_assoc())
     {
       $DbResult2 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
@@ -77 +77 @@
         'JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
         'WHERE `NetworkDevice`.`Id` = (SELECT `NetworkInterface`.`Device` FROM `NetworkInterface` WHERE `NetworkInterface`.`Id` = '.$Link['Interface2'].')');
-      if(($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
+      if (($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
       {
         $Device1 = $DbResult2->fetch_assoc();
@@ -83 +83 @@
         $Device2 = $DbResult3->fetch_assoc();
         $Pos2 = explode(';', $Device2['Pos']);
-        if(($Device1['Used'] == 1) and ($Device2['Used'] == 1))
+        if (($Device1['Used'] == 1) and ($Device2['Used'] == 1))
         {
           $PolyLine = new MapPolyLine();
@@ -146 +146 @@
         NetworkLinks = [';
     $DbResult = $this->Database->query('SELECT * FROM `NetworkLink` WHERE (`Interface1` <> 0) AND (`Interface2` <> 0)');
-    while($Link = $DbResult->fetch_assoc())
+    while ($Link = $DbResult->fetch_assoc())
     {
       $DbResult2 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
@@ -154 +154 @@
         'JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
         'WHERE `NetworkDevice`.`Id` = (SELECT `NetworkInterface`.`Device` FROM `NetworkInterface` WHERE `NetworkInterface`.`Id` = '.$Link['Interface2'].')');
-      if(($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
+      if (($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
       {
         $Device1 = $DbResult2->fetch_assoc();
@@ -160 +160 @@
         $Device2 = $DbResult3->fetch_assoc();
         $Pos2 = explode(';', $Device2['Pos']);
-        if(($Device1['Used'] == 1) and ($Device2['Used'] == 1))
+        if (($Device1['Used'] == 1) and ($Device2['Used'] == 1))
           $Output .= 'new google.maps.Polyline([new google.maps.LatLng('.$Pos1[0].', '.
         $Pos1[1].'),new google.maps.LatLng('.$Pos2[0].', '.$Pos2[1].')], "#4F4FBF", 3, 0.8), ';
@@ -198 +198 @@
       'WHERE (`NetworkDevice`.`Used`=1) AND (`NetworkDevice`.`MapPosition` IS NOT NULL) '.
       'GROUP BY `NetworkDevice`.`MapPosition`');
-    while($Device = $DbResult->fetch_assoc())
+    while ($Device = $DbResult->fetch_assoc())
     {
       $Pos = explode(';', $Device['Pos']);
@@ -236 +236 @@
                 </table>';
     */
-    return($Output);
+    return ($Output);
   }
 }
@@ -245 +245 @@
   {
     $Output = parent::OnEdit($Item);
-    if($this->FormManager->ShowRelation)
+    if ($this->FormManager->ShowRelation)
       $Output .=  '<img src="'.$this->FormManager->Root.'/images/select.png" alf="Vybrat" language="javascript" '.
         'onclick="return popupwindow(&quot;'.$this->FormManager->Root.'/is/?a=mapselect&amp;r='.
         $Item['Name'].'&quot;,&quot;test&quot;);" style="cursor:hand;cursor:pointer"/>';
-    return($Output);
+    return ($Output);
   }
 }

trunk/Modules/Map/MapAPI.php

@@ -37 +37 @@
   function Show()
   {
-    return('');
+    return ('');
   }
 }
@@ -78 +78 @@
           if (point)
           {
-            set_return(point.lat() + ";" + point.lng(),"'.$this->OnClickObject.'");
+            set_return (point.lat() + ";" + point.lng(),"'.$this->OnClickObject.'");
             window.close();
           }
@@ -102 +102 @@
     </script>';
     $Output .= '<div id="map_canvas" style="width: 100%; height: 98%;"></div>';
-    return($Output);
+    return ($Output);
   }
 }
@@ -162 +162 @@
           if (e)
           {
-            set_return(e.latlng.lat + ";" + e.latlng.lng,"'.$this->OnClickObject.'");
+            set_return (e.latlng.lat + ";" + e.latlng.lng,"'.$this->OnClickObject.'");
             window.close();
           }