phpipam / phpipam

functions/functions.php

Braces +4 added lines, -4 removed lines

@@ -48,8 +48,7 @@ 
 	# database object
 	$Database 	= new Database_PDO;
 	# try to fetch settings
-	try { $settings = $Database->getObject("settings", 1); }
-	catch (Exception $e) { $settings = false; }
+	try { $settings = $Database->getObject("settings", 1); } catch (Exception $e) { $settings = false; }
 	if ($settings!==false) {
 		define(SETTINGS, json_encode($settings));
 	}
@@ -70,8 +69,9 @@ 
 	# set normal link array
 	$el = array("page", "section", "subnetId", "sPage", "ipaddrid");
 	// override for search
-	if ($l0=="tools" && $l1=="search")
-    $el = array("page", "section", "addresses", "subnets", "vlans", "ip");
+	if ($l0=="tools" && $l1=="search") {
+	    $el = array("page", "section", "addresses", "subnets", "vlans", "ip");
+	}
 
 	# set rewrite
 	if($User->settings->prettyLinks=="Yes") {

functions/scripts/pingCheck.php

Braces +5 added lines, -4 removed lines

@@ -89,7 +89,7 @@ 
 
 		$subnet_addresses = $Addresses->fetch_subnet_addresses ($s->id);
 		//set array for fping
-		if($Scan->icmp_type=="fping")	{
+		if($Scan->icmp_type=="fping") {
 			$subnets[] = array("id"=>$s->id, "cidr"=>$Subnets->transform_to_dotted($s->subnet)."/".$s->mask);
 		}
 		//save addresses
@@ -98,7 +98,7 @@ 
 				//ignore excludePing
 				if($a->excludePing!=1) {
 					//create different array for fping
-					if($Scan->icmp_type=="fping")	{
+					if($Scan->icmp_type=="fping") {
 						$addresses2[$s->id][$a->id] = array("id"=>$a->id, "ip_addr"=>$a->ip_addr, "description"=>$a->description, "dns_name"=>$a->dns_name, "subnetId"=>$a->subnetId, "lastSeenOld"=>$a->lastSeen, "lastSeen"=>$a->lastSeen);	//used for status check
 						$addresses[$s->id][$a->id]  = $a->ip_addr;																												//used for alive check
 					}
@@ -269,7 +269,7 @@ 
     // now offline, and diff > offline period, do checks
     elseif($change['lastSeenNew']==NULL && $deviceDiff >= (int) $statuses[1]) {
         // if not already reported
-        if ($deviceDiff <= ((int) $statuses[1] + $agentDiff))  {
+        if ($deviceDiff <= ((int) $statuses[1] + $agentDiff)) {
             $address_change[$k]['oldStatus'] = 0;
             $address_change[$k]['newStatus'] = 2;
         }
@@ -367,7 +367,8 @@ 
 		//ago
 		if(is_null($change['lastSeen']) || $change['lastSeen']=="0000-00-00 00:00:00") {
 			$ago	  = "never";
-		} else {
+		}
+		else {
 			$timeDiff = $now - strtotime($change['lastSeen']);
 			$ago 	  = $change['lastSeen']." (".$Result->sec2hms($timeDiff)." ago)";
 		}

functions/classes/class.Install.php

Braces +25 added lines, -25 removed lines

@@ -41,8 +41,7 @@ 
 		# set debugging
 		$this->set_db_params ();
 		# Log object
-		try { $this->Database->connect(); }
-		catch ( Exception $e ) {}
+		try { $this->Database->connect(); } catch ( Exception $e ) {}
 	}
 
 
@@ -109,8 +108,7 @@ 
 	 	# set query
 	    $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);}
 	}
 
 	/**
@@ -123,8 +121,7 @@ 
 	 	# set query
 	    $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);}
 	}
 
 	/**
@@ -137,8 +134,7 @@ 
 	 	# set query
 	    $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);}
 	}
 
 	/**
@@ -158,14 +154,11 @@ 
 	    foreach($queries as $q) {
 		    //length check
 		    if (strlen($q)>0) {
-				try { $this->Database_root->runQuery($q.";"); }
-				catch (Exception $e) {
+				try { $this->Database_root->runQuery($q.";"); } catch (Exception $e) {
 					//unlock tables
-					try { $this->Database_root->runQuery("UNLOCK TABLES;"); }
-					catch (Exception $e) {}
+					try { $this->Database_root->runQuery("UNLOCK TABLES;"); } catch (Exception $e) {}
 					//drop database
-					try { $this->Database_root->runQuery("drop database if exists `". $this->db['name'] ."`;"); }
-					catch (Exception $e) {
+					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);
 					}
 					//print error
@@ -201,8 +194,7 @@ 
 	 */
 	public function check_db_connection ($redirect = false) {
 		# try to connect
-		try { $res = $this->Database->connect(); }
-		catch (Exception $e) 	{
+		try { $res = $this->Database->connect(); } catch (Exception $e) 	{
 			$this->exception = $e->getMessage();
 			# redirect ?
 			if($redirect == true)  	{ $this->redirect_to_install (); }
@@ -223,10 +215,21 @@ 
 		# 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;
 	}
@@ -303,8 +306,7 @@ 
 	 * @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;
 	}
 
@@ -317,8 +319,7 @@ 
 	 * @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;
 	}
 
@@ -378,8 +379,7 @@ 
 	    # execute all queries
 	    foreach($queries as $query) {
     	    if (strlen($query)>5) {
-    			try { $this->Database->runQuery($query); }
-    			catch (Exception $e) {
+    			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 );

functions/classes/class.Result.php

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		$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); }

functions/classes/class.Radius.php

Braces +55 added lines, -84 removed lines

@@ -330,11 +330,10 @@ 
 
     function GetLastError()
     {
-        if (0 < $this->_last_error_code)
-        {
+        if (0 < $this->_last_error_code) {
             return $this->_last_error_message.' ('.$this->_last_error_code.')';
-        } else
-        {
+        }
+        else {
             return '';
         }
     }
@@ -387,8 +386,7 @@ 
     function SetUsername($username = '')
     {
         $temp_username = $username;
-        if (false === strpos($temp_username, '@'))
-        {
+        if (false === strpos($temp_username, '@')) {
             $temp_username .= $this->_radius_suffix;
         }
 
@@ -403,8 +401,7 @@ 
         $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));
         }
 
@@ -432,11 +429,10 @@ 
 
     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);
-        } else
-        {
+        }
+        else {
             $this->_nas_ip_address = gethostbyname(isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '0.0.0.0');
         }
         $this->SetAttribute(4, $this->_nas_ip_address);
