Changeset 796 for trunk/Modules/Map/Map.php

Timestamp:

Feb 4, 2016, 5:03:08 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Page javascript script was not loaded.

File:

• trunk/Modules/Map/Map.php (modified) (4 diffs)

trunk/Modules/Map/Map.php

@@ -22 +22 @@
   function ShowPosition()
   {
-    $DbResult = $this->Database->select('MapPosition', '*', 'Id='.$_GET['i']);
+    $DbResult = $this->Database->select('MapPosition', '*', '`Id`='.$_GET['i']);
     if($DbResult->num_rows > 0)
     {
@@ -51 +51 @@
     function initialize()
     {
+
       if (GBrowserIsCompatible())
       {
@@ -88 +89 @@
       {
         NetworkLinks = [';
-    $DbResult = $this->Database->query('SELECT * FROM NetworkLink WHERE Interface1 <> 0 AND Interface2 <> 0');
+    $DbResult = $this->Database->query('SELECT * FROM `NetworkLink` WHERE (`Interface1` <> 0) AND (`Interface2` <> 0)');
     while($Link = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT NetworkDevice.Used, MapPosition.Pos FROM NetworkDevice '.
-        'JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition '.
-        'WHERE NetworkDevice.Id = (SELECT NetworkInterface.Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface1'].')');
-      $DbResult3 = $this->Database->query('SELECT NetworkDevice.Used, MapPosition.Pos FROM NetworkDevice '.
-        'JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition '.
-        'WHERE NetworkDevice.Id = (SELECT NetworkInterface.Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface2'].')');
+      $DbResult2 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
+        'JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
+        'WHERE `NetworkDevice`.`Id` = (SELECT `NetworkInterface`.`Device` FROM `NetworkInterface` WHERE `NetworkInterface`.`Id` = '.$Link['Interface1'].')');
+      $DbResult3 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
+        '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))
       {
@@ -136 +137 @@
         NetworkDevices = [';
 
-    $DbResult = $this->Database->query('SELECT GROUP_CONCAT(NetworkDevice.Name SEPARATOR ",") AS Name, '.
-      'MapPosition.Pos AS Pos, MapPosition.Name AS NodeName '.
-      'FROM NetworkDevice LEFT JOIN MapPosition ON MapPosition.Id = NetworkDevice.MapPosition '.
-      'WHERE (NetworkDevice.Used=1) AND (NetworkDevice.MapPosition IS NOT NULL) '.
-      'GROUP BY NetworkDevice.MapPosition');
+    $DbResult = $this->Database->query('SELECT GROUP_CONCAT(`NetworkDevice`.`Name` SEPARATOR ",") AS `Name`, '.
+      '`MapPosition`.`Pos` AS `Pos`, `MapPosition`.`Name` AS `NodeName` '.
+      'FROM `NetworkDevice` LEFT JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
+      'WHERE (`NetworkDevice`.`Used`=1) AND (`NetworkDevice`.`MapPosition` IS NOT NULL) '.
+      'GROUP BY `NetworkDevice`.`MapPosition`');
     while($Device = $DbResult->fetch_assoc())
     {