Changeset 874 for trunk/Modules/NetworkConfigRouterOS

Timestamp:

Apr 6, 2020, 11:56:19 PM (5 years ago)

Author:

chronos

Message:

• Modified: Do not use parenthesis around returned value.

Location:

trunk/Modules/NetworkConfigRouterOS

Files:

• Generators/AddressPortability.php (modified) (1 diff)
• Generators/Common.php (modified) (2 diffs)
• Generators/Signal.php (modified) (1 diff)
• NetworkConfigRouterOS.php (modified) (3 diffs)
• Routerboard.php (modified) (6 diffs)
• Routerboard2.php (modified) (3 diffs)
• RouterboardAPI.php (modified) (3 diffs)
• SSH.php (modified) (1 diff)

trunk/Modules/NetworkConfigRouterOS/Generators/AddressPortability.php

@@ -11 +11 @@
 {
   $TimeParts = explode(':', $Time);
-  return ($TimeParts[0] * 3600 + $TimeParts[1] * 60 + $TimeParts[2]);
+  return $TimeParts[0] * 3600 + $TimeParts[1] * 60 + $TimeParts[2];
 }
 

trunk/Modules/NetworkConfigRouterOS/Generators/Common.php

@@ -9 +9 @@
   {
     $DbRow = $DbResult->fetch_assoc();
-    return ($DbRow['Id']);
+    return $DbRow['Id'];
   } else
   {
     $DbResult = $Database->query('INSERT INTO `NetworkMark` (`Comment`) VALUES ("'.$Comment.'")');
-    return ($Database->insert_id);
+    return $Database->insert_id;
   }
 }
@@ -25 +25 @@
   {
     $DbRow = $DbResult->fetch_assoc();
-    return ($DbRow['Id']);
+    return $DbRow['Id'];
   } else
   {
     $DbResult = $Database->query('INSERT INTO `NetworkMangleSubgroup` (`AddressRange`) VALUES ("'.$AddressRange.'")');
-    return ($Database->insert_id);
+    return $Database->insert_id;
   }
 }

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -74 +74 @@
     if (substr($Value, -3, 3) == "Mbp") $Value = substr($Value, 0, -3); // without Mbp unit    
     if (substr($Value, -1, 1) == "M") $Value = substr($Value, 0, -1); // without M unit
-    return ($Value);
+    return $Value;
   }
 

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -72 +72 @@
     if (IsInternetAddr($IPAddress)) {
       $Output .= '<p>Internet zdarma je dostupný pouze z vnitřní sítě.</p>';
-      return ($Output);
+      return $Output;
     }
     $Time = time();
@@ -111 +111 @@
       else $Output .= '<a href="?a=activate">Aktivovat</a>';
 
-    return ($Output);
+    return $Output;
   }
 }
@@ -135 +135 @@
     $Routerboard->ExecuteBatch(implode(';', $Commands));
 
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -41 +41 @@
     } else
       $Output = array_merge($Output, $this->ExecuteBatch($Commands));
-    return ($Output);
+    return $Output;
   }
 
@@ -62 +62 @@
     } else $Output = '';
     if ($this->Debug) print_r($Output);
-    return ($Output);
+    return $Output;
   }
 
@@ -79 +79 @@
       } else $List[substr($ResultLineParts[0], 0, -1)] = '';
     }
-    return ($List);
+    return $List;
   }
 
@@ -113 +113 @@
       $List[] = $ListItem;
     }
-    return ($List);
+    return $List;
   }
 
@@ -148 +148 @@
       if (count($ListItem) > 0) $List[] = $ListItem;
     }
-    return ($List);
+    return $List;
   }
 
@@ -244 +244 @@
     }
     if ($this->Debug) print_r($Commands);
-    return ($this->Execute($Commands));
+    return $this->Execute($Commands);
   }
 }

trunk/Modules/NetworkConfigRouterOS/Routerboard2.php

@@ -14 +14 @@
   {
     if (is_array($Commands)) $Commands = implode(';', $Commands);
-    return (parent::Execute($Commands));
+    return parent::Execute($Commands);
   }
 
@@ -28 +28 @@
       $List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
     }
-    return ($List);
+    return $List;
   }
 
@@ -52 +52 @@
       $List[] = $ListItem;
     }
-    return ($List);
+    return $List;
   }
 
   function GetSystemResource()
   {
-    return ($this->GetItem('/system resource print'));
+    return $this->GetItem('/system resource print');
   }
 
   function GetFirewallFilterList()
   {
-    return ($this->GetList('/ip firewall nat', array('src-address', 'dst-address', 'bytes')));
+    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')));
+    return $this->GetList('/ip dhcp-server lease', array('address', 'active-address', 'comment', 'lease-time', 'status', 'host-name'));
   }
 }

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -40 +40 @@
     } else if ($Length >= 0x10000000)
       $Length = chr(0xF0).chr(($Length >> 24) & 0xFF).chr(($Length >> 16) & 0xFF).chr(($Length >> 8) & 0xFF).chr($Length & 0xFF);
-    return ($Length);
+    return $Length;
   }
 
@@ -71 +71 @@
       sleep($this->Delay);
     }
-    return ($this->Connected);
+    return $this->Connected;
   }
 
@@ -234 +234 @@
       $this->Write($el, $Last);
     }
-    return ($this->Read());
+    return $this->Read();
   }
 }

trunk/Modules/NetworkConfigRouterOS/SSH.php

@@ -54 +54 @@
     }
     echo($Response);
-    return (explode("\n", substr($Response, 0, -1)));
+    return explode("\n", substr($Response, 0, -1));
   }
 }