Changeset 522

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• Common/Global.php (modified) (3 diffs)
• Common/Version.php (modified) (1 diff)
• Modules/NetworkConfig (added)
• Modules/NetworkConfig/Generate.php (copied) (copied from trunk/system/generators/generate.php ) (2 diffs)
• Modules/NetworkConfig/NetworkConfig.php (added)
• Modules/NetworkConfigLinux (added)
• Modules/NetworkConfigLinux/Generators (added)
• Modules/NetworkConfigLinux/Generators/DHCP.php (copied) (copied from trunk/system/generators/linux/dhcp.php )
• Modules/NetworkConfigLinux/Generators/IPTables.php (copied) (copied from trunk/system/generators/linux/iptables.php )
• Modules/NetworkConfigLinux/Generators/NAT.php (copied) (copied from trunk/system/generators/linux/nat.php )
• Modules/NetworkConfigLinux/Generators/TrafficShaping.php (copied) (copied from trunk/system/generators/linux/traffic_shaping.php )
• Modules/NetworkConfigLinux/NetworkConfigLinux.php (added)
• Modules/NetworkConfigRouterOS (added)
• Modules/NetworkConfigRouterOS/Generators (added)
• Modules/NetworkConfigRouterOS/Generators/AddressPortability.php (copied) (copied from trunk/system/generators/address_portability.php ) (5 diffs)
• Modules/NetworkConfigRouterOS/Generators/Common.php (copied) (copied from trunk/system/generators/common.php ) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/DHCP.php (copied) (copied from trunk/system/generators/dhcp.php ) (3 diffs)
• Modules/NetworkConfigRouterOS/Generators/DNS.php (copied) (copied from trunk/system/generators/dns.php ) (10 diffs)
• Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php (copied) (copied from trunk/system/generators/firewall_filter.php ) (3 diffs)
• Modules/NetworkConfigRouterOS/Generators/FirewallMangle.php (copied) (copied from trunk/system/generators/firewall_mangle.php ) (5 diffs)
• Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php (copied) (copied from trunk/system/generators/firewall_nat.php ) (5 diffs)
• Modules/NetworkConfigRouterOS/Generators/Netwatch.php (copied) (copied from trunk/system/generators/netwatch.php ) (3 diffs)
• Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (copied) (copied from trunk/system/generators/netwatch_import.php ) (4 diffs)
• Modules/NetworkConfigRouterOS/Generators/Queue.php (copied) (copied from trunk/system/generators/queue.php ) (7 diffs)
• Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (added)
• Modules/NetworkConfigRouterOS/Routerboard.php (copied) (copied from trunk/system/routerboard.php )
• Modules/NetworkConfigRouterOS/Routerboard2.php (copied) (copied from trunk/system/routerboard2.php ) (1 diff)
• Modules/NetworkConfigRouterOS/SSH.php (copied) (copied from trunk/system/ssh.php )
• Readme.txt (modified) (2 diffs)
• system (deleted)

trunk/Common/Global.php

@@ -1 +1 @@
 <?php
-
-$Revision = 
 
 /* @var $System System */
@@ -23 +21 @@
 include_once(dirname(__FILE__).'/Form/Form.php');
 include_once(dirname(__FILE__).'/../form_classes.php');
-
-  
+ 
 // Application modules
 include_once(dirname(__FILE__).'/../Modules/Error/Error.php');
@@ -44 +41 @@
 include_once(dirname(__FILE__).'/../Modules/Meals/Meals.php');
 include_once(dirname(__FILE__).'/../Modules/NetworkTopology/NetworkTopology.php');
+include_once(dirname(__FILE__).'/../Modules/NetworkConfig/NetworkConfig.php');
+include_once(dirname(__FILE__).'/../Modules/NetworkConfigLinux/NetworkConfigLinux.php');
+include_once(dirname(__FILE__).'/../Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php');
 
 class System extends Module

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 521; // Subversion revision
+$Revision = 522; // Subversion revision
 $DatabaseRevision = 517; // SQL structure revision
-$ReleaseTime = '2013-04-14';
+$ReleaseTime = '2013-04-15';
 
 ?>

trunk/Modules/NetworkConfig/Generate.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../Common/Global.php');
-$Database = &$System->Database;
+include_once(dirname(__FILE__).'/../../Common/Global.php');
 
 $Now = time();
