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

Timestamp:

Feb 28, 2016, 10:54:30 AM (8 years ago)

Author:

chronos

Message:

• Modified: Use object oriented approach for page drawing using Application class.
• Added: SQL updated will be automatic using UpdateTrace.php file.
• Added: Use generic setup page at URL /setup for SQL structure update.
• Modified: Update Common package to newer version.

File:

• trunk/Packages/Common/NetworkAddress.php (modified) (1 diff)

trunk/Packages/Common/NetworkAddress.php

@@ -60 +60 @@
 class NetworkAddressIPv6
 {
-        var $Address;
-        var $Prefix;
+  var $Address;
+  var $Prefix;
 
-        function __construct()
-        {
-                $this->Address = 0;
-                $this->Prefix = 0;
-        }
+  function __construct()
+  {
+    $this->Address = 0;
+    $this->Prefix = 0;
+  }
 
   function AddressToString()
   {
-        return(inet_ntop($this->Address));
+    return(inet_ntop($this->Address));
   }
 
   function AddressFromString($Value)
   {
-        $this->Address = inet_pton($Value);
+    $this->Address = inet_pton($Value);
   }
 
   function GetOctets()
   {
-        $Result = array();
-        $Data = array_reverse(unpack('C*', $this->Address));
-        foreach($Data as $Item)
-        {
+    $Result = array();
+    $Data = array_reverse(unpack('C*', $this->Address));
+    foreach($Data as $Item)
+    {
 
-                $Result[] = dechex($Item & 15);
-                $Result[] = dechex(($Item >> 4) & 15);
-        }
-        return($Result);
+      $Result[] = dechex($Item & 15);
+      $Result[] = dechex(($Item >> 4) & 15);
+    }
+    return($Result);
   }
 
   function EncodeMAC($MAC)
   {
-        $MAC = explode(':', $MAC);
-        $Data = unpack('C*', $this->Address);
-        $Data[9] = hexdec($MAC[0]) ^ 0x02;
-        $Data[10] = hexdec($MAC[1]);
-        $Data[11] = hexdec($MAC[2]);
-        $Data[12] = 0xff;
-        $Data[13] = 0xfe;
-        $Data[14] = hexdec($MAC[3]);
-        $Data[15] = hexdec($MAC[4]);
-        $Data[16] = hexdec($MAC[5]);
-        $this->Address = pack_array('C*', $Data);
+    $MAC = explode(':', $MAC);
+    $Data = unpack('C*', $this->Address);
+    $Data[9] = hexdec($MAC[0]) ^ 0x02;
+    $Data[10] = hexdec($MAC[1]);
+    $Data[11] = hexdec($MAC[2]);
+    $Data[12] = 0xff;
+    $Data[13] = 0xfe;
+    $Data[14] = hexdec($MAC[3]);
+    $Data[15] = hexdec($MAC[4]);
+    $Data[16] = hexdec($MAC[5]);
+    $this->Address = pack_array('C*', $Data);
   }