Changeset 213 for trunk/system/generators/traffic_shaping_routerboard.php

Timestamp:

May 10, 2009, 12:30:09 PM (16 years ago)

Author:

george

Message:

Opraveno: Skripty pro generování nastavení směrovačů.

File:

• trunk/system/generators/traffic_shaping_routerboard.php (modified) (5 diffs)

trunk/system/generators/traffic_shaping_routerboard.php

@@ -75 +75 @@
   $Commands[] = ' /queue tree add name='.$Member['Name'].'-in limit-at='.$SpeedOut.' max-limit='.$UserMaxSpeedOut.' parent=main-in queue=wireless-default';
 
-  $DbResult2 = $Database->select('hosts', 'COUNT(*)', '(block = 0) AND (MAC != "") AND (user='.$Member['Id'].')');
-  $Row = $DbResult2->fetch_array();
+  $DbResult2 = $Database->select('NetworkDevice', 'COUNT(*)', 'Member='.$Member['Id']);
+  $Row = $DbResult2->fetch_row();
   $HostCount = $Row[0];
   if($HostCount > 0)
@@ -91 +91 @@
   while($Device = $DbResult2->fetch_assoc())
   {
-    $DbResult3 = $Database->select('NetworkInterface', '*', 'Device = '.$Device['Id']);
+    $DbResult3 = $Database->select('NetworkInterface', '*', 'Device = '.$Device['Id'].' AND LocalIP != ""');
     while($Interface = $DbResult3->fetch_assoc())
     {
-      $Name = $Device['Name'].'-'.$Interface['Name'];
+      $Name = $Device['Name'];
+      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       $Name = RouterOSIdent($Name);
       echo($Name.', ');
@@ -123 +124 @@
   
   $DbResult2 = $Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
-  while($Subnet = $DbResult2->fetch_array())
+  while($Subnet = $DbResult2->fetch_assoc())
   {
     $Subnet['Name'] = RouterOSIdent('subnet-'.$Subnet['Name']);
@@ -139 +140 @@
     if($Index > 50)
     {
+      //print_r($Commands);
       $Commands = addslashes(implode(';', $Commands));
       $Command = '/usr/bin/ssh -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Config['MainRouter']['HostName'].' "'.$Commands.'"';
@@ -150 +152 @@
     $Index++;
   }
-  
   echo("\n");
 }