-$DbResult = $Database->select('NetworkConfiguration', '*, UNIX_TIMESTAMP(LastTime)', '(Changed = 1) AND (Enabled = 1)');
+$DbResult = $System->Database->select('NetworkConfiguration', '*, UNIX_TIMESTAMP(LastTime)', '(Changed = 1) AND (Enabled = 1)');
 while($Service = $DbResult->fetch_assoc())
 {
   if($Service['UNIX_TIMESTAMP(LastTime)'] < (time() - $Service['Period']))
   {
-    $Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 2));
+    $System->Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 2));
     $ExecutionStart = time();
     //echo($Service['Caption'].'...');
@@ -25 +24 @@
     //echo("Done\n");
     $ExecutionTime = time() - $ExecutionStart;
-    $Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 0, 'LastTime' => 'NOW()', 'ExecutionTime' => $ExecutionTime));
-    $Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Log' => implode("\n", $Output)));
+    $System->Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Changed' => 0, 'LastTime' => 'NOW()', 'ExecutionTime' => $ExecutionTime));
+    $System->Database->update('NetworkConfiguration', 'Id='.$Service['Id'], array('Log' => implode("\n", $Output)));
   }
 }

trunk/Modules/NetworkConfigRouterOS/Generators/AddressPortability.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../Common/Global.php');
-include('../routerboard.php');
+include_once(dirname(__FILE__).'/../../../Common/Global.php');
+include_once(dirname(__FILE__).'/../Routerboard.php');
 $Path = array('ip', 'dhcp-server', 'lease');
 
@@ -18 +18 @@
 $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
 
-$DbResult3 = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0 GROUP BY `DHCP`');
+$DbResult3 = $System->Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0 GROUP BY `DHCP`');
 while($Subnet = $DbResult3->fetch_assoc())
 {
@@ -31 +31 @@
       $Properties['expires-after'] = time() - (24 * 3600 - ConvertExpireTime2($Properties['expires-after']));
       echo('MAC: '.$Properties['active-mac-address']."\n");
-      $DbRows2 = $Database->query('SELECT `Id` FROM `NetworkInterface` WHERE `MAC`="'.$Properties['active-mac-address'].'"');
+      $DbRows2 = $System->Database->query('SELECT `Id` FROM `NetworkInterface` WHERE `MAC`="'.$Properties['active-mac-address'].'"');
       if($DbRows2->num_rows > 0)
       {
         $Interface = $DbRows2->fetch_assoc();
         $InterfaceId = $Interface['Id'];
-        $DbRows2 = $Database->query('SELECT `Id` FROM `NetworkInterfacePortable` WHERE `NetworkInterface`='.$InterfaceId);
+        $DbRows2 = $System->Database->query('SELECT `Id` FROM `NetworkInterfacePortable` WHERE `NetworkInterface`='.$InterfaceId);
         if($DbRows2->num_rows > 0)
         {
-          $Database->update('NetworkInterfacePortable', '`Time` < "'.TimeToMysqlDateTime($Properties['expires-after']).'" AND `NetworkInterface`='.$InterfaceId, array('DynamicIP' => $Properties['active-address'], 'Update' => 1));
-        } else $Database->insert('NetworkInterfacePortable', array('NetworkInterface' => $InterfaceId, 'DynamicIP' => $Properties['active-address'], 'Time' => TimeToMysqlDateTime($Properties['expires-after']), 'Update' => 1));
+          $System->Database->update('NetworkInterfacePortable', '`Time` < "'.TimeToMysqlDateTime($Properties['expires-after']).'" AND `NetworkInterface`='.$InterfaceId, array('DynamicIP' => $Properties['active-address'], 'Update' => 1));
+        } else $System->Database->insert('NetworkInterfacePortable', array('NetworkInterface' => $InterfaceId, 'DynamicIP' => $Properties['active-address'], 'Time' => TimeToMysqlDateTime($Properties['expires-after']), 'Update' => 1));
       } else echo('Not registred'."\n");
       //print_r($Properties);
@@ -52 +52 @@
 $MangleRule = array();
 $NATRule = array();
