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

Timestamp:

Apr 6, 2020, 11:17:40 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

File:

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

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -22 +22 @@
   {
     $Output = array();
-    if(is_array($Commands))
+    if (is_array($Commands))
     {
       $I = 0;
       $Batch = array();
-      while($I < count($Commands))
-      {
-        if(($I % $this->MaxBurstLineCount) == 0)
-        {
-          if(count($Batch) > 0)
+      while ($I < count($Commands))
+      {
+        if (($I % $this->MaxBurstLineCount) == 0)
+        {
+          if (count($Batch) > 0)
             $Output = array_merge($Output, $this->ExecuteBatch(implode(';', $Batch)));
           $Batch = array();
@@ -37 +37 @@
         $I++;
       }
-      if(count($Batch) > 0)
+      if (count($Batch) > 0)
        $Output = array_merge($Output, $this->ExecuteBatch(implode(';', $Batch)));
     } else
       $Output = array_merge($Output, $this->ExecuteBatch($Commands));
-    return($Output);
+    return ($Output);
   }
 
@@ -47 +47 @@
   {
     $Commands = trim($Commands);
-    if($Commands != '')
+    if ($Commands != '')
     {
       $Commands = addslashes($Commands);
@@ -57 +57 @@
       $Command = $this->SSHPath.' -oBatchMode=no -o ConnectTimeout='.$this->Timeout.' -l '.$this->UserName.
         $PrivKey.' '.$this->HostName.' "'.$Commands.'"';
-      if($this->Debug) echo($Command);
+      if ($this->Debug) echo($Command);
       $Output = array();
       exec($Command, $Output);
     } else $Output = '';
-    if($this->Debug) print_r($Output);
-    return($Output);
+    if ($this->Debug) print_r($Output);
+    return ($Output);
   }
 
@@ -70 +70 @@
     array_pop($Result);
     $List = array();
-    foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
     {
       $ResultLineParts = explode(' ', trim($ResultLine));
-      if(count($ResultLineParts) > 1)
-      {
-        if($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
+      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);
+    return ($List);
   }
 
@@ -85 +85 @@
   {
     $PropertyList = '"';
-    foreach($Properties as $Index => $Property)
+    foreach ($Properties as $Index => $Property)
     {
       $PropertyList .= $Index.'=".[get $i '.$Property.']." ';
@@ -92 +92 @@
 
     $ConditionList = '';
-    foreach($Conditions as $Index => $Item)
-    {
-      if($Item == 'no') $ConditionList .= $Index.'='.$Item.' ';
+    foreach ($Conditions as $Index => $Item)
+    {
+      if ($Item == 'no') $ConditionList .= $Index.'='.$Item.' ';
       else $ConditionList .= $Index.'="'.$Item.'" ';
     }
@@ -101 +101 @@
     $Result = $this->Execute(implode(' ', $Path).' {:foreach i in=[find '.$ConditionList.'] do={:put ('.$PropertyList.')}}');
     $List = array();
-    foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
     {
       $ResultLineParts = explode(' ', $ResultLine);
       $ListItem = array();
-      foreach($ResultLineParts as $ResultLinePart)
+      foreach ($ResultLineParts as $ResultLinePart)
       {
         $Value = explode('=', $ResultLinePart);
-        if(count($Value) > 1) $ListItem[$Properties[$Value[0]]] = $Value[1];
+        if (count($Value) > 1) $ListItem[$Properties[$Value[0]]] = $Value[1];
           else $ListItem[$Properties[$Value[0]]] = '';
       }
       $List[] = $ListItem;
     }
-    return($List);
+    return ($List);
   }
 
@@ -119 +119 @@
   {
     $ConditionList = '';
-    foreach($Conditions as $Index => $Item)
+    foreach ($Conditions as $Index => $Item)
     {
       $ConditionList .= $Index.'="'.$Item.'" ';
     }
     $ConditionList = substr($ConditionList, 0, -1);
-    if(trim($ConditionList) != '')
+    if (trim($ConditionList) != '')
       $ConditionList = ' where '.$ConditionList;
 
     $Result = $this->Execute(implode(' ', $Path).' print terse'.$ConditionList);
     $List = array();
-    foreach($Result as $ResultLine)
+    foreach ($Result as $ResultLine)
     {
       $ResultLineParts = explode(' ', $ResultLine);
       $ListItem = array();
-      foreach($ResultLineParts as $ResultLinePart)
+      foreach ($ResultLineParts as $ResultLinePart)
       {
         $Value = explode('=', $ResultLinePart);
-        if(in_array($Value[0], $Properties))
-        {
-          if(count($Value) > 1)
+        if (in_array($Value[0], $Properties))
+        {
+          if (count($Value) > 1)
           {
-            if($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);
-            //if(strlen($Value[1]) > 0)
+            if ($Value[1]{0} == '"') $Value[1] = substr($Value[1], 1, -1);
+            //if (strlen($Value[1]) > 0)
             $ListItem[$Value[0]] = $Value[1];
           } else $ListItem[$Value[0]] = '';
         }
       }
-      if(count($ListItem) > 0) $List[] = $ListItem;
-    }
-    return($List);
+      if (count($ListItem) > 0) $List[] = $ListItem;
+    }
+    return ($List);
   }
 
@@ -159 +159 @@
   {
     // Get current list from routerboard
-    if($UsePrint == 0)
+    if ($UsePrint == 0)
     {
       $List = $this->ListGet($Path, $Properties, $Condition);
       // Change boolean values yes/no to true/false
-      foreach($List as $Index => $ListItem)
-      {
-        foreach($ListItem as $Index2 => $Item2)
-        {
-          if($Item2 == 'true') $List[$Index][$Index2] = 'yes';
-          if($Item2 == 'false') $List[$Index][$Index2] = 'no';
+      foreach ($List as $Index => $ListItem)
+      {
+        foreach ($ListItem as $Index2 => $Item2)
+        {
+          if ($Item2 == 'true') $List[$Index][$Index2] = 'yes';
+          if ($Item2 == 'false') $List[$Index][$Index2] = 'no';
         }
       }
@@ -178 +178 @@
 
     // Add empty properties to values
-    foreach($Values as $Index => $Item)
-    {
-      foreach($Properties as $Property)
-      {
-        if(!array_key_exists($Property, $Item))
+    foreach ($Values as $Index => $Item)
+    {
+      foreach ($Properties as $Property)
+      {
+        if (!array_key_exists($Property, $Item))
            $Item[$Property] = '';
       }
       $Values[$Index] = $Item;
     }
-    foreach($List as $Index => $Item)
-    {
-      foreach($Properties as $Property)
-      {
-        if(!array_key_exists($Property, $Item))
+    foreach ($List as $Index => $Item)
+    {
+      foreach ($Properties as $Property)
+      {
+        if (!array_key_exists($Property, $Item))
            $Item[$Property] = '';
       }
@@ -198 +198 @@
 
     // Sort properties
-    foreach($Values as $Index => $Item)
+    foreach ($Values as $Index => $Item)
     {
       ksort($Values[$Index]);
     }
-    foreach($List as $Index => $Item)
+    foreach ($List as $Index => $Item)
     {
       ksort($List[$Index]);
     }
-    if($this->Debug) print_r($List);
-    if($this->Debug) print_r($Values);
+    if ($this->Debug) print_r($List);
+    if ($this->Debug) print_r($Values);
 
     // Erase all items not existed in $Values
-    foreach($List as $Index => $ListItem)
-    {
-      if(!in_array($ListItem, $Values))
+    foreach ($List as $Index => $ListItem)
+    {
+      if (!in_array($ListItem, $Values))
       {
         $Prop = '';
-        foreach($ListItem as $Index => $Property)
-        {
-          if($Property != '')
+        foreach ($ListItem as $Index => $Property)
+        {
+          if ($Property != '')
           {
-            if(($Property == 'yes') or ($Property == 'no')) $Prop .= $Index.'='.$Property.' ';
+            if (($Property == 'yes') or ($Property == 'no')) $Prop .= $Index.'='.$Property.' ';
               else $Prop .= $Index.'="'.$Property.'" ';
           }
         }
         $Prop = substr($Prop, 0, -1);
-        if(trim($Prop) != '')
+        if (trim($Prop) != '')
           $Commands[] = implode(' ', $Path).' remove [find '.$Prop.']';
       }
@@ -230 +230 @@
 
     // Add new items
-    foreach($Values as $ListItem)
-    {
-      if(!in_array($ListItem, $List))
+    foreach ($Values as $ListItem)
+    {
+      if (!in_array($ListItem, $List))
       {
         $Prop = '';
-        foreach($ListItem as $Index => $Property)
-        {
-          if($Property != '') $Prop .= $Index.'="'.$Property.'" ';
+        foreach ($ListItem as $Index => $Property)
+        {
+          if ($Property != '') $Prop .= $Index.'="'.$Property.'" ';
         }
         $Prop = substr($Prop, 0, -1);
@@ -243 +243 @@
       }
     }
-    if($this->Debug) print_r($Commands);
-    return($this->Execute($Commands));
+    if ($this->Debug) print_r($Commands);
+    return ($this->Execute($Commands));
   }
 }