Changeset 658 for trunk/Modules/NetworkConfigRouterOS/Routerboard.php

Timestamp:

May 26, 2014, 1:00:20 AM (11 years ago)

Author:

chronos

Message:

• Přidáno: V tabulce změn stavu síťových rozhraní zobrazovat také dobu trvání.
• Opraveno: Neprováděly se skripty využívající třídu Routerboard.
• Opraveno: Načítání stavu rozhraní z RouterOS.

File:

• trunk/Modules/NetworkConfigRouterOS/Routerboard.php (modified) (12 diffs)

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -39 +39 @@
       if(count($Batch) > 0)
        $Output = array_merge($Output, $this->ExecuteBatch(implode(';', $Batch)));
-    } else 
+    } else
       $Output = array_merge($Output, $this->ExecuteBatch($Commands));
     return($Output);
   }
-  
+
   function ExecuteBatch($Commands)
-  {    
+  {
     $Commands = trim($Commands);
     if($Commands != '')
@@ -51 +51 @@
       $Commands = addslashes($Commands);
       $Commands = str_replace('$', '\$', $Commands);
-      //$Commands = str_replace(' ', '\ ', $Commands);  
+      //$Commands = str_replace(' ', '\ ', $Commands);
       $Command = $this->SSHPath.' -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.' -i '.$this->PrivateKey.' '.$this->HostName.' "'.$Commands.'"';
       if($this->Debug) echo($Command);
       $Output = array();
-      //exec($Command, $Output);
+      exec($Command, $Output);
     } else $Output = '';
     if($this->Debug) print_r($Output);
@@ -121 +121 @@
     $ConditionList = substr($ConditionList, 0, -1);
     if(trim($ConditionList) != '')
-      $ConditionList = ' where '.$ConditionList;    
+      $ConditionList = ' where '.$ConditionList;
 
     $Result = $this->Execute(implode(' ', $Path).' print terse'.$ConditionList);
@@ -134 +134 @@
         if(in_array($Value[0], $Properties))
         {
-          if(count($Value) > 1) 
+          if(count($Value) > 1)
           {
-            if($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);            
+            if($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);
             //if(strlen($Value[1]) > 0)
             $ListItem[$Value[0]] = $Value[1];
@@ -151 +151 @@
     $this->Execute(implode(' ', $Path).' { remove [find] }');
   }
-  
+
   function ListUpdate($Path, $Properties, $Values, $Condition = array(), $UsePrint = false)
   {
     // Get current list from routerboard
-    if($UsePrint == 0) 
+    if($UsePrint == 0)
     {
       $List = $this->ListGet($Path, $Properties, $Condition);
@@ -167 +167 @@
         }
       }
-    } else 
-    {
-      $List = $this->ListGetPrint($Path, $Properties, $Condition);     
+    } else
+    {
+      $List = $this->ListGetPrint($Path, $Properties, $Condition);
     }
     $Commands = array();
-    
+
     // Add empty properties to values
     foreach($Values as $Index => $Item)
@@ -181 +181 @@
            $Item[$Property] = '';
       }
-      $Values[$Index] = $Item;      
+      $Values[$Index] = $Item;
     }
     foreach($List as $Index => $Item)
@@ -190 +190 @@
            $Item[$Property] = '';
       }
-      $List[$Index] = $Item;      
-    }
-    
+      $List[$Index] = $Item;
+    }
+
     // Sort properties
     foreach($Values as $Index => $Item)
@@ -204 +204 @@
     if($this->Debug) print_r($List);
     if($this->Debug) print_r($Values);
-       
+
     // Erase all items not existed in $Values
     foreach($List as $Index => $ListItem)
@@ -213 +213 @@
         foreach($ListItem as $Index => $Property)
         {
-          if($Property != '') 
+          if($Property != '')
           {
             if(($Property == 'yes') or ($Property == 'no')) $Prop .= $Index.'='.$Property.' ';
@@ -224 +224 @@
       }
     }
-    
+
     // Add new items
     foreach($Values as $ListItem)
@@ -240 +240 @@
     }
     if($this->Debug) print_r($Commands);
-    return($this->Execute($Commands));    
+    return($this->Execute($Commands));
   }
 }