Changeset 195 for trunk

Timestamp:

Apr 27, 2009, 7:25:40 AM (16 years ago)

Author:

george

Message:

• Upraveno: Kódování tabulek a sloupců sjednoceno na utf8_czech_ci.
• Opraveno: Zobrazení seznamu počítačů uživatele.

Location:

trunk

Files:

• finance/finance.php (modified) (1 diff)
• finance/zarizeni.php (modified) (2 diffs)
• network.php (modified) (1 diff)
• network/user_hosts.php (modified) (2 diffs)
• sql/updates/195.sql (added)

trunk/finance/finance.php

@@ -216 +216 @@
         $ID = $Row4['parent'];
       }
-      //echo('Pocet '.$Row3[0].','.$Row['hosts'].'<br>');
       $this->Database->update('network_segments', 'id='.$NetworkSegment['id'], array('price' => $Row2['Price'], 'users' => ($Row3[0] + $RowP['users']), 'consumption' => $Row2['Consumption'], 'users_overheads' => ($Row3[0] + $RowP2['users_overheads'])));
     }

trunk/finance/zarizeni.php

@@ -11 +11 @@
     // Seznam segmentů a zařízení
     $Output = 'Seznam segmentů a zařízení:<br><table style="font-size: smaller;" class="WideTable"><tr><th>Název</th><th>Spotřeba<br>[W]</th><th>Datum<br>zakoupení</th><th>Cena [Kč]</th></tr>';
-    $DbResult = $this->Database->query("SELECT * FROM network_segments");    
+    $DbResult = $this->Database->query('SELECT * FROM network_segments');    
     while($Row = $DbResult->fetch_array())
     {
       $Output .= '<tr><td style="text-align: left" colspan="3"><strong>Segment: '.$Row['name'].' ('.$Row['users'].')</strong></td><td style="font-weight: Bold;" align="right">'.$Row['price'].'</td></tr>';
-      $DbResult2 = $this->Database->query("SELECT * FROM network_devices WHERE segment=".$Row['id']." AND used=1");
+      $DbResult2 = $this->Database->query('SELECT * FROM network_devices WHERE segment='.$Row['id'].' AND used=1');
       while($Row = $DbResult2->fetch_array())
       {
@@ -21 +21 @@
       }
     }
-    $DbResult = $this->Database->query("SELECT SUM(price) FROM network_devices WHERE used=1");
+    $DbResult = $this->Database->query('SELECT SUM(price) FROM network_devices WHERE used=1');
     $Row = $DbResult->fetch_array();
     $Output .= '<tr><td colspan="3"><strong>Celkem:</strong></td><td align="right"><strong>'.$Row[0].'</strong></td></tr>';

trunk/network.php

@@ -128 +128 @@
         $Output .= 'Aktualizováno: 10.8.2008';
         break;
-      case 'udp_forward':
-        $Output .= '<br /><strong>Průchozí UDP porty her:</strong><br />
-<table style="font-size: small;" border="1" cellspacing="0" cellpadding="3">
-<tr><th>Hra</th><th>Číslo portu</th></tr>';
-        $DbResult = $this->Database->select('network_udp_forwarder', '*');
-        while($Row = $DbResult->fetch_array())
-        {
-          $Output .= '<tr><td>'.$Row['game'].'</td><td align="right">'.$Row['port'].'</td></tr>';
-        }
-        $Output .= '</table>';
-        break;
       default: 
         $Output .= '<a href="?section=servers">Seznam serverů</a><br />';
-        $Output .= '<a href="?section=udp_forward">Průchozí UDP porty přes centrálu</a><br />';
         $Output .= '<a href="?section=nastaveni_pripojeni">Nastavení připojení počítačů</a><br />';
         $Output .= '<a href="?section=obsazeni_wifi_kanalu">Obsazení Wi-Fi kanálů</a><br />';

trunk/network/user_hosts.php

@@ -12 +12 @@
 
     $Output = '<br /><table class="WideTable">
-<tr><th>Jméno počítače</th><th>Místní IP adresa</th><th>Veřejná IP adresa</th><th>CZFree IP adresa</th><th>Naposledy online</th><th>Fyzická adresa</th></tr>';
+<tr><th>Jméno počítače</th><th>Typ</th></th><th>Místní IP adresa</th><th>Veřejná IP adresa</th><th>CZFree IP adresa</th><th>Naposledy online</th><th>Fyzická adresa</th></tr>';
 
-    $DbResult = $this->Database->select('hosts', '*', 'type=0 AND user='.$this->System->Modules['User']->User['Member']);
+    $DbResult = $this->Database->query('SELECT hosts.*, HostType.Name AS HostType FROM hosts LEFT JOIN HostType ON HostType.Id = hosts.type WHERE (hosts.used = 1) AND (hosts.user = '.$this->System->Modules['User']->User['Member'].') ORDER BY hosts.name');
     while($Host = $DbResult->fetch_array())
     {
@@ -23 +23 @@
       if($Host['external_ip'] == '') $Host['external_ip'] = '&nbsp;';
       if($Host['MAC'] == '') $Host['MAC'] = '&nbsp;';
-      $Output .= '<tr><td style="text-align: left; '.$Style.'">'.$Host['name'].'</td><td>'.$Host['IP'].'</td><td>'.$Host['external_ip'].'</td><td>'.$Host['czfree_ip'].'</td><td >'.HumanDate($Host['last_online']).'</td><td>'.$Host['MAC'].'</td></tr>';
+      $Output .= '<tr><td style="text-align: left; '.$Style.'">'.$Host['name'].'</td><td>'.$Host['HostType'].'</td><td>'.$Host['IP'].'</td><td>'.$Host['external_ip'].'</td><td>'.$Host['czfree_ip'].'</td><td >'.HumanDate($Host['last_online']).'</td><td>'.$Host['MAC'].'</td></tr>';
     }
     $Output .= '</table><br />';