phpipam / phpipam

functions/scripts/find_untranslated_files.php

Braces +3 added lines, -1 removed lines

@@ -72,7 +72,9 @@
 function get_string_between($string, $start, $end){
     $string = " ".$string;
     $ini = strpos($string,$start);
-    if ($ini == 0) return "";
+    if ($ini == 0) {
+        return "";
+    }
     $ini += strlen($start);
     $len = strpos($string,$end,$ini) - $ini;
     return substr($string,$ini,$len);

api/controllers/Responses.php

Braces +12 added lines, -5 removed lines

@@ -270,7 +270,9 @@ 
 		    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)) {
@@ -300,8 +302,9 @@ 
 	 * @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;
+	    foreach ( (array) $xmlObject as $index => $node ) {
+	    	        $out[$index] = ( is_object ( $node ) ) ? $this->xml_to_array ( $node ) : $node;
+	    }
 
 	    return $out;
 	}
@@ -315,14 +318,18 @@ 
 	 */
 	private function object_to_array ($obj) {
 		// object to array
-	    if(is_object($obj)) $obj = (array) $obj;
+	    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;
+	    else {
+	        $new = $obj;
+	    }
 	    return $new;
 	}
 

api/controllers/Addresses.php

Braces +4 added lines, -4 removed lines

@@ -216,11 +216,11 @@ 
 		$this->remap_keys ();
 
 		// first free
