Changeset 304 for trunk

Timestamp:

Jan 30, 2011, 11:22:40 AM (14 years ago)

Author:

george

Message:

• Upraveno: Řazení sloupců a stránkování ve zobrazení seznamu podsítí.

Location:

trunk

Files:

• backup (deleted)
• index.php (modified) (1 diff)
• network/subnet.php (modified) (1 diff)
• sql/updates/303.sql (added)
• style.php (modified) (2 diffs)
• telseznam.php (modified) (1 diff)
• ukoly.php (deleted)

trunk/index.php

@@ -17 +17 @@
 
     $Output = '';
-    $DbResult = $Database->query('SELECT * FROM `Hyperlink` WHERE `Group`='.$GroupId);
+    $DbResult = $Database->query('SELECT * FROM `Hyperlink` WHERE (`Group`='.$GroupId.') AND (`Enable` = 1)');
     while($HyperLink = $DbResult->fetch_assoc())
     {

trunk/network/subnet.php

@@ -9 +9 @@
   function Show()
   {
-    $Output = '<br /><table class="WideTable"><tr><th>Název</th><th>IP rozsah</th><th>Adresa DHCP</th><th>Výchozí brána</th><th>Max. adres</th><th>Registrovaných adres</th><th>Využití [%]</th><th>Účastník</th></tr>';
-    $DbResult = $this->Database->query('SELECT NetworkSubnet.*, Subject.Name AS SubjectName FROM NetworkSubnet LEFT JOIN Member ON Member.Id = NetworkSubnet.Member LEFT JOIN Subject ON Subject.Id = Member.Subject ORDER BY NetworkSubnet.AddressRange');
-    while($Subnet = $DbResult->fetch_assoc())
-    {
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `NetworkSubnet`');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);    
+
+    $Output = $PageList['Output'];
+    $Output .= '<table class="WideTable" style="font-size: small;">';
+   
+    $TableColumns = array(
+      array('Name' => 'Name', 'Title' => 'Název'), 
+      array('Name' => 'AddressRange', 'Title' => 'IP rozsah'), 
+      array('Name' => 'DHCP', 'Title' => 'Adresa DHCP'), 
+      array('Name' => 'Gateway', 'Title' => 'Výchozí brána'), 
+      array('Name' => '', 'Title' => 'Max. adres'), 
+      array('Name' => '', 'Title' => 'Registrovaných adres'), 
+      array('Name' => '', 'Title' => 'Využití'), 
+      array('Name' => 'SubjectName', 'Title' => 'Účastník'), 
+    );
+    $Order = GetOrderTableHeader($TableColumns, 'NetworkSubnet.AddressRange', 0);
+    $Output .= $Order['Output'];
+
+    $Query = 'SELECT NetworkSubnet.*, Subject.Name AS SubjectName FROM NetworkSubnet LEFT JOIN Member ON Member.Id = NetworkSubnet.Member LEFT JOIN Subject ON Subject.Id = Member.Subject '.$Order['SQL'].$PageList['SQLLimit'];
+
+    $DbResult = $this->Database->query($Query);
+    while($Subnet = $DbResult->fetch_assoc()) 
+    { 
       $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM NetworkInterface WHERE CompareNetworkPrefix(INET_ATON("'.$Subnet['AddressRange'].'"), INET_ATON(LocalIP), '.$Subnet['Mask'].')');
       $DbRow = $DbResult2->fetch_row();
       $AddressCount = $DbRow[0];
       $MaxAddressCount = $SubnetMask = pow(2, 32 - $Subnet['Mask']) - 2;
-      $Output .= '<tr><td>'.$Subnet['Name'].'</td><td>'.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'</td><td>'.$Subnet['DHCP'].'</td><td>'.$Subnet['Gateway'].'</td><td>'.$MaxAddressCount.'</td><td>'.$AddressCount.'</td><td>'.round($AddressCount / $MaxAddressCount * 100).'</td><td>'.$Subnet['SubjectName'].'</td></tr>';
+
+      $Output .= '<tr><td>'.$Subnet['Name'].'</td>'.
+      '<td>'.$Subnet['AddressRange'].'/'.$Subnet['Mask'].'</td>'.
+      '<td>'.$Subnet['DHCP'].'</td>'.
+      '<td>'.$Subnet['Gateway'].'</td>'.
+      '<td>'.$MaxAddressCount.'</td>'.
+      '<td>'.$AddressCount.'</td>'.
+      '<td>'.round($AddressCount / $MaxAddressCount * 100).'</td>'.
+      '<td>'.$Subnet['SubjectName'].'</td></tr>';
     }
     $Output .= '</table>';
+    $Output .= $PageList['Output'];
     return($Output);
   }

trunk/style.php

@@ -84 +84 @@
        'index.php' => 'Web kamera',
     ),
-    'navody.php' => 'Návody',
-    'ukoly.php' => 'Úkoly',
     'otevreno.php' => 'Otvírací doby',
     'aktuality' => array('',
@@ -92 +90 @@
     ),
     'sluzby.php' => 'Služby',
-    'history.php' => 'Historie',
     'sunrisechat' => array('',
       'history.php' => 'Historie SunriseChatu',

trunk/telseznam.php

@@ -49 +49 @@
     
     $Output .= '<p>Pro aktualizaci údajů v seznamu se prosím obraťte na email robie@centrum.cz</p>';
-    $Output .= '<a href="images/telseznam.jpg">Starý seznam</a>';
+    $Output .= '<a href="images/telseznam.jpg">Starý seznam</a><br/>';
+    $Output .= '<a href="http://www.xphonet.cz/index.php?tc=registr&t=1&m=1&pc=porovnani-ceniku&p=4&o=5&d=1">Porovnání cen všech operátorů</a><br/>';
     return($Output);
   }