Changeset 738 for trunk/Modules/Map

Timestamp:

Apr 14, 2015, 10:20:16 PM (10 years ago)

Author:

chronos

Message:

• Removed: Spaces on end of line.
• Modified: Tabs converted to spaces.

Location:

trunk/Modules/Map

Files:

• Map.php (modified) (10 diffs)
• MapAPI.php (modified) (6 diffs)

trunk/Modules/Map/Map.php

@@ -15 +15 @@
     if(count($this->System->PathItems) > 1)
     {
-      if($this->System->PathItems[1] == 'show-position') return($this->ShowPosition()); 
+      if($this->System->PathItems[1] == 'show-position') return($this->ShowPosition());
       else return(PAGE_NOT_FOUND);
     } else return($this->ShowMain());
   }
-  
+
   function ShowPosition()
   {
@@ -37 +37 @@
     } else return('Položka nenalezena');
   }
-  
+
   function ShowMain()
   {
@@ -49 +49 @@
     var tinyIcon;
 
-    function initialize() 
-    {
-      if (GBrowserIsCompatible()) 
+    function initialize()
+    {
+      if (GBrowserIsCompatible())
       {
         map = new GMap2(document.getElementById("map_canvas"));
@@ -58 +58 @@
         map.setUIToDefault();
         map.addControl(new GOverviewMapControl(new GSize(128, 96)));
-        
+
 
 // Create our "tiny" marker icon
@@ -68 +68 @@
 tinyIcon.iconAnchor = new GPoint(5, 5);
 tinyIcon.infoWindowAnchor = new GPoint(5, 1);
-    
-        toggleLabel(\'NetworkLinks\');
-        toggleLabel(\'NetworkDevices\');';
-    
-            $Output .= '    
-       }      
-    }
-    
-function toggleLabel(id) 
-{
-        var ele = document.getElementById(id);
-        ele.checked = !ele.checked;
-        ele.onclick( );
-}
-
-    function UpdateNetworkLinks() 
-    {
-            if ((document.getElementById("NetworkLinks")).checked == true) 
-      {
-                    NetworkLinks = [';
+
+  toggleLabel(\'NetworkLinks\');
+  toggleLabel(\'NetworkDevices\');';
+
+      $Output .= '
+       }
+    }
+
+function toggleLabel(id)
+{
+  var ele = document.getElementById(id);
+  ele.checked = !ele.checked;
+  ele.onclick( );
+}
+
+    function UpdateNetworkLinks()
+    {
+      if ((document.getElementById("NetworkLinks")).checked == true)
+      {
+        NetworkLinks = [';
     $DbResult = $this->Database->query('SELECT * FROM NetworkLink WHERE Interface1 <> 0 AND Interface2 <> 0');
     while($Link = $DbResult->fetch_assoc())
@@ -114 +114 @@
                 }
 
-         } else { //checkbox turned off
-                for (var i in NetworkLinks)
-    {
-                        map.removeOverlay(NetworkLinks[i]);
-                        NetworkLinks[i] = null;
-                }
-        }
-}
-
-function toggleLabel(id) 
-{
-        var ele = document.getElementById(id);
-        ele.checked = !ele.checked;
-        ele.onclick( );
-}
-
-    function UpdateNetworkDevices() 
-    {
-            if ((document.getElementById("NetworkDevices")).checked == true) 
-      {
-                    NetworkDevices = [';
+   } else { //checkbox turned off
+    for (var i in NetworkLinks)
+    {
+      map.removeOverlay(NetworkLinks[i]);
+      NetworkLinks[i] = null;
+    }
+  }
+}
+
+function toggleLabel(id)
+{
+  var ele = document.getElementById(id);
+  ele.checked = !ele.checked;
+  ele.onclick( );
+}
+
+    function UpdateNetworkDevices()
+    {
+      if ((document.getElementById("NetworkDevices")).checked == true)
+      {
+        NetworkDevices = [';
 
     $DbResult = $this->Database->query('SELECT GROUP_CONCAT(NetworkDevice.Name SEPARATOR ",") AS Name, '.
@@ -153 +153 @@
                 }
 
-         } else { //checkbox turned off
-                for (var i in NetworkDevices)
-    {
-                        map.removeOverlay(NetworkDevices[i]);
-                        NetworkDevices[i] = null;
-                }
-        }       
+   } else { //checkbox turned off
+    for (var i in NetworkDevices)
+    {
+      map.removeOverlay(NetworkDevices[i]);
+      NetworkDevices[i] = null;
+    }
+  }
 }
 
@@ -165 +165 @@
     $Output .= '<table style="margin-left: auto; margin-right: auto; width: 100%; height: 80%;">
                   <tr>
-                    <td style="width: 80%; height: 100%;"> 
+                    <td style="width: 80%; height: 100%;">
     <div id="map_canvas" style="width: 100%; height: 100%;"></div></td>
     <td style="width: 20%">
@@ -208 +208 @@
     $this->SupportedModels = array();
   }
-  
+
   function DoStart()
   {
@@ -225 +225 @@
     ));
     $this->System->FormManager->RegisterFormType('TMapPosition', array(
-        'Type' => 'Reference',
-        'Table' => 'MapPosition',
-        'Id' => 'Id',
-        'Name' => 'Name',
-        'Filter' => '1',
+      'Type' => 'Reference',
+      'Table' => 'MapPosition',
+      'Id' => 'Id',
+      'Name' => 'Name',
+      'Filter' => '1',
     ));
-    
-  }  
-}
+
+  }
+}

trunk/Modules/Map/MapAPI.php

@@ -1 +1 @@
 <?php
 
-class MapApi extends Model 
+class MapApi extends Model
 {
   var $Position;
@@ -9 +9 @@
   var $ShowMarker;
   var $MarkerText;
-  
+
   function __construct($System)
   {
     parent::__construct($System);
-    $this->Zoom = 2; 
+    $this->Zoom = 2;
     $this->Position = array('Lat' => 40.178873, 'Lng' => 65.039062);
     $this->Key = '';
     $this->ShowMarker = false;
-    $this->MarkerText = ''; 
+    $this->MarkerText = '';
   }
-  
+
   function Show()
   {
@@ -39 +39 @@
       </script>';
     $Output .= '<script type="text/javascript">
-    
+
     var map;
     var tinyIcon;
-    
+
     function initialize()
     {
@@ -52 +52 @@
         map.setUIToDefault();
         map.addControl(new GOverviewMapControl(new GSize(128, 96)));
-    
+
         GEvent.addListener(map,"click",function(overlay, point)
         {
@@ -61 +61 @@
         });
       }
-    
+
     // Create our "tiny" marker icon
     var tinyIcon = new GIcon();
@@ -84 +84 @@
 class MapApiSeznam extends MapApi
 {
-  
+
 }