@@ -452,8 +448,7 @@ 
 
     function SetUdpTimeout($udp_timeout = 5)
     {
-        if (intval($udp_timeout) > 0)
-        {
+        if (intval($udp_timeout) > 0) {
             $this->_udp_timeout = intval($udp_timeout);
         }
     }
@@ -468,8 +463,7 @@ 
 
     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);
         }
     }
@@ -477,8 +471,7 @@ 
 
     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);
         }
     }
@@ -499,21 +492,19 @@ 
     function GetReadableReceivedAttributes()
     {
         $readable_attributes = '';
-        if (isset($this->_attributes_received))
-        {
+        if (isset($this->_attributes_received)) {
             foreach ($this->_attributes_received as $one_received_attribute)
             {
                 $attributes_info = $this->GetAttributesInfo($one_received_attribute[0]);
                 $readable_attributes .= $attributes_info[0].": ";
-                if (26 == $one_received_attribute[0])
-                {
+                if (26 == $one_received_attribute[0]) {
                     $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];
                     }
-                } else
-                {
+                }
+                else {
                     $readable_attributes .= $one_received_attribute[1];
                 }
                 $readable_attributes .= "<br />\n";
@@ -528,8 +519,7 @@ 
         $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;
             }
@@ -540,11 +530,10 @@ 
 
     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)];
-        } else
-        {
+        }
+        else {
             return '';
         }
     }
@@ -552,11 +541,10 @@ 
 
     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)];
-        } else
-        {
+        }
+        else {
             return array('', '');
         }
     }
