Changeset 210 for trunk

Timestamp:

May 6, 2009, 10:17:15 PM (16 years ago)

Author:

george

Message:

• Přidáno: Nastavení GPS polohy zařízení.
• Opraveno: Názvy rozhraní. Zobrazení seznamu počítačů.
• Smazáno: Stará složka mapy s nabídkou map.

Location:

trunk

Files:

• hostlist.php (modified) (1 diff)
• index.php (modified) (1 diff)
• mapy (deleted)
• network/user_hosts.php (modified) (1 diff)
• page.php (modified) (2 diffs)
• sql/updates/210.sql (added)

trunk/hostlist.php

@@ -15 +15 @@
     {
       if($Device['Online'] == 1) $Style = 'color: blue;'; else $Style = '';
-      $Output .= '<tr><td colspan="2" style="text-align: left; font-weight: bold; '.$Style.'">'.$Device['Name'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td><td style="text-align: right;">'.$Device['UserName'].'</td></tr>';
-      $DbResult2 = $this->Database->query('SELECT * FROM NetworkInterface WHERE Device = '.$Device['Id']);
-      while($Interface = $DbResult2->fetch_assoc())
+      $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM NetworkInterface WHERE Device = '.$Device['Id']);
+      $DbRow = $DbResult2->fetch_row();
+      if($DbRow[0] == 1)
       {
+        $DbResult2 = $this->Database->query('SELECT * FROM NetworkInterface WHERE Device = '.$Device['Id']);
+        $Interface = $DbResult2->fetch_assoc();
         if($Interface['LocalIP'] == '') $Interface['LocalIP'] = '&nbsp;';
         if($Interface['Online'] == 1) $Style = 'font-weight: bold; color: blue;'; else $Style = '';
-        $Output .= '<tr><td style="text-align: left; '.$Style.'">&nbsp;&nbsp;'.$Device['Name'].'-'.$Interface['Name'].'</td><td>'.$Interface['LocalIP'].'</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
-      }      
-    }
+        $InterfaceName = $Device['Name'];
+        if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+        $Output .= '<tr><td style="text-align: left; '.$Style.'">'.$InterfaceName.'</td><td>'.$Interface['LocalIP'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td><td style="text-align: right;">'.$Device['UserName'].'</td></tr>';
+      } else
+      {
+        $Output .= '<tr><td colspan="2" style="text-align: left; font-weight: bold; '.$Style.'">'.$Device['Name'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td><td style="text-align: right;">'.$Device['UserName'].'</td></tr>';
+        $DbResult2 = $this->Database->query('SELECT * FROM NetworkInterface WHERE Device = '.$Device['Id']);
+        while($Interface = $DbResult2->fetch_assoc())
+        {
+          if($Interface['LocalIP'] == '') $Interface['LocalIP'] = '&nbsp;';
+          if($Interface['Online'] == 1) $Style = 'font-weight: bold; color: blue;'; else $Style = '';
+          $InterfaceName = $Device['Name'];
+          if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+          $Output .= '<tr><td style="text-align: left; '.$Style.'">&nbsp;&nbsp;'.$InterfaceName.'</td><td>'.$Interface['LocalIP'].'</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+        }      
+      }
+    } 
     $Output .= '</table></div>';
     return($Output);

trunk/index.php

@@ -23 +23 @@
       array('Herní server', 'http://game.zdechov.net/', 'cube.gif'),
       array('Telefonní seznam', '/telseznam.php', 'tel.gif'),
-      array('Mapa Zděchova', 'http://www.mapy.cz/#x=141560832@y=133134848@z=13@mm=FP@sa=s@st=s@ssq=zd%C4%9Bchov@sss=1@ssp=120738725_123701121_150360997_149800833', 'clear.gif'),
+      array('Mapa sítě', '/map/', 'clear.gif'),
       array('Otvírací doby', '/otevreno.php', 'otv_doby.gif'),
       array('Topologie sítě', '/is/topologie.php', 'topologie.gif'),

trunk/network/user_hosts.php

@@ -21 +21 @@
       {
         if($Interface['Online'] == 1) $Style = 'font-weight: bold; color: blue;'; else $Style = '';
-        $Output .= '<tr><td style="text-align: left; '.$Style.'">&nbsp;&nbsp;'.$Device['Name'].'-'.$Interface['Name'].'</td><td>'.NotBlank($Interface['LocalIP']).'</td><td>'.NotBlank($Interface['ExternalIP']).'</td><td>'.NotBlank($Interface['CZFreeIP']).'</td><td>'.NotBlank($Interface['MAC']).'</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+        $InterfaceName = $Device['Name'];
+        if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
+        $Output .= '<tr><td style="text-align: left; '.$Style.'">&nbsp;&nbsp;'.$InterfaceName.'</td><td>'.NotBlank($Interface['LocalIP']).'</td><td>'.NotBlank($Interface['ExternalIP']).'</td><td>'.NotBlank($Interface['CZFreeIP']).'</td><td>'.NotBlank($Interface['MAC']).'</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
       }      
     }

trunk/page.php

@@ -9 +9 @@
     'manualy.php' => 'Manuály',
     'is' => array('',
-      'administration_page.php' => 'Administrace sítě',
       'topologie.php' => 'Topologie sítě',
       'dostupnost.php' => 'Dostupnost zařízení',
-      'tc' => 'Řízení internetového provozu',
     ),
     'network.php' => 'Technické informace',
-    'mapy' => array('',
-      'mapa_nabidka.php' => 'Nabídky mapy',
-      'mapa.php' => 'Mapa',
-    ),
     'map' => array('',
-      'index.php' => 'Mapa',
+      'index.php' => 'Mapa sítě',
     ),
     'network' => array('',
+      'administration.php' => 'Administrace sítě',
       'dostupnost.php' => 'Dostupnost zařízení',
       'restart.php' => 'Restart služeb',
@@ -79 +74 @@
     'sluzby.php' => 'Služby',
     'history.php' => 'Historie',
-    'sunrisechat' => array('',
-      'history.php' => 'Historie SunriseChatu',
-      'network.php' => 'Obsah testu sítě SunriseChatu 2.7+',
-      'network_old.php' => 'Obsah testu sítě SunriseChatu 2.6',
-      'webchat.php' => 'Okno SunriseChatu',
-    ),
     'docs' => array('',
       'zapisy' => array('',