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

Timestamp:

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

Author:

chronos

Message:

• Modified: Improved code format.

File:

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

trunk/Packages/Common/NetworkAddress.php

@@ -16 +16 @@
   function GetNetMask()
   {
-    return(((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1));
+    return (((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $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))));
   }
 
@@ -39 +39 @@
     $To->Address = $From->Address + $HostMask;
     $To->Prefix = IPV4_BIT_WIDTH;
-    return(array('From' => $From, 'To' => $To));
+    return (array('From' => $From, 'To' => $To));
   }
 
@@ -45 +45 @@
   {
     $this->Prefix = $NewPrefix;
-    if($this->Prefix > IPV4_BIT_WIDTH) $this->Prefix = IPV4_BIT_WIDTH;
-    if($this->Prefix < 0) $this->Prefix = 0;
+    if ($this->Prefix > IPV4_BIT_WIDTH) $this->Prefix = IPV4_BIT_WIDTH;
+    if ($this->Prefix < 0) $this->Prefix = 0;
     $this->Address = $this->Address & $this->GetNetMask();
   }
@@ -53 +53 @@
   {
     $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;
-    return($Result);
+    return ($Result);
   }
 }
@@ -74 +74 @@
   function GetNetMask()
   {
-    return(Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
+    return (Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
       Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH - $this->Prefix)), IntToInt128(1))));
   }
@@ -80 +80 @@
   function AddressToString()
   {
-    return(inet_ntop($this->Address));
+    return (inet_ntop($this->Address));
   }
 
@@ -91 +91 @@
   {
     $this->Prefix = $NewPrefix;
-    if($this->Prefix > IPV6_BIT_WIDTH) $this->Prefix = IPV6_BIT_WIDTH;
-    if($this->Prefix < 0) $this->Prefix = 0;
+    if ($this->Prefix > IPV6_BIT_WIDTH) $this->Prefix = IPV6_BIT_WIDTH;
+    if ($this->Prefix < 0) $this->Prefix = 0;
     $this->Address = Int128And($this->Address, $this->GetNetMask());
   }
@@ -100 +100 @@
     $Result = array();
     $Data = array_reverse(unpack('C*', $this->Address));
-    foreach($Data as $Item)
+    foreach ($Data as $Item)
     {
 
@@ -106 +106 @@
       $Result[] = dechex(($Item >> 4) & 15);
     }
-    return($Result);
+    return ($Result);
   }
 
@@ -127 +127 @@
   {
     $UpperNetmask = $this->GetNetMask();
-    if(($this->Prefix < $Address->Prefix) and ((Int128Equal(Int128And($Address->Address, $UpperNetmask), Int128And($this->Address, $UpperNetmask))))) $Result = true;
+    if (($this->Prefix < $Address->Prefix) and ((Int128Equal(Int128And($Address->Address, $UpperNetmask), Int128And($this->Address, $UpperNetmask))))) $Result = true;
       else $Result = false;
-    return($Result);
+    return ($Result);
   }
 }