Changeset 522 for trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

Timestamp:

Apr 15, 2013, 11:08:49 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Skritpy generátorů nastavení routerů přetvořeny na aplikační moduly NetworkConfig.

Location:

trunk/Modules/NetworkConfigRouterOS

Files:

• . (added)
• Generators (added)
• Generators/Queue.php (copied) (copied from trunk/system/generators/queue.php ) (7 diffs)

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -5 +5 @@
 $ClassesEnabled = 1;
 $SessionDisable = true;
-include('../../Common/Global.php');
-include('../routerboard.php');
-include('common.php');
+include_once(dirname(__FILE__).'/../../../Common/Global.php');
+include_once(dirname(__FILE__).'/../Routerboard.php');
+include_once('Common.php');
 $PathQueue = array('queue', 'tree');
-$Database = &$System->Database;
 
 $Routerboard = new Routerboard();
@@ -48 +47 @@
 
 // Divide rules by subnet number
-$DbResult = $Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet`');
+$DbResult = $System->Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet`');
 // Slow free internet
 $PacketMark = GetMarkByComment('free-out');
@@ -56 +55 @@
 
 // Process users
-$DbResult = $Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Blocked`=0');
+$DbResult = $System->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` WHERE `Member`.`Blocked`=0');
 while($Member = $DbResult->fetch_assoc())
 {
@@ -62 +61 @@
 
   echo('Zákazník '.$Member['Name']."\n");
-  $DbResult4 = $Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
+  $DbResult4 = $System->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
     'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`Action` IS NULL)');
   while($Service = $DbResult4->fetch_assoc())
@@ -75 +74 @@
 
     $Filter = '(`Used` = 1) AND (`Service` = '.$Service['RelId'].')';
-    $DbResult2 = $Database->select('NetworkDevice', 'COUNT(*)', $Filter);
+    $DbResult2 = $System->Database->select('NetworkDevice', 'COUNT(*)', $Filter);
     $Row = $DbResult2->fetch_row();
     $HostCount = $Row[0];
@@ -88 +87 @@
     }
 
-    $DbResult2 = $Database->select('NetworkDevice', '*', $Filter);
+    $DbResult2 = $System->Database->select('NetworkDevice', '*', $Filter);
     while($Device = $DbResult2->fetch_assoc())
     {
-      $DbResult3 = $Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
+      $DbResult3 = $System->Database->select('NetworkInterface', '*', '`Device` = '.$Device['Id'].' AND `LocalIP` != ""');
       while($Interface = $DbResult3->fetch_assoc())
       {
@@ -107 +106 @@
     }
   
-    $DbResult2 = $Database->select('NetworkSubnet', '*', '`Service`='.$Service['RelId']);
+    $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Service`='.$Service['RelId']);
     while($Subnet = $DbResult2->fetch_assoc())
     {