Changeset 239

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.

Location:

trunk

Files:

• forms.php (modified) (2 diffs)
• map/index.php (modified) (3 diffs)
• system/generators/dhcp_routerboard.php (modified) (2 diffs)
• system/generators/linux (added)
• system/generators/linux/dhcp.php (added)
• system/generators/linux/iptables.php (added)
• system/generators/linux/nat.php (added)
• system/generators/linux/traffic_shaping.php (added)
• system/generators/netwatch.php (modified) (3 diffs)
• system/queues_import.php (modified) (1 diff)
• system/routerboard.php (modified) (4 diffs)
• system/routerboard2.php (added)

trunk/forms.php

@@ -43 +43 @@
           break;
         case 'String':
-          $Edit = '<input style="width: 100%;" type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
+          $Edit = '<input style="width: 98%;" type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
           break;
         case 'Text':
-          $Edit = '<textarea style="width: 100%; height: 200px;" name="'.$Context.$Index.'">'.$this->Values[$Index].'</textarea>';
-          break;
-        case 'Password':
-          $Edit = '<input style="width: 100%;" type="password" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
+          $Edit = '<textarea style="width: 98%; height: 200px;" name="'.$Context.$Index.'">'.$this->Values[$Index].'</textarea>';
+          break;
+        case 'Password':
+          $Edit = '<input style="width: 98%;" type="password" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
           break;
         case 'Integer':
-          $Edit = '<input style="width: 100%;" type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
+          $Edit = '<input style="width: 98%;" type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
           break;
         case 'Float':
-          $Edit = '<input style="width: 100%;" type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
+          $Edit = '<input style="width: 98%;" type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
           break;
         case 'Time':
           if($this->Values[$Index] == 'Now') $this->Values[$Index] = date('j.n.Y');
-          $Edit = '<input style="width: 100%;" type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
+          $Edit = '<input style="width: 98%;" type="text" name="'.$Context.$Index.'" value="'.$this->Values[$Index].'" />';
           break;
         case 'Array':
@@ -252 +252 @@
     {
       if($Index == 0) $Class = ' class="Header"'; else $Class = '';
-      $Result .= '<td'.$Class.'>'.$Item.'</td>';
+      $Result .= '<td'.$Class.' style="width: '.(floor(100 / count($Row))).'%">'.$Item.'</td>';
     }
     $Result .= '</tr>';

trunk/map/index.php

@@ -18 +18 @@
 
     var map;
+    var tinyIcon;
 
     function initialize() 
@@ -37 +38 @@
 tinyIcon.shadowSize = new GSize(10, 10);
 tinyIcon.iconAnchor = new GPoint(5, 5);
-tinyIcon.infoWindowAnchor = new GPoint(5, 1);
-
-// Set up our GMarkerOptions object literal
-markerOptions = { icon:tinyIcon };';
+tinyIcon.infoWindowAnchor = new GPoint(5, 1);';
     
     $Output .= '    
@@ -102 +100 @@
     while($Device = $DbResult->fetch_assoc())
     {
-      $Output .= 'new GMarker(new GLatLng('.$Device['PositionLatitude'].', '.$Device['PositionLongitude'].'), markerOptions), ';
+      $Output .= 'new GMarker(new GLatLng('.$Device['PositionLatitude'].', '.$Device['PositionLongitude'].'), {title: "'.$Device['Name'].'", icon:tinyIcon }), ';
     }
     $Output .= '];

trunk/system/generators/dhcp_routerboard.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once('../../global.php');
+include('../../global.php');
+include('../routerboard.php');
+$Path = array('ip', 'dhcp-server', 'lease');
+
+$Routerboard = new Routerboard();
+$Routerboard->UserName = $Config['MainRouter']['UserName'];
+$Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
 
 $DbResult = $Database->query('SELECT * FROM `NetworkSubnet` WHERE `Member` = 0');