-		if($this->_params->id=="first_free")   {
+		if($this->_params->id=="first_free") {
     		$this->_params->ip_addr = $this->Addresses->get_first_available_address ($this->_params->subnetId, $this->Subnets);
     		// null
     		if ($this->_params->ip_addr==false)          { $this->Response->throw_exception(404, 'No free addresses found'); }
-            else                                         { $this->_params->ip_addr = $this->Addresses->transform_address ($this->_params->ip_addr, "dotted"); }
+    		else                                         { $this->_params->ip_addr = $this->Addresses->transform_address ($this->_params->ip_addr, "dotted"); }
 		}
 
 		// validate ip address - format, proper subnet, subnet/broadcast check
@@ -240,7 +240,7 @@ 
 		}
 		else {
     		//set result
-    		if($this->_params->id=="first_free")   {
+    		if($this->_params->id=="first_free") {
         	    return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/", "ip"=>$this->Addresses->transform_address ($this->_params->ip_addr, "dotted"));
     		}
     		else {
@@ -315,7 +315,7 @@ 
 		# execute update
 		if(!$this->Addresses->modify_address ($values))
 													{ $this->Response->throw_exception(500, "Failed to delete address"); }
-		else {
+													else {
 			//set result
 			return array("code"=>200, "data"=>"Address deleted");
 		}

api/controllers/Sections.php

Braces +3 added lines, -3 removed lines

@@ -189,7 +189,7 @@ 
 		# execute update
 		if(!$this->Sections->modify_section ("add", $values))
 														{ $this->Response->throw_exception(500, "Section create failed"); }
-		else {
+														else {
 			//set result
 			return array("code"=>201, "data"=>"Section created", "location"=>"/api/".$this->_params->app_id."/sections/".$this->Sections->lastInsertId."/");
 		}
@@ -218,7 +218,7 @@ 
 		# execute update
 		if(!$this->Sections->modify_section ("edit", $values))
 														{ $this->Response->throw_exception(500, "Section update failed"); }
-		else {
+														else {
 			//set result
 			return array("code"=>200, "data"=>NULL);
 		}
@@ -247,7 +247,7 @@ 
 		# execute update
 		if(!$this->Sections->modify_section ("delete", $values))
 														{ $this->Response->throw_exception(500, "Section delete failed"); }
-		else {
+														else {
 			//set result
 			return array("code"=>200, "data"=>NULL);
 		}

api/controllers/Common.php

Braces +6 added lines, -4 removed lines

@@ -244,10 +244,12 @@
 						$result->links[$m] = new stdClass ();
 						$result->links[$m]->rel  	= $link;
 						// self ?
-						if ($link=="self")
-						$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/";
-						else
-						$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/$link/";
+						if ($link=="self") {
+												$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/";
+						}
+						else {
+												$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/$link/";
+						}
 						$result->links[$m]->methods = $method;
 						// next
 						$m++;

api/controllers/Vrfs.php

Braces +3 added lines, -3 removed lines

@@ -163,7 +163,7 @@ 
 		# execute update
 		if(!$this->Admin->object_modify ("vrf", "add", "vrfId", $values))
 													{ $this->Response->throw_exception(500, "VRF creation failed"); }
-		else {
+													else {
 			//set result
 			return array("code"=>201, "data"=>"VRF created", "location"=>"/api/".$this->_params->app_id."/vrfs/".$this->Admin->lastId."/");
 		}
@@ -195,7 +195,7 @@ 
 		# execute update
 		if(!$this->Admin->object_modify ("vrf", "edit", "vrfId", $values))
 													{ $this->Response->throw_exception(500, "Vrf edit failed"); }
-		else {
+													else {
 			//set result
 			return array("code"=>200, "data"=>"VRF updated");
 		}
@@ -222,7 +222,7 @@ 
 		# execute delete
 		if(!$this->Admin->object_modify ("vrf", "delete", "vrfId", $values))
 													{ $this->Response->throw_exception(500, "Vrf delete failed"); }
-		else {
+													else {
 			// delete all references
 			$this->Admin->remove_object_references ("subnets", "vrfId", $this->_params->id);
 

api/controllers/Subnets.php

Braces +5 added lines, -4 removed lines

@@ -248,7 +248,7 @@ 
 			# execute update
 			if(!$this->Subnets->modify_subnet ("edit", $values))
 														{ $this->Response->throw_exception(500, 'Subnet update failed'); }
-			else {
+														else {
 				return array("code"=>200, "data"=>"Subnet updated");
 			}
 		}
@@ -288,7 +288,7 @@ 
 			# execute update
 			if(!$this->Subnets->modify_subnet ("delete", $values))
 														{ $this->Response->throw_exception(500, "Failed to delete subnet"); }
-			else {
+														else {
 				//set result
 				return array("code"=>200, "data"=>"Subnet deleted");
 			}
@@ -413,7 +413,8 @@ 
 		# fetch all addresses and calculate usage
 		if($slaves) {
 			$addresses = $this->Addresses->fetch_subnet_addresses_recursive ($this->_params->id, false);
-		} else {
+		}
+		else {
 			$addresses = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
 		}
 		// calculate
@@ -726,7 +727,7 @@ 
 		$this->settings = $this->Tools->fetch_object ("settings", "id", 1);
 
 		# get master subnet details for folder overrides
-		if($this->_params->masterSubnetId!=0)	{
+		if($this->_params->masterSubnetId!=0) {
 			$master_section = $this->Subnets->fetch_subnet(null, $this->_params->masterSubnetId);
 			if($master_section->isFolder==1)	{ $parent_is_folder = true; }
 			else								{ $parent_is_folder = false; }

api/controllers/Tools.php

Braces +10 added lines, -7 removed lines

@@ -268,7 +268,7 @@ 
 		# execute update
 		if(!$this->Admin->object_modify ($this->_params->id, "add", "", $values))
 													{ $this->Response->throw_exception(500, $this->_params->id." object creation failed"); }
-		else {
+													else {
 			//set result
 			return array("code"=>201, "data"=>$this->_params->id." object created", "location"=>"/api/".$this->_params->app_id."/tools/".$this->_params->id."/".$this->Admin->lastId."/");
 		}
@@ -325,7 +325,7 @@ 
 		# execute update
 		if(!$this->Admin->object_modify ($table_name, "edit",  $this->sort_key, $values))
 													{ $this->Response->throw_exception(500, $table_name." object edit failed"); }
-		else {
+													else {
 			//set result
 			return array("code"=>200, "data"=>$table_name." object updated");
 		}
@@ -355,14 +355,15 @@ 
 		# execute delete
 		if(!$this->Admin->object_modify ($this->_params->id, "delete",  $this->sort_key, $values))
 													{ $this->Response->throw_exception(500, $this->_params->id." object delete failed"); }
-		else {
+													else {
 			// set update field
 			if ($this->_params->id == "devices")	{ $update_field = "switch"; }
 			elseif ($this->_params->id == "ipTags")	{ $update_field = "state"; }
 
 			// delete all references
-			if (isset($update_field))
-			$this->Admin->remove_object_references ("ipaddresses", $update_field, $this->_params->id2);
+			if (isset($update_field)) {
+						$this->Admin->remove_object_references ("ipaddresses", $update_field, $this->_params->id2);
+			}
 
 			// set result
 			return array("code"=>200, "data"=>$this->_params->id." object deleted");
@@ -388,8 +389,10 @@ 
 	 */
 	private function validate_subcontroller () {
 		// not options
-		if($this->_params->controller !== "options")
-		if (!in_array($this->_params->id, @$this->subcontrollers))			{ $this->Response->throw_exception(400, "Invalid subcontroller"); }
+		if($this->_params->controller !== "options") {
+				if (!in_array($this->_params->id, @$this->subcontrollers))			{ $this->Response->throw_exception(400, "Invalid subcontroller");
+		}
+		}
 	}
 
 	/**

api/index.php

Braces +11 added lines, -8 removed lines

@@ -89,21 +89,23 @@ 
 
 
 	// append POST parameters if POST or PATCH
-	if($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH"){
+	if($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH") {
 		// if application tupe is JSON (application/json)
-        if($_SERVER['CONTENT_TYPE']=="application/json"){
+        if($_SERVER['CONTENT_TYPE']=="application/json") {
                 $rawPostData = file_get_contents('php://input');
                 $json = json_decode($rawPostData,true);
-                if(is_array($json))
-                $params = array_merge((array) $params, $json);
+                if(is_array($json)) {
+                                $params = array_merge((array) $params, $json);
+                }
                 $params = (object) $params;
         }
 		// if application tupe is XML (application/json)
-        elseif($_SERVER['CONTENT_TYPE']=="application/xml"){
+        elseif($_SERVER['CONTENT_TYPE']=="application/xml") {
                 $rawPostData = file_get_contents('php://input');
                 $xml = $Response->xml_to_array($rawPostData);
-                if(is_array($xml))
-                $params = array_merge((array) $params, $xml);
+                if(is_array($xml)) {
+                                $params = array_merge((array) $params, $xml);
+                }
                 $params = (object) $params;
         }
 		//if application type is default (application/x-www-form-urlencoded)
@@ -157,7 +159,8 @@ 
 	//check if the controller exists. if not, throw an exception
 	if( file_exists( dirname(__FILE__) . "/controllers/$controller_file.php") ) {
 		require( dirname(__FILE__) . "/controllers/$controller_file.php");
-	} else {
+	}
+	else {
 		$Response->throw_exception(400, 'invalid controller');
 	}