Changeset 171 for www/system

Timestamp:

Mar 24, 2009, 7:28:33 PM (16 years ago)

Author:

george

Message:

• Opraveno: Konfigurační skripty síťových zařízení opraveny pro nové tabulky Member a Subject.

Location:

www/system/generators

Files:

• dhcp_routerboard.php (modified) (1 diff)
• dns.php (modified) (1 diff)
• nat_routerboard.php (modified) (3 diffs)
• netwatch.php (modified) (1 diff)
• traffic_shaping_routerboard.php (modified) (6 diffs)

www/system/generators/dhcp_routerboard.php

@@ -20 +20 @@
   $Commands = implode(';', $Commands);
   $Command = '/usr/bin/ssh -l '.$UserName.' -i id_dsa '.$Subnet['DHCP'].' "'.$Commands.'"';
-  echo($Command."\n");
+  //echo($Command."\n");
   $Output = '';
   exec($Command, $Output);

www/system/generators/dns.php

@@ -291 +291 @@
   fclose($File2);
 }
+
 ?>

www/system/generators/nat_routerboard.php

@@ -1 +1 @@
 <?php
+
 include_once('../../global.php');
 
@@ -8 +9 @@
 $Commands[] = '/ip firewall nat { remove [find] }';
 
-$DbResult = $Database->select('users', 'CONCAT(second_name, " ", first_name) as fullname, id');
-while($User = $DbResult->fetch_array())
+$DbResult = $Database->query('SELECT Member.*, Subject.* FROM Member ON Member.Subject = Subject.Id');
+while($Member = $DbResult->fetch_assoc())
 {
-  echo($User['fullname']."\n");
-  $DbResult2 = $Database->select('hosts', '*', '(external_ip <> "") AND (user='.$User['id'].') AND (IP != external_ip) ORDER BY id DESC');
-  while($Host = $DbResult2->fetch_array())
+  echo($Member['Name']."\n");
+  $DbResult2 = $Database->select('hosts', '*', '(external_ip <> "") AND (user='.$Member['Id'].') AND (IP != external_ip) ORDER BY id DESC');
+  while($Host = $DbResult2->fetch_assoc())
   {
     echo($Host['name']."\n");
@@ -28 +29 @@
 
 $Commands = addslashes(implode(';', $Commands));
-$Command = '/usr/bin/ssh -l admin-ssh -i /root/.ssh/id_dsa '.$Router.' "'.$Commands.'"';
-//echo($Command."\n");
-exec($Command, $Output);
+$Command = '/usr/bin/ssh -l admin-ssh -i id_dsa '.$Router.' "'.$Commands.'"';
+echo($Command."\n");
+//exec($Command, $Output);
 //array_pop($Output);
 //print_r($Output);

www/system/generators/netwatch.php

@@ -24 +24 @@
   $Commands = implode(';', $Commands);
   $Command = '/usr/bin/ssh -l '.$UserName.' -i id_dsa '.$Router['DHCP'].' "'.$Commands.'"';
-  echo($Command."\n");
+  //echo($Command."\n");
   $Output = '';
   exec($Command, $Output);

www/system/generators/traffic_shaping_routerboard.php

@@ -6 +6 @@
 include_once('../../global.php');
 $Finance = &$System->Modules['Finance'];
-$Finance->NactiMesicniParametry(0);
+$Finance->LoadMonthParameters(0);
 
 // Generate traffic shaping rules
@@ -29 +29 @@
 
 $InetInterface = 'ether3';
-$Router = '192.168.0.99';
+$Router = '192.168.0.11';
 
 $Commands = array();
@@ -59 +59 @@
 // Process users
 $Index = 0;
-$DbResult = $Database->select('users', '*, CONCAT(second_name, " ", first_name) as fullname', '(inet=1)');
-while($User = $DbResult->fetch_array())
+$DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member LEFT JOIN Subject ON Subject.Id = Member.Subject');
+while($Member = $DbResult->fetch_array())
 {
-  $User['fullname'] = strtr(strtolower(trim($User['fullname'])), array(' ' => '-', '(' => '-', ')' => '-',
+  $Member['Name'] = strtr(strtolower(trim($Member['Name'])), array(' ' => '-', '(' => '-', ')' => '-',
   'č' => 'c', 'š' => 's', 'ě' => 'e', 'ř' => 'r', 'ž' => 'z', 'ý' => 'y', 'á' => 'a', 'í' => 'i', 'é' => 'e', 'ů' => 'u', 'ú' => 'u', 'ď' => 'd', 'ť' => 't', 'ň' => 'n', 'ó' => 'o',
   'Č' => 'c', 'Š' => 's', 'Ě' => 'e', 'Ř' => 'r', 'Ž' => 'z', 'Ý' => 'y', 'Á' => 'a', 'Í' => 'i', 'É' => 'e', 'Ů' => 'u', 'Ú' => 'u', 'Ď' => 'd', 'Ť' => 't', 'Ň' => 'n', 'Ó' => 'o',
 ));
 
-  echo('Uživatel '.$User['fullname'].": ");
-  $SpeedIn = round($Tarify[$User['inet_tarif_now']]['min_speed'] / $InDivider);
-  $SpeedOut = round($Tarify[$User['inet_tarif_now']]['min_speed'] / $OutDivider);
-  $UserMaxSpeedIn = round($Tarify[$User['inet_tarif_now']]['max_speed'] / $InDivider);
-  $UserMaxSpeedOut = round($Tarify[$User['inet_tarif_now']]['max_speed'] / $OutDivider);
-  $Quantum = $Tarify[$User['inet_tarif_now']]['speed_factor'] * 1500;
-  $Commands[] = ' /queue tree add name='.$User['fullname'].'-out limit-at='.$SpeedIn.' max-limit='.$UserMaxSpeedIn.' parent=main-out queue=wireless-default';
-  $Commands[] = ' /queue tree add name='.$User['fullname'].'-in limit-at='.$SpeedOut.' max-limit='.$UserMaxSpeedOut.' parent=main-in queue=wireless-default';
+  echo('Uživatel '.$Member['Name'].": ");
+  $Tariff = $Finance->Tarify[$Member['InternetTariffCurrentMonth']]; 
+  $SpeedIn = round($Tariff['min_speed'] / $InDivider);
+  $SpeedOut = round($Tariff['min_speed'] / $OutDivider);
+  $UserMaxSpeedIn = round($Tariff['max_speed'] / $InDivider);
+  $UserMaxSpeedOut = round($Tariff['max_speed'] / $OutDivider);
+  $Quantum = $Tariff['speed_factor'] * 1500;
+  $Commands[] = ' /queue tree add name='.$Member['Name'].'-out limit-at='.$SpeedIn.' max-limit='.$UserMaxSpeedIn.' parent=main-out queue=wireless-default';
+  $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=".$User['id']);
+  $DbResult2 = $Database->select('hosts', 'COUNT(*)', "block=0 AND MAC!='' AND user=".$Member['Id']);
   $Row = $DbResult2->fetch_array();
   $HostCount = $Row[0];
@@ -82 +83 @@
   $HostSpeedOut = round($SpeedOut / $HostCount);
 
-  $DbResult2 = $Database->select('hosts', '*', "block=0 AND MAC!='' AND user=".$User['id']);
+  $DbResult2 = $Database->select('hosts', '*', "block=0 AND MAC!='' AND user=".$Member['Id']);
   while($Host = $DbResult2->fetch_array())
   {
@@ -90 +91 @@
     $Subnet = $IPParts[2];
     $Commands[] = ' /ip firewall mangle add chain=inet-out-'.$Subnet.' src-address='.$Host['IP'].' out-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Host['name'].'"';
-    $Commands[] = ' /queue tree add name='.$Host['name'].'-out limit-at='.$HostSpeedIn.' max-limit='.$UserMaxSpeedIn.' parent='.$User['fullname'].'-out packet-mark='.$PacketMark.' queue=wireless-default';
+    $Commands[] = ' /queue tree add name='.$Host['name'].'-out limit-at='.$HostSpeedIn.' max-limit='.$UserMaxSpeedIn.' parent='.$Member['Name'].'-out packet-mark='.$PacketMark.' queue=wireless-default';
     $PacketMark++;
     $Commands[] = ' /ip firewall mangle add chain=inet-in-'.$Subnet.' dst-address='.$Host['IP'].' in-interface='.$InetInterface.' action=mark-packet new-packet-mark='.$PacketMark.' passthrough=no comment="'.$Host['name'].'"';
-    $Commands[] = ' /queue tree add name='.$Host['name'].'-in limit-at='.$HostSpeedOut.' max-limit='.$UserMaxSpeedOut.' parent='.$User['fullname'].'-in packet-mark='.$PacketMark.' queue=wireless-default';
+    $Commands[] = ' /queue tree add name='.$Host['name'].'-in limit-at='.$HostSpeedOut.' max-limit='.$UserMaxSpeedOut.' parent='.$Member['Name'].'-in packet-mark='.$PacketMark.' queue=wireless-default';
     $PacketMark++;
 
     // Posílej po menších částech
     if($Index > 50)
-        {
+          {
       $Commands = addslashes(implode(';', $Commands));
-      $Command = '/usr/bin/ssh -l admin-ssh -i /root/.ssh/id_dsa '.$Router.' "'.$Commands.'"';
+      $Command = '/usr/bin/ssh -l admin-ssh -i id_dsa '.$Router.' "'.$Commands.'"';
+      //echo($Command."\n");
       exec($Command, $Output);
       print_r($Output);
-          $Commands = array();
-          $Index = 0;
-        }
+          $Commands = array();
+            $Index = 0;
+          }
     $Index++;
   }
@@ -112 +114 @@
 //print_r($Commands);
 $Commands = addslashes(implode(';', $Commands));
-$Command = '/usr/bin/ssh -l admin-ssh -i /root/.ssh/id_dsa '.$Router.' "'.$Commands.'"';
+$Command = '/usr/bin/ssh -l admin-ssh -i id_dsa '.$Router.' "'.$Commands.'"';
 //echo($Command."\n");
 exec($Command, $Output);