Changeset 239 for trunk/system/generators/netwatch.php

Timestamp:

Aug 2, 2009, 10:28:58 AM (15 years ago)

Author:

george

Message:

• Upraveno: Vylepšena třída Routerboard pro načítání z/do nastavení do routerů Mikrotik.
• Upraveno: Skripty pro generování DHCP a Netwatch routerů byly upraveny pro použití třídy Routerboar.
• Upraveno: Zobrazování editačních políček formuláře lépe viditelné v IE8.

File:

• trunk/system/generators/netwatch.php (modified) (3 diffs)

trunk/system/generators/netwatch.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once('../../global.php');
+include('../../global.php');
+include('../routerboard.php');
+$Path = array('tool', 'netwatch');
+
+$Routerboard = new Routerboard();
+$Routerboard->UserName = $Config['MainRouter']['UserName'];
+$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
 
 $DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`) FROM `NetworkSubnet` WHERE `Member` = 0');
@@ -8 +14 @@
 {
   echo($Router['DHCP']."\n");
-  $Commands = array();
-  $Commands[] = '/tool netwatch remove [find]';
+  $Routerboard->HostName = $Router['DHCP'];
+  $Items = array();
   $DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `DHCP`="'.$Router['DHCP'].'"');
   while($Subnet = $DbResult->fetch_assoc())
@@ -22 +28 @@
       if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       echo($Name.', ');
-      $Commands[] = '/tool netwatch add host='.$Interface['LocalIP'].' interval=1m comment='.$Name;
+      $Items[] = array('host' => $Interface['LocalIP'], 'interval' => '00:01:00', 'comment' => $Name);
     }
   }
-  $Commands = implode(';', $Commands);
-  $Command = '/usr/bin/ssh -o ConnectTimeout='.$Config['MainRouter']['ConnectTimeout'].' -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Router['DHCP'].' "'.$Commands.'"';
-  //echo($Command."\n");
-  $Output = '';
-  exec($Command, $Output);
-  print_r($Output);
+  $Routerboard->ListUpdate($Path, array('host', 'interval', 'comment'), $Items);    
   echo("\n");
 }