Changeset 229 for trunk

Timestamp:

Jun 21, 2009, 12:04:00 PM (16 years ago)

Author:

george

Message:

• Opraveno: Funkce pro přidávání předpon násobků jednotek čísel.
• Upraveno: Seznam dostupných AP a obsazených kanálů se nyní načítá z databáze z tabulky NetworkAP.

Location:

trunk

Files:

• database.php (modified) (1 diff)
• forms.php (modified) (1 diff)
• global.php (modified) (5 diffs)
• network.php (modified) (1 diff)
• sql/updates/229.sql (added)

trunk/database.php

@@ -54 +54 @@
     {
             if(!in_array($Value, $this->Functions)) $Value = '"'.$this->real_escape_string($Value).'"';
-      $Values .= ', '.$Key.'='.$Value;
+      $Values .= ', `'.$Key.'`='.$Value;
     }
     $Values = substr($Values, 2);  

trunk/forms.php

@@ -94 +94 @@
                 $Edit = '<select style="width: 100%;" name="'.$Context.$Index.'">';
                 $DbResult = $Database->select($FormTypes[$Item['Type']]['Table'], $FormTypes[$Item['Type']]['Id'].' as Id, '.$FormTypes[$Item['Type']]['Name'].' as Name', $FormTypes[$Item['Type']]['Filter'].' ORDER BY Name');
-                while($Row = $DbResult->fetch_array())
-                  $Edit .= '<option value="'.$Row['Id'].'">'.$Row['Name'].'</option>';
+                while($Row = $DbResult->fetch_assoc())
+                {
+                  if($Row['Id'] == $this->Values[$Index]) $Selected = ' selected="selected"'; 
+                    else $Selected = '';
+                  $Edit .= '<option value="'.$Row['Id'].'"'.$Selected.'>'.$Row['Name'].'</option>';
+                }
                 $Edit .= '</select>';
                 break;

trunk/global.php

@@ -50 +50 @@
       array('u', 'mikro', pow(10, -6)),
       array('m', 'mili', pow(10, -3)),
-      array('', '', pow(10, 0), pow(2, 0)),
+      array('', '', pow(10, 0)),
       array('k', 'kilo', pow(10, 3)),
       array('M', 'mega', pow(10, 6)),
@@ -63 +63 @@
   'Time' => array
   (
-    'BaseIndex' => 0,
+    'BaseIndex' => 8,
     'Definition' => array
     (
@@ -75 +75 @@
       array('ms', 'milisekunda', pow(10, -3)),
       array('s', 'sekunda', 1),
-      array('min', 'minuta', 60),
-      array('hod', 'hodina', 60 * 60) ,
-      array('den', 'den', 24 * 60 * 60),
-      array('týd', 'týden', 7 * 24 * 60 * 60),
-      array('měs', 'měsíc', 30 * 24 * 60 * 60),
-      array('rok', 'rok', 364 * 24 * 60 * 60),
-      array('des', 'desetiletí', 10 * 364 * 24 * 60 * 60),
-      array('sta', 'staletí', 100 * 364 * 24 * 60 * 60),
-      array('tis', 'tisiciletí', 10000 * 364 * 24 * 60 * 60),
+      array('minut', 'minuta', 60),
+      array('hodin', 'hodina', 60 * 60) ,
+      array('dnů', 'den', 24 * 60 * 60),
+      array('týdnů', 'týden', 7 * 24 * 60 * 60),
+      array('měsíců', 'měsíc', 30 * 24 * 60 * 60),
+      array('roků', 'rok', 364 * 24 * 60 * 60),
+      array('desetiletí', 'desetiletí', 10 * 364 * 24 * 60 * 60),
+      array('stalatí', 'staletí', 100 * 364 * 24 * 60 * 60),
+      array('tisíciletí', 'tisiciletí', 10000 * 364 * 24 * 60 * 60),
     ),
   ),
 );
-
 
 class System extends Module
@@ -137 +136 @@
   function HumanDate($Time)
   {
-      return(date('j.n.Y', $Time));
+    return(date('j.n.Y', $Time));
   }
 
@@ -158 +157 @@
     global $PrefixMultipliers;
 
-    if(($Unit == '') and ($PrefixType != 'Time')) return($this->TruncateDigits($Value, $Digits));
+    $Negative = ($Value < 0);
+    $Value = abs($Value);
+    if(($Unit == '') and ($PrefixType != 'Time'))
+      return($this->TruncateDigits($Value, $Digits));
+
     $I = $PrefixMultipliers[$PrefixType]['BaseIndex'];
-    if($Value > 0) $II = 1; 
-    else if($Value < 0) $II = -1;
-    else $II = 0;
-    while((($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + $II][2]) > $II) and (($I + $II) >= 0) and (($I + $II) <= count($PrefixMultipliers[$PrefixType]['Definition']))) $I = $I + $II;
+    if($Value == 0) return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
+     
+    if($Value > 1) 
+    {
+      while((($I + 1) <= count($PrefixMultipliers[$PrefixType]['Definition'])) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I + 1][2]) > 1))
+        $I = $I + 1;
+    } else 
+    if($Value < 1)
+    {
+      while((($I - 1) >= 0) and (($Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2]) < 1))
+        $I = $I - 1;
+    }
     $Value = $Value / $PrefixMultipliers[$PrefixType]['Definition'][$I][2];