-$DbRows = $Database->query('SELECT NetworkDevice.Name AS DeviceName, NetworkInterface.Name AS InterfaceName, DynamicIP FROM `NetworkInterfacePortable` JOIN NetworkInterface ON NetworkInterface.Id=NetworkInterfacePortable.NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE `Update`=1');
+$DbRows = $System->Database->query('SELECT NetworkDevice.Name AS DeviceName, NetworkInterface.Name AS InterfaceName, DynamicIP FROM `NetworkInterfacePortable` JOIN NetworkInterface ON NetworkInterface.Id=NetworkInterfacePortable.NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE `Update`=1');
 while($Portable = $DbRows->fetch_assoc())
 {
@@ -68 +68 @@
 $Routerboard->ExecuteBatch($NATRule);
 $Routerboard->ExecuteBatch($MangleRule);
-$Database->query('UPDATE NetworkInterfacePortable SET Update=0');
+$System->Database->query('UPDATE NetworkInterfacePortable SET Update=0');
 
 ?>

trunk/Modules/NetworkConfigRouterOS/Generators/Common.php

@@ -1 +1 @@
 <?php
 
-include_once('../../Common/NetworkAddress.php');
+include_once(dirname(__FILE__).'/../../../Common/NetworkAddress.php');
 
 function GetMarkByComment($Comment)

trunk/Modules/NetworkConfigRouterOS/Generators/DHCP.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../Common/Global.php');
-include('../routerboard.php');
+include_once(dirname(__FILE__).'/../../../Common/Global.php');
+include_once(dirname(__FILE__).'/../Routerboard.php');
 $Path = array('ip', 'dhcp-server', 'lease');
-$Database = &$System->Database;
 
 $Routerboard = new Routerboard();
@@ -12 +11 @@
 $Routerboard->Debug = true;
 
-$DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Configure`=1');
+$DbResult = $System->Database->query('SELECT * FROM `NetworkSubnet` WHERE `Configure`=1');
 while($Subnet = $DbResult->fetch_assoc())
 {
@@ -19 +18 @@
   $Items = array();
   $Server = 'dhcp'.$Subnet['Id'];
-  $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE '.
+  $DbResult2 = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE '.
   ' CompareNetworkPrefix(INET_ATON(LocalIP), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].') AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
   while($Interface = $DbResult2->fetch_assoc())

trunk/Modules/NetworkConfigRouterOS/Generators/DNS.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../Common/Global.php');
-$Database = &$System->Database;
+include_once(dirname(__FILE__).'/../../../Common/Global.php');
 
 $BaseDomain = 'zdechov.net';
@@ -122 +121 @@
 
 // Local records
-$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP <> ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP <> ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -131 +130 @@
 
 // External records in internal server
-$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP <> ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP <> ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -151 +150 @@
 
 // Domain aliases
-$DbResult = $Database->select('NetworkDomainAlias', '*');
+$DbResult = $System->Database->select('NetworkDomainAlias', '*');
 while($Alias = $DbResult->fetch_assoc())
 {
@@ -177 +176 @@
 );
 
-$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP != ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.ExternalIP != ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -186 +185 @@
 
 // Domain alias
-$DbResult = $Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`'); 
+$DbResult = $System->Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`'); 
 // JOIN `NetworkDevice` ON NetworkDomainAlias.Target LIKE NetworkDevice.Name AND NetworkInterface.ExternalIP != ""');
 while($Alias = $DbResult->fetch_assoc())
@@ -215 +214 @@
 
 // Hosts
-$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP != ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP != ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -224 +223 @@
 
 // Domain alias
-$DbResult = $Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`');
+$DbResult = $System->Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`');
 // JOIN `hosts` ON NetworkDomainAlias.Target LIKE hosts.name AND hosts.czfree_ip != ""');
 while($Alias = $DbResult->fetch_assoc())
@@ -252 +251 @@
 
 // Hosts
-$DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP != ""');
+$DbResult = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.LocalIP != ""');
 while($Interface = $DbResult->fetch_assoc())
 {
@@ -262 +261 @@
 
 // Domain alias
-$DbResult = $Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`');
+$DbResult = $System->Database->query('SELECT NetworkDomainAlias.* FROM `NetworkDomainAlias`');
 // JOIN `hosts` ON NetworkDomainAlias.Target LIKE hosts.name AND hosts.czfree_ip != ""');
 while($Alias = $DbResult->fetch_assoc())

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallFilter.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-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');
 $Path = array('ip', 'firewall', 'filter');
-$Database = &$System->Database;
 
 $Routerboard = new Routerboard($Config['MainRouter']['HostName']);
@@ -44 +43 @@
 
 // Insert blocked addresses
-$DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id WHERE Member.Blocked=1');
+$DbResult = $System->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id WHERE Member.Blocked=1');
 while($Member = $DbResult->fetch_assoc())
 {
   echo($Member['Name'].': ');
   // Hosts
-  $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
+  $DbResult2 = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
   while($Interface = $DbResult2->fetch_assoc())
   {
@@ -61 +60 @@
 
   // Subnets
-  $DbResult2 = $Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
+  $DbResult2 = $System->Database->select('NetworkSubnet', '*', 'Member='.$Member['Id']);
   while($Subnet = $DbResult2->fetch_assoc())
   {   

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallMangle.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');
 $PathFirewall = array('ip', 'firewall', 'mangle');
-$Database = &$System->Database;
 
 $Routerboard = new Routerboard();
@@ -24 +23 @@
 
 // Divide rules by subnet number
-$DbResult = $Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet` WHERE `Member` IS NULL');
+$DbResult = $System->Database->query('SELECT `Id`, `Name`, `AddressRange`, `Mask` FROM `NetworkSubnet` WHERE `Member` IS NULL');
 while($Subnet = $DbResult->fetch_assoc())
 {
@@ -34 +33 @@
 
 // Process users
-$DbResult = $Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
+$DbResult = $System->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
   'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
   'WHERE `Member`.`Blocked` = 0');
@@ -42 +41 @@
   echo('Uživatel '.$Member['Name'].': ');
 
-  $DbResult2 = $Database->select('NetworkDevice', '*', '`Used` = 1 AND `Member` = '.$Member['Id']);
+  $DbResult2 = $System->Database->select('NetworkDevice', '*', '`Used` = 1 AND `Member` = '.$Member['Id']);
   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())
     {
@@ -59 +58 @@
   }
   
-  $DbResult2 = $Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
+  $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
   while($Subnet = $DbResult2->fetch_assoc())
   {

trunk/Modules/NetworkConfigRouterOS/Generators/FirewallNAT.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-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');
 $Path = array('ip', 'firewall', 'nat');
-$Database = &$System->Database;
 
 $Routerboard = new Routerboard($Config['MainRouter']['HostName']);
@@ -37 +36 @@
 //$Items[] = array('chain' => 'inet-in', 'dst-address' => '172.16.1.1/30', 'action' => 'accept', 'comment' => 'Local_subnet');
 
-$DbResult = $Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
+$DbResult = $System->Database->query('SELECT `Member`.*, `Subject`.`Name` FROM `Member` '.
   'LEFT JOIN `Subject` ON `Subject`.`Id` = `Member`.`Subject` '.
   'WHERE `Member`.`Blocked` = 0');
@@ -44 +43 @@
   echo($Member['Name'].': ');
   // Hosts
-  $DbResult2 = $Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName`, `NetworkDevice`.`InboundNATPriority` FROM `NetworkInterface`'.
+  $DbResult2 = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName`, `NetworkDevice`.`InboundNATPriority` FROM `NetworkInterface`'.
   ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE (`NetworkInterface`.`ExternalIP` <> "")'.
   ' AND (`NetworkDevice`.`Member` = '.$Member['Id'].') AND (`NetworkInterface`.`LocalIP` != `NetworkInterface`.`ExternalIP`) ORDER BY `id` DESC');
@@ -65 +64 @@
 
   // Subnets
-  $DbResult2 = $Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
+  $DbResult2 = $System->Database->select('NetworkSubnet', '*', '`Member`='.$Member['Id']);
   while($Subnet = $DbResult2->fetch_assoc())
   {   
@@ -115 +114 @@
 /*
 // Route public addresses localy
-$DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
+$DbResult = $System->Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
 while($Member = $DbResult->fetch_assoc())
 {
   echo($Member['Name'].': ');
   // Hosts
-  $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
+  $DbResult2 = $System->Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (NetworkInterface.ExternalIP <> "") AND (NetworkDevice.Member = '.$Member['Id'].') AND (NetworkInterface.LocalIP != NetworkInterface.ExternalIP) ORDER BY id DESC');
   while($Interface = $DbResult2->fetch_assoc())
   {

trunk/Modules/NetworkConfigRouterOS/Generators/Netwatch.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../Common/Global.php');
-include('../routerboard.php');
+include_once(dirname(__FILE__).'/../../../Common/Global.php');
+include_once(dirname(__FILE__).'/../Routerboard.php');
 $Path = array('tool', 'netwatch');
-$Database = &$System->Database;
 
 $Routerboard = new Routerboard();
@@ -12 +11 @@
 $Routerboard->Debug = true;
 
-$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Configure` = 1'); // WHERE `Member` = 0');
+$DbResult3 = $System->Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Configure` = 1'); // WHERE `Member` = 0');
 while($Router = $DbResult3->fetch_assoc())
 {
@@ -18 +17 @@
   $Routerboard->HostName = $Router['DHCP'];
   $Items = array();
-  $DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`DHCP`="'.$Router['DHCP'].'")');
+  $DbResult = $System->Database->query('SELECT * FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`DHCP`="'.$Router['DHCP'].'")');
   while($Subnet = $DbResult->fetch_assoc())
   {
     $I = explode('.', $Subnet['AddressRange']);
     $I = $I[2];
-    $DbResult2 = $Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface`'.
+    $DbResult2 = $System->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface`'.
     ' LEFT JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE CompareNetworkPrefix(INET_ATON(`LocalIP`), INET_ATON("'.$Subnet['AddressRange'].'"), '.$Subnet['Mask'].')'.
     ' AND (`NetworkDevice`.`Used` = 1) ORDER BY `NetworkInterface`.`LocalIP`');

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-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');
 $Path = array('tool', 'netwatch');
 $Period = 60; // every 60 seconds
-$Database = &$System->Database;
 
 while(1)
@@ -13 +12 @@
   $StartTime = time();
 
-  $DbResult3 = $Database->query('SELECT DHCP, AddressRange, Mask FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
+  $DbResult3 = $System->Database->query('SELECT DHCP, AddressRange, Mask FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
   //echo($DbResult3->num_rows);
   while($Subnet = $DbResult3->fetch_assoc())
@@ -38 +37 @@
       }
 
-      $DbResult = $Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', $Values);
+      $DbResult = $System->Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', $Values);
     }
   }
 
   // Update device online state
-  $DbResult = $Database->select('NetworkDevice', 'Id', '`Used`=1');
+  $DbResult = $System->Database->select('NetworkDevice', 'Id', '`Used`=1');
   while($Device = $DbResult->fetch_assoc())
   {
-    $DbResult2 = $Database->select('NetworkInterface', 'SUM(`Online`) AS `SumOnline`', '`Device`='.$Device['Id']);
+    $DbResult2 = $System->Database->select('NetworkInterface', 'SUM(`Online`) AS `SumOnline`', '`Device`='.$Device['Id']);
     $DbRow = $DbResult2->fetch_array();
     if($DbRow['SumOnline'] > 0) $Online = 1; 
@@ -52 +51 @@
     $Values = array('Online' => $Online);
     if($Online == 1) $Values['LastOnline'] = 'NOW()';
-    $Database->update('NetworkDevice', 'Id='.$Device['Id'], $Values);
+    $System->Database->update('NetworkDevice', 'Id='.$Device['Id'], $Values);
   }
 
   // Update interface online statistics
-  $DbResult = $Database->select('NetworkInterface', 'Id', '`Online` = 1');
+  $DbResult = $System->Database->select('NetworkInterface', 'Id', '`Online` = 1');
   while($Interface = $DbResult->fetch_assoc())
   {
-    $DbResult2 = $Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-    if($DbResult2->num_rows == 0) $Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"), 1)');          
-      else $Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+    $DbResult2 = $System->Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+    if($DbResult2->num_rows == 0) $System->Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"), 1)');          
+      else $System->Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
   }
 

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())
     {

trunk/Modules/NetworkConfigRouterOS/Routerboard2.php

@@ -1 +1 @@
 <?php
 
-include_once('ssh.php');
+include_once('SSH.php');
 
 class Routerboard extends SSH

trunk/Readme.txt

@@ -18 +18 @@
 3) Neverzované složky s daty
 
-  finance/doklady - účetní doklady
   files - úložiště souborů
   galerie - fotogalerie obrázků
-  files - načtené soubory přes web
 
 4) Práva složek
@@ -27 +25 @@
   webcam - vlastníka nastavit na apache
   files - vlastníka nastavit na apache
-  finance/doklady - vlastníka nastavit na apache