@@ -8 +14 @@
 {
   echo($Subnet['DHCP']);
+  $Routerboard->HostName = $Subnet['DHCP'];
   $I = explode('.', $Subnet['AddressRange']);
   $I = $I[2];
-  $Commands = array();
-  $Commands[] = '/ip dhcp-server lease { remove [find server=dhcp'.$I.']}';
+  $Items = array();
   $DbResult2 = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM `NetworkInterface` LEFT JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE (`LocalIP` LIKE "192.168.'.$I.'.%") AND (`MAC` != "00:00:00:00:00:00") ORDER BY `LocalIP`');
   while($Interface = $DbResult2->fetch_assoc())
   {
-    $Commands[] = '/ip dhcp-server lease add mac-address='.$Interface['MAC'].' address='.$Interface['LocalIP'].' server=dhcp'.$I.' comment='.$Interface['DeviceName'].'-'.$Interface['Name'];
+    $Name = $Interface['DeviceName'];
+    if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    $Items[] = array('mac-address' => $Interface['MAC'], 'address' => $Interface['LocalIP'], 'server' => 'dhcp'.$I, 'comment' => $Name);
   }
-  $Commands = implode(';', $Commands);
-  $Command = '/usr/bin/ssh -o ConnectTimeout=5 -l '.$Config['MainRouter']['UserName'].' -i id_dsa '.$Subnet['DHCP'].' "'.$Commands.'"';
-  //echo($Command."\n");
-  $Output = '';
-  exec($Command, $Output);
-  print_r($Output);
+ 
+  print_r($Routerboard->ListUpdate($Path, array('mac-address', 'address', 'server', 'comment'), $Items, array('server' => 'dhcp'.$I)));    
   echo("\n");
 }

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");
 }

trunk/system/queues_import.php

@@ -1 +1 @@
 <?php
-include_once('global.php');
+include_once('../global.php');
 
 $Config['Web']['ShowErrors'] = 1;
 
-include_once('routerboard.php');
+include('routerboard.php');
 
 $Routerboard = new Routerboard($Config['MainRouter']['HostName'], $Config['MainRouter']['UserName'], $Config['MainRouter']['Password']);
-$QueueTree = $Routerboard->GetList('/queue tree', array('bytes', 'rate', 'parent', 'packet-mark', 'name'));
-print($QueueTree);
+$Routerboard->PrivateKey = 'generators/id_dsa';
+print_r($Routerboard->ListUpdate(array('tool', 'netwatch'), array('host', 'comment'), array()));
+//print_r($Routerboard->Execute('ip address {:foreach i in=[find] do={:put "address=".[get $i address]." network=".[get $i network])}}'));
+//print_r($Routerboard->GetItem('system ntp client print'));
 
 ?>

trunk/system/routerboard.php

@@ -1 +1 @@
 <?php
 
