Changeset 55 for trunk/Packages/Common/NetworkAddress.php

Timestamp:

Apr 7, 2020, 12:55:39 AM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• trunk/Packages/Common/NetworkAddress.php (modified) (7 diffs)

trunk/Packages/Common/NetworkAddress.php

@@ -14 +14 @@
   function GetNetMask()
   {
-    return(0xffffffff ^ ((1 << (32 - $this->Prefix)) - 1));
+    return 0xffffffff ^ ((1 << (32 - $this->Prefix)) - 1);
   }
 
   function AddressToString()
   {
-    return(implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255))));
+    return implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255)));
   }
 
@@ -37 +37 @@
     $To->Address = $From->Address + $HostMask;
     $To->Prefix = 32;
-    return(array('From' => $From, 'To' => $To));
+    return array('From' => $From, 'To' => $To);
   }
 
@@ -43 +43 @@
   {
     $this->Prefix = $NewPrefix;
-    if($this->Prefix > 32) $this->Prefix = 32;
-    if($this->Prefix < 0) $this->Prefix = 0;
+    if ($this->Prefix > 32) $this->Prefix = 32;
+    if ($this->Prefix < 0) $this->Prefix = 0;
     $this->Address = $this->Address & $this->GetNetMask();
   }
@@ -51 +51 @@
   {
     $UpperNetmask = $this->GetNetMask();
-    if(($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
+    if (($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
       else $Result = false;
     //echo($Address->AddressToString().'/'.$Address->Prefix.' in '.$this->AddressToString().'/'.$this->Prefix.' '.$Result."\n");
-    return($Result);
+    return $Result;
   }
 }
@@ -71 +71 @@
   function AddressToString()
   {
-    return(inet_ntop($this->Address));
+    return inet_ntop($this->Address);
   }
 
@@ -83 +83 @@
     $Result = array();
     $Data = array_reverse(unpack('C*', $this->Address));
-    foreach($Data as $Item)
+    foreach ($Data as $Item)
     {
 
@@ -89 +89 @@
       $Result[] = dechex(($Item >> 4) & 15);
     }
-    return($Result);
+    return $Result;
   }