@@ -564,8 +552,7 @@ 
 
     function DebugInfo($debug_info)
     {
-        if ($this->_debug_mode)
-        {
+        if ($this->_debug_mode) {
 	        //save debugging
 	        $this->debug_text[] = date('Y-m-d H:i:s').' DEBUG: '.$debug_info;
         }
@@ -577,8 +564,7 @@ 
         $attribute_index = -1;
         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;
             }
@@ -586,10 +572,8 @@ 
 
         $temp_attribute = NULL;
 
-        if (isset($this->_attributes_info[$type]))
-        {
-            switch ($this->_attributes_info[$type][1])
-            {
+        if (isset($this->_attributes_info[$type])) {
+            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;
                     break;
@@ -611,12 +595,11 @@ 
             }
         }
 
-        if ($attribute_index > -1)
-        {
+        if ($attribute_index > -1) {
             $this->_attributes_to_send[$attribute_index] = $temp_attribute;
             $additional_debug = 'Modified';
-        } else
-        {
+        }
+        else {
             $this->_attributes_to_send[] = $temp_attribute;
             $additional_debug = 'Added';
         }
@@ -629,10 +612,8 @@ 
     {
         $attribute_value = NULL;
 
-        if (isset($this->_attributes_info[$attribute_format]))
-        {
-            switch ($this->_attributes_info[$attribute_format][1])
-            {
+        if (isset($this->_attributes_info[$attribute_format])) {
+            switch ($this->_attributes_info[$attribute_format][1]) {
                 case 'T': // Text, 1-253 octets containing UTF-8 encoded ISO 10646 characters (RFC 2279).
                     $attribute_value = $attribute_raw_value;
                     break;
@@ -690,26 +671,22 @@ 
 
         $this->SetPacketCodeToSend(1); // Access-Request
 
-        if (0 < strlen($username))
-        {
+        if (0 < strlen($username)) {
             $this->SetUsername($username);
         }
 
-        if (0 < strlen($password))
-        {
+        if (0 < strlen($password)) {
             $this->SetPassword($password);
         }
 
-        if ($state !== NULL)
-        {
+        if ($state !== NULL) {
             $this->SetAttribute(24, $state);
-        } else
-        {
+        }
+        else {
             $this->SetAttribute(6, 1); // 1=Login
         }
 
-        if (intval($udp_timeout) > 0)
-        {
+        if (intval($udp_timeout) > 0) {
             $this->SetUdpTimeout($udp_timeout);
         }
 
@@ -732,23 +709,21 @@ 
 
         $_socket_to_server = socket_create(AF_INET, SOCK_DGRAM, 17); // UDP packet = 17
 
-        if ($_socket_to_server === FALSE)
-        {
+        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))
-        {
+        }
+        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))
-        {
+        }
+        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);
-        } else
-        {
+        }
+        else {
             $this->DebugInfo('<b>Packet type '.$this->_radius_packet_to_send.' ('.$this->GetRadiusPacketInfo($this->_radius_packet_to_send).')'.' sent</b>');
-            if ($this->_debug_mode)
-            {
+            if ($this->_debug_mode) {
                 $readable_attributes = '';
                 foreach ($this->_attributes_to_send as $one_attribute_to_send)
                 {
@@ -762,10 +737,8 @@ 
 
             $received_packet = chr(0);
 
-            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 (!(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 (FALSE === ($received_packet = @socket_read($_socket_to_server, 1024))) {
                         // @ used, than no error is displayed if the connection is closed by the remote host
                     {
@@ -773,13 +746,13 @@ 
                     }
                         $this->_last_error_code    = socket_last_error();
                         $this->_last_error_message = socket_strerror($this->_last_error_code);
-                    } else
-                    {
+                    }
+                    else {
                         socket_close($_socket_to_server);
                     }
                 }
-            } else
-            {
+            }
+            else {
                 socket_close($_socket_to_server);
             }
         }
@@ -788,8 +761,7 @@ 
 
         $this->DebugInfo('<b>Packet type '.$this->_radius_packet_received.' ('.$this->GetRadiusPacketInfo($this->_radius_packet_received).')'.' received</b>');
 
-        if ($this->_radius_packet_received > 0)
-        {
+        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);
@@ -804,15 +776,14 @@ 
                 $attribute_value = $this->DecodeAttribute($attribute_raw_value, $attribute_type);
 
                 $attribute_info = $this->GetAttributesInfo($attribute_type);
-                if (26 == $attribute_type)
-                {
+                if (26 == $attribute_type) {
                     $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]);
                     }
-                } else
-                {
+                }
+                else {
                     $this->DebugInfo('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', value <em>'.$attribute_value.'</em>');
                 }
 

functions/classes/class.Thread.php

Braces +18 added lines, -8 removed lines

@@ -133,10 +133,13 @@ 
     public function isAlive() {
         $pid = pcntl_waitpid( $this->pid, $status, WNOHANG );
 
-        if ($pid === 0) { // child is still alive
+        if ($pid === 0) {
+// child is still alive
             return true;
-        } else {
-            if (pcntl_wifexited($status) && $this->exitCode == -1) { // normal exit
+        }
+        else {
+            if (pcntl_wifexited($status) && $this->exitCode == -1) {
+// normal exit
                 $this->exitCode = pcntl_wexitstatus($status);
             }
             return false;
@@ -196,12 +199,17 @@ 
 		$results = null;
 		$pid = pcntl_fork();
 
-		if( $pid == -1 ) { //error forking, no child is created
+		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
+		}
+		else if ( $pid ) {
+// parent
 			$this->pid = $pid;
 
-		} else { // child
+		}
+		else {
+// child
 			$this->pid = posix_getpid();//pid (child)
 			$this->ppid = posix_getppid();//pid (parent)
 
@@ -209,13 +217,15 @@ 
 			$array_args = func_get_args();
 			if ( !empty( $array_args ) ) {
 				$results = call_user_func_array( $this->runnable, $array_args );
-			}else{
+			}
+			else {
 				$results = call_user_func( $this->runnable );
 			}
 
 			$pipe = "/tmp/pipe_".$this->pid;//pid is known by parent
 
-			if(!file_exists($pipe)) {//child talks to parent using this pipe
+			if(!file_exists($pipe)) {
+//child talks to parent using this pipe
 				umask(0);
 				posix_mkfifo($pipe, 0600);
 			}

functions/classes/class.Mail.php

Braces +5 added lines, -3 removed lines

@@ -87,8 +87,9 @@ 
 		//set smtp
 		$this->Php_mailer->isSMTP();
 		//tls, ssl?
-		if ($this->mail_settings->msecure != 'none')
-		$this->Php_mailer->SMTPSecure = $this->mail_settings->msecure == 'ssl' ? 'ssl' : 'tls';
+		if ($this->mail_settings->msecure != 'none') {
+				$this->Php_mailer->SMTPSecure = $this->mail_settings->msecure == 'ssl' ? 'ssl' : 'tls';
+		}
 		//server
 		$this->Php_mailer->Host = $this->mail_settings->mserver;
 		$this->Php_mailer->Port = $this->mail_settings->mport;
@@ -109,7 +110,8 @@ 
 			$this->Php_mailer->SMTPAuth = true;
 			$this->Php_mailer->Username = $this->mail_settings->muser;
 			$this->Php_mailer->Password = $this->mail_settings->mpass;
-		} else {
+		}
+		else {
 			$this->Php_mailer->SMTPAuth = false;
 		}
 	}

functions/classes/class.FirewallZones.php

Braces +63 added lines, -60 removed lines

@@ -50,7 +50,8 @@ 
 		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
 		if ($firewallZoneSettings['padding'] == 'on') {
 			return str_pad(dechex($zone),$firewallZoneSettings['zoneLength'],"0",STR_PAD_LEFT);
-		} else {
+		}
+		else {
 			return dechex($zone);
 		}
 
@@ -70,9 +71,11 @@ 
 		# 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 ) {
+		}
+		elseif($firewallZoneSettings['zoneGenerator'] == 2 ) {
 			return $this->validate_text_zone_name ($values);
-		} else {
+		}
+		else {
 			return $this->Result->show("danger", _("Invalid generator ID"), true);
 		}
 	}
@@ -89,8 +92,7 @@ 
 	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;');}
-		catch (Exception $e) {
+		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);
 			return false;
 		}
@@ -102,17 +104,19 @@ 
 				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(strlen(dechex($zoneName)) > $zoneLength){
+				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);
 				}
 			}
 
-		} else {
+		}
+		else {
 			# set the initial zone name to "1"
 			$zoneName = 1;
 		}
@@ -133,17 +137,17 @@ 
 		# get settings
 		$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 {
+		}
+		else {
 			$query = 'SELECT zone FROM firewallZones WHERE zone = ?;';
 			$params = $values[0];
 		}
 
 		# execute
-		try { $uniqueZone = $this->Database->getObjectsQuery($query,$params);}
-		catch (Exception $e) {
+		try { $uniqueZone = $this->Database->getObjectsQuery($query,$params);} catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
 		}
@@ -152,7 +156,8 @@ 
 
 			$this->Result->show("danger", _("Error: The zone name ".$zone." is not unique!"), false);
 
-		} else {
+		}
+		else {
 			# set the initial zone name to "1"
 			$zoneName = $values[0];
 		}
@@ -213,11 +218,11 @@ 
 		# modify the zone output values
 		foreach ($mappings as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($mappings[$key]->generator == 1 ){
+			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);
@@ -287,11 +292,11 @@ 
 		# modify the zone output values
 		foreach ($mapping as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($mapping[$key]->generator == 1 ){
+			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);
@@ -365,11 +370,11 @@ 
 			# modify the zone output values
 			foreach ($info as $key => $val) {
 				# transform the zone name from decimal to hex
-				if($info[$key]->generator == 1 ){
+				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);
@@ -416,11 +421,11 @@ 
 		# modify the zone output values
 		foreach ($zones as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($zones[$key]->generator == 1 ){
+			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);
@@ -476,11 +481,11 @@ 
 		# modify the zone output values
 		foreach ($zone as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($zone[$key]->generator == 1 ){
+			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);
@@ -545,7 +550,8 @@ 
 
 				if (!$network->subnetIsFolder) {
 					print '<td>'.$this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</td>';
-				} else{
+				}
+				else {
 					print '<td>Folder '.$network->subnetDescription.'</td>';
 				}
 				print '<td>'.$network->vlan.$network->vlanName.'</td>';
@@ -597,7 +603,8 @@ 
 
 			if ($network->subnetIsFolder == 1 ) {
 				print 'Folder: '.$network->subnetDescription;
-			} else {
+			}
+			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>';	}
@@ -626,7 +633,8 @@ 
 		if(!sizeof($networkInformation)>0 ) {
 			# return dummy value
 			return 'success';
-		} else {
+		}
+		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);
 			return false;
 		}
@@ -659,7 +667,8 @@ 
 
 			# throw exception
 			catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-		} else {
+		}
+		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);
 			return false;
 		}
@@ -686,7 +695,8 @@ 
 		# return dummy value or false
 		if ($deleteRow) {
 			return 'success';
-		} else {
+		}
+		else {
 			return false;
 		}
 	}
@@ -738,16 +748,14 @@ 
 		$values['length'] = $firewallZoneSettings['zoneLength'];
 
 		# execute insert
-		try { $this->Database->insertObject("firewallZones", $values); }
-		catch (Exception $e) {
+		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);
 			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']);}
-		catch (Exception $e) {
+		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);
 			return false;
 		}
@@ -756,8 +764,7 @@ 
 			foreach ($network as $subnetId) {
 				$values = array('zoneId' => $lastId[0]->id, 'subnetId' => $subnetId);
 				# add the network bindings if there are any
-				try { $this->Database->insertObject("firewallZoneSubnet", $values); }
-				catch (Exception $e) {
+				try { $this->Database->insertObject("firewallZoneSubnet", $values); } catch (Exception $e) {
 					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 					return false;
 				}
@@ -779,8 +786,7 @@ 
 	 */
 	private function zone_edit ($values) {
 		# execute
-		try { $this->Database->updateObject("firewallZones", $values, "id"); }
-		catch (Exception $e) {
+		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);
 			return false;
@@ -803,16 +809,14 @@ 
 		$old_zone = $this->get_zone($id);
 
 		# delete mappings
-		try { $this->Database->deleteRow("firewallZoneMapping", "zoneId", $id); }
-		catch (Exception $e) {
+		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);
 			return false;
 		}
 
 		# delete zone
-		try { $this->Database->deleteRow("firewallZones", "id", $id); }
-		catch (Exception $e) {
+		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);
 			return false;
@@ -859,8 +863,7 @@ 
 		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
 
 		# execute
-		try { $this->Database->insertObject("firewallZoneMapping", $values); }
-		catch (Exception $e) {
+		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);
 			return false;
@@ -880,8 +883,7 @@ 
 	 */
 	private function mapping_edit ($values) {
 		# execute
-		try { $this->Database->updateObject("firewallZoneMapping", $values, "id"); }
-		catch (Exception $e) {
+		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);
 			return false;
@@ -904,8 +906,7 @@ 
 		$old_mapping = $this->get_zone_mapping($id);
 
 		# delete mapping
-		try { $this->Database->deleteRow("firewallZoneMapping", "id", $id); }
-		catch (Exception $e) {
+		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);
 			return false;
@@ -944,7 +945,8 @@ 
 					# 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.$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;
@@ -959,10 +961,12 @@ 
 			# 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)) {
+			}
+			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' ) {
+		}
+		elseif ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'description' ) {
 			$firewallAddressObject = $firewallAddressObject.str_replace(' ',$firewallZoneSettings['separator'],strtolower($zone->subnetDescription));
 		}
 
@@ -973,8 +977,7 @@ 
 		if ($zone->firewallAddressObject != $firewallAddressObject ) {
 			# update field in database
 			$values = array('id' => $id , 'firewallAddressObject' => $firewallAddressObject);
-			try { $this->Database->updateObject("subnets", $values, "id"); }
-			catch (Exception $e) {
+			try { $this->Database->updateObject("subnets", $values, "id"); } catch (Exception $e) {
 				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 				return false;
 			}
@@ -1018,7 +1021,8 @@ 
 					# 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.$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;
@@ -1072,7 +1076,8 @@ 
 					# 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.$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;
@@ -1092,8 +1097,7 @@ 
 		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"); }
-			catch (Exception $e) {
+			try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); } catch (Exception $e) {
 				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 				return false;
 			}
@@ -1127,8 +1131,7 @@ 
 		# fetch zone informations
 		$zone = $this->get_zone_subnet_info($subnetId);
 
-		try { $ipaddresses = $this->Database->getObjectsQuery('SELECT id, dns_name FROM ipaddresses WHERE subnetId = ? ',$subnetId); }
-		catch (Exception $e) {
+		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);
 			return false;
 		}
@@ -1149,7 +1152,8 @@ 
 						# 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.$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;
@@ -1169,8 +1173,7 @@ 
 			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"); }
-				catch (Exception $e) {
+				try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); } catch (Exception $e) {
 					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 					return false;
 				}

functions/classes/class.PDO.php

Braces +76 added lines, -33 removed lines

@@ -312,9 +312,15 @@ 
 	 * @return void
 	 */
 	public function __construct($username = null, $password = null, $charset = null, $ssl = null) {
-		if (isset($username)) $this->username = $username;
-		if (isset($password)) $this->password = $password;
-		if (isset($charset))  $this->charset = $charset;
+		if (isset($username)) {
+		    $this->username = $username;
+		}
+		if (isset($password)) {
+		    $this->password = $password;
+		}
+		if (isset($charset)) {
+		    $this->charset = $charset;
+		}
 		# ssl
 		if ($ssl) {
 			$this->ssl = $ssl;
@@ -332,9 +338,11 @@ 
 	public static function toDate($date = null) {
 		if (is_int($date)) {
 			return date('Y-m-d H:i:s', $date);
-		} else if (is_string($date)) {
+		}
+		else if (is_string($date)) {
 			return date('Y-m-d H:i:s', strtotime($date));
-		} else {
+		}
+		else {
 			return date('Y-m-d H:i:s');
 		}
 	}
@@ -419,12 +427,15 @@ 
 		if ($len>1) {
 			if ($str[0] == "'" && $str[$len-1] == "'") {
 				return substr($str, 1, -1);
-			} else if ($str[0] == "'") {
+			}
+			else if ($str[0] == "'") {
 				return substr($str, 1);
-			} else if ($str[$len-1] == "'") {
+			}
+			else if ($str[$len-1] == "'") {
 				return substr($str, 0, -1);
 			}
-		} else if ($len>0) {
+		}
+		else if ($len>0) {
 			if ($str[0] == "'") {
 				return '';
 			}
@@ -463,7 +474,9 @@ 
 	 * @return void
 	 */
 	public function runQuery($query, $values = array()) {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		$statement = $this->pdo->prepare($query);
 		//debuq
@@ -480,7 +493,9 @@ 
 	 * @return void
 	 */
 	public function escape($str) {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		return $this->unquote_outer($this->pdo->quote((string)$str));
 	}
@@ -493,7 +508,9 @@ 
 	 * @return void
 	 */
 	public function numObjects($tableName) {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		$tableName = $this->escape($tableName);
 		$statement = $this->pdo->prepare('SELECT COUNT(*) as `num` FROM `'.$tableName.'`;');
@@ -515,7 +532,9 @@ 
 	 * @return void
 	 */
 	public function numObjectsFilter($tableName, $method, $value) {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		$tableName = $this->escape($tableName);
 		$statement = $this->pdo->prepare('SELECT COUNT(*) as `num` FROM `'.$tableName.'` where `'.$method.'`=?;');
@@ -540,7 +559,9 @@ 
 	 * @return void
 	 */
 	public function updateObject($tableName, $obj, $primarykey = 'id', $primarykey2 = null) {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		$obj = (array)$obj;
 
@@ -575,10 +596,12 @@ 
 		$preparedParamStr = implode(',', $preparedParamArr);
 
 		//primary key 2?
-		if(!is_null($primarykey2))
-		$statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=? AND `' . $primarykey2 . '`=?;');
-		else
-		$statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=?;');
+		if(!is_null($primarykey2)) {
+				$statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=? AND `' . $primarykey2 . '`=?;');
+		}
+		else {
+				$statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=?;');
+		}
 
 		//merge the parameters and values
 		$paramValues = array_merge(array_values($obj), $objId);
@@ -627,7 +650,9 @@ 
 	 * @return void
 	 */
 	public function insertObject($tableName, $obj, $raw = false, $replace = false) {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		$obj = (array)$obj;
 
@@ -654,7 +679,8 @@ 
 
 		if ($replace) {
 			$statement = $this->pdo->prepare('REPLACE INTO `' . $tableName . '` (' . $preparedParamsStr . ') VALUES (' . $preparedValuesStr . ');');
-		} else {
+		}
+		else {
 			$statement = $this->pdo->prepare('INSERT INTO `' . $tableName . '` (' . $preparedParamsStr . ') VALUES (' . $preparedValuesStr . ');');
 		}
 
@@ -697,7 +723,9 @@ 
 	 * @return void
 	 */
 	public function getObjects($tableName, $sortField = 'id', $sortAsc = true, $numRecords = null, $offset = 0, $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		$sortStr = '';
 		if (!$sortAsc) {
@@ -711,7 +739,8 @@ 
 		if ($numRecords === null) {
 			//get all (no limit)
 			$statement = $this->pdo->query('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.';');
-		} else {
+		}
+		else {
 			//get a limited range of objects
 			$statement = $this->pdo->query('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.' LIMIT '.$numRecords.' OFFSET '.$offset.';');
 		}
@@ -738,7 +767,9 @@ 
 	 * @return void
 	 */
 	public function getObjectsQueryIncremental($query = null, $values = array(), $callback = null) {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		$statement = $this->pdo->prepare($query);
 
@@ -770,7 +801,9 @@ 
 	 * @return void
 	 */
 	public function getObjectsQuery($query = null, $values = array(), $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		$statement = $this->pdo->prepare($query);
 
@@ -799,7 +832,9 @@ 
 	 * @return void
 	 */
 	public function getObject($tableName, $id = null, $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 		$id = intval($id);
 
 		//has a custom query been provided?
@@ -809,7 +844,8 @@ 
 		if ($id !== null) {
 			$statement = $this->pdo->prepare('SELECT * FROM `'.$tableName.'` WHERE `id`=? LIMIT 1;');
 			$statement->bindParam(1, $id, \PDO::PARAM_INT);
-		} else {
+		}
+		else {
 			$statement = $this->pdo->prepare('SELECT * FROM `'.$tableName.'` LIMIT 1;');
 		}
 
@@ -822,7 +858,8 @@ 
 
 		if ($resultObj === false) {
 			return null;
-		} else {
+		}
+		else {
 			return $resultObj;
 		}
 	}
@@ -837,7 +874,9 @@ 
 	 * @return void
 	 */
 	public function getObjectQuery($query = null, $values = array(), $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
+		if (!$this->isConnected()) {
+		    $this->connect();
+		}
 
 		$statement = $this->pdo->prepare($query);
 		//debuq
@@ -848,7 +887,8 @@ 
 
 		if ($resultObj === false) {
 			return null;
-		} else {
+		}
+		else {
 			return $resultObj;
 		}
 	}
@@ -868,7 +908,8 @@ 
 		if (is_object($obj)) {
 			$obj = (array)$obj;
 			return reset($obj);
-		} else {
+		}
+		else {
 			return null;
 		}
 	}
@@ -975,10 +1016,12 @@ 
 		$field = $this->escape($field);
 
 		//multiple
-		if(!is_null($field2))
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=? and `'.$field2.'`=?;', array($value, $value2));
-		else
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=?;', array($value));
+		if(!is_null($field2)) {
+				return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=? and `'.$field2.'`=?;', array($value, $value2));
+		}
+		else {
+				return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=?;', array($value));
+		}
 	}
 
 	/**