-include_once('ssh.php');
-
-class Routerboard extends SSH
+class Routerboard
 {
-  var $Methods = array(
-    'kex' => 'diffie-hellman-group1-sha1',
-    'client_to_server' => array('crypt' => '3des-cbc', 'comp' => 'none'),
-    'server_to_client' => array('crypt' => 'aes256-cbc,aes192-cbc,aes128-cbc', 'comp' => 'none')
-  );
+  var $SSHPath = '/usr/bin/ssh';
+  var $Timeout = 3;
+  var $HostName;
+  var $UserName;
+  var $Password;
+  var $PrivateKey = 'id_dsa';
+  
+  function __construct($HostName = 'localhost', $UserName = 'admin', $Password = '')
+  {
+    $this->HostName = $HostName;
+    $this->UserName = $UserName;
+    $this->Password = $Password;
+  }
 
   function Execute($Commands)
-  {
+  {    
     if(is_array($Commands)) $Commands = implode(';', $Commands);
-    return(parent::Execute($Commands));
+    $Commands = trim($Commands);
+    if($Commands != '')
+    {
+      $Output = array();
+      $Commands = addslashes($Commands);
+      $Commands = str_replace('$', '\$', $Commands);
+      $Command = $this->SSHPath.' -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.' -i '.$this->PrivateKey.' '.$this->HostName.' "'.$Commands.'"';
+      //echo($Command);
+      exec($Command, $Output);
+    } else $Output = '';
+    //print_r($Output);
+    return($Output);
   }
 
-  function GetItem($Command)
+  function ItemGet($Path)
   {
-    $Result = $this->Execute($Command);
+    $Result = $this->Execute(implode(' ', $Path).' print');
     array_pop($Result);
     $List = array();
@@ -25 +42 @@
     {
       $ResultLineParts = explode(' ', trim($ResultLine));
-      if($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
-      $List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
+      if(count($ResultLineParts) > 1)
+      {
+        if($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
+        $List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
+      } else $List[substr($ResultLineParts[0], 0, -1)] = '';
     }
     return($List);
   }
 
-  function GetList($Command, $Properties)
+  function ListGet($Path, $Properties, $Conditions = array())
   {
     $PropertyList = '"';
-    foreach($Properties as $Property)
+    foreach($Properties as $Index => $Property)
     {
-      $PropertyList .= $Property.'=".[get $i '.$Property.']." ';
+      $PropertyList .= $Index.'=".[get $i '.$Property.']." ';
     }
     $PropertyList = substr($PropertyList, 0, -3);
-    $Result = $this->Execute($Command.' {:foreach i in=[find] do={:put ('.$PropertyList.')}}');
+
+    $ConditionList = '';
+    foreach($Conditions as $Index => $Item)
+    {
+      $ConditionList .= $Index.'="'.$Item.'" ';
+    }
+    $ConditionList = substr($ConditionList, 0, -1);
+
+    $Result = $this->Execute(implode(' ', $Path).' {:foreach i in=[find '.$ConditionList.'] do={:put ('.$PropertyList.')}}');
     $List = array();
     foreach($Result as $ResultLine)
@@ -48 +76 @@
       {
         $Value = explode('=', $ResultLinePart);
-        $ListItem[$Value[0]] = $Value[1];
+        $ListItem[$Properties[$Value[0]]] = $Value[1];
       }
       $List[] = $ListItem;
@@ -55 +83 @@
   }
 
-  function GetSystemResource()
+  function ListEraseAll($Path)
   {
-    return($this->GetItem('/system resource print'));
+    $this->Execute(implode(' ', $Path).' { remove [find] }');
   }
-
-  function GetFirewallFilterList()
+  
+  function ListUpdate($Path, $Properties, $Values, $Condition = array())
   {
-    return($this->GetList('/ip firewall nat', array('src-address', 'dst-address', 'bytes')));
-  }
-
-  function GetDHCPServerLeasesList()
-  {
-    return($this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name'))); 
+    $List = $this->ListGet($Path, $Properties, $Condition);
+    //print_r($List);
+    //print_r($Values);
+    $Commands = array();
+    
+    // Erase all items not existed in $Values
+    foreach($List as $Index => $ListItem)
+    {
+      if(!in_array($ListItem, $Values))
+      {
+        $Prop = '';
+        foreach($ListItem as $Index => $Property)
+        {
+          $Prop .= $Index.'="'.$Property.'" ';
+        }
+        $Prop = substr($Prop, 0, -1);
+        $Commands[] = implode(' ', $Path).' remove [find '.$Prop.']';
+      }
+    }
+    
+    // Add new items
+    foreach($Values as $ListItem)
+    {
+      if(!in_array($ListItem, $List))
+      {
+        $Prop = '';
+        foreach($ListItem as $Index => $Property)
+        {
+          $Prop .= $Index.'='.$Property.' ';
+        }
+        $Prop = substr($Prop, 0, -1);
+        $Commands[] = implode(' ', $Path).' add '.$Prop;
+      }
+    }
+    //print_r($Commands);
+    return($this->Execute($Commands));    
   }
 }