-
+    
     // Truncate digits count
     $Value = $this->TruncateDigits($Value, $Digits);
-
+    if($Negative) $Value = -$Value;
     return($Value.' '.$PrefixMultipliers[$PrefixType]['Definition'][$I][0].$Unit);
   }

trunk/network.php

@@ -98 +98 @@
         break;
       case 'obsazeni_wifi_kanalu':
-        $Output .= '<br /><strong>Obsazení wifi kanálů:</strong><br />
-<table style="font-size: small;"  border="1" cellspacing="0" cellpadding="3">
-<tr><th>Kanál</th><th>Frekvence [GHz]</th><th>Zařízení</th></tr>
-<tr><td>1</td><td>2,412</td><td>AP-RUDO, AP-HAJDIKOVI, ptp-skarpa</td></tr>
-<tr><td>2</td><td>2,417</td><td>&nbsp;</td></tr>
-<tr><td>3</td><td>2,422</td><td>ap-markytan, ap-zvonicek, ap-hrbacek</td></tr>
-<tr><td>4</td><td>2,427</td><td>ap-george</td></tr>
-<tr><td>5</td><td>2,432</td><td>AP-MARON, ap-janicata</td></tr>
-<tr><td>6</td><td>2,437</td><td>ap-sekula</td></tr>
-<tr><td>7</td><td>2,442</td><td>ap-chaty</td></tr>
-<tr><td>8</td><td>2,447</td><td>ap-bytovky</td></tr>
-<tr><td>9</td><td>2,452</td><td>ap-kopecek</td></tr>
-<tr><td>10</td><td>2,457</td><td>ap-skarpa, AP-HAJDIKOVI2, AP-NAVRATIL</td></tr>
-<tr><td>11</td><td>2,462</td><td>&nbsp;</td></tr>
-<tr><td>12</td><td>2,467</td><td>&nbsp;</td></tr>
-<tr><td>13</td><td>2,472</td><td>ap-hajda, zbranek</td></tr>
-<tr><td>100</td><td>5,500</td><td>ptp-markytan</td></tr>
-<tr><td>104</td><td>5,520</td><td>ptp-smutny</td></tr>
-<tr><td>108</td><td>5,540</td><td>&nbsp;</td></tr>
-<tr><td>112</td><td>5,560</td><td>&nbsp;</td></tr>
-<tr><td>116</td><td>5,580</td><td>ptp-janicata</td></tr>
-<tr><td>120</td><td>5,600</td><td>ptp-hajdova</td></tr>
-<tr><td>124</td><td>5,620</td><td>&nbsp;</td></tr>
-<tr><td>128</td><td>5,640</td><td>ptp-bytovky</td></tr>
-<tr><td>132</td><td>5,660</td><td>ptp-chaty</td></tr>
-<tr><td>136<td>5,700</td></td><td>ptp-sekula</td></tr>
-<tr><td>140<td>5,720</td></td><td>&nbsp;</td></tr>
-</table>';
-        $Output .= 'Aktualizováno: 10.8.2008';
+        $Output .= '<br/><div align="center"><strong>Seznam AP a obsazení wifi kanálů:</strong></div>
+<table class="WideTable">
+<tr><th>Kanál</th><th>Frekvence [GHz]</th><th>SSID</th></tr>';  
+        // http://en.wikipedia.org/wiki/List_of_WLAN_channels
+        $ChannelList = array(2412 => 1, 2417 => 2, 2422 => 3, 2427 => 4, 2432 => 5, 2437 => 6, 2442 => 7, 2447 => 8, 2452 => 9, 2457 => 10, 2462 => 11, 2467 => 12, 2472 => 13, 5210 => 42, 5250 => 50, 5290 => 48, 5500 => 100, 5520 => 104, 5540 => 108, 5560 => 112, 5580 => 116, 5600 => 120, 5620 => 124, 5640 => 128, 5660 => 132, 5700 => 140, 5720 => 144);
+        $DbResult = $this->Database->query('SELECT Frequency FROM NetworkAP GROUP BY Frequency');
+        while($DbRow = $DbResult->fetch_assoc())
+        {
+          $SSID = '';
+          $DbResult2 = $this->Database->query('SELECT * FROM NetworkAP WHERE Frequency='.$DbRow['Frequency']);
+          while($DbRow2 = $DbResult2->fetch_assoc())
+            $SSID .= ', '.$DbRow2['SSID'];
+          $SSID = substr($SSID, 2);
+          $Output .= '<tr><td>'.$ChannelList[$DbRow['Frequency']].'</td><td>'.$DbRow['Frequency'].'</td><td>'.$SSID.'</td></tr>';
+        }
+        $Output .= '</table>';
         break;
       default: