phpipam / phpipam

functions/classes/class.Radius.php

Doc Comments +34 added lines

@@ -355,30 +355,45 @@ 
     }

 

 

+    /**
+     * @param integer $packet_code
+     */
     function SetPacketCodeToSend($packet_code)

     {

         $this->_radius_packet_to_send = $packet_code;

     }

 

 

+    /**
+     * @param boolean $debug_mode
+     */
     function SetDebugMode($debug_mode)

     {

         $this->_debug_mode = (TRUE === $debug_mode);

     }

 

 

+    /**
+     * @param string $ip_radius_server
+     */
     function SetIpRadiusServer($ip_radius_server)

     {

         $this->_ip_radius_server = gethostbyname($ip_radius_server);

     }

 

 

+    /**
+     * @param string $shared_secret
+     */
     function SetSharedSecret($shared_secret)

     {

         $this->_shared_secret = $shared_secret;

     }

 

 

+    /**
+     * @param string $radius_suffix
+     */
     function SetRadiusSuffix($radius_suffix)

     {

         $this->_radius_suffix = $radius_suffix;

@@ -468,6 +483,9 @@ 
     }

 

 

+    /**
+     * @param integer $authentication_port
+     */
     function SetAuthenticationPort($authentication_port)

     {

         if ((intval($authentication_port) > 0) && (intval($authentication_port) < 65536))

@@ -477,6 +495,9 @@ 
     }

 

 

+    /**
+     * @param integer $accounting_port
+     */
     function SetAccountingPort($accounting_port)

     {

         if ((intval($accounting_port) > 0) && (intval($accounting_port) < 65536))

@@ -541,6 +562,9 @@ 
     }

 

 

+    /**
+     * @param integer $info_index
+     */
     function GetRadiusPacketInfo($info_index)

     {

         if (isset($this->_radius_packet_info[intval($info_index)]))

@@ -567,6 +591,9 @@ 
     }

 

 

+    /**
+     * @param string $debug_info
+     */
     function DebugInfo($debug_info)

     {

         if ($this->_debug_mode)

@@ -577,6 +604,9 @@ 
     }

 

 

+    /**
+     * @param integer $type
+     */
     function SetAttribute($type, $value)

     {

         $attribute_index = -1;

@@ -631,6 +661,10 @@ 
     }

 

 

+    /**
+     * @param string $attribute_raw_value
+     * @param integer $attribute_format
+     */
     function DecodeAttribute($attribute_raw_value, $attribute_format)

     {

         $attribute_value = NULL;

Spacing +223 added lines, -223 removed lines

@@ -182,32 +182,32 @@ 
  *********************************************************************/
 class Radius
 {
-    var $_ip_radius_server;       // Radius server IP address
-    var $_shared_secret;          // Shared secret with the radius server
-    var $_radius_suffix;          // Radius suffix (default is '');
-    var $_udp_timeout;            // Timeout of the UDP connection in seconds (default value is 5)
-    var $_authentication_port;    // Authentication port (default value is 1812)
-    var $_accounting_port;        // Accouting port (default value is 1813)
-    var $_nas_ip_address;         // NAS IP address
-    var $_nas_port;               // NAS port
-    var $_encrypted_password;     // Encrypted password, as described in the RFC 2865
-    var $_user_ip_address;        // Remote IP address of the user
-    var $_request_authenticator;  // Request-Authenticator, 16 octets random number
+    var $_ip_radius_server; // Radius server IP address
+    var $_shared_secret; // Shared secret with the radius server
+    var $_radius_suffix; // Radius suffix (default is '');
+    var $_udp_timeout; // Timeout of the UDP connection in seconds (default value is 5)
+    var $_authentication_port; // Authentication port (default value is 1812)
+    var $_accounting_port; // Accouting port (default value is 1813)
+    var $_nas_ip_address; // NAS IP address
+    var $_nas_port; // NAS port
+    var $_encrypted_password; // Encrypted password, as described in the RFC 2865
+    var $_user_ip_address; // Remote IP address of the user
+    var $_request_authenticator; // Request-Authenticator, 16 octets random number
     var $_response_authenticator; // Request-Authenticator, 16 octets random number
-    var $_username;               // Username to sent to the Radius server
-    var $_password;               // Password to sent to the Radius server (clear password, must be encrypted)
-    var $_identifier_to_send;     // Identifier field for the packet to be sent
-    var $_identifier_received;    // Identifier field for the received packet
-    var $_radius_packet_to_send;  // Radius packet code (1=Access-Request, 2=Access-Accept, 3=Access-Reject, 4=Accounting-Request, 5=Accounting-Response, 11=Access-Challenge, 12=Status-Server (experimental), 13=Status-Client (experimental), 255=Reserved
+    var $_username; // Username to sent to the Radius server
+    var $_password; // Password to sent to the Radius server (clear password, must be encrypted)
+    var $_identifier_to_send; // Identifier field for the packet to be sent
+    var $_identifier_received; // Identifier field for the received packet
+    var $_radius_packet_to_send; // Radius packet code (1=Access-Request, 2=Access-Accept, 3=Access-Reject, 4=Accounting-Request, 5=Accounting-Response, 11=Access-Challenge, 12=Status-Server (experimental), 13=Status-Client (experimental), 255=Reserved
     var $_radius_packet_received; // Radius packet code (1=Access-Request, 2=Access-Accept, 3=Access-Reject, 4=Accounting-Request, 5=Accounting-Response, 11=Access-Challenge, 12=Status-Server (experimental), 13=Status-Client (experimental), 255=Reserved
-    var $_attributes_to_send;     // Radius attributes to send
-    var $_attributes_received;    // Radius attributes received
-    var $_socket_to_server;       // Socket connection
-    var $_debug_mode;             // Debug mode flag
-    var $_attributes_info;        // Attributes info array
-    var $_radius_packet_info;     // Radius packet codes info array
-    var $_last_error_code;        // Last error code
-    var $_last_error_message;     // Last error message
+    var $_attributes_to_send; // Radius attributes to send
+    var $_attributes_received; // Radius attributes received
+    var $_socket_to_server; // Socket connection
+    var $_debug_mode; // Debug mode flag
+    var $_attributes_info; // Attributes info array
+    var $_radius_packet_info; // Radius packet codes info array
+    var $_last_error_code; // Last error code
+    var $_last_error_message; // Last error message
 
 
     /*********************************************************************
@@ -227,7 +227,7 @@ 
      * @param integer accounting port
      * @return NULL
      *********************************************************************/
-    public function Radius($ip_radius_server = '127.0.0.1', $shared_secret = '', $radius_suffix = '', $udp_timeout = 5, $authentication_port = 1812, $accounting_port = 1813)
+    public function Radius ($ip_radius_server = '127.0.0.1', $shared_secret = '', $radius_suffix = '', $udp_timeout = 5, $authentication_port = 1812, $accounting_port = 1813)
     {
         $this->_radius_packet_info[1] = 'Access-Request';
         $this->_radius_packet_info[2] = 'Access-Accept';
@@ -239,96 +239,96 @@ 
         $this->_radius_packet_info[13] = 'Status-Client (experimental)';
         $this->_radius_packet_info[255] = 'Reserved';
 
-        $this->_attributes_info[1] = array('User-Name', 'S');
-        $this->_attributes_info[2] = array('User-Password', 'S');
-        $this->_attributes_info[3] = array('CHAP-Password', 'S'); // Type (1) / Length (1) / CHAP Ident (1) / String
-        $this->_attributes_info[4] = array('NAS-IP-Address', 'A');
-        $this->_attributes_info[5] = array('NAS-Port', 'I');
-        $this->_attributes_info[6] = array('Service-Type', 'I');
-        $this->_attributes_info[7] = array('Framed-Protocol', 'I');
-        $this->_attributes_info[8] = array('Framed-IP-Address', 'A');
-        $this->_attributes_info[9] = array('Framed-IP-Netmask', 'A');
-        $this->_attributes_info[10] = array('Framed-Routing', 'I');
-        $this->_attributes_info[11] = array('Filter-Id', 'T');
-        $this->_attributes_info[12] = array('Framed-MTU', 'I');
-        $this->_attributes_info[13] = array('Framed-Compression', 'I');
-        $this->_attributes_info[14] = array('Login-IP-Host', 'A');
-        $this->_attributes_info[15] = array('Login-service', 'I');
-        $this->_attributes_info[16] = array('Login-TCP-Port', 'I');
-        $this->_attributes_info[17] = array('(unassigned)', '');
-        $this->_attributes_info[18] = array('Reply-Message', 'T');
-        $this->_attributes_info[19] = array('Callback-Number', 'S');
-        $this->_attributes_info[20] = array('Callback-Id', 'S');
-        $this->_attributes_info[21] = array('(unassigned)', '');
-        $this->_attributes_info[22] = array('Framed-Route', 'T');
-        $this->_attributes_info[23] = array('Framed-IPX-Network', 'I');
-        $this->_attributes_info[24] = array('State', 'S');
-        $this->_attributes_info[25] = array('Class', 'S');
-        $this->_attributes_info[26] = array('Vendor-Specific', 'S'); // Type (1) / Length (1) / Vendor-Id (4) / Vendor type (1) / Vendor length (1) / Attribute-Specific...
-        $this->_attributes_info[27] = array('Session-Timeout', 'I');
-        $this->_attributes_info[28] = array('Idle-Timeout', 'I');
-        $this->_attributes_info[29] = array('Termination-Action', 'I');
-        $this->_attributes_info[30] = array('Called-Station-Id', 'S');
-        $this->_attributes_info[31] = array('Calling-Station-Id', 'S');
-        $this->_attributes_info[32] = array('NAS-Identifier', 'S');
-        $this->_attributes_info[33] = array('Proxy-State', 'S');
-        $this->_attributes_info[34] = array('Login-LAT-Service', 'S');
-        $this->_attributes_info[35] = array('Login-LAT-Node', 'S');
-        $this->_attributes_info[36] = array('Login-LAT-Group', 'S');
-        $this->_attributes_info[37] = array('Framed-AppleTalk-Link', 'I');
-        $this->_attributes_info[38] = array('Framed-AppleTalk-Network', 'I');
-        $this->_attributes_info[39] = array('Framed-AppleTalk-Zone', 'S');
-        $this->_attributes_info[60] = array('CHAP-Challenge', 'S');
-        $this->_attributes_info[61] = array('NAS-Port-Type', 'I');
-        $this->_attributes_info[62] = array('Port-Limit', 'I');
-        $this->_attributes_info[63] = array('Login-LAT-Port', 'S');
-        $this->_attributes_info[76] = array('Prompt', 'I');
+        $this->_attributes_info[1] = array ('User-Name', 'S');
+        $this->_attributes_info[2] = array ('User-Password', 'S');
+        $this->_attributes_info[3] = array ('CHAP-Password', 'S'); // Type (1) / Length (1) / CHAP Ident (1) / String
+        $this->_attributes_info[4] = array ('NAS-IP-Address', 'A');
+        $this->_attributes_info[5] = array ('NAS-Port', 'I');
+        $this->_attributes_info[6] = array ('Service-Type', 'I');
+        $this->_attributes_info[7] = array ('Framed-Protocol', 'I');
+        $this->_attributes_info[8] = array ('Framed-IP-Address', 'A');
+        $this->_attributes_info[9] = array ('Framed-IP-Netmask', 'A');
+        $this->_attributes_info[10] = array ('Framed-Routing', 'I');
+        $this->_attributes_info[11] = array ('Filter-Id', 'T');
+        $this->_attributes_info[12] = array ('Framed-MTU', 'I');
+        $this->_attributes_info[13] = array ('Framed-Compression', 'I');
+        $this->_attributes_info[14] = array ('Login-IP-Host', 'A');
+        $this->_attributes_info[15] = array ('Login-service', 'I');
+        $this->_attributes_info[16] = array ('Login-TCP-Port', 'I');
+        $this->_attributes_info[17] = array ('(unassigned)', '');
+        $this->_attributes_info[18] = array ('Reply-Message', 'T');
+        $this->_attributes_info[19] = array ('Callback-Number', 'S');
+        $this->_attributes_info[20] = array ('Callback-Id', 'S');
+        $this->_attributes_info[21] = array ('(unassigned)', '');
+        $this->_attributes_info[22] = array ('Framed-Route', 'T');
+        $this->_attributes_info[23] = array ('Framed-IPX-Network', 'I');
+        $this->_attributes_info[24] = array ('State', 'S');
+        $this->_attributes_info[25] = array ('Class', 'S');
+        $this->_attributes_info[26] = array ('Vendor-Specific', 'S'); // Type (1) / Length (1) / Vendor-Id (4) / Vendor type (1) / Vendor length (1) / Attribute-Specific...
+        $this->_attributes_info[27] = array ('Session-Timeout', 'I');
+        $this->_attributes_info[28] = array ('Idle-Timeout', 'I');
+        $this->_attributes_info[29] = array ('Termination-Action', 'I');
+        $this->_attributes_info[30] = array ('Called-Station-Id', 'S');
+        $this->_attributes_info[31] = array ('Calling-Station-Id', 'S');
+        $this->_attributes_info[32] = array ('NAS-Identifier', 'S');
+        $this->_attributes_info[33] = array ('Proxy-State', 'S');
+        $this->_attributes_info[34] = array ('Login-LAT-Service', 'S');
+        $this->_attributes_info[35] = array ('Login-LAT-Node', 'S');
+        $this->_attributes_info[36] = array ('Login-LAT-Group', 'S');
+        $this->_attributes_info[37] = array ('Framed-AppleTalk-Link', 'I');
+        $this->_attributes_info[38] = array ('Framed-AppleTalk-Network', 'I');
+        $this->_attributes_info[39] = array ('Framed-AppleTalk-Zone', 'S');
+        $this->_attributes_info[60] = array ('CHAP-Challenge', 'S');
+        $this->_attributes_info[61] = array ('NAS-Port-Type', 'I');
+        $this->_attributes_info[62] = array ('Port-Limit', 'I');
+        $this->_attributes_info[63] = array ('Login-LAT-Port', 'S');
+        $this->_attributes_info[76] = array ('Prompt', 'I');
 
         $this->_identifier_to_send = 0;
         $this->_user_ip_address = (isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0');
 
-        $this->GenerateRequestAuthenticator();
-        $this->SetIpRadiusServer($ip_radius_server);
-        $this->SetSharedSecret($shared_secret);
-        $this->SetAuthenticationPort($authentication_port);
-        $this->SetAccountingPort($accounting_port);
-        $this->SetRadiusSuffix($radius_suffix);
-        $this->SetUdpTimeout($udp_timeout);
-        $this->SetUsername();
-        $this->SetPassword();
-        $this->SetNasIpAddress();
-        $this->SetNasPort();
-
-        $this->ClearLastError();
-        $this->ClearDataToSend();
-        $this->ClearDataReceived();
+        $this->GenerateRequestAuthenticator ();
+        $this->SetIpRadiusServer ($ip_radius_server);
+        $this->SetSharedSecret ($shared_secret);
+        $this->SetAuthenticationPort ($authentication_port);
+        $this->SetAccountingPort ($accounting_port);
+        $this->SetRadiusSuffix ($radius_suffix);
+        $this->SetUdpTimeout ($udp_timeout);
+        $this->SetUsername ();
+        $this->SetPassword ();
+        $this->SetNasIpAddress ();
+        $this->SetNasPort ();
+
+        $this->ClearLastError ();
+        $this->ClearDataToSend ();
+        $this->ClearDataReceived ();
     }
 
 
-    function GetNextIdentifier()
+    function GetNextIdentifier ()
     {
         $this->_identifier_to_send = (($this->_identifier_to_send + 1) % 256);
         return $this->_identifier_to_send;
     }
 
 
-    function GenerateRequestAuthenticator()
+    function GenerateRequestAuthenticator ()
     {
         $this->_request_authenticator = '';
         for ($ra_loop = 0; $ra_loop <= 15; $ra_loop++)
         {
-            $this->_request_authenticator .= chr(rand(1, 255));
+            $this->_request_authenticator .= chr (rand (1, 255));
         }
     }
 
 
-    function GetRequestAuthenticator()
+    function GetRequestAuthenticator ()
     {
         return $this->_request_authenticator;
     }
 
 
-    function GetLastError()
+    function GetLastError ()
     {
         if (0 < $this->_last_error_code)
         {
@@ -340,174 +340,174 @@ 
     }
 
 
-    function ClearDataToSend()
+    function ClearDataToSend ()
     {
         $this->_radius_packet_to_send = 0;
         $this->_attributes_to_send = NULL;
     }
 
 
-    function ClearDataReceived()
+    function ClearDataReceived ()
     {
         $this->_radius_packet_received = 0;
         $this->_attributes_received = NULL;
     }
 
 
-    function SetPacketCodeToSend($packet_code)
+    function SetPacketCodeToSend ($packet_code)
     {
         $this->_radius_packet_to_send = $packet_code;
     }
 
 
-    function SetDebugMode($debug_mode)
+    function SetDebugMode ($debug_mode)
     {
         $this->_debug_mode = (TRUE === $debug_mode);
     }
 
 
-    function SetIpRadiusServer($ip_radius_server)
+    function SetIpRadiusServer ($ip_radius_server)
     {
-        $this->_ip_radius_server = gethostbyname($ip_radius_server);
+        $this->_ip_radius_server = gethostbyname ($ip_radius_server);
     }
 
 
-    function SetSharedSecret($shared_secret)
+    function SetSharedSecret ($shared_secret)
     {
         $this->_shared_secret = $shared_secret;
     }
 
 
-    function SetRadiusSuffix($radius_suffix)
+    function SetRadiusSuffix ($radius_suffix)
     {
         $this->_radius_suffix = $radius_suffix;
     }
 
 
-    function SetUsername($username = '')
+    function SetUsername ($username = '')
     {
         $temp_username = $username;
-        if (false === strpos($temp_username, '@'))
+        if (false === strpos ($temp_username, '@'))
         {
             $temp_username .= $this->_radius_suffix;
         }
 
         $this->_username = $temp_username;
-        $this->SetAttribute(1, $this->_username);
+        $this->SetAttribute (1, $this->_username);
     }
 
 
-    function SetPassword($password = '')
+    function SetPassword ($password = '')
     {
         $this->_password = $password;
         $encrypted_password = '';
         $padded_password = $password;
 
-        if (0 != (strlen($password) % 16))
+        if (0 != (strlen ($password) % 16))
         {
-            $padded_password .= str_repeat(chr(0), (16 - strlen($password) % 16));
+            $padded_password .= str_repeat (chr (0), (16 - strlen ($password) % 16));
         }
 
         $previous_result = $this->_request_authenticator;
 
-        for ($full_loop = 0; $full_loop < (strlen($padded_password) / 16); $full_loop++)
+        for ($full_loop = 0; $full_loop < (strlen ($padded_password) / 16); $full_loop++)
         {
-            $xor_value = md5($this->_shared_secret.$previous_result);
+            $xor_value = md5 ($this->_shared_secret.$previous_result);
 
             $previous_result = '';
             for ($xor_loop = 0; $xor_loop <= 15; $xor_loop++)
             {
-                $value1 = ord(substr($padded_password, ($full_loop * 16) + $xor_loop, 1));
-                $value2 = hexdec(substr($xor_value, 2 * $xor_loop, 2));
-                $xor_result = $value1^$value2;
-                $previous_result .= chr($xor_result);
+                $value1 = ord (substr ($padded_password, ($full_loop * 16) + $xor_loop, 1));
+                $value2 = hexdec (substr ($xor_value, 2 * $xor_loop, 2));
+                $xor_result = $value1 ^ $value2;
+                $previous_result .= chr ($xor_result);
             }
             $encrypted_password .= $previous_result;
         }
 
         $this->_encrypted_password = $encrypted_password;
-        $this->SetAttribute(2, $this->_encrypted_password);
+        $this->SetAttribute (2, $this->_encrypted_password);
     }
 
 
-    function SetNasIPAddress($nas_ip_address = '')
+    function SetNasIPAddress ($nas_ip_address = '')
     {
-        if (0 < strlen($nas_ip_address))
+        if (0 < strlen ($nas_ip_address))
         {
-            $this->_nas_ip_address = gethostbyname($nas_ip_address);
+            $this->_nas_ip_address = gethostbyname ($nas_ip_address);
         } else
         {
-            $this->_nas_ip_address = gethostbyname(isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '0.0.0.0');
+            $this->_nas_ip_address = gethostbyname (isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '0.0.0.0');
         }
-        $this->SetAttribute(4, $this->_nas_ip_address);
+        $this->SetAttribute (4, $this->_nas_ip_address);
     }
 
 
-    function SetNasPort($nas_port = 0)
+    function SetNasPort ($nas_port = 0)
     {
-        $this->_nas_port = intval($nas_port);
-        $this->SetAttribute(5, $this->_nas_port);
+        $this->_nas_port = intval ($nas_port);
+        $this->SetAttribute (5, $this->_nas_port);
     }
 
 
-    function SetUdpTimeout($udp_timeout = 5)
+    function SetUdpTimeout ($udp_timeout = 5)
     {
-        if (intval($udp_timeout) > 0)
+        if (intval ($udp_timeout) > 0)
         {
-            $this->_udp_timeout = intval($udp_timeout);
+            $this->_udp_timeout = intval ($udp_timeout);
         }
     }
 
 
-    function ClearLastError()
+    function ClearLastError ()
     {
         $this->_last_error_code    = 0;
         $this->_last_error_message = '';
     }
 
 
-    function SetAuthenticationPort($authentication_port)
+    function SetAuthenticationPort ($authentication_port)
     {
-        if ((intval($authentication_port) > 0) && (intval($authentication_port) < 65536))
+        if ((intval ($authentication_port) > 0) && (intval ($authentication_port) < 65536))
         {
-            $this->_authentication_port = intval($authentication_port);
+            $this->_authentication_port = intval ($authentication_port);
         }
     }
 
 
-    function SetAccountingPort($accounting_port)
+    function SetAccountingPort ($accounting_port)
     {
-        if ((intval($accounting_port) > 0) && (intval($accounting_port) < 65536))
+        if ((intval ($accounting_port) > 0) && (intval ($accounting_port) < 65536))
         {
-            $this->_accounting_port = intval($accounting_port);
+            $this->_accounting_port = intval ($accounting_port);
         }
     }
 
 
-    function GetReceivedPacket()
+    function GetReceivedPacket ()
     {
         return $this->_radius_packet_received;
     }
 
 
-    function GetReceivedAttributes()
+    function GetReceivedAttributes ()
     {
         return $this->_attributes_received;
     }
 
 
-    function GetReadableReceivedAttributes()
+    function GetReadableReceivedAttributes ()
     {
         $readable_attributes = '';
         if (isset($this->_attributes_received))
         {
             foreach ($this->_attributes_received as $one_received_attribute)
             {
-                $attributes_info = $this->GetAttributesInfo($one_received_attribute[0]);
+                $attributes_info = $this->GetAttributesInfo ($one_received_attribute[0]);
                 $readable_attributes .= $attributes_info[0].": ";
                 if (26 == $one_received_attribute[0])
                 {
-                    $vendor_array = $this->DecodeVendorSpecificContent($one_received_attribute[1]);
+                    $vendor_array = $this->DecodeVendorSpecificContent ($one_received_attribute[1]);
                     foreach ($vendor_array as $vendor_one)
                     {
                         $readable_attributes .= 'Vendor-Id: '.$vendor_one[0].", Vendor-type: ".$vendor_one[1].",  Attribute-specific: ".$vendor_one[2];
@@ -523,12 +523,12 @@ 
     }
 
 
-    function GetAttribute($attribute_type)
+    function GetAttribute ($attribute_type)
     {
         $attribute_value = NULL;
         foreach ($this->_attributes_received as $one_received_attribute)
         {
-            if (intval($attribute_type) == $one_received_attribute[0])
+            if (intval ($attribute_type) == $one_received_attribute[0])
             {
                 $attribute_value = $one_received_attribute[1];
                 break;
@@ -538,11 +538,11 @@ 
     }
 
 
-    function GetRadiusPacketInfo($info_index)
+    function GetRadiusPacketInfo ($info_index)
     {
-        if (isset($this->_radius_packet_info[intval($info_index)]))
+        if (isset($this->_radius_packet_info[intval ($info_index)]))
         {
-            return $this->_radius_packet_info[intval($info_index)];
+            return $this->_radius_packet_info[intval ($info_index)];
         } else
         {
             return '';
@@ -550,34 +550,34 @@ 
     }
 
 
-    function GetAttributesInfo($info_index)
+    function GetAttributesInfo ($info_index)
     {
-        if (isset($this->_attributes_info[intval($info_index)]))
+        if (isset($this->_attributes_info[intval ($info_index)]))
         {
-            return $this->_attributes_info[intval($info_index)];
+            return $this->_attributes_info[intval ($info_index)];
         } else
         {
-            return array('', '');
+            return array ('', '');
         }
     }
 
 
-    function DebugInfo($debug_info)
+    function DebugInfo ($debug_info)
     {
         if ($this->_debug_mode)
         {
 	        //save debugging
-	        $this->debug_text[] = date('Y-m-d H:i:s').' DEBUG: '.$debug_info;
+	        $this->debug_text[] = date ('Y-m-d H:i:s').' DEBUG: '.$debug_info;
         }
     }
 
 
-    function SetAttribute($type, $value)
+    function SetAttribute ($type, $value)
     {
         $attribute_index = -1;
-        for ($attributes_loop = 0; $attributes_loop < count($this->_attributes_to_send); $attributes_loop++)
+        for ($attributes_loop = 0; $attributes_loop < count ($this->_attributes_to_send); $attributes_loop++)
         {
-            if ($type == ord(substr($this->_attributes_to_send[$attributes_loop], 0, 1)))
+            if ($type == ord (substr ($this->_attributes_to_send[$attributes_loop], 0, 1)))
             {
                 $attribute_index = $attributes_loop;
                 break;
@@ -591,17 +591,17 @@ 
             switch ($this->_attributes_info[$type][1])
             {
                 case 'T': // Text, 1-253 octets containing UTF-8 encoded ISO 10646 characters (RFC 2279).
-                    $temp_attribute = chr($type).chr(2 + strlen($value)).$value;
+                    $temp_attribute = chr ($type).chr (2 + strlen ($value)).$value;
                     break;
                 case 'S': // String, 1-253 octets containing binary data (values 0 through 255 decimal, inclusive).
-                    $temp_attribute = chr($type).chr(2 + strlen($value)).$value;
+                    $temp_attribute = chr ($type).chr (2 + strlen ($value)).$value;
                     break;
                 case 'A': // Address, 32 bit value, most significant octet first.
-                    $ip_array = explode(".", $value);
-                    $temp_attribute = chr($type).chr(6).chr($ip_array[0]).chr($ip_array[1]).chr($ip_array[2]).chr($ip_array[3]);
+                    $ip_array = explode (".", $value);
+                    $temp_attribute = chr ($type).chr (6).chr ($ip_array[0]).chr ($ip_array[1]).chr ($ip_array[2]).chr ($ip_array[3]);
                     break;
                 case 'I': // Integer, 32 bit unsigned value, most significant octet first.
-                    $temp_attribute = chr($type).chr(6).chr(($value / (256 * 256 * 256)) % 256).chr(($value / (256 * 256)) % 256).chr(($value / (256)) % 256).chr($value % 256);
+                    $temp_attribute = chr ($type).chr (6).chr (($value / (256 * 256 * 256)) % 256).chr (($value / (256 * 256)) % 256).chr (($value / (256)) % 256).chr ($value % 256);
                     break;
                 case 'D': // Time, 32 bit unsigned value, most significant octet first -- seconds since 00:00:00 UTC, January 1, 1970. (not used in this RFC)
                     $temp_attribute = NULL;
@@ -620,12 +620,12 @@ 
             $this->_attributes_to_send[] = $temp_attribute;
             $additional_debug = 'Added';
         }
-        $attribute_info = $this->GetAttributesInfo($type);
-        $this->DebugInfo($additional_debug.' Attribute '.$type.' ('.$attribute_info[0].'), format '.$attribute_info[1].', value <em>'.$value.'</em>');
+        $attribute_info = $this->GetAttributesInfo ($type);
+        $this->DebugInfo ($additional_debug.' Attribute '.$type.' ('.$attribute_info[0].'), format '.$attribute_info[1].', value <em>'.$value.'</em>');
     }
 
 
-    function DecodeAttribute($attribute_raw_value, $attribute_format)
+    function DecodeAttribute ($attribute_raw_value, $attribute_format)
     {
         $attribute_value = NULL;
 
@@ -640,10 +640,10 @@ 
                     $attribute_value = $attribute_raw_value;
                     break;
                 case 'A': // Address, 32 bit value, most significant octet first.
-                    $attribute_value = ord(substr($attribute_raw_value, 0, 1)).'.'.ord(substr($attribute_raw_value, 1, 1)).'.'.ord(substr($attribute_raw_value, 2, 1)).'.'.ord(substr($attribute_raw_value, 3, 1));
+                    $attribute_value = ord (substr ($attribute_raw_value, 0, 1)).'.'.ord (substr ($attribute_raw_value, 1, 1)).'.'.ord (substr ($attribute_raw_value, 2, 1)).'.'.ord (substr ($attribute_raw_value, 3, 1));
                     break;
                 case 'I': // Integer, 32 bit unsigned value, most significant octet first.
-                    $attribute_value = (ord(substr($attribute_raw_value, 0, 1)) * 256 * 256 * 256) + (ord(substr($attribute_raw_value, 1, 1)) * 256 * 256) + (ord(substr($attribute_raw_value, 2, 1)) * 256) + ord(substr($attribute_raw_value, 3, 1));
+                    $attribute_value = (ord (substr ($attribute_raw_value, 0, 1)) * 256 * 256 * 256) + (ord (substr ($attribute_raw_value, 1, 1)) * 256 * 256) + (ord (substr ($attribute_raw_value, 2, 1)) * 256) + ord (substr ($attribute_raw_value, 3, 1));
                     break;
                 case 'D': // Time, 32 bit unsigned value, most significant octet first -- seconds since 00:00:00 UTC, January 1, 1970. (not used in this RFC)
                     $attribute_value = NULL;
@@ -659,18 +659,18 @@ 
     /*********************************************************************
      * Array returned: array(array(Vendor-Id1, Vendor type1, Attribute-Specific1), ..., array(Vendor-IdN, Vendor typeN, Attribute-SpecificN)
      *********************************************************************/
-    function DecodeVendorSpecificContent($vendor_specific_raw_value)
+    function DecodeVendorSpecificContent ($vendor_specific_raw_value)
     {
-        $result = array();
+        $result = array ();
         $offset_in_raw = 0;
-        $vendor_id = (ord(substr($vendor_specific_raw_value, 0, 1)) * 256 * 256 * 256) + (ord(substr($vendor_specific_raw_value, 1, 1)) * 256 * 256) + (ord(substr($vendor_specific_raw_value, 2, 1)) * 256) + ord(substr($vendor_specific_raw_value, 3, 1));
+        $vendor_id = (ord (substr ($vendor_specific_raw_value, 0, 1)) * 256 * 256 * 256) + (ord (substr ($vendor_specific_raw_value, 1, 1)) * 256 * 256) + (ord (substr ($vendor_specific_raw_value, 2, 1)) * 256) + ord (substr ($vendor_specific_raw_value, 3, 1));
         $offset_in_raw += 4;
-        while ($offset_in_raw < strlen($vendor_specific_raw_value))
+        while ($offset_in_raw < strlen ($vendor_specific_raw_value))
         {
-            $vendor_type = (ord(substr($vendor_specific_raw_value, 0 + $offset_in_raw, 1)));
-            $vendor_length = (ord(substr($vendor_specific_raw_value, 1 + $offset_in_raw, 1)));
-            $attribute_specific = substr($vendor_specific_raw_value, 2 + $offset_in_raw, $vendor_length);
-            $result[] = array($vendor_id, $vendor_type, $attribute_specific);
+            $vendor_type = (ord (substr ($vendor_specific_raw_value, 0 + $offset_in_raw, 1)));
+            $vendor_length = (ord (substr ($vendor_specific_raw_value, 1 + $offset_in_raw, 1)));
+            $attribute_specific = substr ($vendor_specific_raw_value, 2 + $offset_in_raw, $vendor_length);
+            $result[] = array ($vendor_id, $vendor_type, $attribute_specific);
             $offset_in_raw += ($vendor_length);
         }
 
@@ -683,140 +683,140 @@ 
      *
      * Return TRUE if Access-Request is accepted, FALSE otherwise
      */
-    function AccessRequest($username = '', $password = '', $udp_timeout = 0, $state = NULL)
+    function AccessRequest ($username = '', $password = '', $udp_timeout = 0, $state = NULL)
     {
-        $this->ClearDataReceived();
-        $this->ClearLastError();
+        $this->ClearDataReceived ();
+        $this->ClearLastError ();
 
-        $this->SetPacketCodeToSend(1); // Access-Request
+        $this->SetPacketCodeToSend (1); // Access-Request
 
-        if (0 < strlen($username))
+        if (0 < strlen ($username))
         {
-            $this->SetUsername($username);
+            $this->SetUsername ($username);
         }
 
-        if (0 < strlen($password))
+        if (0 < strlen ($password))
         {
-            $this->SetPassword($password);
+            $this->SetPassword ($password);
         }
 
         if ($state !== NULL)
         {
-            $this->SetAttribute(24, $state);
+            $this->SetAttribute (24, $state);
         } else
         {
-            $this->SetAttribute(6, 1); // 1=Login
+            $this->SetAttribute (6, 1); // 1=Login
         }
 
-        if (intval($udp_timeout) > 0)
+        if (intval ($udp_timeout) > 0)
         {
-            $this->SetUdpTimeout($udp_timeout);
+            $this->SetUdpTimeout ($udp_timeout);
         }
 
         $attributes_content = '';
-        for ($attributes_loop = 0; $attributes_loop < count($this->_attributes_to_send); $attributes_loop++)
+        for ($attributes_loop = 0; $attributes_loop < count ($this->_attributes_to_send); $attributes_loop++)
         {
             $attributes_content .= $this->_attributes_to_send[$attributes_loop];
         }
 
         $packet_length  = 4; // Radius packet code + Identifier + Length high + Length low
-        $packet_length += strlen($this->_request_authenticator); // Request-Authenticator
-        $packet_length += strlen($attributes_content); // Attributes
+        $packet_length += strlen ($this->_request_authenticator); // Request-Authenticator
+        $packet_length += strlen ($attributes_content); // Attributes
 
-        $packet_data  = chr($this->_radius_packet_to_send);
-        $packet_data .= chr($this->GetNextIdentifier());
-        $packet_data .= chr(intval($packet_length / 256));
-        $packet_data .= chr(intval($packet_length % 256));
+        $packet_data  = chr ($this->_radius_packet_to_send);
+        $packet_data .= chr ($this->GetNextIdentifier ());
+        $packet_data .= chr (intval ($packet_length / 256));
+        $packet_data .= chr (intval ($packet_length % 256));
         $packet_data .= $this->_request_authenticator;
         $packet_data .= $attributes_content;
 
-        $_socket_to_server = socket_create(AF_INET, SOCK_DGRAM, 17); // UDP packet = 17
+        $_socket_to_server = socket_create (AF_INET, SOCK_DGRAM, 17); // UDP packet = 17
 
         if ($_socket_to_server === FALSE)
         {
-            $this->_last_error_code    = socket_last_error();
-            $this->_last_error_message = socket_strerror($this->_last_error_code);
-        } elseif (FALSE === socket_connect($_socket_to_server, $this->_ip_radius_server, $this->_authentication_port))
+            $this->_last_error_code    = socket_last_error ();
+            $this->_last_error_message = socket_strerror ($this->_last_error_code);
+        } elseif (FALSE === socket_connect ($_socket_to_server, $this->_ip_radius_server, $this->_authentication_port))
         {
-            $this->_last_error_code    = socket_last_error();
-            $this->_last_error_message = socket_strerror($this->_last_error_code);
-        } elseif (FALSE === socket_write($_socket_to_server, $packet_data, $packet_length))
+            $this->_last_error_code    = socket_last_error ();
+            $this->_last_error_message = socket_strerror ($this->_last_error_code);
+        } elseif (FALSE === socket_write ($_socket_to_server, $packet_data, $packet_length))
         {
-            $this->_last_error_code    = socket_last_error();
-            $this->_last_error_message = socket_strerror($this->_last_error_code);
+            $this->_last_error_code    = socket_last_error ();
+            $this->_last_error_message = socket_strerror ($this->_last_error_code);
         } else
         {
-            $this->DebugInfo('<b>Packet type '.$this->_radius_packet_to_send.' ('.$this->GetRadiusPacketInfo($this->_radius_packet_to_send).')'.' sent</b>');
+            $this->DebugInfo ('<b>Packet type '.$this->_radius_packet_to_send.' ('.$this->GetRadiusPacketInfo ($this->_radius_packet_to_send).')'.' sent</b>');
             if ($this->_debug_mode)
             {
                 $readable_attributes = '';
                 foreach ($this->_attributes_to_send as $one_attribute_to_send)
                 {
-                    $attribute_info = $this->GetAttributesInfo(ord(substr($one_attribute_to_send, 0, 1)));
-                    $this->DebugInfo('Attribute '.ord(substr($one_attribute_to_send, 0, 1)).' ('.$attribute_info[0].'), length '.(ord(substr($one_attribute_to_send, 1, 1)) - 2).', format '.$attribute_info[1].', value <em>'.$this->DecodeAttribute(substr($one_attribute_to_send, 2), ord(substr($one_attribute_to_send, 0, 1))).'</em>');
+                    $attribute_info = $this->GetAttributesInfo (ord (substr ($one_attribute_to_send, 0, 1)));
+                    $this->DebugInfo ('Attribute '.ord (substr ($one_attribute_to_send, 0, 1)).' ('.$attribute_info[0].'), length '.(ord (substr ($one_attribute_to_send, 1, 1)) - 2).', format '.$attribute_info[1].', value <em>'.$this->DecodeAttribute (substr ($one_attribute_to_send, 2), ord (substr ($one_attribute_to_send, 0, 1))).'</em>');
                 }
             }
-            $read_socket_array   = array($_socket_to_server);
+            $read_socket_array   = array ($_socket_to_server);
             $write_socket_array  = NULL;
             $except_socket_array = NULL;
 
-            $received_packet = chr(0);
+            $received_packet = chr (0);
 
-            if (!(FALSE === socket_select($read_socket_array, $write_socket_array, $except_socket_array, $this->_udp_timeout)))
+            if (!(FALSE === socket_select ($read_socket_array, $write_socket_array, $except_socket_array, $this->_udp_timeout)))
             {
-                if (in_array($_socket_to_server, $read_socket_array))
+                if (in_array ($_socket_to_server, $read_socket_array))
                 {
-                    if (FALSE === ($received_packet = @socket_read($_socket_to_server, 1024))) {
+                    if (FALSE === ($received_packet = @socket_read ($_socket_to_server, 1024))) {
                         // @ used, than no error is displayed if the connection is closed by the remote host
                     {
-                        $received_packet = chr(0);
+                        $received_packet = chr (0);
                     }
-                        $this->_last_error_code    = socket_last_error();
-                        $this->_last_error_message = socket_strerror($this->_last_error_code);
+                        $this->_last_error_code    = socket_last_error ();
+                        $this->_last_error_message = socket_strerror ($this->_last_error_code);
                     } else
                     {
-                        socket_close($_socket_to_server);
+                        socket_close ($_socket_to_server);
                     }
                 }
             } else
             {
-                socket_close($_socket_to_server);
+                socket_close ($_socket_to_server);
             }
         }
 
-        $this->_radius_packet_received = intval(ord(substr($received_packet, 0, 1)));
+        $this->_radius_packet_received = intval (ord (substr ($received_packet, 0, 1)));
 
-        $this->DebugInfo('<b>Packet type '.$this->_radius_packet_received.' ('.$this->GetRadiusPacketInfo($this->_radius_packet_received).')'.' received</b>');
+        $this->DebugInfo ('<b>Packet type '.$this->_radius_packet_received.' ('.$this->GetRadiusPacketInfo ($this->_radius_packet_received).')'.' received</b>');
 
         if ($this->_radius_packet_received > 0)
         {
-            $this->_identifier_received = intval(ord(substr($received_packet, 1, 1)));
-            $packet_length = (intval(ord(substr($received_packet, 2, 1))) * 256) + (intval(ord(substr($received_packet, 3, 1))));
-            $this->_response_authenticator = substr($received_packet, 4, 16);
-            $attributes_content = substr($received_packet, 20, ($packet_length - 4 - 16));
-            while (strlen($attributes_content) > 2)
+            $this->_identifier_received = intval (ord (substr ($received_packet, 1, 1)));
+            $packet_length = (intval (ord (substr ($received_packet, 2, 1))) * 256) + (intval (ord (substr ($received_packet, 3, 1))));
+            $this->_response_authenticator = substr ($received_packet, 4, 16);
+            $attributes_content = substr ($received_packet, 20, ($packet_length - 4 - 16));
+            while (strlen ($attributes_content) > 2)
             {
-                $attribute_type = intval(ord(substr($attributes_content, 0, 1)));
-                $attribute_length = intval(ord(substr($attributes_content, 1, 1)));
-                $attribute_raw_value = substr($attributes_content, 2, $attribute_length - 2);
-                $attributes_content = substr($attributes_content, $attribute_length);
+                $attribute_type = intval (ord (substr ($attributes_content, 0, 1)));
+                $attribute_length = intval (ord (substr ($attributes_content, 1, 1)));
+                $attribute_raw_value = substr ($attributes_content, 2, $attribute_length - 2);
+                $attributes_content = substr ($attributes_content, $attribute_length);
 
-                $attribute_value = $this->DecodeAttribute($attribute_raw_value, $attribute_type);
+                $attribute_value = $this->DecodeAttribute ($attribute_raw_value, $attribute_type);
 
-                $attribute_info = $this->GetAttributesInfo($attribute_type);
+                $attribute_info = $this->GetAttributesInfo ($attribute_type);
                 if (26 == $attribute_type)
                 {
-                    $vendor_array = $this->DecodeVendorSpecificContent($attribute_value);
+                    $vendor_array = $this->DecodeVendorSpecificContent ($attribute_value);
                     foreach ($vendor_array as $vendor_one)
                     {
-                        $this->DebugInfo('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', Vendor-Id: '.$vendor_one[0].", Vendor-type: ".$vendor_one[1].",  Attribute-specific: ".$vendor_one[2]);
+                        $this->DebugInfo ('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', Vendor-Id: '.$vendor_one[0].", Vendor-type: ".$vendor_one[1].",  Attribute-specific: ".$vendor_one[2]);
                     }
                 } else
                 {
-                    $this->DebugInfo('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', value <em>'.$attribute_value.'</em>');
+                    $this->DebugInfo ('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', value <em>'.$attribute_value.'</em>');
                 }
 
-                $this->_attributes_received[] = array($attribute_type, $attribute_value);
+                $this->_attributes_received[] = array ($attribute_type, $attribute_value);
             }
         }
 

functions/classes/class.Result.php

Doc Comments +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @access public
 	 * @param string $text (default: "No value provided")
-	 * @return void
+	 * @return string
 	 */
 	public function show_cli_message ($text="No value provided") {
 		// array - join
@@ -95,11 +95,11 @@ 
 	 * Show GUI result
 	 *
 	 * @access public
-	 * @param mixed $class
-	 * @param mixed $text
-	 * @param mixed $popup
-	 * @param mixed $popup2
-	 * @return void
+	 * @param string $class
+	 * @param string $text
+	 * @param boolean $popup
+	 * @param boolean $popup2
+	 * @return string
 	 */
 	public function show_message ($class, $text, $popup, $popup2) {
 		// format if array
@@ -144,7 +144,7 @@ 
 	 * Exists with exception for API
 	 *
 	 * @access public
-	 * @param mixed $content
+	 * @param string $content
 	 * @return void
 	 */
 	public function throw_exception ($content) {

Spacing +30 added lines, -30 removed lines

@@ -45,28 +45,28 @@ 
 	 * @param bool $popup2 (default: false)					close for JS for popup2
 	 * @return void
 	 */
-	public function show($class="muted", $text="No value provided", $die=false, $popup=false, $inline = false, $popup2 = false) {
+	public function show ($class = "muted", $text = "No value provided", $die = false, $popup = false, $inline = false, $popup2 = false) {
 
 		# set die
 		$this->die = $die;
 
 		# API - throw exception
-		if($this->exit_method == "exception")  {
+		if ($this->exit_method == "exception") {
 			# ok, just return success
-			if ($class=="success") 		{ return true; }
-			else						{ return $this->throw_exception ($text); }
+			if ($class == "success") { return true; }
+			else { return $this->throw_exception ($text); }
 		}
 		else {
 			# cli or GUI
-			if (php_sapi_name()=="cli") { print $this->show_cli_message ($text); }
+			if (php_sapi_name () == "cli") { print $this->show_cli_message ($text); }
 			else {
 				# return or print
-				if ($inline) 			{ return $this->show_message ($class, $text, $popup, $popup2); }
-				else					{ print  $this->show_message ($class, $text, $popup, $popup2); }
+				if ($inline) { return $this->show_message ($class, $text, $popup, $popup2); }
+				else { print  $this->show_message ($class, $text, $popup, $popup2); }
 			}
 
 			# die
-			if($this->die===true)	{die(); }
+			if ($this->die === true) {die(); }
 		}
 	}
 
@@ -78,8 +78,8 @@ 
 	 * @param bool $die (default: false)
 	 * @return void
 	 */
-	public function show_cli ($text="No value provided", $die=false) {
-		$this->show(false, $text, $die, false, false, false);
+	public function show_cli ($text = "No value provided", $die = false) {
+		$this->show (false, $text, $die, false, false, false);
 	}
 
 	/**
@@ -89,18 +89,18 @@ 
 	 * @param string $text (default: "No value provided")
 	 * @return void
 	 */
-	public function show_cli_message ($text="No value provided") {
+	public function show_cli_message ($text = "No value provided") {
 		// array - join
-		if (is_array($text) && sizeof($text)>0) {
+		if (is_array ($text) && sizeof ($text) > 0) {
 			// 1 element
-			if(sizeof( $text )==1) {
+			if (sizeof ($text) == 1) {
 				$text = $text[0];
 			}
 			// multiple - format
 			else {
-				foreach( $text as $l ) { $out[] = "\t* $l"; }
+				foreach ($text as $l) { $out[] = "\t* $l"; }
 				// join
-				$text = implode("\n", $out);
+				$text = implode ("\n", $out);
 			}
 		}
 		# print
@@ -119,41 +119,41 @@ 
 	 */
 	public function show_message ($class, $text, $popup, $popup2) {
     	// to array if object
-    	if (is_object($text))   { $text = (array) $text; }
+    	if (is_object ($text)) { $text = (array) $text; }
 		// format if array
-		if(is_array($text)) {
+		if (is_array ($text)) {
 			// single value
-			if(sizeof( $text )==1) {
+			if (sizeof ($text) == 1) {
 				$out = $text;
 			}
 			// multiple values
 			else {
 				$out[] = "<ul>";
-				foreach( $text as $l ) { $out[] = "<li>$l</li>"; }
+				foreach ($text as $l) { $out[] = "<li>$l</li>"; }
 				$out[] = "</ul>";
 			}
 			// join
-			$text = implode("\n", $out);
+			$text = implode ("\n", $out);
 		}
 
 		# print popup or normal
-		if($popup===false) {
+		if ($popup === false) {
 			return "<div class='alert alert-".$class."'>".$text."</div>";
 		}
 		else {
 			// set close class for JS
-			$pclass = $popup2===false ? "hidePopups" : "hidePopup2";
+			$pclass = $popup2 === false ? "hidePopups" : "hidePopup2";
 			// change danger to error for popup
-			$htext = $class==="danger" ? "error" : $class;
+			$htext = $class === "danger" ? "error" : $class;
 
-			$out[] = '<div class="pHeader">'._(ucwords($htext)).'</div>';
+			$out[] = '<div class="pHeader">'._ (ucwords ($htext)).'</div>';
 			$out[] = '<div class="pContent">';
 			$out[] = '<div class="alert alert-'.$class.'">'.$text.'</div>';
 			$out[] = '</div>';
-			$out[] = '<div class="pFooter"><button class="btn btn-sm btn-default '.$pclass.'">'._('Close').'</button></div>';
+			$out[] = '<div class="pFooter"><button class="btn btn-sm btn-default '.$pclass.'">'._ ('Close').'</button></div>';
 
 			// return
-			return implode("\n", $out);
+			return implode ("\n", $out);
 		}
 	}
 
@@ -166,11 +166,11 @@ 
 	 */
 	public function throw_exception ($content) {
 		// include Exceptions class for API
-		include_once( dirname(__FILE__) . '../../../api/controllers/Responses.php' );
+		include_once(dirname (__FILE__).'../../../api/controllers/Responses.php');
 		// initialize exceptions
 		$Exceptions = new Responses ();
 		// throw error
-		$Exceptions->throw_exception(500, $content);
+		$Exceptions->throw_exception (500, $content);
 	}
 
 	/**
@@ -179,9 +179,9 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function __destruct() {
+	public function __destruct () {
 		// exit if required
-		if ($this->die === true)	{ die(); }
+		if ($this->die === true) { die(); }
 	}
 }
 

functions/classes/class.Scan.php

Doc Comments +8 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
 	 * Returns all possible ping types / apps
 	 *
 	 * @access public
-	 * @return array
+	 * @return string[]
 	 */
 	public function ping_fetch_types () {
 		return array("ping", "pear", "fping");
@@ -152,7 +152,6 @@ 
 	 * @param mixed $address
 	 * @param int $count (default: 1)
 	 * @param int $timeout (default: 1)
-	 * @param bool $exit (default: false)
 	 * @return void
 	 */
 	public function ping_address ($address, $count=1, $timeout = 1) {
@@ -178,7 +177,7 @@ 
 	 *
 	 * @access protected
 	 * @param ip $address
-	 * @return void
+	 * @return null|integer
 	 */
 	protected function ping_address_method_ping ($address) {
 		# verify ping path
@@ -276,8 +275,7 @@ 
 	 *	fping cannot be run from web, it needs root privileges to be able to open raw socket :/
 	 *
 	 * @access public
-	 * @param mixed $subnet 	//CIDR
-	 * @return void
+	 * @return null|integer
 	 */
 	public function ping_address_method_fping ($address) {
 		# verify ping path
@@ -329,7 +327,7 @@ 
 	 *	fping cannot be run from web, it needs root privileges to be able to open raw socket :/
 	 *
 	 * @access public
-	 * @param mixed $subnet 	//CIDR
+	 * @param mixed $subnet_cidr 	//CIDR
 	 * @return void
 	 */
 	public function ping_address_method_fping_subnet ($subnet_cidr, $return_result = false) {
@@ -377,8 +375,8 @@ 
 	 * Explains invalid error codes
 	 *
 	 * @access public
-	 * @param mixed $code
-	 * @return void
+	 * @param null|integer $code
+	 * @return string|false
 	 */
 	public function ping_exit_explain ($code) {
 		# fetch explain codes
@@ -396,7 +394,7 @@ 
 	 *	extend if needed for future scripts
 	 *
 	 * @access public
-	 * @return void
+	 * @return string[]
 	 */
 	public function ping_set_exit_code_explains () {
 		$explain_codes[0]  = "SUCCESS";
@@ -523,6 +521,7 @@ 
 	 *
 	 * @access public
 	 * @param mixed $subnetId
+	 * @param boolean $die
 	 * @return void
 	 */
 	public function prepare_addresses_to_discover_subnetId ($subnetId, $die) {

Spacing +105 added lines, -105 removed lines

@@ -131,9 +131,9 @@ 
 		# initialize Result
 		$this->Result = new Result ();
 		# debugging
-		$this->set_debugging();
+		$this->set_debugging ();
 		# fetch settings
-		is_null($this->settings) ? $this->get_settings() : (object) $this->settings;
+		is_null ($this->settings) ? $this->get_settings () : (object) $this->settings;
 		# set type
 		$this->reset_scan_method ($this->settings->scanPingType);
 		# set php exec
@@ -149,7 +149,7 @@ 
 	 * @return array
 	 */
 	public function ping_fetch_types () {
-		return array("ping", "pear", "fping");
+		return array ("ping", "pear", "fping");
 	}
 
 	/**
@@ -163,10 +163,10 @@ 
 		// fetch possible methods
 		$possible = $this->ping_fetch_types ();
 		//check
-		if(!in_array($method, $possible)) {
+		if (!in_array ($method, $possible)) {
 			//die or print?
-			if($this->icmp_exit)				{ die(json_encode(array("status"=>1, "error"=>"Invalid scan method"))); }
-			else								{ $this->Result->show("danger", "Invalid scan method", true); }
+			if ($this->icmp_exit) { die(json_encode (array ("status"=>1, "error"=>"Invalid scan method"))); }
+			else { $this->Result->show ("danger", "Invalid scan method", true); }
 		}
 		//ok
 		else {
@@ -239,13 +239,13 @@ 
 	 * @param bool $exit (default: false)
 	 * @return void
 	 */
-	public function ping_address ($address, $count=1, $timeout = 1) {
+	public function ping_address ($address, $count = 1, $timeout = 1) {
 		#set parameters
 		$this->icmp_timeout = $timeout;
 		$this->icmp_count = $count;
 
 		# escape address
-		$address = escapeshellarg($address);
+		$address = escapeshellarg ($address);
 
 		# make sure it is in right format
 		$address = $this->transform_address ($address, "dotted");
@@ -269,27 +269,27 @@ 
 		$this->ping_verify_path ($this->settings->scanPingPath);
 
 		# if ipv6 append 6
-		if ($this->identify_address ($address)=="IPv6")	{ $this->settings->scanPingPath = $this->settings->scanPingPath."6"; }
+		if ($this->identify_address ($address) == "IPv6") { $this->settings->scanPingPath = $this->settings->scanPingPath."6"; }
 
 		# set ping command based on OS type
-		if	(PHP_OS == "FreeBSD" || PHP_OS == "NetBSD")                         { $cmd = $this->settings->scanPingPath." -c $this->icmp_count -W ".($this->icmp_timeout*1000)." $address 1>/dev/null 2>&1"; }
-		elseif(PHP_OS == "Linux" || PHP_OS == "OpenBSD")                        { $cmd = $this->settings->scanPingPath." -c $this->icmp_count -w $this->icmp_timeout $address 1>/dev/null 2>&1"; }
-		elseif(PHP_OS == "WIN32" || PHP_OS == "Windows" || PHP_OS == "WINNT")	{ $cmd = $this->settings->scanPingPath." -n $this->icmp_count -I ".($this->icmp_timeout*1000)." $address 1>/dev/null 2>&1"; }
-		else																	{ $cmd = $this->settings->scanPingPath." -c $this->icmp_count -n $address 1>/dev/null 2>&1"; }
+		if (PHP_OS == "FreeBSD" || PHP_OS == "NetBSD") { $cmd = $this->settings->scanPingPath." -c $this->icmp_count -W ".($this->icmp_timeout * 1000)." $address 1>/dev/null 2>&1"; }
+		elseif (PHP_OS == "Linux" || PHP_OS == "OpenBSD") { $cmd = $this->settings->scanPingPath." -c $this->icmp_count -w $this->icmp_timeout $address 1>/dev/null 2>&1"; }
+		elseif (PHP_OS == "WIN32" || PHP_OS == "Windows" || PHP_OS == "WINNT") { $cmd = $this->settings->scanPingPath." -n $this->icmp_count -I ".($this->icmp_timeout * 1000)." $address 1>/dev/null 2>&1"; }
+		else { $cmd = $this->settings->scanPingPath." -c $this->icmp_count -n $address 1>/dev/null 2>&1"; }
 
         # for IPv6 remove wait
-        if ($this->identify_address ($address)=="IPv6") {
-            $cmd = explode(" ", $cmd);
+        if ($this->identify_address ($address) == "IPv6") {
+            $cmd = explode (" ", $cmd);
             unset($cmd[3], $cmd[4]);
-            $cmd = implode(" ", $cmd);
+            $cmd = implode (" ", $cmd);
         }
 
 		# execute command, return $retval
-	    exec($cmd, $output, $retval);
+	    exec ($cmd, $output, $retval);
 
 		# return result for web or cmd
-		if($this->icmp_exit)	{ exit  ($retval); }
-		else					{ return $retval; }
+		if ($this->icmp_exit) { exit  ($retval); }
+		else { return $retval; }
 	}
 
 	/**
@@ -301,38 +301,38 @@ 
 	 */
 	protected function ping_address_method_pear ($address) {
 		# we need pear ping package
-		require_once(dirname(__FILE__) . '/../../functions/PEAR/Net/Ping.php');
-		$ping = Net_Ping::factory();
+		require_once(dirname (__FILE__).'/../../functions/PEAR/Net/Ping.php');
+		$ping = Net_Ping::factory ();
 
 		# ipv6 not supported
-		if ($this->identify_address ($address)=="IPv6") {
+		if ($this->identify_address ($address) == "IPv6") {
     		//return result for web or cmd
-    		if($this->icmp_exit) 	{ exit	(255); }
-    		else	  				{ return 255; }
+    		if ($this->icmp_exit) { exit	(255); }
+    		else { return 255; }
 		}
 
 		# check for errors
-		if($ping->pear->isError($ping)) {
-			if($this->icmp_exit)	{ exit  ($ping->getMessage()); }
-			else					{ return $ping->getMessage(); }
+		if ($ping->pear->isError ($ping)) {
+			if ($this->icmp_exit) { exit  ($ping->getMessage ()); }
+			else { return $ping->getMessage (); }
 		}
 		else {
 			//set count and timeout
-			$ping->setArgs(array('count' => $this->icmp_timeout, 'timeout' => $this->icmp_timeout));
+			$ping->setArgs (array ('count' => $this->icmp_timeout, 'timeout' => $this->icmp_timeout));
 			//execute
-			$ping_response = $ping->ping($address);
+			$ping_response = $ping->ping ($address);
 			//check response for error
-			if($ping->pear->isError($ping_response)) {
+			if ($ping->pear->isError ($ping_response)) {
 				$result['code'] = 2;
 			}
 			else {
 				//all good
-				if($ping_response->_transmitted == $ping_response->_received) {
+				if ($ping_response->_transmitted == $ping_response->_received) {
 					$result['code'] = 0;
-					$this->rtt = "RTT: ". strstr($ping_response->_round_trip['avg'], ".", true);
+					$this->rtt = "RTT: ".strstr ($ping_response->_round_trip['avg'], ".", true);
 				}
 				//ping loss
-				elseif($ping_response->_received == 0) {
+				elseif ($ping_response->_received == 0) {
 					$result['code'] = 1;
 				}
 				//failed
@@ -343,8 +343,8 @@ 
 		}
 
 		//return result for web or cmd
-		if($this->icmp_exit) 	{ exit	($result['code']); }
-		else	  				{ return $result['code']; }
+		if ($this->icmp_exit) { exit	($result['code']); }
+		else { return $result['code']; }
 	}
 
 	/**
@@ -368,21 +368,21 @@ 
 		$this->ping_verify_path ($this->settings->scanFPingPath);
 
 		# if ipv6 append 6
-		if ($this->identify_address ($address)=="IPv6")	{ $this->settings->scanFPingPath = $this->settings->scanFPingPath."6"; }
+		if ($this->identify_address ($address) == "IPv6") { $this->settings->scanFPingPath = $this->settings->scanFPingPath."6"; }
 
 		# set command
-		$cmd = $this->settings->scanFPingPath." -c $this->icmp_count -t ".($this->icmp_timeout*1000)." $address";
+		$cmd = $this->settings->scanFPingPath." -c $this->icmp_count -t ".($this->icmp_timeout * 1000)." $address";
 		# execute command, return $retval
-	    exec($cmd, $output, $retval);
+	    exec ($cmd, $output, $retval);
 
 	    # save result
-	    if($retval==0) {
+	    if ($retval == 0) {
 	    	$this->save_fping_rtt ($output[0]);
 		}
 
 		# return result for web or cmd
-		if($this->icmp_exit)	{ exit  ($retval); }
-		else					{ return $retval; }
+		if ($this->icmp_exit) { exit  ($retval); }
+		else { return $retval; }
 	}
 
 	/**
@@ -394,10 +394,10 @@ 
 	 */
 	private function save_fping_rtt ($line) {
 		// 173.192.112.30 : xmt/rcv/%loss = 1/1/0%, min/avg/max = 160/160/160
- 		$tmp = explode(" ",$line);
+ 		$tmp = explode (" ", $line);
 
  		# save rtt
-		@$this->rtt	= "RTT: ".str_replace("(", "", $tmp[7]);
+		@$this->rtt = "RTT: ".str_replace ("(", "", $tmp[7]);
 	}
 
 	/**
@@ -420,14 +420,14 @@ 
 		# verify ping path
 		$this->ping_verify_path ($this->settings->scanFPingPath);
 		# set command
-		$cmd = $this->settings->scanFPingPath." -c $this->icmp_count -t ".($this->icmp_timeout*1000)." -Ag $subnet_cidr";
+		$cmd = $this->settings->scanFPingPath." -c $this->icmp_count -t ".($this->icmp_timeout * 1000)." -Ag $subnet_cidr";
 		# execute command, return $retval
-	    exec($cmd, $output, $retval);
+	    exec ($cmd, $output, $retval);
 
 	    # save result
-	    if(sizeof($output)>0) {
-	    	foreach($output as $line) {
-		    	$tmp = explode(" ",$line);
+	    if (sizeof ($output) > 0) {
+	    	foreach ($output as $line) {
+		    	$tmp = explode (" ", $line);
 		    	$out[] = $tmp[0];
 	    	}
 	    }
@@ -436,11 +436,11 @@ 
 	    $this->fping_result = $out;
 
 	    # return result?
-	    if($return_result)		{ return $out; }
+	    if ($return_result) { return $out; }
 
 		# return result for web or cmd
-		if($this->icmp_exit)	{ exit  ($retval); }
-		else					{ return $retval; }
+		if ($this->icmp_exit) { exit  ($retval); }
+		else { return $retval; }
 	}
 
 	/**
@@ -451,9 +451,9 @@ 
 	 * @return void
 	 */
 	private function ping_verify_path ($path) {
-		if(!file_exists($path)) {
-			if($this->icmp_exit)	{ exit  ($this->ping_exit_explain(1000)); }
-			else					{ return $this->Result->show("danger", _($this->ping_exit_explain(1000)), true);  }
+		if (!file_exists ($path)) {
+			if ($this->icmp_exit) { exit  ($this->ping_exit_explain (1000)); }
+			else { return $this->Result->show ("danger", _ ($this->ping_exit_explain (1000)), true); }
 		}
 	}
 
@@ -513,13 +513,13 @@ 
 	 */
 	public function ping_update_lastseen ($id, $datetime = null) {
     	# set datetime
-    	$datetime = is_null($datetime) ? date("Y-m-d H:i:s") : $datetime;
+    	$datetime = is_null ($datetime) ? date ("Y-m-d H:i:s") : $datetime;
 		# execute
-		try { $this->Database->updateObject("ipaddresses", array("id"=>$id, "lastSeen"=>$datetime), "id"); }
+		try { $this->Database->updateObject ("ipaddresses", array ("id"=>$id, "lastSeen"=>$datetime), "id"); }
 		catch (Exception $e) {
-			!$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false);
+			!$this->debugging ? : $this->Result->show ("danger", $e->getMessage (), false);
 			# log
-			!$this->debugging ? : $this->Log->write ("status_update", _('Failed to update address status'), 0 );
+			!$this->debugging ? : $this->Log->write ("status_update", _ ('Failed to update address status'), 0);
 		}
 	}
 
@@ -533,10 +533,10 @@ 
 	 */
 	public function ping_update_scanagent_checktime ($id, $date = false) {
     	# set time
-    	if ($date === false)    { $date = date("Y-m-d H:i:s"); }
-    	else                    { $date = $date; }
+    	if ($date === false) { $date = date ("Y-m-d H:i:s"); }
+    	else { $date = $date; }
 		# execute
-		try { $this->Database->updateObject("scanAgents", array("id"=>$id, "last_access"=>date("Y-m-d H:i:s")), "id"); }
+		try { $this->Database->updateObject ("scanAgents", array ("id"=>$id, "last_access"=>date ("Y-m-d H:i:s")), "id"); }
 		catch (Exception $e) {
 		}
 	}
@@ -551,20 +551,20 @@ 
 	 */
 	public function telnet_address ($address, $port) {
 		# set all ports
-		$ports = explode(",", str_replace(";",",",$port));
+		$ports = explode (",", str_replace (";", ",", $port));
 		# default response is dead
 		$retval = 1;
 		//try each port untill one is alive
-		foreach($ports as $p) {
+		foreach ($ports as $p) {
 			// open socket
-			$conn = @fsockopen($address, $p, $errno, $errstr, $this->icmp_timeout);
+			$conn = @fsockopen ($address, $p, $errno, $errstr, $this->icmp_timeout);
 			//failed
 			if (!$conn) {}
 			//success
-			else 		{
-				$retval = 0;	//set return as port if alive
-				fclose($conn);
-				break;			//end foreach if success
+			else {
+				$retval = 0; //set return as port if alive
+				fclose ($conn);
+				break; //end foreach if success
 			}
 		}
 	    # exit with result
@@ -595,11 +595,11 @@ 
 	 */
 	public function prepare_addresses_to_scan ($type, $subnet, $die = true) {
 		# discover new addresses
-		if($type=="discovery") 	{ return is_numeric($subnet) ? $this->prepare_addresses_to_discover_subnetId ($subnet, $die) : $this->prepare_addresses_to_discover_subnet ($subnet, $die); }
+		if ($type == "discovery") { return is_numeric ($subnet) ? $this->prepare_addresses_to_discover_subnetId ($subnet, $die) : $this->prepare_addresses_to_discover_subnet ($subnet, $die); }
 		# update addresses statuses
-		elseif($type=="update") { return $this->prepare_addresses_to_update ($subnet); }
+		elseif ($type == "update") { return $this->prepare_addresses_to_update ($subnet); }
 		# fail
-		else 					{ die(json_encode(array("status"=>1, "error"=>"Invalid scan type provided"))); }
+		else { die(json_encode (array ("status"=>1, "error"=>"Invalid scan type provided"))); }
 	}
 
 	/**
@@ -611,19 +611,19 @@ 
 	 */
 	public function prepare_addresses_to_discover_subnetId ($subnetId, $die) {
 		# initialize classes
-		$Subnets   = new Subnets ($this->Database);
+		$Subnets = new Subnets ($this->Database);
 
 		//subnet ID is provided, fetch subnet
-		$subnet = $Subnets->fetch_subnet(null, $subnetId);
-		if($subnet===false)	{
-			 if ($die)											{ die(json_encode(array("status"=>1, "error"=>"Invalid subnet ID provided"))); }
-			 else												{ return array(); }
+		$subnet = $Subnets->fetch_subnet (null, $subnetId);
+		if ($subnet === false) {
+			 if ($die) { die(json_encode (array ("status"=>1, "error"=>"Invalid subnet ID provided"))); }
+			 else { return array (); }
 		}
 
 		// we should support only up to 4094 hosts!
-		if($Subnets->get_max_hosts ($subnet->mask, "IPv4")>4094 && php_sapi_name()!="cli")
-		if ($die)												{ die(json_encode(array("status"=>1, "error"=>"Scanning from GUI is only available for subnets up to /20 or 4094 hosts!"))); }
-		else													{ return array(); }
+		if ($Subnets->get_max_hosts ($subnet->mask, "IPv4") > 4094 && php_sapi_name () != "cli")
+		if ($die) { die(json_encode (array ("status"=>1, "error"=>"Scanning from GUI is only available for subnets up to /20 or 4094 hosts!"))); }
+		else { return array (); }
 
 		# set array of addresses to scan, exclude existing!
 		$ip = $this->get_all_possible_subnet_addresses ($subnet->subnet, $subnet->mask);
@@ -632,9 +632,9 @@ 
 		$ip = $this->remove_existing_subnet_addresses ($ip, $subnetId);
 
 		//none to scan?
-		if(sizeof($ip)==0)	{
-			if ($die)											{ die(json_encode(array("status"=>1, "error"=>"Didn't find any address to scan!"))); }
-			else												{ return array(); }
+		if (sizeof ($ip) == 0) {
+			if ($die) { die(json_encode (array ("status"=>1, "error"=>"Didn't find any address to scan!"))); }
+			else { return array (); }
 		}
 
 		//return
@@ -653,23 +653,23 @@ 
 		# initialize classes
 		$Subnets   = new Subnets ($this->Database);
 		# make sure we have proper subnet format
-		$subnet    = $Subnets->transform_address($subnet, "decimal");
+		$subnet    = $Subnets->transform_address ($subnet, "decimal");
 		//fetch start and stop addresses
 		$boundaries = (object) $Subnets->get_network_boundaries ($subnet, $mask);
 		//create array
-		if($mask==32) {
-			$ip[] = $Subnets->transform_to_decimal($boundaries->network);
+		if ($mask == 32) {
+			$ip[] = $Subnets->transform_to_decimal ($boundaries->network);
 		}
-		elseif($mask==31) {
-			$ip[] = $Subnets->transform_to_decimal($boundaries->network);
-			$ip[] = $Subnets->transform_to_decimal($boundaries->broadcast);
+		elseif ($mask == 31) {
+			$ip[] = $Subnets->transform_to_decimal ($boundaries->network);
+			$ip[] = $Subnets->transform_to_decimal ($boundaries->broadcast);
 		}
 		else {
 			//set loop limits
-			$start = gmp_strval(gmp_add($Subnets->transform_to_decimal($boundaries->network),1));
-			$stop  = gmp_strval($Subnets->transform_to_decimal($boundaries->broadcast));
+			$start = gmp_strval (gmp_add ($Subnets->transform_to_decimal ($boundaries->network), 1));
+			$stop  = gmp_strval ($Subnets->transform_to_decimal ($boundaries->broadcast));
 			//loop
-			for($m=$start; $m<$stop; $m++) {
+			for ($m = $start; $m < $stop; $m++) {
 				$ip[] = $m;
 			}
 		}
@@ -689,20 +689,20 @@ 
 		# first fetch all addresses
 		$Addresses = new Addresses ($this->Database);
 		// get all existing IP addresses in subnet
-		$addresses  = $Addresses->fetch_subnet_addresses($subnetId);
+		$addresses = $Addresses->fetch_subnet_addresses ($subnetId);
 		// if some exist remove them
-		if(sizeof($addresses)>0 && sizeof(@$ip)>0) {
-			foreach($addresses as $a) {
-				$key = array_search($a->ip_addr, $ip);
-				if($key !== false) {
+		if (sizeof ($addresses) > 0 && sizeof (@$ip) > 0) {
+			foreach ($addresses as $a) {
+				$key = array_search ($a->ip_addr, $ip);
+				if ($key !== false) {
 					unset($ip[$key]);
 				}
 			}
 			//reindex array for pinging
-			$ip = array_values(@$ip);
+			$ip = array_values (@$ip);
 		}
 		//return
-		return is_array(@$ip) ? $ip : array();
+		return is_array (@$ip) ? $ip : array ();
 	}
 
 	/**
@@ -714,11 +714,11 @@ 
 	 */
 	public function prepare_addresses_to_discover_subnet ($subnet) {
 		//set subnet / mask
-		$subnet_parsed = explode("/", $subnet);
+		$subnet_parsed = explode ("/", $subnet);
 		# result
 		$ip = $this->get_all_possible_subnet_addresses ($subnet_parsed[0], $subnet_parsed[1]);
 		//none to scan?
-		if(sizeof($ip)==0)									{ die(json_encode(array("status"=>1, "error"=>"Didn't find any address to scan!"))); }
+		if (sizeof ($ip) == 0) { die(json_encode (array ("status"=>1, "error"=>"Didn't find any address to scan!"))); }
 		//result
 		return $ip;
 	}
@@ -734,19 +734,19 @@ 
 		# first fetch all addresses
 		$Addresses = new Addresses ($this->Database);
 		// get all existing IP addresses in subnet
-		$subnet_addresses = $Addresses->fetch_subnet_addresses($subnetId);
+		$subnet_addresses = $Addresses->fetch_subnet_addresses ($subnetId);
 		//create array
-		if(sizeof($subnet_addresses)>0) {
-			foreach($subnet_addresses as $a) {
+		if (sizeof ($subnet_addresses) > 0) {
+			foreach ($subnet_addresses as $a) {
 				$scan_addresses[$a->id] = $a->ip_addr;
 			}
 			//reindex
-			$scan_addresses = array_values(@$scan_addresses);
+			$scan_addresses = array_values (@$scan_addresses);
 			//return
 			return $scan_addresses;
 		}
 		else {
-			return array();
+			return array ();
 		}
 	}
 }

functions/classes/class.Thread.php

Doc Comments +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
 	/**
 	* alias of stop();
 	*
-	* @return boolean
+	* @return boolean|null
 	*/
     public function kill( $_signal = SIGKILL, $_wait = false ) {
         return $this->stop( $_signal, $_wait );

Spacing +65 added lines, -65 removed lines

@@ -16,7 +16,7 @@ 
 	*
 	* @var array
 	*/
-    private $errors = array(
+    private $errors = array (
         Thread::FUNCTION_NOT_CALLABLE => 'You must specify a valid function name that can be called from the current scope.',
         Thread::COULD_NOT_FORK => 'pcntl_fork() returned a status of -1. No new process was created',
     );
@@ -52,13 +52,13 @@ 
 	*
 	* @return boolean
 	*/
-    public static function available() {
-        $required_functions = array(
+    public static function available () {
+        $required_functions = array (
             'pcntl_fork',
         );
 
-        foreach( $required_functions as $function ) {
-            if ( !function_exists( $function ) ) {
+        foreach ($required_functions as $function) {
+            if (!function_exists ($function)) {
                 return false;
             }
         }
@@ -72,9 +72,9 @@ 
 	*
 	* @param callback $_runnable
 	*/
-    public function __construct( $_runnable = null ) {
-		if( $_runnable !== null ) {
-			$this->setRunnable( $_runnable );
+    public function __construct ($_runnable = null) {
+		if ($_runnable !== null) {
+			$this->setRunnable ($_runnable);
 		}
     }
 
@@ -84,12 +84,12 @@ 
 	* @param callback $_runnable
 	* @return callback
 	*/
-    public function setRunnable( $_runnable ) {
-        if( self::runnableOk( $_runnable ) ) {
+    public function setRunnable ($_runnable) {
+        if (self::runnableOk ($_runnable)) {
             $this->runnable = $_runnable;
         }
         else {
-            throw new Exception( $this->getError( Thread::FUNCTION_NOT_CALLABLE ), Thread::FUNCTION_NOT_CALLABLE );
+            throw new Exception ($this->getError (Thread::FUNCTION_NOT_CALLABLE), Thread::FUNCTION_NOT_CALLABLE);
         }
     }
 
@@ -98,7 +98,7 @@ 
 	*
 	* @return callback
 	*/
-    public function getRunnable() {
+    public function getRunnable () {
         return $this->runnable;
     }
 
@@ -112,8 +112,8 @@ 
 	* @param callback $_runnable
 	* @return boolean
 	*/
-    public static function runnableOk( $_runnable ) {
-        return ( function_exists( $_runnable ) && is_callable( $_runnable ) );
+    public static function runnableOk ($_runnable) {
+        return (function_exists ($_runnable) && is_callable ($_runnable));
     }
 
 	/**
@@ -121,7 +121,7 @@ 
 	*
 	* @return int
 	*/
-    public function getPid() {
+    public function getPid () {
         return $this->pid;
     }
 
@@ -130,14 +130,14 @@ 
 	*
 	* @return boolean
 	*/
-    public function isAlive() {
-        $pid = pcntl_waitpid( $this->pid, $status, WNOHANG );
+    public function isAlive () {
+        $pid = pcntl_waitpid ($this->pid, $status, WNOHANG);
 
         if ($pid === 0) { // child is still alive
             return true;
         } else {
-            if (pcntl_wifexited($status) && $this->exitCode == -1) { // normal exit
-                $this->exitCode = pcntl_wexitstatus($status);
+            if (pcntl_wifexited ($status) && $this->exitCode == -1) { // normal exit
+                $this->exitCode = pcntl_wexitstatus ($status);
             }
             return false;
         }
@@ -148,8 +148,8 @@ 
 	*
 	* @return int
 	*/
-    public function getExitCode() {
-        $this->isAlive();
+    public function getExitCode () {
+        $this->isAlive ();
         return $this->exitCode;
     }
 
@@ -159,27 +159,27 @@ 
 	*
 	* @return void
 	*/
-    public function start() {
-        $pid = @ pcntl_fork();
-        if( $pid == -1 ) {
-            throw new Exception( $this->getError( Thread::COULD_NOT_FORK ), Thread::COULD_NOT_FORK );
+    public function start () {
+        $pid = @ pcntl_fork ();
+        if ($pid == -1) {
+            throw new Exception ($this->getError (Thread::COULD_NOT_FORK), Thread::COULD_NOT_FORK);
         }
-        if( $pid ) {
+        if ($pid) {
             // parent
             $this->pid = $pid;
         }
         else {
             // child
-            pcntl_signal( SIGTERM, array( $this, 'signalHandler' ) );
-            $arguments = func_get_args();
-            if ( !empty( $arguments ) ) {
-                call_user_func_array( $this->runnable, $arguments );
+            pcntl_signal (SIGTERM, array ($this, 'signalHandler'));
+            $arguments = func_get_args ();
+            if (!empty($arguments)) {
+                call_user_func_array ($this->runnable, $arguments);
             }
             else {
-                call_user_func( $this->runnable );
+                call_user_func ($this->runnable);
             }
 
-            exit( 0 );
+            exit(0);
         }
     }
 
@@ -191,40 +191,40 @@ 
 	*
 	* @return void
 	*/
-    public function start_fping() {
+    public function start_fping () {
 		$status = 0;
 		$results = null;
-		$pid = pcntl_fork();
+		$pid = pcntl_fork ();
 
-		if( $pid == -1 ) { //error forking, no child is created
-			throw new Exception( $this->getError( Thread::COULD_NOT_FORK ), Thread::COULD_NOT_FORK );
-		}else if ( $pid ) {// parent
+		if ($pid == -1) { //error forking, no child is created
+			throw new Exception ($this->getError (Thread::COULD_NOT_FORK), Thread::COULD_NOT_FORK);
+		} else if ($pid) {// parent
 			$this->pid = $pid;
 
 		} else { // child
-			$this->pid = posix_getpid();//pid (child)
-			$this->ppid = posix_getppid();//pid (parent)
+			$this->pid = posix_getpid (); //pid (child)
+			$this->ppid = posix_getppid (); //pid (parent)
 
-			pcntl_signal( SIGTERM, array( $this, 'signalHandler' ) );
-			$array_args = func_get_args();
-			if ( !empty( $array_args ) ) {
-				$results = call_user_func_array( $this->runnable, $array_args );
-			}else{
-				$results = call_user_func( $this->runnable );
+			pcntl_signal (SIGTERM, array ($this, 'signalHandler'));
+			$array_args = func_get_args ();
+			if (!empty($array_args)) {
+				$results = call_user_func_array ($this->runnable, $array_args);
+			} else {
+				$results = call_user_func ($this->runnable);
 			}
 
-			$pipe = "/tmp/pipe_".$this->pid;//pid is known by parent
+			$pipe = "/tmp/pipe_".$this->pid; //pid is known by parent
 
-			if(!file_exists($pipe)) {//child talks to parent using this pipe
-				umask(0);
-				posix_mkfifo($pipe, 0600);
+			if (!file_exists ($pipe)) {//child talks to parent using this pipe
+				umask (0);
+				posix_mkfifo ($pipe, 0600);
 			}
 			//we have to open the pipe and send the data serialized
-			$pipe_descriptor = fopen($pipe, 'w');
-			fwrite($pipe_descriptor, serialize( $results ) );
+			$pipe_descriptor = fopen ($pipe, 'w');
+			fwrite ($pipe_descriptor, serialize ($results));
 
 			//and kill the child using posix_kill ( exit(0) duplicates headers!! )
-			posix_kill( $this->pid , SIGKILL);
+			posix_kill ($this->pid, SIGKILL);
 			exit(0);
 		}
     }
@@ -236,11 +236,11 @@ 
 	* @param integer $_signal - SIGKILL/SIGTERM
 	* @param boolean $_wait
 	*/
-    public function stop( $_signal = SIGKILL, $_wait = false ) {
-        if( $this->isAlive() ) {
-            posix_kill( $this->pid, $_signal );
-            if( $_wait ) {
-                pcntl_waitpid( $this->pid, $status = 0 );
+    public function stop ($_signal = SIGKILL, $_wait = false) {
+        if ($this->isAlive ()) {
+            posix_kill ($this->pid, $_signal);
+            if ($_wait) {
+                pcntl_waitpid ($this->pid, $status = 0);
             }
         }
     }
@@ -250,8 +250,8 @@ 
 	*
 	* @return boolean
 	*/
-    public function kill( $_signal = SIGKILL, $_wait = false ) {
-        return $this->stop( $_signal, $_wait );
+    public function kill ($_signal = SIGKILL, $_wait = false) {
+        return $this->stop ($_signal, $_wait);
     }
 
 	/**
@@ -261,12 +261,12 @@ 
 	* @param integer $_code
 	* @return string
 	*/
-    public function getError( $_code ) {
-        if ( isset( $this->errors[$_code] ) ) {
+    public function getError ($_code) {
+        if (isset($this->errors[$_code])) {
             return $this->errors[$_code];
         }
         else {
-            return 'No such error code ' . $_code . '! Quit inventing errors!!!';
+            return 'No such error code '.$_code.'! Quit inventing errors!!!';
         }
     }
 
@@ -275,10 +275,10 @@ 
 	*
 	* @param integer $_signal
 	*/
-    protected function signalHandler( $_signal ) {
-        switch( $_signal ) {
+    protected function signalHandler ($_signal) {
+        switch ($_signal) {
             case SIGTERM:
-                exit( 0 );
+                exit(0);
             break;
         }
     }

functions/classes/class.Install.php

Doc Comments +10 added lines, -10 removed lines

@@ -67,7 +67,7 @@ 
 	 * @param bool $drop_database (default: false)
 	 * @param bool $create_database (default: false)
 	 * @param bool $create_grants (default: false)
-	 * @return void
+	 * @return boolean|null
 	 */
 	public function install_database ($rootuser, $rootpass, $drop_database = false, $create_database = false, $create_grants = false) {
 
@@ -145,7 +145,7 @@ 
 	 * Execute files installation
 	 *
 	 * @access private
-	 * @return void
+	 * @return false|null
 	 */
 	private function install_database_execute () {
 	    # import SCHEMA file queries
@@ -197,7 +197,7 @@ 
 	 *
 	 * @access public
 	 * @param bool $redirect
-	 * @return void
+	 * @return boolean
 	 */
 	public function check_db_connection ($redirect = false) {
 		# try to connect
@@ -217,7 +217,7 @@ 
 	 *
 	 * @access public
 	 * @param mixed $table
-	 * @return void
+	 * @return boolean
 	 */
 	public function check_table ($table, $redirect = false) {
 		# set query
@@ -284,7 +284,7 @@ 
 	 * @param mixed $adminpass
 	 * @param mixed $siteTitle
 	 * @param mixed $siteURL
-	 * @return void
+	 * @return boolean
 	 */
 	function postauth_update($adminpass, $siteTitle, $siteURL) {
 		# update Admin pass
@@ -300,7 +300,7 @@ 
 	 *
 	 * @access public
 	 * @param mixed $adminpass
-	 * @return void
+	 * @return boolean
 	 */
 	public function postauth_update_admin_pass ($adminpass) {
 		try { $this->Database->updateObject("users", array("password"=>$adminpass, "passChange"=>"No","username"=>"Admin"), "username"); }
@@ -314,7 +314,7 @@ 
 	 * @access private
 	 * @param mixed $siteTitle
 	 * @param mixed $siteURL
-	 * @return void
+	 * @return boolean
 	 */
 	private function postauth_update_settings ($siteTitle, $siteURL) {
 		try { $this->Database->updateObject("settings", array("siteTitle"=>$siteTitle, "siteURL"=>$siteURL,"id"=>1), "id"); }
@@ -340,7 +340,7 @@ 
 	 * Upgrade database checks and executes.
 	 *
 	 * @access public
-	 * @return void
+	 * @return null|boolean
 	 */
 	public function upgrade_database () {
 		# first check version
@@ -361,7 +361,7 @@ 
 	 * Execute database upgrade.
 	 *
 	 * @access private
-	 * @return void
+	 * @return boolean
 	 */
 	private function upgrade_database_execute () {
 		# set queries
@@ -408,7 +408,7 @@ 
 	 * Fetch all upgrade queries from DB files
 	 *
 	 * @access public
-	 * @return void
+	 * @return string
 	 */
 	public function get_upgrade_queries () {
 		// save all queries fro UPDATE.sql file

Spacing +66 added lines, -66 removed lines

@@ -85,8 +85,8 @@ 
 		# set debugging
 		$this->set_db_params ();
 		# Log object
-		try { $this->Database->connect(); }
-		catch ( Exception $e ) {}
+		try { $this->Database->connect (); }
+		catch (Exception $e) {}
 	}
 
 
@@ -122,23 +122,23 @@ 
 		$this->Database_root->install = true;
 
 		# drop database if requested
-		if($drop_database===true) 	{ $this->drop_database(); }
+		if ($drop_database === true) { $this->drop_database (); }
 
 		# create database if requested
-		if($create_database===true) { $this->create_database(); }
+		if ($create_database === true) { $this->create_database (); }
 
 		# set permissions!
-		if($create_grants===true) 	{ $this->create_grants(); }
+		if ($create_grants === true) { $this->create_grants (); }
 
 	    # reset connection, reset install flag and connect again
-		$this->Database_root->resetConn();
+		$this->Database_root->resetConn ();
 
 		# install database
-		if($this->install_database_execute () !== false) {
+		if ($this->install_database_execute () !== false) {
 		    # return true, if some errors occured script already died! */
-			sleep(1);
+			sleep (1);
 			$this->Log = new Logging ($this->Database);
-			$this->Log->write( "Database installation", "Database installed successfully. Version ".VERSION.".".REVISION." installed", 1 );
+			$this->Log->write ("Database installation", "Database installed successfully. Version ".VERSION.".".REVISION." installed", 1);
 			return true;
 		}
 	}
@@ -151,10 +151,10 @@ 
 	 */
 	private function drop_database () {
 	 	# set query
-	    $query = "drop database if exists `". $this->db['name'] ."`;";
+	    $query = "drop database if exists `".$this->db['name']."`;";
 		# execute
-		try { $this->Database_root->runQuery($query); }
-		catch (Exception $e) {	$this->Result->show("danger", $e->getMessage(), true);}
+		try { $this->Database_root->runQuery ($query); }
+		catch (Exception $e) {	$this->Result->show ("danger", $e->getMessage (), true); }
 	}
 
 	/**
@@ -165,10 +165,10 @@ 
 	 */
 	private function create_database () {
 	 	# set query
-	    $query = "create database `". $this->db['name'] ."`;";
+	    $query = "create database `".$this->db['name']."`;";
 		# execute
-		try { $this->Database_root->runQuery($query); }
-		catch (Exception $e) {	$this->Result->show("danger", $e->getMessage(), true);}
+		try { $this->Database_root->runQuery ($query); }
+		catch (Exception $e) {	$this->Result->show ("danger", $e->getMessage (), true); }
 	}
 
 	/**
@@ -179,10 +179,10 @@ 
 	 */
 	private function create_grants () {
 	 	# set query
-	    $query = 'grant ALL on `'. $this->db['name'] .'`.* to '. $this->db['user'] .'@localhost identified by "'. $this->db['pass'] .'";';
+	    $query = 'grant ALL on `'.$this->db['name'].'`.* to '.$this->db['user'].'@localhost identified by "'.$this->db['pass'].'";';
 		# execute
-		try { $this->Database_root->runQuery($query); }
-		catch (Exception $e) {	$this->Result->show("danger", $e->getMessage(), true);}
+		try { $this->Database_root->runQuery ($query); }
+		catch (Exception $e) {	$this->Result->show ("danger", $e->getMessage (), true); }
 	}
 
 	/**
@@ -193,28 +193,28 @@ 
 	 */
 	private function install_database_execute () {
 	    # import SCHEMA file queries
-	    $query  = file_get_contents("../../db/SCHEMA.sql");
+	    $query = file_get_contents ("../../db/SCHEMA.sql");
 
 	    # formulate queries
-	    $queries = array_filter(explode(";\n", $query));
+	    $queries = array_filter (explode (";\n", $query));
 
 	    # execute
-	    foreach($queries as $q) {
+	    foreach ($queries as $q) {
 		    //length check
-		    if (strlen($q)>0) {
-				try { $this->Database_root->runQuery($q.";"); }
+		    if (strlen ($q) > 0) {
+				try { $this->Database_root->runQuery ($q.";"); }
 				catch (Exception $e) {
 					//unlock tables
-					try { $this->Database_root->runQuery("UNLOCK TABLES;"); }
+					try { $this->Database_root->runQuery ("UNLOCK TABLES;"); }
 					catch (Exception $e) {}
 					//drop database
-					try { $this->Database_root->runQuery("drop database if exists `". $this->db['name'] ."`;"); }
+					try { $this->Database_root->runQuery ("drop database if exists `".$this->db['name']."`;"); }
 					catch (Exception $e) {
-						$this->Result->show("danger", 'Cannot drop database: '.$e->getMessage(), true);
+						$this->Result->show ("danger", 'Cannot drop database: '.$e->getMessage (), true);
 					}
 					//print error
-					$this->Result->show("danger", "Cannot install sql SCHEMA file: ".$e->getMessage()."<br>query that failed: <pre>$q</pre>", false);
-					$this->Result->show("info", "Database dropped", false);
+					$this->Result->show ("danger", "Cannot install sql SCHEMA file: ".$e->getMessage ()."<br>query that failed: <pre>$q</pre>", false);
+					$this->Result->show ("info", "Database dropped", false);
 
 					return false;
 				}
@@ -245,12 +245,12 @@ 
 	 */
 	public function check_db_connection ($redirect = false) {
 		# try to connect
-		try { $res = $this->Database->connect(); }
-		catch (Exception $e) 	{
-			$this->exception = $e->getMessage();
+		try { $res = $this->Database->connect (); }
+		catch (Exception $e) {
+			$this->exception = $e->getMessage ();
 			# redirect ?
-			if($redirect == true)  	{ $this->redirect_to_install (); }
-			else					{ return false; }
+			if ($redirect == true) { $this->redirect_to_install (); }
+			else { return false; }
 		}
 		# ok
 		return true;
@@ -267,10 +267,10 @@ 
 		# set query
 		$query = "SELECT COUNT(*) AS `cnt` FROM information_schema.tables WHERE table_schema = '".$this->db['name']."' AND table_name = '$table';";
 		# try to fetch count
-		try { $table = $this->Database->getObjectQuery($query); }
-		catch (Exception $e) 	{ if($redirect === true) $this->redirect_to_install ();	else return false; }
+		try { $table = $this->Database->getObjectQuery ($query); }
+		catch (Exception $e) { if ($redirect === true) $this->redirect_to_install (); else return false; }
 		# redirect if it is not existing
-		if($table->cnt!=1) 	 	{ if($redirect === true) $this->redirect_to_install ();	else return false; }
+		if ($table->cnt != 1) { if ($redirect === true) $this->redirect_to_install (); else return false; }
 		# ok
 		return true;
 	}
@@ -283,7 +283,7 @@ 
 	 */
 	private function redirect_to_install () {
 		# redirect to install
-		header("Location: ".create_link("install"));
+		header ("Location: ".create_link ("install"));
 	}
 
 	/**
@@ -293,8 +293,8 @@ 
 	 * @return void
 	 */
 	public function set_debugging () {
-		require( dirname(__FILE__) . '/../../config.php' );
-		if($debugging==true) { $this->debugging = true; }
+		require(dirname (__FILE__).'/../../config.php');
+		if ($debugging == true) { $this->debugging = true; }
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 * @return void
 	 */
 	private function set_db_params () {
-		require( dirname(__FILE__) . '/../../config.php' );
+		require(dirname (__FILE__).'/../../config.php');
 		$this->db = $db;
 	}
 
@@ -330,7 +330,7 @@ 
 	 * @param mixed $siteURL
 	 * @return void
 	 */
-	function postauth_update($adminpass, $siteTitle, $siteURL) {
+	function postauth_update ($adminpass, $siteTitle, $siteURL) {
 		# update Admin pass
 		$this->postauth_update_admin_pass ($adminpass);
 		# update settings
@@ -347,8 +347,8 @@ 
 	 * @return void
 	 */
 	public function postauth_update_admin_pass ($adminpass) {
-		try { $this->Database->updateObject("users", array("password"=>$adminpass, "passChange"=>"No","username"=>"Admin"), "username"); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); }
+		try { $this->Database->updateObject ("users", array ("password"=>$adminpass, "passChange"=>"No", "username"=>"Admin"), "username"); }
+		catch (Exception $e) { $this->Result->show ("danger", $e->getMessage (), false); }
 		return true;
 	}
 
@@ -361,8 +361,8 @@ 
 	 * @return void
 	 */
 	private function postauth_update_settings ($siteTitle, $siteURL) {
-		try { $this->Database->updateObject("settings", array("siteTitle"=>$siteTitle, "siteURL"=>$siteURL,"id"=>1), "id"); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); }
+		try { $this->Database->updateObject ("settings", array ("siteTitle"=>$siteTitle, "siteURL"=>$siteURL, "id"=>1), "id"); }
+		catch (Exception $e) { $this->Result->show ("danger", $e->getMessage (), false); }
 		return true;
 	}
 
@@ -390,10 +390,10 @@ 
 		# first check version
 		$this->get_settings ();
 
-		if($this->settings->version == VERSION)				{ $this->Result->show("danger", "Database already at latest version", true); }
+		if ($this->settings->version == VERSION) { $this->Result->show ("danger", "Database already at latest version", true); }
 		else {
 			# check db connection
-			if($this->check_db_connection(false)===false)  	{ $this->Result->show("danger", "Cannot connect to database", true); }
+			if ($this->check_db_connection (false) === false) { $this->Result->show ("danger", "Cannot connect to database", true); }
 			# execute
 			else {
 				return $this->upgrade_database_execute ();
@@ -411,26 +411,26 @@ 
 		# set queries
 		$subversion_queries = $this->get_upgrade_queries ();
 		// create default arrays
-		$queries = array();
+		$queries = array ();
 		// succesfull queries:
-		$queries_ok = array();
+		$queries_ok = array ();
 
 		// replace CRLF
-		$subversion_queries = str_replace("\r\n", "\n", $subversion_queries);
-		$queries = array_filter(explode(";\n", $subversion_queries));
+		$subversion_queries = str_replace ("\r\n", "\n", $subversion_queries);
+		$queries = array_filter (explode (";\n", $subversion_queries));
 
 	    # execute all queries
-	    foreach($queries as $query) {
-    	    if (strlen($query)>5) {
-    			try { $this->Database->runQuery($query); }
+	    foreach ($queries as $query) {
+    	    if (strlen ($query) > 5) {
+    			try { $this->Database->runQuery ($query); }
     			catch (Exception $e) {
     				$this->Log = new Logging ($this->Database);
     				# write log
-    				$this->Log->write( "Database upgrade", $e->getMessage()."<br>query: ".$query, 2 );
+    				$this->Log->write ("Database upgrade", $e->getMessage ()."<br>query: ".$query, 2);
     				# fail
     				print "<h3>Upgrade failed !</h3><hr style='margin:30px;'>";
-    				$this->Result->show("danger", $e->getMessage()."<hr>Failed query: <pre>".$query.";</pre>", false);
-    				$this->Result->show("success", "Succesfull queries: <pre>".implode(";", $queries_ok).";</pre>", false);
+    				$this->Result->show ("danger", $e->getMessage ()."<hr>Failed query: <pre>".$query.";</pre>", false);
+    				$this->Result->show ("success", "Succesfull queries: <pre>".implode (";", $queries_ok).";</pre>", false);
     				# revert version
     				//try { $this->Database->runQuery('update `settings` set `version` = ?', array($this->settings->version)); }
     				//catch (Exception $e) { var_dump($e); }
@@ -444,9 +444,9 @@ 
 
 
 		# all good, print it
-		sleep(1);
+		sleep (1);
 		$this->Log = new Logging ($this->Database);
-		$this->Log->write( "Database upgrade", "Database upgraded from version ".$this->settings->version." to version ".VERSION.".".REVISION, 1 );
+		$this->Log->write ("Database upgrade", "Database upgraded from version ".$this->settings->version." to version ".VERSION.".".REVISION, 1);
 		return true;
 	}
 
@@ -458,30 +458,30 @@ 
 	 */
 	public function get_upgrade_queries () {
 		// save all queries fro UPDATE.sql file
-		$queries = str_replace("\r\n", "\n", (file_get_contents( dirname(__FILE__) . '/../../db/UPDATE.sql')));
+		$queries = str_replace ("\r\n", "\n", (file_get_contents (dirname (__FILE__).'/../../db/UPDATE.sql')));
 
 		// fetch settings if not present - for manual instructions
 		if (!isset($this->settings->version)) { $this->get_settings (); }
 
         // explode and loop to get next version from current
         $delimiter = false;
-        foreach (explode("/* VERSION ", $queries) as $k=>$q) {
-            $q_version = str_replace(" */", "", array_shift(explode("\n", $q)));
+        foreach (explode ("/* VERSION ", $queries) as $k=>$q) {
+            $q_version = str_replace (" */", "", array_shift (explode ("\n", $q)));
 
             // if delimiter was found in previous loop
-            if ($delimiter!==false) {
+            if ($delimiter !== false) {
                 $delimiter = $q_version;
                 break;
             }
             // if match with current set pointer to next item - delimiter
-            if ($q_version==$this->settings->version) {
+            if ($q_version == $this->settings->version) {
                 $delimiter = true;
             };
         }
 
         // remove older queries before this version
-        $old_queries = explode("/* VERSION $delimiter */", $queries);
-        $old_queries = trim($old_queries[1]);
+        $old_queries = explode ("/* VERSION $delimiter */", $queries);
+        $old_queries = trim ($old_queries[1]);
 
 		# return
 		return $old_queries;

api/controllers/Responses.php

Doc Comments +4 added lines, -5 removed lines

@@ -80,7 +80,6 @@ 
 	 * Sets header based on provided HTTP code
 	 *
 	 * @access private
-	 * @param mixed $code
 	 * @return void
 	 */
 	private function set_header () {
@@ -99,7 +98,7 @@ 
 	 *
 	 * @access public
 	 * @param mixed $result
-	 * @return void
+	 * @return string
 	 */
 	public function formulate_result ($result) {
 		// make sure result is array
@@ -210,7 +209,7 @@ 
 	 * Outputs result
 	 *
 	 * @access private
-	 * @return void
+	 * @return string
 	 */
 	private function create_result () {
 		// reorder
@@ -239,7 +238,7 @@ 
 	 * Creates XML result
 	 *
 	 * @access private
-	 * @return void
+	 * @return string|false
 	 */
 	private function create_xml () {
 		// convert whole object to array
@@ -329,7 +328,7 @@ 
 	 * Creates JSON result
 	 *
 	 * @access private
-	 * @return void
+	 * @return string
 	 */
 	private function create_json () {
 		return json_encode((array) $this->result);

Spacing +41 added lines, -41 removed lines

@@ -53,7 +53,7 @@ 
 	 *
 	 * @access public
 	 */
-	public function __construct() {
+	public function __construct () {
 		# set error codes
 		$this->set_error_codes ();
 	}
@@ -109,7 +109,7 @@ 
 		// set header
 		$this->set_header ();
 		// throw exception
-		throw new Exception($exception);
+		throw new Exception ($exception);
 	}
 
 	/**
@@ -121,11 +121,11 @@ 
 	 */
 	private function set_header () {
 		// wrong code
-		if(!isset($this->exception))		{ header("HTTP/1.1 500 Invalid result code"); }
-		else								{ header("HTTP/1.1 ".$this->result['code']." ".$this->errors[$this->result['code']]); }
+		if (!isset($this->exception)) { header ("HTTP/1.1 500 Invalid result code"); }
+		else { header ("HTTP/1.1 ".$this->result['code']." ".$this->errors[$this->result['code']]); }
 
 		// 401 - add location
-		if ($this->result['code']==401) {
+		if ($this->result['code'] == 401) {
 			$this->set_location_header ("/api/".$_REQUEST['app_id']."/user/");
 		}
 	}
@@ -139,7 +139,7 @@ 
 	 */
 	public function formulate_result ($result) {
 		// make sure result is array
-		$this->result = is_null($this->result) ? (array) $result : $this->result;
+		$this->result = is_null ($this->result) ? (array) $result : $this->result;
 
 		// get requested content type
 		$this->get_request_content_type ();
@@ -149,7 +149,7 @@ 
 		// set cache header
 		$this->set_cache_header ();
 		// set result header if not already set with $result['success']=false
-		$this->exception===true ? : $this->set_success_header ();
+		$this->exception === true ? : $this->set_success_header ();
 
 		// return result
 		return $this->create_result ();
@@ -163,11 +163,11 @@ 
 	 */
 	public function validate_content_type () {
 		// not set, presume json
-		if( !isset($_SERVER['CONTENT_TYPE']) ) {}
+		if (!isset($_SERVER['CONTENT_TYPE'])) {}
 		// post
-		elseif($_SERVER['CONTENT_TYPE']=="application/x-www-form-urlencoded") {}
+		elseif ($_SERVER['CONTENT_TYPE'] == "application/x-www-form-urlencoded") {}
 		// set, verify
-		elseif (!($_SERVER['CONTENT_TYPE']=="application/xml" || $_SERVER['CONTENT_TYPE']=="application/json")) {
+		elseif (!($_SERVER['CONTENT_TYPE'] == "application/xml" || $_SERVER['CONTENT_TYPE'] == "application/json")) {
 			$this->throw_exception (415, "Invalid Content type ".$_SERVER['CONTENT_TYPE']);
 		}
 	}
@@ -179,7 +179,7 @@ 
 	 * @return void
 	 */
 	private function get_request_content_type () {
-		$this->result_type = $_SERVER['CONTENT_TYPE']=="application/xml" ? "xml" : "json";
+		$this->result_type = $_SERVER['CONTENT_TYPE'] == "application/xml" ? "xml" : "json";
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 	 */
 	private function set_content_type_header () {
 		// content_type
-		$this->result_type == "xml" ? header('Content-Type: application/xml') : header('Content-Type: application/json');
+		$this->result_type == "xml" ? header ('Content-Type: application/xml') : header ('Content-Type: application/json');
 	}
 
 	/**
@@ -201,13 +201,13 @@ 
 	 */
 	private function set_cache_header ($seconds = NULL) {
 		// none
-		if($seconds===NULL) {
-			header("Cache-Control: no-cache");
-			header("Pragma: no-cache");
+		if ($seconds === NULL) {
+			header ("Cache-Control: no-cache");
+			header ("Pragma: no-cache");
 		}
 		// cache
 		else {
-			header("Cache-Control: $seconds");
+			header ("Cache-Control: $seconds");
 		}
 	}
 
@@ -219,7 +219,7 @@ 
 	 */
 	private function set_success_header () {
 		// check fo location
-		if(isset($this->result['location'])) {
+		if (isset($this->result['location'])) {
 			$this->set_location_header ($this->result['location']);
 		}
 
@@ -239,7 +239,7 @@ 
 	 * @return void
 	 */
 	private function set_location_header ($location) {
-		header("Location: ".$location);
+		header ("Location: ".$location);
 	}
 
 	/**
@@ -267,9 +267,9 @@ 
 		// reset
 		$this->result['code'] = $tmp['code'];
 		$this->result['success'] = $tmp['success'];
-		if(isset($tmp['message']))	{ $this->result['message'] = $tmp['message']; }
-		if(isset($tmp['data']))		{ $this->result['data'] = $tmp['data']; }
-		if(isset($tmp['ip']))	    { $this->result['ip'] = $tmp['ip']; }
+		if (isset($tmp['message'])) { $this->result['message'] = $tmp['message']; }
+		if (isset($tmp['data'])) { $this->result['data'] = $tmp['data']; }
+		if (isset($tmp['ip'])) { $this->result['ip'] = $tmp['ip']; }
 	}
 
 	/**
@@ -280,15 +280,15 @@ 
 	 */
 	private function create_xml () {
 		// convert whole object to array
-		$this->result = $this->object_to_array($this->result);
+		$this->result = $this->object_to_array ($this->result);
 
 		// new SimpleXMLElement object
-		$xml = new SimpleXMLElement('<'.$_GET['controller'].'/>');
+		$xml = new SimpleXMLElement ('<'.$_GET['controller'].'/>');
 		// generate xml from result
-		$this->array_to_xml($xml, $this->result);
+		$this->array_to_xml ($xml, $this->result);
 
 		// return XML result
-		return $xml->asXML();
+		return $xml->asXML ();
 	}
 
 	/**
@@ -299,23 +299,23 @@ 
 	 * @param array $data
 	 * @return void
 	 */
-	private function array_to_xml(SimpleXMLElement $object, array $data) {
+	private function array_to_xml (SimpleXMLElement $object, array $data) {
 		// loop through values
 	    foreach ($data as $key => $value) {
 		    // if spaces exist in key replace them with underscores
-		    if(strpos($key, " ")>0)	{ $key = str_replace(" ", "_", $key); }
+		    if (strpos ($key, " ") > 0) { $key = str_replace (" ", "_", $key); }
 
 		    // if key is numeric append item
-		    if(is_numeric($key)) $key = "item".$key;
+		    if (is_numeric ($key)) $key = "item".$key;
 
 			// if array add child
-	        if (is_array($value)) {
-	            $new_object = $object->addChild($key);
-	            $this->array_to_xml($new_object, $value);
+	        if (is_array ($value)) {
+	            $new_object = $object->addChild ($key);
+	            $this->array_to_xml ($new_object, $value);
 	        }
 	        // else write value
 	        else {
-	            $object->addChild($key, $value);
+	            $object->addChild ($key, $value);
 	        }
 	    }
 	}
@@ -335,9 +335,9 @@ 
 	 * @license http://creativecommons.org/licenses/by/3.0/
 	 * @license CC-BY-3.0 <http://spdx.org/licenses/CC-BY-3.0>
 	 */
-	public function xml_to_array ( $xmlObject, $out = array () ) {
-	    foreach ( (array) $xmlObject as $index => $node )
-	        $out[$index] = ( is_object ( $node ) ) ? $this->xml_to_array ( $node ) : $node;
+	public function xml_to_array ($xmlObject, $out = array ()) {
+	    foreach ((array) $xmlObject as $index => $node)
+	        $out[$index] = (is_object ($node)) ? $this->xml_to_array ($node) : $node;
 
 	    return $out;
 	}
@@ -351,11 +351,11 @@ 
 	 */
 	private function object_to_array ($obj) {
 		// object to array
-	    if(is_object($obj)) $obj = (array) $obj;
-	    if(is_array($obj)) {
-	        $new = array();
-	        foreach($obj as $key => $val) {
-	            $new[$key] = $this->object_to_array($val);
+	    if (is_object ($obj)) $obj = (array) $obj;
+	    if (is_array ($obj)) {
+	        $new = array ();
+	        foreach ($obj as $key => $val) {
+	            $new[$key] = $this->object_to_array ($val);
 	        }
 	    }
 	    else $new = $obj;
@@ -369,7 +369,7 @@ 
 	 * @return void
 	 */
 	private function create_json () {
-		return json_encode((array) $this->result);
+		return json_encode ((array) $this->result);
 	}
 
 

api/controllers/User.php

Doc Comments +2 added lines, -2 removed lines

@@ -330,7 +330,7 @@ 
 	 * Validates users token from database
 	 *
 	 * @access private
-	 * @return void
+	 * @return boolean
 	 */
 	private function validate_user_token () {
 		// is set
@@ -412,7 +412,7 @@ 
 	 * Checks if token has expired
 	 *
 	 * @access private
-	 * @return void
+	 * @return boolean
 	 */
 	private function validate_token_expiration () {
 		return strtotime($this->token_expires) < time() ? true : false;

Spacing +59 added lines, -59 removed lines

@@ -110,7 +110,7 @@ 
 	 * @param mixed $params
 	 * @param mixed $Response
 	 */
-	public function __construct ($Database, $Tools=null, $params=null, $Response) {
+	public function __construct ($Database, $Tools = null, $params = null, $Response) {
 		$this->Database = $Database;
 		$this->Response = $Response;
 		$this->_params = $params;
@@ -123,7 +123,7 @@ 
 		$this->set_token_length ();
 
 		// if HTTP_TOKEN is set change it to HTTP_PHPIPAM_TOKEN
-		if (isset($_SERVER['HTTP_TOKEN'])&&!isset($_SERVER['HTTP_PHPIPAM_TOKEN'])) 		{ $_SERVER['HTTP_PHPIPAM_TOKEN'] = $_SERVER['HTTP_TOKEN']; }
+		if (isset($_SERVER['HTTP_TOKEN']) && !isset($_SERVER['HTTP_PHPIPAM_TOKEN'])) { $_SERVER['HTTP_PHPIPAM_TOKEN'] = $_SERVER['HTTP_TOKEN']; }
 	}
 
 
@@ -146,15 +146,15 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/user/", 	"methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																										 array("rel"=>"create", "method"=>"POST"),
-																										 array("rel"=>"update", "method"=>"PATCH"),
-																										 array("rel"=>"delete", "method"=>"DELETE"))),
+		$result = array ();
+		$result['methods'] = array (
+								array ("href"=>"/api/".$this->_params->app_id."/user/", "methods"=>array (array ("rel"=>"read", "method"=>"GET"),
+																										 array ("rel"=>"create", "method"=>"POST"),
+																										 array ("rel"=>"update", "method"=>"PATCH"),
+																										 array ("rel"=>"delete", "method"=>"DELETE"))),
 							);
 		# result
-		return array("code"=>200, "data"=>$result);
+		return array ("code"=>200, "data"=>$result);
 	}
 
 
@@ -176,7 +176,7 @@ 
 		// validate token
 		$this->validate_requested_token ();
 		// ok
-		return array("code"=>200, "data"=>array("expires"=>$this->token_expires));
+		return array ("code"=>200, "data"=>array ("expires"=>$this->token_expires));
 	}
 
 
@@ -214,7 +214,7 @@ 
 		// refresh
 		$this->refresh_token_expiration ();
 		// ok
-		return array("code"=>200, "data"=>array("expires"=>$this->token_expires));
+		return array ("code"=>200, "data"=>array ("expires"=>$this->token_expires));
 	}
 
 
@@ -236,7 +236,7 @@ 
 		// remove token
 		$this->remove_token ();
 		// result
-		return array("code"=>200, "data"=>array("Token removed"));
+		return array ("code"=>200, "data"=>array ("Token removed"));
 	}
 
 
@@ -280,7 +280,7 @@ 
 			// get count
 			$cnt = $this->User->block_check_ip ();
 			// failure
-			if ($cnt > $this->max_failures) 		{ $this->Response->throw_exception(500, "Your IP has been blocked for 5 minutes because of excesive login failures"); }
+			if ($cnt > $this->max_failures) { $this->Response->throw_exception (500, "Your IP has been blocked for 5 minutes because of excesive login failures"); }
 		}
 	}
 
@@ -314,7 +314,7 @@ 
 		}
 
 	    # result
-	    return array("code"=>200, "data"=>array("token"=>$this->token, "expires"=>$this->token_expires));
+	    return array ("code"=>200, "data"=>array ("token"=>$this->token, "expires"=>$this->token_expires));
 	}
 
 
@@ -338,11 +338,11 @@ 
 	 */
 	public function set_token_valid_time ($token_valid_time = null) {
 		// validate integer
-		if ($this->token_length!=null) {
-			if (!is_numeric($this->token_length))	{ $this->Response->throw_exception(500, "token valid time must be an integer"); }
+		if ($this->token_length != null) {
+			if (!is_numeric ($this->token_length)) { $this->Response->throw_exception (500, "token valid time must be an integer"); }
 		}
 		// save
-		$this->token_valid_time = is_null($token_valid_time) ? 21600 : $token_valid_time;
+		$this->token_valid_time = is_null ($token_valid_time) ? 21600 : $token_valid_time;
 	}
 
 	/**
@@ -352,13 +352,13 @@ 
 	 * @param mixed $failures (default: null)
 	 * @return void
 	 */
-	public function set_max_failures ($failures=null) {
+	public function set_max_failures ($failures = null) {
 		// validate integer
-		if ($this->token_length!=null) {
-			if (!is_numeric($this->token_length))	{ $this->Response->throw_exception(500, "Max failures must be an integer"); }
+		if ($this->token_length != null) {
+			if (!is_numeric ($this->token_length)) { $this->Response->throw_exception (500, "Max failures must be an integer"); }
 		}
 		// save
-		$this->max_failures = $failures==null ? 10 : $failures;
+		$this->max_failures = $failures == null ? 10 : $failures;
 	}
 
 	/**
@@ -370,8 +370,8 @@ 
 	 */
 	public function block_ip ($block = true) {
 		// validate integer
-		if (!is_bool($block)) {
-			if (!is_numeric($this->token_length))	{ $this->Response->throw_exception(500, "Max failures must be an integer"); }
+		if (!is_bool ($block)) {
+			if (!is_numeric ($this->token_length)) { $this->Response->throw_exception (500, "Max failures must be an integer"); }
 		}
 		// save
 		$this->block_ip = $$block;
@@ -386,12 +386,12 @@ 
 	 */
 	public function set_token_length ($length = null) {
 		// validate number
-		if ($length!=null) {
-			if (!is_numeric($length))				{ $this->Response->throw_exception(500, "token length must be an integer"); }
-			elseif ($length>24)						{ $this->Response->throw_exception(500, "Maximum token length is 24 characters"); }
+		if ($length != null) {
+			if (!is_numeric ($length)) { $this->Response->throw_exception (500, "token length must be an integer"); }
+			elseif ($length > 24) { $this->Response->throw_exception (500, "Maximum token length is 24 characters"); }
 		}
 		// save
-		$this->token_length = is_null($length) ? 24 : $length;
+		$this->token_length = is_null ($length) ? 24 : $length;
 	}
 
 	/**
@@ -402,14 +402,14 @@ 
 	 */
 	private function save_user_token () {
 		# set token values
-		$values = array(
+		$values = array (
 					"id"=>$this->User->user->id,
 					"token"=>$this->token,
 					"token_valid_until"=>$this->token_expires
 					);
 		# save token to database
-		if(!$this->Admin->object_modify ("users", "edit",  "id", $values ))
-													{ $this->Response->throw_exception(500, "Failed to update token"); }
+		if (!$this->Admin->object_modify ("users", "edit", "id", $values))
+													{ $this->Response->throw_exception (500, "Failed to update token"); }
 	}
 
 	/**
@@ -420,13 +420,13 @@ 
 	 */
 	private function validate_user_token () {
 		// is set
-		if (strlen($this->User->user->token)==0)							{ return false; }
+		if (strlen ($this->User->user->token) == 0) { return false; }
 		// date not set
-		elseif (strlen($this->User->user->token_valid_until)==0)			{ return false; }
+		elseif (strlen ($this->User->user->token_valid_until) == 0) { return false; }
 		// expired
-		elseif ($this->User->user->token_valid_until < date("Y-m-d H:is:"))	{ return false; }
+		elseif ($this->User->user->token_valid_until < date ("Y-m-d H:is:")) { return false; }
 		// ok
-		else																{ return true; }
+		else { return true; }
 
 	}
 
@@ -437,7 +437,7 @@ 
 	 * @return void
 	 */
 	private function validate_requested_token () {
-		return $this->_params->controller=="user" ? $this->validate_requested_token_user () : $this->validate_requested_token_general ();
+		return $this->_params->controller == "user" ? $this->validate_requested_token_user () : $this->validate_requested_token_general ();
 	}
 
 	/**
@@ -448,20 +448,20 @@ 
 	 */
 	private function validate_requested_token_user () {
 		// check that token is present
-		if(!isset($_SERVER['HTTP_PHPIPAM_TOKEN']))	{ $this->Response->throw_exception(403, "Please provide token"); }
+		if (!isset($_SERVER['HTTP_PHPIPAM_TOKEN'])) { $this->Response->throw_exception (403, "Please provide token"); }
 		// validate and remove token
 		else {
 			// fetch token
-			if(($token = $this->Admin->fetch_object ("users", "token", $_SERVER['HTTP_PHPIPAM_TOKEN'])) === false)
-													{ $this->Response->throw_exception(403, "Invalid token"); }
+			if (($token = $this->Admin->fetch_object ("users", "token", $_SERVER['HTTP_PHPIPAM_TOKEN'])) === false)
+													{ $this->Response->throw_exception (403, "Invalid token"); }
 			// save token
 			$this->User->user = $token;
 			$this->token = $token->token;
 			$this->token_expires = $token->token_valid_until;
 
 			// expired
-			if($this->validate_token_expiration () === true)
-													{  $this->Response->throw_exception(403, "Token expired");  }
+			if ($this->validate_token_expiration () === true)
+													{  $this->Response->throw_exception (403, "Token expired"); }
 		}
 	}
 
@@ -473,20 +473,20 @@ 
 	 */
 	private function validate_requested_token_general () {
 		// check that token is present
-		if(!isset($_SERVER['HTTP_PHPIPAM_TOKEN']))	{ $this->Response->throw_exception(401, $this->Response->errors[401]); }
+		if (!isset($_SERVER['HTTP_PHPIPAM_TOKEN'])) { $this->Response->throw_exception (401, $this->Response->errors[401]); }
 		// validate and remove token
 		else {
 			// fetch token
-			if(($token = $this->Admin->fetch_object ("users", "token", $_SERVER['HTTP_PHPIPAM_TOKEN'])) === false)
-													{ $this->Response->throw_exception(401, $this->Response->errors[401]); }
+			if (($token = $this->Admin->fetch_object ("users", "token", $_SERVER['HTTP_PHPIPAM_TOKEN'])) === false)
+													{ $this->Response->throw_exception (401, $this->Response->errors[401]); }
 			// save token
 			$this->User->user = $token;
 			$this->token = $token->token;
 			$this->token_expires = $token->token_valid_until;
 
 			// expired
-			if($this->validate_token_expiration () === true)
-													{  $this->Response->throw_exception(401, $this->Response->errors[401]);  }
+			if ($this->validate_token_expiration () === true)
+													{  $this->Response->throw_exception (401, $this->Response->errors[401]); }
 			// refresh
 			$this->refresh_token_expiration ();
 		}
@@ -501,7 +501,7 @@ 
 	 * @return void
 	 */
 	private function validate_token_expiration () {
-		return strtotime($this->token_expires) < time() ? true : false;
+		return strtotime ($this->token_expires) < time () ? true : false;
 	}
 
 	/**
@@ -515,24 +515,24 @@ 
 		$this->token = $this->User->user->token;
         
 		// convert existing expiry date string to a timestamp
-		$expire_time = strtotime($this->token_expires);
+		$expire_time = strtotime ($this->token_expires);
 
 		// Write Throttling from token updates
 		// In order to keep the DB writes from token updates to a minimum, only update the expire time
 		// if the expire time was set more than 60 seconds ago.
-		if ( ((time()+$this->token_valid_time) - $expire_time) < 60) {
+		if (((time () + $this->token_valid_time) - $expire_time) < 60) {
 				return;
 		}
 
-		$this->token_expires = date("Y-m-d H:i:s", time()+$this->token_valid_time);
+		$this->token_expires = date ("Y-m-d H:i:s", time () + $this->token_valid_time);
 		# set token values
-		$values = array(
+		$values = array (
 					"id"=>$this->User->user->id,
 					"token_valid_until"=>$this->token_expires
 					);
 		# save token to database
-		if(!$this->Admin->object_modify ("users", "edit",  "id", $values ))
-													{ $this->Response->throw_exception(500, "Failed to update token expiration date"); }
+		if (!$this->Admin->object_modify ("users", "edit", "id", $values))
+													{ $this->Response->throw_exception (500, "Failed to update token expiration date"); }
 	}
 
 	/**
@@ -543,14 +543,14 @@ 
 	 */
 	private function remove_token () {
 		# set token values
-		$values = array(
+		$values = array (
 					"id"=>$this->User->user->id,
 					"token"=>null,
 					"token_valid_until"=>null
 					);
 		# save token to database
-		if(!$this->Admin->object_modify ("users", "edit",  "id", $values ))
-													{ $this->Response->throw_exception(500, "Failed to remove token"); }
+		if (!$this->Admin->object_modify ("users", "edit", "id", $values))
+													{ $this->Response->throw_exception (500, "Failed to remove token"); }
 
 	}
 
@@ -561,16 +561,16 @@ 
 	 * @return void
 	 */
 	private function generate_token () {
-	    $chars 		  = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_$%!=.';
-	    $chars_length = strlen($chars);
+	    $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_$%!=.';
+	    $chars_length = strlen ($chars);
 	    // generate string
 	    $token = '';
 	    for ($i = 0; $i < $this->token_length; $i++) {
-	        $token .= $chars[rand(0, $chars_length - 1)];
+	        $token .= $chars[rand (0, $chars_length - 1)];
 	    }
 	    // save token and valid time
 	    $this->token = $token;
-	    $this->token_expires = date("Y-m-d H:i:s", time()+$this->token_valid_time);
+	    $this->token_expires = date ("Y-m-d H:i:s", time () + $this->token_valid_time);
 	}
 
 }

functions/classes/class.Rackspace.php

Doc Comments +10 added lines, -10 removed lines

@@ -152,7 +152,7 @@ 
      * Fetches details about specific rack
      *
      * @access public
-     * @param mixed $id
+     * @param integer $id
      * @return void
      */
     public function fetch_rack_details ($id) {
@@ -169,7 +169,7 @@ 
      * Fetches all devices attached to rack
      *
      * @access public
-     * @param mixed $id
+     * @param integer $id
      * @return void
      */
     public function fetch_rack_devices ($id) {
@@ -247,7 +247,7 @@ 
      * Set active rack devide.
      *
      * @access public
-     * @param mixed $id         // device id
+     * @param boolean $id         // device id
      * @return void
      */
     public function set_active_rack_device ($id) {
@@ -383,7 +383,7 @@ 
      *
      * @access private
      * @param RackContent $content
-     * @param mixed $img
+     * @param resource $img
      * @param mixed $name
      * @return void
      */
@@ -501,7 +501,7 @@ 
      * getSpace function.
      *
      * @access public
-     * @return void
+     * @return integer
      */
     public function getSpace() {
         return $this->space;
@@ -543,7 +543,7 @@ 
      * Checks if item is active
      *
      * @access public
-     * @return void
+     * @return boolean
      */
     public function isActive() {
         return $this->active;
@@ -614,7 +614,7 @@ 
      * returns id
      *
      * @access public
-     * @return void
+     * @return integer
      */
     public function getId() {
         return $this->id;
@@ -656,7 +656,7 @@ 
      * Checks if item is active
      *
      * @access public
-     * @return void
+     * @return boolean
      */
     public function isActive() {
         return $this->active;
@@ -677,7 +677,7 @@ 
      * Returns start position
      *
      * @access public
-     * @return void
+     * @return integer
      */
     public function getStartLocation() {
         return $this->startLocation;
@@ -698,7 +698,7 @@ 
      * Gets rack size.
      *
      * @access public
-     * @return void
+     * @return integer
      */
     public function getSize() {
         return $this->size;

Spacing +75 added lines, -75 removed lines

@@ -15,7 +15,7 @@ 
      * @var array
      * @access public
      */
-    public $rack_sizes = array();
+    public $rack_sizes = array ();
 
     /**
      * List of all racks
@@ -35,7 +35,7 @@ 
      * @var array
      * @access private
      */
-    private $rack_content = array();
+    private $rack_content = array ();
 
 	/**
 	 * Result printing class
@@ -103,7 +103,7 @@ 
 		# set racksizes
 		$this->define_rack_sizes ();
 		# initialize rack
-        $this->Drawer = new RackDrawer();
+        $this->Drawer = new RackDrawer ();
 	}
 
 
@@ -122,7 +122,7 @@ 
      * @return void
      */
     private function define_rack_sizes () {
-        $this->rack_sizes = array(14, 20, 24, 30, 35, 40, 42, 44, 45, 48);
+        $this->rack_sizes = array (14, 20, 24, 30, 35, 40, 42, 44, 45, 48);
     }
 
 
@@ -133,9 +133,9 @@ 
      * @return void
      */
     public function fetch_all_racks () {
-        $all_racks = $this->fetch_all_objects("racks", "name", "acs");
+        $all_racks = $this->fetch_all_objects ("racks", "name", "acs");
         // reorder
-        if ($all_racks==false) {
+        if ($all_racks == false) {
             $this->all_racks = false;
         }
         else {
@@ -161,7 +161,7 @@ 
             return $this->all_racks->$id;
         }
         else {
-            return $this->fetch_object("racks", "id", $id);
+            return $this->fetch_object ("racks", "id", $id);
         }
     }
 
@@ -204,10 +204,10 @@ 
         $this->rack_size = $rack->size;
 
         // set content
-        if ($devices!==false) {
+        if ($devices !== false) {
             foreach ($devices as $d) {
                 // add initial location
-                $rd = array("id"=>$d->id,
+                $rd = array ("id"=>$d->id,
                             "name"=>$d->hostname,
                             "startLocation"=>$d->rack_start,
                             "size"=>$d->rack_size,
@@ -223,7 +223,7 @@ 
         // create rack
         $this->set_rack ();
         // set active device
-        if ($deviceId!==false) {
+        if ($deviceId !== false) {
             $this->set_active_rack_device ($deviceId);
         }
         // draw rack drawer
@@ -238,9 +238,9 @@ 
      */
     private function set_rack () {
         // initialize
-        $this->Rack = new Rack (array("name"=>$this->rack_name, "content"=>$this->rack_content));
+        $this->Rack = new Rack (array ("name"=>$this->rack_name, "content"=>$this->rack_content));
         // set rack size
-        $this->Rack->setSpace($this->rack_size);
+        $this->Rack->setSpace ($this->rack_size);
     }
 
     /**
@@ -251,9 +251,9 @@ 
      * @return void
      */
     public function set_active_rack_device ($id) {
-        foreach ($this->Rack->getContent() as $content) {
-            if ($content->getId() == $id) {
-                $content->setActive();
+        foreach ($this->Rack->getContent () as $content) {
+            if ($content->getId () == $id) {
+                $content->setActive ();
             }
         }
     }
@@ -312,15 +312,15 @@ 
      * @param Rack $rack
      * @return void
      */
-    public function draw(Rack $rack) {
+    public function draw (Rack $rack) {
         $this->rack = $rack;
-        $this->template = imagecreatefrompng( $this->createURL().BASE."css/1.2/images/blankracks/".$this->rack->getSpace().".png" );
-        $this->drawNameplate();
-        $this->drawContents();
+        $this->template = imagecreatefrompng ($this->createURL ().BASE."css/1.2/images/blankracks/".$this->rack->getSpace ().".png");
+        $this->drawNameplate ();
+        $this->drawContents ();
 
-        header("Content-type: image/png");
-        imagepng($this->template);
-        imagedestroy($this->template);
+        header ("Content-type: image/png");
+        imagepng ($this->template);
+        imagedestroy ($this->template);
     }
 
     /**
@@ -329,12 +329,12 @@ 
      * @access private
      * @return void
      */
-    private function drawNameplate() {
-        $nameplate = imagecreate(150, 20);
-        imagecolorallocate( $nameplate, 255, 255, 255 ); // Allocate a background color (first color assigned)
-        $textColour = imagecolorallocate($nameplate, 0, 0, 0);
-        $this->imageCenterString($nameplate, 3, $this->rack->getName(), $textColour);
-        imagecopy($this->template, $nameplate, 52, 1, 0, 0, 150, 20);
+    private function drawNameplate () {
+        $nameplate = imagecreate (150, 20);
+        imagecolorallocate ($nameplate, 255, 255, 255); // Allocate a background color (first color assigned)
+        $textColour = imagecolorallocate ($nameplate, 0, 0, 0);
+        $this->imageCenterString ($nameplate, 3, $this->rack->getName (), $textColour);
+        imagecopy ($this->template, $nameplate, 52, 1, 0, 0, 150, 20);
     }
 
     /**
@@ -345,15 +345,15 @@ 
      * @param string $text
      * @param int $color
      */
-    private function imageCenterString($img, $font, $text, $color) {
+    private function imageCenterString ($img, $font, $text, $color) {
         if ($font < 0 || $font > 5) {
             $font = 0;
         }
-        $num = Array( Array(4.6, 6), Array(4.6, 6), Array(5.6, 12), Array(6.5, 12), Array(7.6, 16), Array(8.5, 16));
-        $width = ceil(strlen($text) * $num[$font][0]);
-        $x = imagesx($img) - $width - 8;
-        $y = Imagesy($img) - ($num[$font][1] + 2);
-        imagestring($img, $font, $x/2, $y/2, $text, $color);
+        $num = Array (Array (4.6, 6), Array (4.6, 6), Array (5.6, 12), Array (6.5, 12), Array (7.6, 16), Array (8.5, 16));
+        $width = ceil (strlen ($text) * $num[$font][0]);
+        $x = imagesx ($img) - $width - 8;
+        $y = Imagesy ($img) - ($num[$font][1] + 2);
+        imagestring ($img, $font, $x / 2, $y / 2, $text, $color);
     }
 
 
@@ -363,18 +363,18 @@ 
      * @access private
      * @return void
      */
-    private function drawContents() {
-        foreach ($this->rack->getContent() as $content)
+    private function drawContents () {
+        foreach ($this->rack->getContent () as $content)
         {
-            $pixelSize = 20 * $content->getSize();
+            $pixelSize = 20 * $content->getSize ();
 
-            $img = imagecreate(200, $pixelSize);
-            $this->drawContent($content, $img, $content->getName());
+            $img = imagecreate (200, $pixelSize);
+            $this->drawContent ($content, $img, $content->getName ());
 
-            $yPos = 22 + 20 * ($this->rack->getSpace() - ($content->getStartLocation() + $content->getSize()));
+            $yPos = 22 + 20 * ($this->rack->getSpace () - ($content->getStartLocation () + $content->getSize ()));
 
-            imagecopy($this->template, $img, 27, $yPos, 0, 0, 200, $pixelSize);
-            imagedestroy($img);
+            imagecopy ($this->template, $img, 27, $yPos, 0, 0, 200, $pixelSize);
+            imagedestroy ($img);
         }
     }
 
@@ -387,21 +387,21 @@ 
      * @param mixed $name
      * @return void
      */
-    private function drawContent(RackContent $content, $img, $name)
+    private function drawContent (RackContent $content, $img, $name)
     {
-        if ($content->isActive()) {
-            imagecolorallocate($img, 207, 232, 255); // Allocate a background color (first color assigned) - active
-            $textColour = imagecolorallocate($img, 0, 0, 0);
-            $lineColour = imagecolorallocate($img, 122, 137, 150);
+        if ($content->isActive ()) {
+            imagecolorallocate ($img, 207, 232, 255); // Allocate a background color (first color assigned) - active
+            $textColour = imagecolorallocate ($img, 0, 0, 0);
+            $lineColour = imagecolorallocate ($img, 122, 137, 150);
         } else {
-            imagecolorallocate($img, 230, 230, 230); // Allocate a background color (first color assigned)  - all
-            $textColour = imagecolorallocate($img, 0, 0, 0);
-            $lineColour = imagecolorallocate($img, 122, 137, 150);
+            imagecolorallocate ($img, 230, 230, 230); // Allocate a background color (first color assigned)  - all
+            $textColour = imagecolorallocate ($img, 0, 0, 0);
+            $lineColour = imagecolorallocate ($img, 122, 137, 150);
         }
 
-        $this->imageCenterString($img, 3, $name, $textColour);
-        imageline($img, 0, 0, 200, 0, $lineColour);
-        imageline($img, 0, imagesy($img) - 1, 200, imagesy($img) - 1, $lineColour);
+        $this->imageCenterString ($img, 3, $name, $textColour);
+        imageline ($img, 0, 0, 200, 0, $lineColour);
+        imageline ($img, 0, imagesy ($img) - 1, 200, imagesy ($img) - 1, $lineColour);
     }
 }
 
@@ -418,13 +418,13 @@ 
      * @param array $fields
      * @return void
      */
-    public function __construct(array $fields)
+    public function __construct (array $fields)
     {
         foreach ($fields as $field => $value)
         {
-            $setter = 'set' . ucfirst($field);
-            if (method_exists($this, $setter)) {
-                $this->$setter($value);
+            $setter = 'set'.ucfirst ($field);
+            if (method_exists ($this, $setter)) {
+                $this->$setter ($value);
             }
         }
     }
@@ -482,7 +482,7 @@ 
      * @access public
      * @return void
      */
-    public function getName() {
+    public function getName () {
         return $this->name;
     }
 
@@ -493,7 +493,7 @@ 
      * @param mixed $name
      * @return void
      */
-    public function setName($name) {
+    public function setName ($name) {
         $this->name = $name;
     }
 
@@ -503,7 +503,7 @@ 
      * @access public
      * @return void
      */
-    public function getSpace() {
+    public function getSpace () {
         return $this->space;
     }
 
@@ -514,7 +514,7 @@ 
      * @param mixed $space
      * @return void
      */
-    public function setSpace($space) {
+    public function setSpace ($space) {
         $this->space = $space;
     }
 
@@ -524,7 +524,7 @@ 
      * @access public
      * @return void
      */
-    public function getContent() {
+    public function getContent () {
         return $this->content;
     }
 
@@ -535,7 +535,7 @@ 
      * @param mixed $content
      * @return void
      */
-    public function setContent($content) {
+    public function setContent ($content) {
         $this->content = $content;
     }
 
@@ -545,7 +545,7 @@ 
      * @access public
      * @return void
      */
-    public function isActive() {
+    public function isActive () {
         return $this->active;
     }
 
@@ -556,7 +556,7 @@ 
      * @param bool $active (default: true)
      * @return void
      */
-    public function setActive($active) {
+    public function setActive ($active) {
         $this->active = $active;
     }
 }
@@ -616,7 +616,7 @@ 
      * @access public
      * @return void
      */
-    public function getId() {
+    public function getId () {
         return $this->id;
     }
 
@@ -627,7 +627,7 @@ 
      * @param mixed $id
      * @return void
      */
-    public function setId($id) {
+    public function setId ($id) {
         $this->id = $id;
     }
 
@@ -637,7 +637,7 @@ 
      * @access public
      * @return void
      */
-    public function getName() {
+    public function getName () {
         return $this->name;
     }
 
@@ -648,7 +648,7 @@ 
      * @param mixed $name
      * @return void
      */
-    public function setName($name) {
+    public function setName ($name) {
         $this->name = $name;
     }
 
@@ -658,7 +658,7 @@ 
      * @access public
      * @return void
      */
-    public function isActive() {
+    public function isActive () {
         return $this->active;
     }
 
@@ -669,7 +669,7 @@ 
      * @param bool $active (default: true)
      * @return void
      */
-    public function setActive($active = true) {
+    public function setActive ($active = true) {
         $this->active = $active;
     }
 
@@ -679,7 +679,7 @@ 
      * @access public
      * @return void
      */
-    public function getStartLocation() {
+    public function getStartLocation () {
         return $this->startLocation;
     }
 
@@ -690,7 +690,7 @@ 
      * @param mixed $startLocation
      * @return void
      */
-    public function setStartLocation($startLocation) {
+    public function setStartLocation ($startLocation) {
         $this->startLocation = $startLocation;
     }
 
@@ -700,7 +700,7 @@ 
      * @access public
      * @return void
      */
-    public function getSize() {
+    public function getSize () {
         return $this->size;
     }
 
@@ -711,7 +711,7 @@ 
      * @param mixed $size
      * @return void
      */
-    public function setSize($size) {
+    public function setSize ($size) {
         $this->size = $size;
     }
 }

functions/classes/class.FirewallZones.php

Doc Comments +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 	 * Fetches zone mapping from database, depending on id
 	 *
 	 * @access public
-	 * @param mixed $id
+	 * @param string $id
 	 * @return void
 	 */
 	public function get_zone_mapping ($id) {

Spacing +213 added lines, -213 removed lines

@@ -83,7 +83,7 @@ 
 		# Log object
 		$this->Log = new Logging ($this->Database);
 		# get settings
-		$this->get_settings();
+		$this->get_settings ();
 		# subnet object
 		$this->Subnets = new Subnets ($this->Database);
 	}
@@ -97,11 +97,11 @@ 
 	 * @return string
 	 */
 	public function zone2hex ($zone) {
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 		if ($firewallZoneSettings['padding'] == 'on') {
-			return str_pad(dechex($zone),$firewallZoneSettings['zoneLength'],"0",STR_PAD_LEFT);
+			return str_pad (dechex ($zone), $firewallZoneSettings['zoneLength'], "0", STR_PAD_LEFT);
 		} else {
-			return dechex($zone);
+			return dechex ($zone);
 		}
 
 	}
@@ -116,14 +116,14 @@ 
 	 */
 	public function generate_zone_name ($values = NULL) {
 		# get settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 		# execute based on action
-		if($firewallZoneSettings['zoneGenerator'] == 0 || $firewallZoneSettings['zoneGenerator'] == 1 ) {
-			return $this->generate_numeric_zone_name ($firewallZoneSettings['zoneLength'],$firewallZoneSettings['zoneGenerator']);
-		} elseif($firewallZoneSettings['zoneGenerator'] == 2 ) {
+		if ($firewallZoneSettings['zoneGenerator'] == 0 || $firewallZoneSettings['zoneGenerator'] == 1) {
+			return $this->generate_numeric_zone_name ($firewallZoneSettings['zoneLength'], $firewallZoneSettings['zoneGenerator']);
+		} elseif ($firewallZoneSettings['zoneGenerator'] == 2) {
 			return $this->validate_text_zone_name ($values);
 		} else {
-			return $this->Result->show("danger", _("Invalid generator ID"), true);
+			return $this->Result->show ("danger", _ ("Invalid generator ID"), true);
 		}
 	}
 
@@ -136,29 +136,29 @@ 
 	 * @param mixed $zoneGenerator
 	 * @return void
 	 */
-	private function generate_numeric_zone_name ($zoneLength,$zoneGenerator) {
+	private function generate_numeric_zone_name ($zoneLength, $zoneGenerator) {
 
 		# execute
-		try { $maxZone = $this->Database->getObjectsQuery('SELECT MAX(CAST(zone as UNSIGNED)) as zone FROM firewallZones WHERE generator NOT LIKE 2;');}
+		try { $maxZone = $this->Database->getObjectsQuery ('SELECT MAX(CAST(zone as UNSIGNED)) as zone FROM firewallZones WHERE generator NOT LIKE 2;'); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 
-		if($maxZone[0]->zone) {
+		if ($maxZone[0]->zone) {
 			# add 1 to the zone name
 			$zoneName = ++$maxZone[0]->zone;
-			if($zoneGenerator == 0 ) {
-				if(strlen($zoneName) > $zoneLength) {
-					return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
+			if ($zoneGenerator == 0) {
+				if (strlen ($zoneName) > $zoneLength) {
+					return $this->Result->show ("danger", _ ("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
 				}
-			} elseif($zoneGenerator == 1) {
+			} elseif ($zoneGenerator == 1) {
 				# the highest convertable integer value for dechex() is 4294967295!
-				if($zoneName > 4294967295) {
-					return $this->Result->show("danger", _("The maximum convertable vlaue is reached. Consider to switch to decimal or text mode and change the zone name length value."), true);
+				if ($zoneName > 4294967295) {
+					return $this->Result->show ("danger", _ ("The maximum convertable vlaue is reached. Consider to switch to decimal or text mode and change the zone name length value."), true);
 				}
-				if(strlen(dechex($zoneName)) > $zoneLength){
-					return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
+				if (strlen (dechex ($zoneName)) > $zoneLength) {
+					return $this->Result->show ("danger", _ ("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
 				}
 			}
 
@@ -168,7 +168,7 @@ 
 		}
 
 		# return the values
-		return sizeof($zoneName)>0 ? $zoneName : false;
+		return sizeof ($zoneName) > 0 ? $zoneName : false;
 	}
 
 
@@ -181,9 +181,9 @@ 
 	 */
 	private function validate_text_zone_name ($values) {
 		# get settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
-		if($values[1]){
+		if ($values[1]) {
 			$query = 'SELECT zone FROM firewallZones WHERE zone = ? AND id NOT LIKE ?;';
 			$params = $values;
 		} else {
@@ -192,15 +192,15 @@ 
 		}
 
 		# execute
-		try { $uniqueZone = $this->Database->getObjectsQuery($query,$params);}
+		try { $uniqueZone = $this->Database->getObjectsQuery ($query, $params); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 
 		if ($uniqueZone[0]->zone && $firewallZoneSettings['strictMode'] == 'on') {
 
-			$this->Result->show("danger", _("Error: The zone name ".$zone." is not unique!"), false);
+			$this->Result->show ("danger", _ ("Error: The zone name ".$zone." is not unique!"), false);
 
 		} else {
 			# set the initial zone name to "1"
@@ -208,7 +208,7 @@ 
 		}
 
 		# return the values
-		return sizeof($zoneName)>0 ? $zoneName : false;
+		return sizeof ($zoneName) > 0 ? $zoneName : false;
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 */
 	public function get_zone_mappings () {
 		# try to fetch all zone mappings
-		try { $mappings =  $this->Database->getObjectsQuery('SELECT
+		try { $mappings = $this->Database->getObjectsQuery ('SELECT
 						firewallZones.id AS id,
 						firewallZones.generator AS generator,
 						firewallZones.length AS length,
@@ -237,12 +237,12 @@ 
 						FROM firewallZoneMapping
 						RIGHT JOIN firewallZones ON zoneId = firewallZones.id
 						LEFT JOIN devices ON deviceId = devices.id
-						having  deviceId is not NULL order by firewallZones.id ASC;');}
+						having  deviceId is not NULL order by firewallZones.id ASC;'); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# try to fetch all subnet and vlan informations for all zones
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -256,32 +256,32 @@ 
 						vlans.name AS vlanName
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON subnetId = subnets.id
-						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;');}
+						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;'); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# modify the zone output values
 		foreach ($mappings as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($mappings[$key]->generator == 1 ){
-				$mappings[$key]->zone = dechex($mappings[$key]->zone);
+			if ($mappings[$key]->generator == 1) {
+				$mappings[$key]->zone = dechex ($mappings[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($mappings[$key]->padding == 1 && $mappings[$key]->generator != 2){
+			if ($mappings[$key]->padding == 1 && $mappings[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
-			$mappings[$key]->zone = str_pad(ltrim($mappings[$key]->zone,0),$mappings[$key]->length,"0",STR_PAD_LEFT);
+			$mappings[$key]->zone = str_pad (ltrim ($mappings[$key]->zone, 0), $mappings[$key]->length, "0", STR_PAD_LEFT);
 			}
 			# inject network informations
 			foreach ($networkInformation as $nkey => $nval) {
-				if($mappings[$key]->id == $nval->zoneId) {
+				if ($mappings[$key]->id == $nval->zoneId) {
 					# add each network and vlan information to the object
 					$mappings[$key]->network[] = $networkInformation[$nkey];
 				}
 			}
 		}
 		# return the values
-		return sizeof($mappings)>0 ? $mappings : false;
+		return sizeof ($mappings) > 0 ? $mappings : false;
 	}
 
 
@@ -294,7 +294,7 @@ 
 	 */
 	public function get_zone_mapping ($id) {
 		# try to fetch id specific zone mapping
-		try { $mapping =  $this->Database->getObjectsQuery('SELECT
+		try { $mapping = $this->Database->getObjectsQuery ('SELECT
 						firewallZones.id AS id,
 						firewallZones.generator AS generator,
 						firewallZones.length AS length,
@@ -310,12 +310,12 @@ 
 						FROM firewallZoneMapping
 						RIGHT JOIN firewallZones ON zoneId = firewallZones.id
 						LEFT JOIN devices ON deviceId = devices.id
-						having  deviceId is not NULL AND mappingId = ?;', $id);}
+						having  deviceId is not NULL AND mappingId = ?;', $id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# try to fetch all subnet and vlan informations for all zones
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -330,25 +330,25 @@ 
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON subnetId = subnets.id
 						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId
-						HAVING zoneId = ? ORDER BY subnet ASC;', $mapping[0]->id);}
+						HAVING zoneId = ? ORDER BY subnet ASC;', $mapping[0]->id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# modify the zone output values
 		foreach ($mapping as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($mapping[$key]->generator == 1 ){
-				$mapping[$key]->zone = dechex($mapping[$key]->zone);
+			if ($mapping[$key]->generator == 1) {
+				$mapping[$key]->zone = dechex ($mapping[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($mapping[$key]->padding == 1 && $mapping[$key]->generator != 2){
+			if ($mapping[$key]->padding == 1 && $mapping[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
-			$mapping[$key]->zone = str_pad(ltrim($mapping[$key]->zone,0),$mapping[$key]->length,"0",STR_PAD_LEFT);
+			$mapping[$key]->zone = str_pad (ltrim ($mapping[$key]->zone, 0), $mapping[$key]->length, "0", STR_PAD_LEFT);
 			}
 			# inject network informations
 			foreach ($networkInformation as $nkey => $nval) {
-				if($mapping[$key]->id == $nval->zoneId) {
+				if ($mapping[$key]->id == $nval->zoneId) {
 					# remove the zoneId, we don't need it anymore
 					unset($networkInformation[$nkey]->zoneId);
 					# add each network and vlan information to the object
@@ -357,7 +357,7 @@ 
 			}
 		}
 		# return the values
-		return sizeof($mapping)>0 ? $mapping[0] : false;
+		return sizeof ($mapping) > 0 ? $mapping[0] : false;
 	}
 
 	/**
@@ -369,13 +369,13 @@ 
 	 */
 	public function check_zone_mapping ($zoneId) {
 		# try to fetch id specific zone mapping
-		try { $mapping =  $this->Database->getObjectsQuery('SELECT id FROM firewallZoneMapping WHERE zoneId = ?;', $zoneId);}
+		try { $mapping = $this->Database->getObjectsQuery ('SELECT id FROM firewallZoneMapping WHERE zoneId = ?;', $zoneId); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# return the values
-		return sizeof($mapping)>0 ? $mapping[0] : false;
+		return sizeof ($mapping) > 0 ? $mapping[0] : false;
 	}
 
 
@@ -388,7 +388,7 @@ 
 	 */
 	public function get_zone_subnet_info ($id) {
 		# try to fetch id specific zone information
-		try { $info =  $this->Database->getObjectsQuery('SELECT
+		try { $info = $this->Database->getObjectsQuery ('SELECT
 						firewallZones.zone as zone,
 						firewallZones.padding as padding,
 						firewallZones.length as length,
@@ -408,27 +408,27 @@ 
 						LEFT JOIN firewallZoneSubnet on firewallZoneMapping.zoneId = firewallZoneSubnet.zoneId
 						LEFT JOIN devices ON firewallZoneMapping.deviceId = devices.id
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
-						HAVING firewallZoneSubnet.subnetId = ?;', $id);}
+						HAVING firewallZoneSubnet.subnetId = ?;', $id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 		if ($info) {
 			# modify the zone output values
 			foreach ($info as $key => $val) {
 				# transform the zone name from decimal to hex
-				if($info[$key]->generator == 1 ){
-					$info[$key]->zone = dechex($info[$key]->zone);
+				if ($info[$key]->generator == 1) {
+					$info[$key]->zone = dechex ($info[$key]->zone);
 				}
 				# add some padding if it is activated and the zone generatore is not text
-				if($info[$key]->padding == 1 && $info[$key]->generator != 2){
+				if ($info[$key]->padding == 1 && $info[$key]->generator != 2) {
 				# remove leading zeros (padding) and raise the value in case of any zone name length changes
 				# add some padding to reach the maximum zone name lenght
-				$info[$key]->zone = str_pad(ltrim($info[$key]->zone,0),$info[$key]->length,"0",STR_PAD_LEFT);
+				$info[$key]->zone = str_pad (ltrim ($info[$key]->zone, 0), $info[$key]->length, "0", STR_PAD_LEFT);
 				}
 			}
 		}
 
 		# return the values
-		return sizeof($info)>0 ? $info[0] : false;
+		return sizeof ($info) > 0 ? $info[0] : false;
 	}
 
 
@@ -440,12 +440,12 @@ 
 	 */
 	public function get_zones () {
 		# try to fetch all zones
-		try { $zones =  $this->Database->getObjectsQuery('SELECT * FROM firewallZones;');}
+		try { $zones = $this->Database->getObjectsQuery ('SELECT * FROM firewallZones;'); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# try to fetch all subnet and vlan informations for all zones
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -459,25 +459,25 @@ 
 						vlans.name AS vlanName
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
-						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;');}
+						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;'); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# modify the zone output values
 		foreach ($zones as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($zones[$key]->generator == 1 ){
-				$zones[$key]->zone = dechex($zones[$key]->zone);
+			if ($zones[$key]->generator == 1) {
+				$zones[$key]->zone = dechex ($zones[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($zones[$key]->padding == 1 && $zones[$key]->generator != 2){
+			if ($zones[$key]->padding == 1 && $zones[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
-			$zones[$key]->zone = str_pad(ltrim($zones[$key]->zone,0),$zones[$key]->length,"0",STR_PAD_LEFT);
+			$zones[$key]->zone = str_pad (ltrim ($zones[$key]->zone, 0), $zones[$key]->length, "0", STR_PAD_LEFT);
 			}
 			# inject network informations
 			foreach ($networkInformation as $nkey => $nval) {
-				if($zones[$key]->id == $nval->zoneId) {
+				if ($zones[$key]->id == $nval->zoneId) {
 					# remove the zoneId, we don't need it anymore
 					unset($networkInformation[$nkey]->zoneId);
 					# add each network and vlan information to the object
@@ -486,7 +486,7 @@ 
 			}
 		}
 		# return the values
-		return sizeof($zones)>0 ? $zones : false;
+		return sizeof ($zones) > 0 ? $zones : false;
 	}
 
 
@@ -499,13 +499,13 @@ 
 	 */
 	public function get_zone ($id) {
 		# try to fetch zone with ID $id
-		try { $zone = $this->Database->getObjectsQuery('SELECT * FROM firewallZones WHERE id = ?;', $id);}
+		try { $zone = $this->Database->getObjectsQuery ('SELECT * FROM firewallZones WHERE id = ?;', $id); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# try to fetch all subnet and vlan informations for this zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -519,25 +519,25 @@ 
 						vlans.name AS vlanName
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
-						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id);}
+						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# modify the zone output values
 		foreach ($zone as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($zone[$key]->generator == 1 ){
-				$zone[$key]->zone = dechex($zone[$key]->zone);
+			if ($zone[$key]->generator == 1) {
+				$zone[$key]->zone = dechex ($zone[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($zone[$key]->padding == 1 && $zone[$key]->generator != 2){
+			if ($zone[$key]->padding == 1 && $zone[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
-			$zone[$key]->zone = str_pad(ltrim($zone[$key]->zone,0),$zone[$key]->length,"0",STR_PAD_LEFT);
+			$zone[$key]->zone = str_pad (ltrim ($zone[$key]->zone, 0), $zone[$key]->length, "0", STR_PAD_LEFT);
 			}
 			# inject network informations
 			foreach ($networkInformation as $nkey => $nval) {
-				if($zone[$key]->id == $nval->zoneId) {
+				if ($zone[$key]->id == $nval->zoneId) {
 					# remove the zoneId, we don't need it anymore
 					unset($networkInformation[$nkey]->zoneId);
 					# add each network and vlan information to the object
@@ -547,7 +547,7 @@ 
 		}
 
 		# return the values
-		return sizeof($zone)>0 ? $zone[0] : false;
+		return sizeof ($zone) > 0 ? $zone[0] : false;
 	}
 
 
@@ -560,22 +560,22 @@ 
 	 */
 	public function get_zone_detail ($id) {
 		# get zone informations
-		$zoneInformation = $this->get_zone($id);
+		$zoneInformation = $this->get_zone ($id);
 
 		# build html output
 		print '<table class="table table-auto table-condensed" style="margin-bottom:0px;">';
 		print "<tr><td colspan='2'><h4>Zone details</h4><hr></td></tr>";
 		print '<tr>';
-		print '<td style="width:110px;">'._('Zone Name').'</td>';
+		print '<td style="width:110px;">'._ ('Zone Name').'</td>';
 		print '<td>'.$zoneInformation->zone.'</td>';
 		print '</tr>';
 		print '<tr>';
-		print '<td>'._('Indicator').'</td>';
+		print '<td>'._ ('Indicator').'</td>';
 		$title = $zoneInformation->indicator == 0 ? 'Own Zone' : 'Customer Zone';
-		print '<td><span class="fa fa-home"  title="'._($title).'"></span></td>';
+		print '<td><span class="fa fa-home"  title="'._ ($title).'"></span></td>';
 		print '</tr>';
 		print '<tr>';
-		print '<td>'._('Description').'</td>';
+		print '<td>'._ ('Description').'</td>';
 		print '<td>'.$zoneInformation->description.'</td>';
 		print '</tr>';
 		print "</table>";
@@ -584,8 +584,8 @@ 
 			print "<table class='table table-condensed' style='margin-bottom:30px;'>";
 			print "<tr><td colspan='2'><br><h4>Subnets</h4><hr></td></tr>";
 			print '<tr>';
-			print '<th>'._('Subnet').'</th>';
-			print '<th>'._('VLAN').'</th>';
+			print '<th>'._ ('Subnet').'</th>';
+			print '<th>'._ ('VLAN').'</th>';
 			print '</tr>';
 			foreach ($zoneInformation->network as $network) {
 				print '<tr>';
@@ -594,8 +594,8 @@ 
 				$network->vlanName = $network->vlanName ? "(".$network->vlanName.")" : "";
 
 				if (!$network->subnetIsFolder) {
-					print '<td>'.$this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</td>';
-				} else{
+					print '<td>'.$this->Subnets->transform_to_dotted ($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</td>';
+				} else {
 					print '<td>Folder '.$network->subnetDescription.'</td>';
 				}
 				print '<td>'.$network->vlan.$network->vlanName.'</td>';
@@ -614,7 +614,7 @@ 
 	 */
 	public function get_zone_network ($id) {
 		# try to fetch all subnet and vlan informations for this zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -628,11 +628,11 @@ 
 						vlans.name AS vlanName
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
-						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id);}
+						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
-		$rowspan = count($networkInformation);
+		$rowspan = count ($networkInformation);
 		$i = 1;
 		print '<table class="table table-noborder table-condensed" style="padding-bottom:20px;">';
 		foreach ($networkInformation as $network) {
@@ -641,16 +641,16 @@ 
 				print '<td rowspan="'.$rowspan.'" style="width:150px;">Network</td>';
 			}
 			print '<td>';
-			print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._('Delete Network').'" title="'._('Delete Network').'" data-action="delete" data-zoneId="'.$id.'" data-subnetId="'.$network->subnetId.'">';
+			print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._ ('Delete Network').'" title="'._ ('Delete Network').'" data-action="delete" data-zoneId="'.$id.'" data-subnetId="'.$network->subnetId.'">';
 			print '<span><i class="fa fa-close"></i></span>';
 			print "</a>";
 
-			if ($network->subnetIsFolder == 1 ) {
+			if ($network->subnetIsFolder == 1) {
 				print 'Folder: '.$network->subnetDescription;
 			} else {
 				# display network information with or without description
-				if ($network->subnetDescription) 	{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>';	}
-				else 								{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.'</td>';	}
+				if ($network->subnetDescription) {	print $this->Subnets->transform_to_dotted ($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>'; }
+				else {	print $this->Subnets->transform_to_dotted ($network->subnet).'/'.$network->subnetMask.'</td>'; }
 			}
 			print '</tr>';
 			$i++;
@@ -668,16 +668,16 @@ 
 	 */
 	public function check_zone_network ($subnetId) {
 		# check if the subnet is already bound to this or any other zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId);}
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
-		if(!sizeof($networkInformation)>0 ) {
+		if (!sizeof ($networkInformation) > 0) {
 			# return dummy value
 			return 'success';
 		} else {
-			$this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
+			$this->Result->show ("danger", "<strong>"._ ('Error').":</strong><br>"._ ("This network is already bound to this or another zone.<br>The binding must be unique."), false);
 			return false;
 		}
 		# return dummy value
@@ -693,24 +693,24 @@ 
 	 * @param mixed $subnetId
 	 * @return false|string
 	 */
-	public function add_zone_network ($zoneId,$subnetId) {
+	public function add_zone_network ($zoneId, $subnetId) {
 		# check if the subnet is already bound to this or any other zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId);}
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
-		if(!sizeof($networkInformation)>0 ) {
+		if (!sizeof ($networkInformation) > 0) {
 			$query = 'INSERT INTO firewallZoneSubnet (zoneId, subnetId) VALUES (?,?);';
-			$params = array('zoneId' => $zoneId, 'subnetId' => $subnetId);
+			$params = array ('zoneId' => $zoneId, 'subnetId' => $subnetId);
 
 			# try to fetch all subnet and vlan informations for this zone
-			try { $addRow =  $this->Database->insertObject("firewallZoneSubnet", $params);}
+			try { $addRow = $this->Database->insertObject ("firewallZoneSubnet", $params); }
 
 			# throw exception
-			catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+			catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 		} else {
-			$this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
+			$this->Result->show ("danger", "<strong>"._ ('Error').":</strong><br>"._ ("This network is already bound to this or another zone.<br>The binding must be unique."), false);
 			return false;
 		}
 		# return dummy value
@@ -726,12 +726,12 @@ 
 	 * @param mixed $subnetId
 	 * @return string|false
 	 */
-	public function delete_zone_network ($zoneId,$subnetId) {
+	public function delete_zone_network ($zoneId, $subnetId) {
 		# try to fetch all subnet and vlan informations for this zone
-		try { $deleteRow =  $this->Database->deleteRow("firewallZoneSubnet", "zoneId", $zoneId, "subnetId", $subnetId); }
+		try { $deleteRow = $this->Database->deleteRow ("firewallZoneSubnet", "zoneId", $zoneId, "subnetId", $subnetId); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# return dummy value or false
 		if ($deleteRow) {
@@ -765,10 +765,10 @@ 
 		}
 
 		# execute based on action
-		if($action=="add")			{ return $this->zone_add ($values,$network); }
-		elseif($action=="edit")		{ return $this->zone_edit ($values); }
-		elseif($action=="delete")	{ return $this->zone_delete ($values['id']); }
-		else						{ return $this->Result->show("danger", _("Invalid action"), true); }
+		if ($action == "add") { return $this->zone_add ($values, $network); }
+		elseif ($action == "edit") { return $this->zone_edit ($values); }
+		elseif ($action == "delete") { return $this->zone_delete ($values['id']); }
+		else { return $this->Result->show ("danger", _ ("Invalid action"), true); }
 	}
 
 
@@ -780,35 +780,35 @@ 
 	 * @param mixed $network
 	 * @return boolean
 	 */
-	private function zone_add ($values,$network) {
+	private function zone_add ($values, $network) {
 		# get the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# push the zone name length into the values array
 		$values['length'] = $firewallZoneSettings['zoneLength'];
 
 		# execute insert
-		try { $this->Database->insertObject("firewallZones", $values); }
+		try { $this->Database->insertObject ("firewallZones", $values); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone created", "Failed to add new firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
+			$this->Log->write ("Firewall zone created", "Failed to add new firewall zone<hr>".$e->getMessage (), 2, $this->User->username);
 			return false;
 		}
 
 		# fetch the highest inserted id, matching the zone name
-		try { $lastId=$this->Database->getObjectsQuery("SELECT MAX(id) AS id FROM firewallZones WHERE zone = ? ;", $values['zone']);}
+		try { $lastId = $this->Database->getObjectsQuery ("SELECT MAX(id) AS id FROM firewallZones WHERE zone = ? ;", $values['zone']); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 
 		if ($network) {
 			foreach ($network as $subnetId) {
-				$values = array('zoneId' => $lastId[0]->id, 'subnetId' => $subnetId);
+				$values = array ('zoneId' => $lastId[0]->id, 'subnetId' => $subnetId);
 				# add the network bindings if there are any
-				try { $this->Database->insertObject("firewallZoneSubnet", $values); }
+				try { $this->Database->insertObject ("firewallZoneSubnet", $values); }
 				catch (Exception $e) {
-					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+					$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 					return false;
 				}
 			}
@@ -829,14 +829,14 @@ 
 	 */
 	private function zone_edit ($values) {
 		# execute
-		try { $this->Database->updateObject("firewallZones", $values, "id"); }
+		try { $this->Database->updateObject ("firewallZones", $values, "id"); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone edited", "Failed to edit firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
+			$this->Log->write ("Firewall zone edited", "Failed to edit firewall zone<hr>".$e->getMessage (), 2, $this->User->username);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone edited", "Firewall zone edited<hr>".$this->array_to_log($values), 0, $this->User->username);
+		$this->Log->write ("Firewall zone edited", "Firewall zone edited<hr>".$this->array_to_log ($values), 0, $this->User->username);
 		return true;
 	}
 
@@ -850,25 +850,25 @@ 
 	 */
 	private function zone_delete ($id) {
 		# save old values
-		$old_zone = $this->get_zone($id);
+		$old_zone = $this->get_zone ($id);
 
 		# delete mappings
-		try { $this->Database->deleteRow("firewallZoneMapping", "zoneId", $id); }
+		try { $this->Database->deleteRow ("firewallZoneMapping", "zoneId", $id); }
 		catch (Exception $e) {
-			$this->Log->write( "Firewall zone and mappings delete", "Failed to delete firewall zone mappfings of $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Log->write ("Firewall zone and mappings delete", "Failed to delete firewall zone mappfings of $old_zone->zone<hr>".$e->getMessage (), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 
 		# delete zone
-		try { $this->Database->deleteRow("firewallZones", "id", $id); }
+		try { $this->Database->deleteRow ("firewallZones", "id", $id); }
 		catch (Exception $e) {
-			$this->Log->write( "Firewall zone delete", "Failed to delete firewall zone $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Log->write ("Firewall zone delete", "Failed to delete firewall zone $old_zone->zone<hr>".$e->getMessage (), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone deleted", "Firewall zone ".$old_zone->zone." deleted<hr>".$this->array_to_log($old_subnet), 0, $this->User->username);
+		$this->Log->write ("Firewall zone deleted", "Firewall zone ".$old_zone->zone." deleted<hr>".$this->array_to_log ($old_subnet), 0, $this->User->username);
 
 		return true;
 	}
@@ -890,10 +890,10 @@ 
 		$values = $this->reformat_empty_array_fields ($values, null);
 
 		# execute based on action
-		if($action=="add")			{ return $this->mapping_add ($values); }
-		elseif($action=="edit")		{ return $this->mapping_edit ($values); }
-		elseif($action=="delete")	{ return $this->mapping_delete ($values['id']); }
-		else						{ return $this->Result->show("danger", _("Invalid action"), true); }
+		if ($action == "add") { return $this->mapping_add ($values); }
+		elseif ($action == "edit") { return $this->mapping_edit ($values); }
+		elseif ($action == "delete") { return $this->mapping_delete ($values['id']); }
+		else { return $this->Result->show ("danger", _ ("Invalid action"), true); }
 	}
 
 
@@ -906,17 +906,17 @@ 
 	 */
 	private function mapping_add ($values) {
 		# get the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# execute
-		try { $this->Database->insertObject("firewallZoneMapping", $values); }
+		try { $this->Database->insertObject ("firewallZoneMapping", $values); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone mapping created", "Failed to add new firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
+			$this->Log->write ("Firewall zone mapping created", "Failed to add new firewall zone mapping<hr>".$e->getMessage (), 2, $this->User->username);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone mapping created", "New firewall zone mapping created<hr>".$this->array_to_log($values), 0, $this->User->username);
+		$this->Log->write ("Firewall zone mapping created", "New firewall zone mapping created<hr>".$this->array_to_log ($values), 0, $this->User->username);
 		return true;
 	}
 
@@ -930,14 +930,14 @@ 
 	 */
 	private function mapping_edit ($values) {
 		# execute
-		try { $this->Database->updateObject("firewallZoneMapping", $values, "id"); }
+		try { $this->Database->updateObject ("firewallZoneMapping", $values, "id"); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone mapping edited", "Failed to edit firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
+			$this->Log->write ("Firewall zone mapping edited", "Failed to edit firewall zone mapping<hr>".$e->getMessage (), 2, $this->User->username);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone mapping edited", "Firewall zone mapping edited<hr>".$this->array_to_log($values), 0, $this->User->username);
+		$this->Log->write ("Firewall zone mapping edited", "Firewall zone mapping edited<hr>".$this->array_to_log ($values), 0, $this->User->username);
 		return true;
 	}
 
@@ -951,17 +951,17 @@ 
 	 */
 	private function mapping_delete ($id) {
 		# save old values
-		$old_mapping = $this->get_zone_mapping($id);
+		$old_mapping = $this->get_zone_mapping ($id);
 
 		# delete mapping
-		try { $this->Database->deleteRow("firewallZoneMapping", "id", $id); }
+		try { $this->Database->deleteRow ("firewallZoneMapping", "id", $id); }
 		catch (Exception $e) {
-			$this->Log->write( "Firewall zone mapping delete", "Failed to delete firewall zone mapping $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Log->write ("Firewall zone mapping delete", "Failed to delete firewall zone mapping $old_zone->zone<hr>".$e->getMessage (), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone mapping deleted", "Firewall zone mapping ".$old_zone->zone." deleted<hr>".$this->array_to_log($old_subnet), 0, $this->User->username);
+		$this->Log->write ("Firewall zone mapping deleted", "Firewall zone mapping ".$old_zone->zone." deleted<hr>".$this->array_to_log ($old_subnet), 0, $this->User->username);
 
 		return true;
 	}
@@ -975,26 +975,26 @@ 
 	 */
 	public function generate_subnet_object ($id) {
 		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($id);
+		$zone = $this->get_zone_subnet_info ($id);
 
 		# build the object name prefix
 		foreach ($firewallZoneSettings['pattern'] as $pattern) {
 			switch ($pattern) {
 				case 'patternIndicator':
-					if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-					else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+					if ($zone->indicator == 0) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+					else { 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
 					break;
 				case 'patternZoneName':
 					$firewallAddressObject = $firewallAddressObject.$zone->zone;
 					break;
 				case 'patternIPType':
 					# check if the subnet is v4 or v6
-					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+					if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 					}
 					break;
@@ -1005,27 +1005,27 @@ 
 		}
 
 		#build the object name
-		if ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'network' ) {
+		if ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'network') {
 			# check if the subnet is v4 or v6
-			if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-				$firewallAddressObject = $firewallAddressObject.$this->Subnets->transform_to_dotted($zone->subnet).'-'.$zone->mask;
-			} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-				$firewallAddressObject = $firewallAddressObject.str_replace(':',$firewallZoneSettings['separator'],$this->Subnets->transform_to_dotted($zone->subnet)).'-'.$zone->mask;
+			if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+				$firewallAddressObject = $firewallAddressObject.$this->Subnets->transform_to_dotted ($zone->subnet).'-'.$zone->mask;
+			} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+				$firewallAddressObject = $firewallAddressObject.str_replace (':', $firewallZoneSettings['separator'], $this->Subnets->transform_to_dotted ($zone->subnet)).'-'.$zone->mask;
 			}
-		} elseif ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'description' ) {
-			$firewallAddressObject = $firewallAddressObject.str_replace(' ',$firewallZoneSettings['separator'],strtolower($zone->subnetDescription));
+		} elseif ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'description') {
+			$firewallAddressObject = $firewallAddressObject.str_replace (' ', $firewallZoneSettings['separator'], strtolower ($zone->subnetDescription));
 		}
 
 		# get subnet information to compare against the changes
-		$subnet = (array) $this->Subnets->fetch_subnet("id",$id);
+		$subnet = (array) $this->Subnets->fetch_subnet ("id", $id);
 
 		# compare both versions, if there is no difference, just do nothing
-		if ($zone->firewallAddressObject != $firewallAddressObject ) {
+		if ($zone->firewallAddressObject != $firewallAddressObject) {
 			# update field in database
-			$values = array('id' => $id , 'firewallAddressObject' => $firewallAddressObject);
-			try { $this->Database->updateObject("subnets", $values, "id"); }
+			$values = array ('id' => $id, 'firewallAddressObject' => $firewallAddressObject);
+			try { $this->Database->updateObject ("subnets", $values, "id"); }
 			catch (Exception $e) {
-				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+				$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 				return false;
 			}
 			# clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
@@ -1033,7 +1033,7 @@ 
 			$subnet['firewallAddressObject'] = $firewallAddressObject;
 
 			# write changelog
-			$this->Log->write_changelog('subnet', 'edit', 'success', $subnet_old,$subnet);
+			$this->Log->write_changelog ('subnet', 'edit', 'success', $subnet_old, $subnet);
 
 			return ture;
 		}
@@ -1048,32 +1048,32 @@ 
 	 * @param mixed $dnsName
 	 * @return string
 	 */
-	public function generate_address_object ($id,$dnsName) {
+	public function generate_address_object ($id, $dnsName) {
 		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($id);
+		$zone = $this->get_zone_subnet_info ($id);
 
 		foreach ($firewallZoneSettings['pattern'] as $pattern) {
 			switch ($pattern) {
 				case 'patternIndicator':
-					if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-					else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+					if ($zone->indicator == 0) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+					else { 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
 					break;
 				case 'patternZoneName':
 					$firewallAddressObject = $firewallAddressObject.$zone->zone;
 					break;
 				case 'patternIPType':
 					# check if the subnet is v4 or v6
-					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+					if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 					}
 					break;
 				case 'patternHost':
-						$hostName = explode('.', $dnsName);
+						$hostName = explode ('.', $dnsName);
 						$firewallAddressObject = $firewallAddressObject.$hostName[0];
 					break;
 				case 'patternFQDN':
@@ -1096,7 +1096,7 @@ 
 	 * @param mixed $dnsName
 	 * @return void
 	 */
-	public function update_address_object ($subnetId,$IPId,$dnsName) {
+	public function update_address_object ($subnetId, $IPId, $dnsName) {
 		# Addresses object
 		$this->Addresses = new Addresses ($this->Database);
 
@@ -1104,30 +1104,30 @@ 
 		$address_old = $this->Addresses->fetch_address (null, $IPId);
 
 		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($subnetId);
+		$zone = $this->get_zone_subnet_info ($subnetId);
 
 		foreach ($firewallZoneSettings['pattern'] as $pattern) {
 			switch ($pattern) {
 				case 'patternIndicator':
-					if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-					else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+					if ($zone->indicator == 0) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+					else { 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
 					break;
 				case 'patternZoneName':
 					$firewallAddressObject = $firewallAddressObject.$zone->zone;
 					break;
 				case 'patternIPType':
 					# check if the subnet is v4 or v6
-					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+					if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 					}
 					break;
 				case 'patternHost':
-						$hostName = explode('.', $dnsName);
+						$hostName = explode ('.', $dnsName);
 						$firewallAddressObject = $firewallAddressObject.$hostName[0];
 					break;
 				case 'patternFQDN':
@@ -1141,10 +1141,10 @@ 
 
 		if ($address_old->firewallAddressObject != $firewallAddressObject) {
 			# update field in database
-			$values = array('id' => $IPId , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
-			try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
+			$values = array ('id' => $IPId, 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
+			try { $this->Database->updateObject ("ipaddresses", $values, "id", "subnetId"); }
 			catch (Exception $e) {
-				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+				$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 				return false;
 			}
 			# clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
@@ -1152,7 +1152,7 @@ 
 			$address->firewallAddressObject = $firewallAddressObject;
 
 			# write changelog
-			$this->Log->write_changelog('ip_addr', 'edit', 'success', (array)$address_old,(array)$address);
+			$this->Log->write_changelog ('ip_addr', 'edit', 'success', (array) $address_old, (array) $address);
 
 			return ture;
 		}
@@ -1172,14 +1172,14 @@ 
 		$this->Addresses = new Addresses ($this->Database);
 
 		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($subnetId);
+		$zone = $this->get_zone_subnet_info ($subnetId);
 
-		try { $ipaddresses = $this->Database->getObjectsQuery('SELECT id, dns_name FROM ipaddresses WHERE subnetId = ? ',$subnetId); }
+		try { $ipaddresses = $this->Database->getObjectsQuery ('SELECT id, dns_name FROM ipaddresses WHERE subnetId = ? ', $subnetId); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 		foreach ($ipaddresses as $ipaddress) {
@@ -1189,22 +1189,22 @@ 
 			foreach ($firewallZoneSettings['pattern'] as $key => $pattern) {
 				switch ($pattern) {
 					case 'patternIndicator':
-						if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-						else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+						if ($zone->indicator == 0) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+						else { 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
 						break;
 					case 'patternZoneName':
 						$firewallAddressObject = $firewallAddressObject.$zone->zone;
 						break;
 					case 'patternIPType':
 						# check if the subnet is v4 or v6
-						if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+						if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 							$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-						} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+						} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 							$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 						}
 						break;
 					case 'patternHost':
-							$hostName = explode('.', $ipaddress->dns_name);
+							$hostName = explode ('.', $ipaddress->dns_name);
 							$firewallAddressObject = $firewallAddressObject.$hostName[0];
 						break;
 					case 'patternFQDN':
@@ -1218,10 +1218,10 @@ 
 
 			if ($address_old->firewallAddressObject != $firewallAddressObject) {
 				# update field in database
-				$values = array('id' => $ipaddress->id , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
-				try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
+				$values = array ('id' => $ipaddress->id, 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
+				try { $this->Database->updateObject ("ipaddresses", $values, "id", "subnetId"); }
 				catch (Exception $e) {
-					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+					$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 					return false;
 				}
 				# clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
@@ -1229,7 +1229,7 @@ 
 				$address->firewallAddressObject = $firewallAddressObject;
 
 				# write changelog
-				$this->Log->write_changelog('ip_addr', 'edit', 'success', (array)$address_old,(array)$address);
+				$this->Log->write_changelog ('ip_addr', 'edit', 'success', (array) $address_old, (array) $address);
 			}
 
 			# unset firewallAddressObject to avoid chaining