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);

Spacing +21 added lines, -21 removed lines

@@ -7,50 +7,50 @@ 
  */
 
 // only from cli
-if (php_sapi_name() != "cli")	{ die("Cli only!"); }
+if (php_sapi_name () != "cli") { die("Cli only!"); }
 
 
 // search for all translated words and put them to array
-$untranslated = explode("\n",shell_exec("cd ".dirname(__FILE__)."/../../ && grep -r '_(' * "));
+$untranslated = explode ("\n", shell_exec ("cd ".dirname (__FILE__)."/../../ && grep -r '_(' * "));
 // loop and search
 foreach ($untranslated as $u) {
 	// find string
-	$str = get_string_between($u, "_('", "')");
+	$str = get_string_between ($u, "_('", "')");
 	// remove "" and '
-	$str = trim($str, "',\"");
+	$str = trim ($str, "',\"");
 	// search for invalud content and remove
-	if (substr($str, 0, 1)!="$") {
+	if (substr ($str, 0, 1) != "$") {
 		$all_translations[] = $str;
 	}
 
 	// find string
-	$str = get_string_between($u, '_("', '")');
+	$str = get_string_between ($u, '_("', '")');
 	// remove "" and '
-	$str = trim($str, "',\"");
+	$str = trim ($str, "',\"");
 	// search for invalud content and remove
-	if (substr($str, 0, 1)!="$") {
+	if (substr ($str, 0, 1) != "$") {
 		$all_translations[] = $str;
 	}
 }
 //unique
-$all_translations = array_unique($all_translations);
+$all_translations = array_unique ($all_translations);
 
 
 // search all existing translations
-$untranslated = explode("\n",shell_exec("cd ".dirname(__FILE__)."/../../ && more functions/locale/en/LC_MESSAGES/phpipam.po"));
+$untranslated = explode ("\n", shell_exec ("cd ".dirname (__FILE__)."/../../ && more functions/locale/en/LC_MESSAGES/phpipam.po"));
 // loop and create
 foreach ($untranslated as $u) {
 	// search for string
-	if (substr($u, 0, 7)=='msgid "') {
-		$u = str_replace("msgid ", "", $u);
-		$u = trim($u, '"');
+	if (substr ($u, 0, 7) == 'msgid "') {
+		$u = str_replace ("msgid ", "", $u);
+		$u = trim ($u, '"');
 		$translated[] = $u;
 	}
 }
 
 // remove existing from unique
 foreach ($all_translations as $tr) {
-	if (!in_array($tr, $translated)) {
+	if (!in_array ($tr, $translated)) {
 		$new[] = $tr;
 	}
 }
@@ -61,20 +61,20 @@ 
 	$text[] = "msgstr \"\"\n";
 }
 // join text
-$text = implode("\n",$text);
+$text = implode ("\n", $text);
 
 
 // output changes
-print_r($text);
+print_r ($text);
 
 
 // returns string between 2 separators
-function get_string_between($string, $start, $end){
+function get_string_between ($string, $start, $end) {
     $string = " ".$string;
-    $ini = strpos($string,$start);
+    $ini = strpos ($string, $start);
     if ($ini == 0) return "";
-    $ini += strlen($start);
-    $len = strpos($string,$end,$ini) - $ini;
-    return substr($string,$ini,$len);
+    $ini += strlen ($start);
+    $len = strpos ($string, $end, $ini) - $ini;
+    return substr ($string, $ini, $len);
 }
 ?>
\ No newline at end of file

upgrade/index.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		Make sure BASE directive is set for your installation. This is used to properly detect phpIPAM directory. It must be set in config.php and in .htaccess
 
 		<div class="well" style="padding:5px;margin-top:5px;">
-		Detected BASE: <?php print str_replace("upgrade/", "", $_SERVER['REQUEST_URI']);  ?>
+		Detected BASE: <?php print str_replace ("upgrade/", "", $_SERVER['REQUEST_URI']); ?>
 		</div>
 
 		<h4>2.) Enable mod_rewrite</h4>

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;
 	}
 

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/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");
 		}

Spacing +77 added lines, -77 removed lines

@@ -5,7 +5,7 @@ 
  *
  *
  */
-class Addresses_controller extends Common_api_functions  {
+class Addresses_controller extends Common_api_functions {
 
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * @param class $Tools
 	 * @param mixed $params		// post/get values
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		$this->Response = $Response;
 		// init required objects
@@ -132,16 +132,16 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/addresses/", 	"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/addresses/{id}/","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."/addresses/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/".$this->_params->app_id."/addresses/{id}/", "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);
 	}
 
 
@@ -165,24 +165,24 @@ 
 	 */
 	public function GET () {
 		// subnet Id > read all addresses in subnet
-		if($this->_params->id=="custom_fields") {
+		if ($this->_params->id == "custom_fields") {
 			// check result
-			if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-			else										{ return array("code"=>200, "data"=>$this->custom_fields); }
+			if (sizeof ($this->custom_fields) == 0) { $this->Response->throw_exception (404, 'No custom fields defined'); }
+			else { return array ("code"=>200, "data"=>$this->custom_fields); }
 		}
 		// tags
-		elseif($this->_params->id=="tags") {
+		elseif ($this->_params->id == "tags") {
 			// validate
 			$this->validate_tag ();
 			// all addresses with tag
-			if (@$this->_params->id3=="addresses") {
+			if (@$this->_params->id3 == "addresses") {
 				// fetch
 				$result = $this->Tools->fetch_multiple_objects ("ipaddresses", "state", $this->_params->id2);
 
 				// filter by subnetId
-				if ($result!==false) {
-					if(isset($this->_params->subnetId)) {
-						if (is_numeric($this->_params->subnetId)) {
+				if ($result !== false) {
+					if (isset($this->_params->subnetId)) {
+						if (is_numeric ($this->_params->subnetId)) {
 							// filter
 							foreach ($result as $k=>$v) {
 								if ($v->subnetId != $this->_params->subnetId) {
@@ -190,7 +190,7 @@ 
 								}
 							}
 							// any left
-							if (sizeof($result)==0) {
+							if (sizeof ($result) == 0) {
 								$result = false;
 							}
 						}
@@ -198,34 +198,34 @@ 
 				}
 
 				// result
-				if($result===false)						{ $this->Response->throw_exception(404, 'No addresses found'); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, false)); }
+				if ($result === false) { $this->Response->throw_exception (404, 'No addresses found'); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, false)); }
 			}
 			// tags
 			else {
 				// fetch all by tag
-				if(isset($this->_params->id2)) {
+				if (isset($this->_params->id2)) {
 					// numeric
-					if(is_numeric($this->_params->id2)) { $result = $this->Tools->fetch_object ("ipTags", "id", $this->_params->id2); }
+					if (is_numeric ($this->_params->id2)) { $result = $this->Tools->fetch_object ("ipTags", "id", $this->_params->id2); }
 					// type
-					else 								{ $result = $this->Tools->fetch_multiple_objects ("ipTags", "type", $this->_params->id2); }
+					else { $result = $this->Tools->fetch_multiple_objects ("ipTags", "type", $this->_params->id2); }
 				}
 				// all tags
-				else 									{ $result = $this->Tools->fetch_all_objects ("ipTags"); }
+				else { $result = $this->Tools->fetch_all_objects ("ipTags"); }
 
 				// result
-				if($result===false)						{ $this->Response->throw_exception(404, 'Tag not found'); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses/tags", true, false)); }
+				if ($result === false) { $this->Response->throw_exception (404, 'Tag not found'); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "addresses/tags", true, false)); }
 			}
 		}
 		// id not set
 		elseif (!isset($this->_params->id)) {
-														{ $this->Response->throw_exception(400, 'Address ID is required'); }
+														{ $this->Response->throw_exception (400, 'Address ID is required'); }
 		}
 		// id
-		elseif (is_numeric($this->_params->id)) {
+		elseif (is_numeric ($this->_params->id)) {
 			// ping
-			if(@$this->_params->id2=="ping") {
+			if (@$this->_params->id2 == "ping") {
 				# scan class
 				$Scan = new Scan ($this->Database);
 				$Scan->ping_set_exit (false);
@@ -233,35 +233,35 @@ 
 				$this->validate_address_id ();
 
 				// set result
-				$result = array();
+				$result = array ();
 				$result['scan_type'] = $Scan->icmp_type;
 				$result['exit_code'] = $Scan->ping_address ($this->old_address->ip_addr);
 
 				// success
-				if($result['exit_code']==0) 			{ $Scan->ping_update_lastseen ($this->_params->id); return array("code"=>200, "data"=>$result); }
-				else									{ $this->Response->throw_exception(404, "Address offline. Exit code: ".$result['exit_code']."( ".$Scan->ping_exit_explain ($result['exit_code'])." )"); }
+				if ($result['exit_code'] == 0) { $Scan->ping_update_lastseen ($this->_params->id); return array ("code"=>200, "data"=>$result); }
+				else { $this->Response->throw_exception (404, "Address offline. Exit code: ".$result['exit_code']."( ".$Scan->ping_exit_explain ($result['exit_code'])." )"); }
 			}
 			else {
 				// fetch
 				$result = $this->Addresses->fetch_address ("id", $this->_params->id);
 				// check result
-				if($result==false)						{ $this->Response->throw_exception(404, "Invalid Id"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
+				if ($result == false) { $this->Response->throw_exception (404, "Invalid Id"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
 			}
 		}
 		// ip address ?
-		elseif (@$this->_params->id=="search") {
+		elseif (@$this->_params->id == "search") {
 			// validate
-			if(!$this->Addresses->validate_address ($this->_params->id2))
-														{ $this->Response->throw_exception(404, 'Invalid address'); }
+			if (!$this->Addresses->validate_address ($this->_params->id2))
+														{ $this->Response->throw_exception (404, 'Invalid address'); }
 			// search
 			$result = $this->Tools->fetch_multiple_objects ("ipaddresses", "ip_addr", $this->Subnets->transform_address ($this->_params->id2, "decimal"));
 			// check result
-			if($result===false)							{ $this->Response->throw_exception(404, 'Address not found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
+			if ($result === false) { $this->Response->throw_exception (404, 'Address not found'); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
 		}
 		// false
-		else											{  $this->Response->throw_exception(400, "Invalid Id"); }
+		else {  $this->Response->throw_exception (400, "Invalid Id"); }
 	}
 
 
@@ -297,11 +297,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"); }
+    		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"); }
 		}
 
 		// validate ip address - format, proper subnet, subnet/broadcast check
@@ -311,21 +311,21 @@ 
 		$values = $this->validate_keys ();
 
 		// transform address to decimal format
-		$values['ip_addr'] = $this->Addresses->transform_address($values['ip_addr'] ,"decimal");
+		$values['ip_addr'] = $this->Addresses->transform_address ($values['ip_addr'], "decimal");
 		// set action
 		$values['action'] = "add";
 
 		# execute
-		if(!$this->Addresses->modify_address ($values)) {
-			$this->Response->throw_exception(500, "Failed to create address");
+		if (!$this->Addresses->modify_address ($values)) {
+			$this->Response->throw_exception (500, "Failed to create address");
 		}
 		else {
     		//set result
-    		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"));
+    		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 {
-        	    return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/");
+        	    return array ("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/");
     		}
 		}
 	}
@@ -348,8 +348,8 @@ 
 		$this->remap_keys ();
 
 		// we dont allow address or subnet change
-		if(isset($this->_params->ip_addr))			{ $this->Response->throw_exception(400, "IP address cannot be changed"); }
-		if(isset($this->_params->subnetId))			{ $this->Response->throw_exception(400, "Subnet cannot be changed"); }
+		if (isset($this->_params->ip_addr)) { $this->Response->throw_exception (400, "IP address cannot be changed"); }
+		if (isset($this->_params->subnetId)) { $this->Response->throw_exception (400, "Subnet cannot be changed"); }
 
 		// validations
 		$this->validate_update_parameters ();
@@ -363,12 +363,12 @@ 
 		$this->init_object ("Admin", $this->Database);
 
 		# execute
-		if(!$this->Admin->object_modify ("ipaddresses", "edit", "id", $values)) {
-			$this->Response->throw_exception(500, "Failed to update address");
+		if (!$this->Admin->object_modify ("ipaddresses", "edit", "id", $values)) {
+			$this->Response->throw_exception (500, "Failed to update address");
 		}
 		else {
 			//set result
-			return array("code"=>200, "data"=>"Address updated");
+			return array ("code"=>200, "data"=>"Address updated");
 		}
 
 	}
@@ -390,16 +390,16 @@ 
 		$this->validate_address_id ();
 
 		// set variables for delete
-		$values = array();
-		$values["id"] 	  = $this->_params->id;
+		$values = array ();
+		$values["id"] = $this->_params->id;
 		$values["action"] = "delete";
 
 		# execute update
-		if(!$this->Addresses->modify_address ($values))
-													{ $this->Response->throw_exception(500, "Failed to delete address"); }
+		if (!$this->Addresses->modify_address ($values))
+													{ $this->Response->throw_exception (500, "Failed to delete address"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>"Address deleted");
+			return array ("code"=>200, "data"=>"Address deleted");
 		}
 
 	}
@@ -421,7 +421,7 @@ 
 	 * @return void
 	 */
 	private function validate_address_id () {
-		if(!$this->old_address = $this->Addresses->fetch_address ("id", $this->_params->id)){ $this->Response->throw_exception(404, "Address does not exist"); }
+		if (!$this->old_address = $this->Addresses->fetch_address ("id", $this->_params->id)) { $this->Response->throw_exception (404, "Address does not exist"); }
 	}
 
 	/**
@@ -432,9 +432,9 @@ 
 	 */
 	private function validate_tag () {
 		// numeric
-		if(!is_numeric(@$this->_params->id2))												{ $this->Response->throw_exception(400, 'Invalid tag identifier'); }
+		if (!is_numeric (@$this->_params->id2)) { $this->Response->throw_exception (400, 'Invalid tag identifier'); }
 		// check db
-		if (!$this->Tools->fetch_object ("ipTags", "id", $this->_params->id2))				{ $this->Response->throw_exception(404, "Address tag does not exist"); }
+		if (!$this->Tools->fetch_object ("ipTags", "id", $this->_params->id2)) { $this->Response->throw_exception (404, "Address tag does not exist"); }
 	}
 
 	/**
@@ -445,10 +445,10 @@ 
 	 */
 	private function validate_subnet () {
 		// numberic
-		if(!is_numeric($this->_params->subnetId))											{ $this->Response->throw_exception(400, "Subnet Id must be numeric"); }
+		if (!is_numeric ($this->_params->subnetId)) { $this->Response->throw_exception (400, "Subnet Id must be numeric"); }
 		// check subnet
-		if(is_null($res = $this->Subnets->fetch_subnet ("id", $this->_params->subnetId)))	{ $this->Response->throw_exception(400, "Invalid subnet Id"); }
-		else																				{ $this->subnet_details = $res; }
+		if (is_null ($res = $this->Subnets->fetch_subnet ("id", $this->_params->subnetId))) { $this->Response->throw_exception (400, "Invalid subnet Id"); }
+		else { $this->subnet_details = $res; }
 	}
 
 	/**
@@ -462,7 +462,7 @@ 
 		$this->validate_subnet ();
 
 		// validate overlapping
-		if($this->Addresses->address_exists ($this->_params->ip_addr, $this->_params->subnetId))	{ $this->Response->throw_exception(400, "IP address already exists"); }
+		if ($this->Addresses->address_exists ($this->_params->ip_addr, $this->_params->subnetId)) { $this->Response->throw_exception (400, "IP address already exists"); }
 
 		// fetch subnet
 		$subnet = $this->subnet_details;
@@ -470,14 +470,14 @@ 
 		$subnet = $this->Subnets->transform_to_dotted ($subnet->subnet)."/".$subnet->mask;
 
 		// validate address, that it is inside subnet, not subnet/broadcast
-		$this->Addresses->verify_address( $this->_params->ip_addr, $subnet, false, true );
+		$this->Addresses->verify_address ($this->_params->ip_addr, $subnet, false, true);
 
 		// validate device
-		if(isset($this->_params->switch)) {
-		if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
+		if (isset($this->_params->switch)) {
+		if ($this->Tools->fetch_object ("devices", "vlanId", $this->_params->switch) === false) { $this->Response->throw_exception (400, "Device does not exist"); } }
 		// validate state
-		if(isset($this->_params->state)) {
-		if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
+		if (isset($this->_params->state)) {
+		if ($this->Tools->fetch_object ("ipTags", "id", $this->_params->state) === false) { $this->Response->throw_exception (400, "Tag does not exist"); } }
 		else { $this->_params->state = 2; }
 	}
 
@@ -492,11 +492,11 @@ 
 		$this->validate_address_id ();
 
 		// validate device
-		if(isset($this->_params->switch)) {
-		if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
+		if (isset($this->_params->switch)) {
+		if ($this->Tools->fetch_object ("devices", "vlanId", $this->_params->switch) === false) { $this->Response->throw_exception (400, "Device does not exist"); } }
 		// validate state
-		if(isset($this->_params->state)) {
-		if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
+		if (isset($this->_params->state)) {
+		if ($this->Tools->fetch_object ("ipTags", "id", $this->_params->state) === false) { $this->Response->throw_exception (400, "Tag does not exist"); } }
 		else { $this->_params->state = 2; }
 	}
 }

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);
 		}

Spacing +48 added lines, -48 removed lines

@@ -74,10 +74,10 @@ 
 	 * @param mixed $params
 	 * @param mixed $Response
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
 		$this->Response = $Response;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		# sections
 		// init required objects
@@ -101,16 +101,16 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/sections/", 			"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/sections/{id}/", 	"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."/sections/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/".$this->_params->app_id."/sections/{id}/", "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);
 	}
 
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function GET () {
 		// fetch subnets in section
-		if(@$this->_params->id2=="subnets" && is_numeric($this->_params->id)) {
+		if (@$this->_params->id2 == "subnets" && is_numeric ($this->_params->id)) {
 			// we dont need id2 anymore
 			unset($this->_params->id2);
 			//validate section
@@ -143,54 +143,54 @@ 
 			//fetch
 			$result = $this->Subnets->fetch_section_subnets ($this->_params->id);
             // add gateway
-			if($result!=false) {
+			if ($result != false) {
 				foreach ($result as $k=>$r) {
     				//gw
             		$gateway = $this->read_subnet_gateway ($r->id);
-            		if ( $gateway!== false) {
+            		if ($gateway !== false) {
                 		$result[$k]->gatewayId = $gateway->id;
             		}
             		//nameservers
             		$ns = $this->read_subnet_nameserver ($r->nameserverId);
-                    if ($ns!==false) {
+                    if ($ns !== false) {
                         $result[$k]->nameservers = $ns;
                     }
 				}
 			}
 			// check result
-			if(sizeof($result)==0) 						{ return array("code"=>200, "data"=>NULL); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+			if (sizeof ($result) == 0) { return array ("code"=>200, "data"=>NULL); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
 		}
 		// verify ID
-		elseif(isset($this->_params->id)) {
+		elseif (isset($this->_params->id)) {
 			# fetch by id
-			if(is_numeric($this->_params->id)) {
+			if (is_numeric ($this->_params->id)) {
 				$result = $this->Sections->fetch_section ("id", $this->_params->id);
 				// check result
-				if(sizeof($result)==0) 					{ $this->Response->throw_exception(404, NULL); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if (sizeof ($result) == 0) { $this->Response->throw_exception (404, NULL); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 			# return custom fields
-			elseif($this->_params->id=="custom_fields") {
+			elseif ($this->_params->id == "custom_fields") {
 				// check result
-				if(sizeof($this->custom_fields)==0)		{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-				else									{ return array("code"=>200, "data"=>$result); }
+				if (sizeof ($this->custom_fields) == 0) { $this->Response->throw_exception (404, 'No custom fields defined'); }
+				else { return array ("code"=>200, "data"=>$result); }
 			}
 			# fetch by name
 			else {
 				$result = $this->Sections->fetch_section ("name", $this->_params->id);
 				// check result
-				if(sizeof($result)==0) 					{ $this->Response->throw_exception(404, $this->Response->errors[404]); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if (sizeof ($result) == 0) { $this->Response->throw_exception (404, $this->Response->errors[404]); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 		}
 		# all sections
 		else {
 				// all sections
-				$result = $this->Sections->fetch_all_sections();
+				$result = $this->Sections->fetch_all_sections ();
 				// check result
-				if($result===false) 					{ return array("code"=>204, NULL); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result === false) { return array ("code"=>204, NULL); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 		}
 	}
 
@@ -225,22 +225,22 @@ 
 		unset($values['editDate']);
 
 		# validate mandatory parameters
-		if(strlen($this->_params->name)<3)				{ $this->Response->throw_exception(400, 'Name is mandatory or too short (mininum 3 characters)'); }
+		if (strlen ($this->_params->name) < 3) { $this->Response->throw_exception (400, 'Name is mandatory or too short (mininum 3 characters)'); }
 
 		# verify masterSection
-		if(isset($this->_params->masterSection)) {
+		if (isset($this->_params->masterSection)) {
 			$masterSection = $this->Sections->fetch_section ("id", $this->_params->masterSection);
 			// checks
-			if(sizeof($masterSection)==0)				{ $this->Response->throw_exception(400, 'Invalid masterSection id '.$this->_params->masterSection); }
-			elseif($masterSection->masterSection!="0")	{ $this->Response->throw_exception(400, 'Only 1 level of nesting is permitted for sections');  }
+			if (sizeof ($masterSection) == 0) { $this->Response->throw_exception (400, 'Invalid masterSection id '.$this->_params->masterSection); }
+			elseif ($masterSection->masterSection != "0") { $this->Response->throw_exception (400, 'Only 1 level of nesting is permitted for sections'); }
 		}
 
 		# execute update
-		if(!$this->Sections->modify_section ("add", $values))
-														{ $this->Response->throw_exception(500, "Section create failed"); }
+		if (!$this->Sections->modify_section ("add", $values))
+														{ $this->Response->throw_exception (500, "Section create failed"); }
 		else {
 			//set result
-			return array("code"=>201, "data"=>"Section created", "location"=>"/api/".$this->_params->app_id."/sections/".$this->Sections->lastInsertId."/");
+			return array ("code"=>201, "data"=>"Section created", "location"=>"/api/".$this->_params->app_id."/sections/".$this->Sections->lastInsertId."/");
 		}
 	}
 
@@ -256,20 +256,20 @@ 
 	 */
 	public function PATCH () {
 		# Check for id
-		if(!isset($this->_params->id))					{ $this->Response->throw_exception(400, "Section Id required"); }
+		if (!isset($this->_params->id)) { $this->Response->throw_exception (400, "Section Id required"); }
 		# check that section exists
-		if(sizeof($this->Sections->fetch_section ("id", $this->_params->id))==0)
-														{ $this->Response->throw_exception(404, "Section does not exist"); }
+		if (sizeof ($this->Sections->fetch_section ("id", $this->_params->id)) == 0)
+														{ $this->Response->throw_exception (404, "Section does not exist"); }
 
 		# validate and prepare keys
 		$values = $this->validate_keys ();
 
 		# execute update
-		if(!$this->Sections->modify_section ("edit", $values))
-														{ $this->Response->throw_exception(500, "Section update failed"); }
+		if (!$this->Sections->modify_section ("edit", $values))
+														{ $this->Response->throw_exception (500, "Section update failed"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>NULL);
+			return array ("code"=>200, "data"=>NULL);
 		}
 	}
 
@@ -285,21 +285,21 @@ 
 	 */
 	public function DELETE () {
 		# Check for id
-		if(!isset($this->_params->id))					{ $this->Response->throw_exception(400, "Section Id required"); }
+		if (!isset($this->_params->id)) { $this->Response->throw_exception (400, "Section Id required"); }
 		# check that section exists
-		if(sizeof($this->Sections->fetch_section ("id", $this->_params->id))==0)
-														{ $this->Response->throw_exception(404, "Section does not exist"); }
+		if (sizeof ($this->Sections->fetch_section ("id", $this->_params->id)) == 0)
+														{ $this->Response->throw_exception (404, "Section does not exist"); }
 
 		# set variables for update
-		$values = array();
+		$values = array ();
 		$values["id"] = $this->_params->id;
 
 		# execute update
-		if(!$this->Sections->modify_section ("delete", $values))
-														{ $this->Response->throw_exception(500, "Section delete failed"); }
+		if (!$this->Sections->modify_section ("delete", $values))
+														{ $this->Response->throw_exception (500, "Section delete failed"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>NULL);
+			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++;

Spacing +131 added lines, -131 removed lines

@@ -102,11 +102,11 @@ 
 	 */
 	protected function init_object ($Object_name, $Database) {
 		// admin fix
-		if($Object_name=="Admin")	    { $this->$Object_name	= new $Object_name ($Database, false); }
+		if ($Object_name == "Admin") { $this->$Object_name = new $Object_name ($Database, false); }
 		// User fix
-		elseif($Object_name=="User")	{ $this->$Object_name	= new $Object_name ($Database, true); $this->$Object_name->user = null; }
+		elseif ($Object_name == "User") { $this->$Object_name = new $Object_name ($Database, true); $this->$Object_name->user = null; }
 		// default
-		else					        { $this->$Object_name	= new $Object_name ($Database); }
+		else { $this->$Object_name = new $Object_name ($Database); }
 		// set exit method
 		$this->$Object_name->Result->exit_method = "exception";
 		// set API flag
@@ -122,15 +122,15 @@ 
 	 */
 	protected function set_valid_keys ($controller) {
 		# array of controller keys
-		$this->controller_keys = array("app_id", "controller");
+		$this->controller_keys = array ("app_id", "controller");
 
 		# array of all valid keys - fetch from SCHEMA
 		$this->valid_keys = $this->Tools->fetch_standard_fields ($controller);
 
 		# add custom fields
-		$custom_fields = $this->Tools->fetch_custom_fields($controller);
-		if(sizeof($custom_fields)>0) {
-			foreach($custom_fields as $cf) {
+		$custom_fields = $this->Tools->fetch_custom_fields ($controller);
+		if (sizeof ($custom_fields) > 0) {
+			foreach ($custom_fields as $cf) {
 				$this->custom_keys[] = $cf['name'];
 			}
 		}
@@ -139,16 +139,16 @@ 
 		$this->custom_fields = $custom_fields;
 
 		# merge all
-		$this->valid_keys = array_merge($this->controller_keys, $this->valid_keys);
-		if(isset($this->custom_keys)) {
-			$this->valid_keys = array_merge($this->valid_keys, $this->custom_keys);
+		$this->valid_keys = array_merge ($this->controller_keys, $this->valid_keys);
+		if (isset($this->custom_keys)) {
+			$this->valid_keys = array_merge ($this->valid_keys, $this->custom_keys);
 		}
 
 		# set items to remove
-		$this->remove_keys = array("editDate");
+		$this->remove_keys = array ("editDate");
 		# remove update time
-		foreach($this->valid_keys as $k=>$v) {
-			if(in_array($v, $this->remove_keys)) {
+		foreach ($this->valid_keys as $k=>$v) {
+			if (in_array ($v, $this->remove_keys)) {
 				unset($this->valid_keys[$k]);
 			}
 		}
@@ -167,12 +167,12 @@ 
 	 */
 	protected function prepare_result ($result, $controller = null, $links = true, $transform_address = true) {
 		// empty controller
-		$controller = is_null($controller) ? $this->_params->controller : $controller;
+		$controller = is_null ($controller) ? $this->_params->controller : $controller;
 
 		// links
-		if($links) {
+		if ($links) {
 			// explicitly set to no
-			if(@$this->_params->links!="false")
+			if (@$this->_params->links != "false")
 								{ $result = $this->add_links ($result, $controller); }
 		}
 		// filter
@@ -180,7 +180,7 @@ 
 								{ $result = $this->filter_result ($result); }
 		}
 		// transform address
-		if($transform_address)	{ $result = $this->transform_address ($result); }
+		if ($transform_address) { $result = $this->transform_address ($result); }
 
 		// remove subnets and addresses if needed
 		$result = $this->remove_folders ($result);
@@ -209,7 +209,7 @@ 
 		$this->validate_filter_by ($result);
 
 		// filter - array
-		if (is_array($result)) {
+		if (is_array ($result)) {
 			foreach ($result as $m=>$r) {
 				foreach ($r as $k=>$v) {
 					if ($k == $this->_params->filter_by) {
@@ -234,7 +234,7 @@ 
 		}
 
 		# null?
-		if (sizeof($result)==0)				{ $this->Response->throw_exception(404, 'No results (filter applied)'); }
+		if (sizeof ($result) == 0) { $this->Response->throw_exception (404, 'No results (filter applied)'); }
 
 		# result
 		return $result;
@@ -249,17 +249,17 @@ 
 	 */
 	protected function validate_filter_by ($result) {
 		// validate filter
-		if (is_array($result))	{ $result_tmp = $result[0]; }
-		else					{ $result_tmp = $result; }
+		if (is_array ($result)) { $result_tmp = $result[0]; }
+		else { $result_tmp = $result; }
 
 		$error = true;
 		foreach ($result_tmp as $k=>$v) {
-			if ($k==$this->_params->filter_by) {
+			if ($k == $this->_params->filter_by) {
 				$error = false;
 			}
 		}
 		// die
-		if ($error)							{ $this->Response->throw_exception(400, 'Invalid filter value'); }
+		if ($error) { $this->Response->throw_exception (400, 'Invalid filter value'); }
 	}
 
 	/**
@@ -270,26 +270,26 @@ 
 	 * @param mixed $controller
 	 * @return void
 	 */
-	protected function add_links ($result, $controller=null) {
+	protected function add_links ($result, $controller = null) {
 		// lower controller
-		$controller = strtolower($controller);
+		$controller = strtolower ($controller);
 
 		// multiple options
-		if(is_array($result)) {
-			foreach($result as $k=>$r) {
+		if (is_array ($result)) {
+			foreach ($result as $k=>$r) {
 				// fix for Vlans and vrfs
-				if($controller=="vlans")				{ $r->id = $r->vlanId; }
-				if($controller=="tools/vlans")			{ $r->id = $r->vlanId; }
-				if($controller=="vrfs")					{ $r->id = $r->vrfId; }
-				if($this->_params->id=="deviceTypes")	{ $r->id = $r->tid; }
+				if ($controller == "vlans") { $r->id = $r->vlanId; }
+				if ($controller == "tools/vlans") { $r->id = $r->vlanId; }
+				if ($controller == "vrfs") { $r->id = $r->vrfId; }
+				if ($this->_params->id == "deviceTypes") { $r->id = $r->tid; }
 
-				$m=0;
+				$m = 0;
 				// custom links
 				$custom_links = $this->define_links ($controller);
-				if($custom_links!==false) {
-					foreach($this->define_links ($controller) as $link=>$method) {
+				if ($custom_links !== false) {
+					foreach ($this->define_links ($controller) as $link=>$method) {
 						// self only !
-						if ($link=="self") {
+						if ($link == "self") {
 						$result[$k]->links[$m] = new stdClass ();
 						$result[$k]->links[$m]->rel  	= $link;
 						$result[$k]->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$r->id."/";
@@ -298,27 +298,27 @@ 
 				}
 
 				// remove id for vlans
-				if($controller=="vlans")	{ unset($r->id); }
-				if($controller=="vrfs")		{ unset($r->id); }
+				if ($controller == "vlans") { unset($r->id); }
+				if ($controller == "vrfs") { unset($r->id); }
 			}
 		}
 		// single item
 		else {
 				// fix for Vlans and Vrfs
-				if($controller=="vlans")				{ $result->id = $result->vlanId; }
-				if($controller=="tools/vlans")			{ $result->id = $result->vlanId; }
-				if($controller=="vrfs")					{ $result->id = $result->vrfId; }
-				if($this->_params->id=="deviceTypes")	{ $result->id = $result->tid; }
+				if ($controller == "vlans") { $result->id = $result->vlanId; }
+				if ($controller == "tools/vlans") { $result->id = $result->vlanId; }
+				if ($controller == "vrfs") { $result->id = $result->vrfId; }
+				if ($this->_params->id == "deviceTypes") { $result->id = $result->tid; }
 
-				$m=0;
+				$m = 0;
 				// custom links
 				$custom_links = $this->define_links ($controller);
-				if($custom_links!==false) {
-					foreach($this->define_links ($controller) as $link=>$method) {
+				if ($custom_links !== false) {
+					foreach ($this->define_links ($controller) as $link=>$method) {
 						$result->links[$m] = new stdClass ();
 						$result->links[$m]->rel  	= $link;
 						// self ?
-						if ($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/";
@@ -329,8 +329,8 @@ 
 				}
 
 				// remove id for vlans
-				if($controller=="vlans")	{ unset($result->id); }
-				if($controller=="vrfs")		{ unset($result->id); }
+				if ($controller == "vlans") { unset($result->id); }
+				if ($controller == "vrfs") { unset($result->id); }
 		}
 		# return
 		return $result;
@@ -345,17 +345,17 @@ 
 	 */
 	private function define_links ($controller) {
     	// init
-    	$result = array();
+    	$result = array ();
 		// sections
-		if($controller=="sections") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["subnets"]          = array ("GET");
+		if ($controller == "sections") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
 		// subnets
-		elseif($controller=="subnets") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+		elseif ($controller == "subnets") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
 			$result["addresses"]        = array ("GET");
 			$result["usage"]            = array ("GET");
 			$result["first_free"]       = array ("GET");
@@ -368,86 +368,86 @@ 
 			return $result;
 		}
 		// addresses
-		elseif($controller=="addresses") {
-			$result["self"]				= array ("GET","POST","DELETE","PATCH");
+		elseif ($controller == "addresses") {
+			$result["self"]				= array ("GET", "POST", "DELETE", "PATCH");
 			$result["ping"]				= array ("GET");
 			// return
 			return $result;
 		}
 		// tags
-		elseif($controller=="addresses/tags") {
-			$result["self"]				= array ("GET");
-			$result["addresses"]		= array ("GET");
+		elseif ($controller == "addresses/tags") {
+			$result["self"] = array ("GET");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - devices
-		elseif($controller=="tools/devices") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["addresses"]        = array ("GET");
+		elseif ($controller == "tools/devices") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - devices
-		elseif($controller=="tools/devicetypes") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["devices"]        	= array ("GET");
+		elseif ($controller == "tools/devicetypes") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["devices"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - tags
-		elseif($controller=="tools/iptags") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["addresses"]        = array ("GET");
+		elseif ($controller == "tools/iptags") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - tags
-		elseif($controller=="tools/vlans") {
-			$result["self"]			 	= array ("GET");
-			$result["subnets"]          = array ("GET");
+		elseif ($controller == "tools/vlans") {
+			$result["self"] = array ("GET");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - tags
-		elseif($controller=="tools/vrf") {
-			$result["self"]			 	= array ("GET");
-			$result["subnets"]          = array ("GET");
+		elseif ($controller == "tools/vrf") {
+			$result["self"] = array ("GET");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tags
-		elseif($controller=="iptags") {
-			$result["self"]				= array ("GET");
-			$result["addresses"]		= array ("GET");
+		elseif ($controller == "iptags") {
+			$result["self"] = array ("GET");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tags
-		elseif($controller=="devices") {
-			$result["self"]				= array ("GET");
-			$result["addresses"]		= array ("GET");
+		elseif ($controller == "devices") {
+			$result["self"] = array ("GET");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// vlan domains
-		elseif($controller=="l2domains") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["vlans"]          	= array ("GET");
+		elseif ($controller == "l2domains") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["vlans"] = array ("GET");
 			// return
 			return $result;
 		}
 		// vlans
-		elseif($controller=="vlans") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["subnets"]          = array ("GET");
+		elseif ($controller == "vlans") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
 		// vrfs
-		elseif($controller=="vrfs") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["subnets"]          = array ("GET");
+		elseif ($controller == "vrfs") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
@@ -465,22 +465,22 @@ 
 	 */
 	protected function transform_address ($result) {
 		// multiple options
-		if (is_array($result)) {
-			foreach($result as $k=>$r) {
+		if (is_array ($result)) {
+			foreach ($result as $k=>$r) {
 				// remove IP
-				if (isset($r->ip))					{ unset($r->ip); }
+				if (isset($r->ip)) { unset($r->ip); }
 				// transform
-				if (isset($r->subnet))				{ $r->subnet  = $this->Subnets->transform_address ($r->subnet,  "dotted"); }
-				elseif (isset($r->ip_addr))			{ $r->ip_addr = $this->Subnets->transform_address ($r->ip_addr, "dotted"); }
+				if (isset($r->subnet)) { $r->subnet = $this->Subnets->transform_address ($r->subnet, "dotted"); }
+				elseif (isset($r->ip_addr)) { $r->ip_addr = $this->Subnets->transform_address ($r->ip_addr, "dotted"); }
 			}
 		}
 		// single item
 		else {
 				// remove IP
-				if (isset($result->ip))				{ unset($result->ip); }
+				if (isset($result->ip)) { unset($result->ip); }
 				// transform
-				if (isset($result->subnet))			{ $result->subnet  = $this->Subnets->transform_address ($result->subnet,  "dotted"); }
-				elseif (isset($result->ip_addr))	{ $result->ip_addr = $this->Subnets->transform_address ($result->ip_addr, "dotted"); }
+				if (isset($result->subnet)) { $result->subnet = $this->Subnets->transform_address ($result->subnet, "dotted"); }
+				elseif (isset($result->ip_addr)) { $result->ip_addr = $this->Subnets->transform_address ($result->ip_addr, "dotted"); }
 		}
 
 		# return
@@ -495,13 +495,13 @@ 
 	 */
 	protected function validate_keys () {
     	// init values
-    	$values = array();
+    	$values = array ();
     	// loop
-		foreach($this->_params as $pk=>$pv) {
-			if(!in_array($pk, $this->valid_keys)) 	{ $this->Response->throw_exception(400, 'Invalid request key '.$pk); }
+		foreach ($this->_params as $pk=>$pv) {
+			if (!in_array ($pk, $this->valid_keys)) { $this->Response->throw_exception (400, 'Invalid request key '.$pk); }
 			// set parameters
 			else {
-				if(!in_array($pk, $this->controller_keys)) {
+				if (!in_array ($pk, $this->controller_keys)) {
 					 $values[$pk] = $pv;
 				}
 			}
@@ -519,9 +519,9 @@ 
 	 * @return void
 	 */
 	protected function validate_options_request () {
-		foreach($this->_params as $key=>$val) {
-			if(!in_array($key, array("app_id", "controller", "id"))) {
-													{ $this->Response->throw_exception(400, 'Invalid request key parameter '.$key); }
+		foreach ($this->_params as $key=>$val) {
+			if (!in_array ($key, array ("app_id", "controller", "id"))) {
+													{ $this->Response->throw_exception (400, 'Invalid request key parameter '.$key); }
 			}
 		}
 	}
@@ -535,24 +535,24 @@ 
 	 */
 	protected function remove_folders ($result) {
 		// must be subnets
-		if($this->_params->controller!="subnets") {
+		if ($this->_params->controller != "subnets") {
 			return $result;
 		}
 		else {
 			// multiple options
-			if (is_array($result)) {
-				foreach($result as $k=>$r) {
+			if (is_array ($result)) {
+				foreach ($result as $k=>$r) {
 					// remove
-					if($r->isFolder=="1")				{ unset($r); }
+					if ($r->isFolder == "1") { unset($r); }
 			}	}
 			// single item
 			else {
 					// remove
-					if($result->isFolder=="1")			{ unset($result); }
+					if ($result->isFolder == "1") { unset($result); }
 			}
 			# return
-			if($result===false)	{ $this->Response->throw_exception(404, "No subnets found"); }
-			else				{ return $result; }
+			if ($result === false) { $this->Response->throw_exception (404, "No subnets found"); }
+			else { return $result; }
 	}	}
 
 	/**
@@ -564,24 +564,24 @@ 
 	 */
 	protected function remove_subnets ($result) {
 		// must be subnets
-		if($this->_params->controller!="folders") {
+		if ($this->_params->controller != "folders") {
 			return $result;
 		}
 		else {
 			// multiple options
-			if (is_array($result)) {
-				foreach($result as $k=>$r) {
+			if (is_array ($result)) {
+				foreach ($result as $k=>$r) {
 					// remove
-					if($r->isFolder!="1")				{ unset($r); }
+					if ($r->isFolder != "1") { unset($r); }
 			}	}
 			// single item
 			else {
 					// remove
-					if($result->isFolder!="1")			{ unset($result); }
+					if ($result->isFolder != "1") { unset($result); }
 			}
 			# return
-			if($result===NULL)	{ $this->Response->throw_exception(404, "No folders found"); }
-			else				{ return $result; }
+			if ($result === NULL) { $this->Response->throw_exception (404, "No folders found"); }
+			else { return $result; }
 	}	}
 
 
@@ -597,17 +597,17 @@ 
 	 */
 	protected function remap_keys ($result = null, $controller = null) {
 		// define keys array
-		$this->keys = array("switch"=>"deviceId", "state"=>"tag", "ip_addr"=>"ip", "dns_name"=>"hostname");
+		$this->keys = array ("switch"=>"deviceId", "state"=>"tag", "ip_addr"=>"ip", "dns_name"=>"hostname");
 
 		// exceptions
-		if($controller=="vlans") 	{ $this->keys['vlanId'] = "id"; }
-		if($controller=="vrfs")  	{ $this->keys['vrfId'] = "id"; }
-		if($this->_params->controller=="tools" && $this->_params->id=="deviceTypes")  { $this->keys['tid'] = "id"; }
+		if ($controller == "vlans") { $this->keys['vlanId'] = "id"; }
+		if ($controller == "vrfs") { $this->keys['vrfId'] = "id"; }
+		if ($this->_params->controller == "tools" && $this->_params->id == "deviceTypes") { $this->keys['tid'] = "id"; }
 
 		// POST / PATCH
-		if ($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH")		{ return $this->remap_update_keys (); }
+		if ($_SERVER['REQUEST_METHOD'] == "POST" || $_SERVER['REQUEST_METHOD'] == "PATCH") { return $this->remap_update_keys (); }
 		// GET
-		elseif ($_SERVER['REQUEST_METHOD']=="GET")											{ return $this->remap_result_keys ($result); }
+		elseif ($_SERVER['REQUEST_METHOD'] == "GET") { return $this->remap_result_keys ($result); }
 	}
 
 	/**
@@ -618,9 +618,9 @@ 
 	 */
 	private function remap_update_keys () {
 		// loop
-		foreach($this->keys as $k=>$v) {
+		foreach ($this->keys as $k=>$v) {
 			// match
-			if(array_key_exists($v, $this->_params)) {
+			if (array_key_exists ($v, $this->_params)) {
 				// replace
 				$this->_params->$k = $this->_params->$v;
 				// remove
@@ -638,12 +638,12 @@ 
 	 */
 	private function remap_result_keys ($result) {
 		# single
-		if(!is_array($result)) {
+		if (!is_array ($result)) {
 			// params
 			$result_remapped = new StdClass ();
 			// search and replace
-			foreach($result as $k=>$v) {
-				if(array_key_exists($k, $this->keys)) {
+			foreach ($result as $k=>$v) {
+				if (array_key_exists ($k, $this->keys)) {
 					// replace
 					$key = $this->keys[$k];
 					$result_remapped->$key = $v;
@@ -656,7 +656,7 @@ 
 		# array
 		else {
 			// create a new array for the remapped data
-			$result_remapped = array();
+			$result_remapped = array ();
 
 			// loop
 			foreach ($result as $m=>$r) {
@@ -664,8 +664,8 @@ 
 				$result_remapped[$m] = new StdClass ();
 
 				// search and replace
-				foreach($r as $k=>$v) {
-					if(array_key_exists($k, $this->keys)) {
+				foreach ($r as $k=>$v) {
+					if (array_key_exists ($k, $this->keys)) {
 						// replace
 						$key_val = $this->keys[$k];
 						$result_remapped[$m]->$key_val = $v;

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);
 

Spacing +36 added lines, -36 removed lines

@@ -67,9 +67,9 @@ 
 	 * @param mixed $params		// post/get values
 	 * @param class $Response
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		$this->Response = $Response;
 		// init required objects
@@ -95,15 +95,15 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/vrfs/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/vrfs/{id}/", "methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																											 array("rel"=>"create", "method"=>"POST"),
-																											 array("rel"=>"update", "method"=>"PATCH"),
-																											 array("rel"=>"delete", "method"=>"DELETE"))),
+		$result['methods'] = array (
+								array ("href"=>"/api/".$this->_params->app_id."/vrfs/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/".$this->_params->app_id."/vrfs/{id}/", "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);
 	}
 
 
@@ -128,8 +128,8 @@ 
 		if (!isset($this->_params->id)) {
 			$result = $this->Tools->fetch_all_objects ("vrf", 'vrfId');
 			// check result
-			if($result===false)						{ $this->Response->throw_exception(404, 'No vrfs configured'); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+			if ($result === false) { $this->Response->throw_exception (404, 'No vrfs configured'); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 		}
 		// subnets
 		elseif (isset($this->_params->id2)) {
@@ -140,22 +140,22 @@ 
 				// fetch
 				$result = $this->Tools->fetch_multiple_objects ("subnets", "vrfId", $this->_params->id, 'subnet', true);
 				// add gateway if present
-    			if($result!=false) {
+    			if ($result != false) {
     				foreach ($result as $k=>$r) {
                 		$gateway = $this->read_subnet_gateway ($r->id);
-                		if ( $gateway!== false) {
+                		if ($gateway !== false) {
                     		$result[$k]->gatewayId = $gateway->id;
                 		}
     				}
     			}
 
 				// check result
-				if($result===false)					{ $this->Response->throw_exception(404, 'No subnets belonging to this vrf'); }
-				else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+				if ($result === false) { $this->Response->throw_exception (404, 'No subnets belonging to this vrf'); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
 			}
 			// error
 			else {
-													{ $this->Response->throw_exception(400, "Invalid identifier"); }
+													{ $this->Response->throw_exception (400, "Invalid identifier"); }
 			}
 		}
 		// by id
@@ -165,8 +165,8 @@ 
 			// fetch
 			$result = $this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id);
 			// check result
-			if($result==NULL)						{ $this->Response->throw_exception(404, "VRF not found"); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+			if ($result == NULL) { $this->Response->throw_exception (404, "VRF not found"); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 		}
 	}
 
@@ -202,11 +202,11 @@ 
 		$this->validate_vrf_edit ();
 
 		# execute update
-		if(!$this->Admin->object_modify ("vrf", "add", "vrfId", $values))
-													{ $this->Response->throw_exception(500, "VRF creation failed"); }
+		if (!$this->Admin->object_modify ("vrf", "add", "vrfId", $values))
+													{ $this->Response->throw_exception (500, "VRF creation failed"); }
 		else {
 			//set result
-			return array("code"=>201, "data"=>"VRF created", "location"=>"/api/".$this->_params->app_id."/vrfs/".$this->Admin->lastId."/");
+			return array ("code"=>201, "data"=>"VRF created", "location"=>"/api/".$this->_params->app_id."/vrfs/".$this->Admin->lastId."/");
 		}
 	}
 
@@ -234,11 +234,11 @@ 
 		$values = $this->validate_keys ();
 
 		# execute update
-		if(!$this->Admin->object_modify ("vrf", "edit", "vrfId", $values))
-													{ $this->Response->throw_exception(500, "Vrf edit failed"); }
+		if (!$this->Admin->object_modify ("vrf", "edit", "vrfId", $values))
+													{ $this->Response->throw_exception (500, "Vrf edit failed"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>"VRF updated");
+			return array ("code"=>200, "data"=>"VRF updated");
 		}
 	}
 
@@ -258,18 +258,18 @@ 
 		$this->validate_vrf ();
 
 		# set variables for update
-		$values = array();
+		$values = array ();
 		$values["vrfId"] = $this->_params->id;
 
 		# execute delete
-		if(!$this->Admin->object_modify ("vrf", "delete", "vrfId", $values))
-													{ $this->Response->throw_exception(500, "Vrf delete failed"); }
+		if (!$this->Admin->object_modify ("vrf", "delete", "vrfId", $values))
+													{ $this->Response->throw_exception (500, "Vrf delete failed"); }
 		else {
 			// delete all references
 			$this->Admin->remove_object_references ("subnets", "vrfId", $this->_params->id);
 
 			// set result
-			return array("code"=>200, "data"=>"VRF deleted");
+			return array ("code"=>200, "data"=>"VRF deleted");
 		}
 	}
 
@@ -294,11 +294,11 @@ 
 	 */
 	private function validate_vrf () {
 		// validate id
-		if(!isset($this->_params->id))														{ $this->Response->throw_exception(400, "Vrf Id is required");  }
+		if (!isset($this->_params->id)) { $this->Response->throw_exception (400, "Vrf Id is required"); }
 		// validate number
-		if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Vrf Id must be numeric"); }
+		if (!is_numeric ($this->_params->id)) { $this->Response->throw_exception (400, "Vrf Id must be numeric"); }
 		// check that it exists
-		if($this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id) === false )		{ $this->Response->throw_exception(400, "Invalid VRF id"); }
+		if ($this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id) === false) { $this->Response->throw_exception (400, "Invalid VRF id"); }
 	}
 
 
@@ -310,20 +310,20 @@ 
 	 */
 	private function validate_vrf_edit () {
 		// check for POST method
-		if($_SERVER['REQUEST_METHOD']=="POST") {
+		if ($_SERVER['REQUEST_METHOD'] == "POST") {
 			// check name
-			if(strlen($this->_params->name)==0)												{ $this->Response->throw_exception(400, "VRF name is required"); }
+			if (strlen ($this->_params->name) == 0) { $this->Response->throw_exception (400, "VRF name is required"); }
 			// check that it exists
-			if($this->Tools->fetch_object ("vrf", "name", $this->_params->name) !== false )	{ $this->Response->throw_exception(400, "VRF with that name already exists"); }
+			if ($this->Tools->fetch_object ("vrf", "name", $this->_params->name) !== false) { $this->Response->throw_exception (400, "VRF with that name already exists"); }
 		}
 		// update check
 		else {
 			// old values
 			$vrf_old = $this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id);
 
-			if(isset($this->_params->name)) {
+			if (isset($this->_params->name)) {
 				if ($this->_params->name != $vrf_old->name) {
-					if($this->Tools->fetch_object ("vrf", "name", $this->_params->name))	{ $this->Response->throw_exception(400, "VRF with that name already exists"); }
+					if ($this->Tools->fetch_object ("vrf", "name", $this->_params->name)) { $this->Response->throw_exception (400, "VRF with that name already exists"); }
 				}
 			}
 		}

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; }

Spacing +123 added lines, -123 removed lines

@@ -81,9 +81,9 @@ 
 	 * @param class $Tools
 	 * @param mixed $params		// post/get values
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		$this->Response = $Response;
 		// init required objects
@@ -108,16 +108,16 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/subnets/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/subnets/{id}/", 	"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."/subnets/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/".$this->_params->app_id."/subnets/{id}/", "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);
 	}
 
 
@@ -135,8 +135,8 @@ 
 	 */
 	public function POST () {
 		# add required parameters
-		if(!isset($this->_params->isFolder)) { $this->_params->isFolder = "0"; }
-		elseif($this->_params->isFolder==1)	 { unset($this->_params->subnet, $this->_params->mask); }
+		if (!isset($this->_params->isFolder)) { $this->_params->isFolder = "0"; }
+		elseif ($this->_params->isFolder == 1) { unset($this->_params->subnet, $this->_params->mask); }
 
 		# validate parameters
 		$this->validate_create_parameters ();
@@ -145,15 +145,15 @@ 
 		$values = $this->validate_keys ();
 
 		# transform subnet to decimal format
-		$values['subnet'] = $this->Addresses->transform_address($values['subnet'] ,"decimal");
+		$values['subnet'] = $this->Addresses->transform_address ($values['subnet'], "decimal");
 
 		# execute
-		if(!$this->Subnets->modify_subnet ("add", $values)) {
-			$this->Response->throw_exception(500, "Failed to create subnet");
+		if (!$this->Subnets->modify_subnet ("add", $values)) {
+			$this->Response->throw_exception (500, "Failed to create subnet");
 		}
 		else {
 			//set result
-			return array("code"=>201, "data"=>"Subnet created", "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
+			return array ("code"=>201, "data"=>"Subnet created", "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
 		}
 	}
 
@@ -180,13 +180,13 @@ 
 	public function GET () {
 		// cidr check
 		// check if id2 is set ?
-		if(isset($this->_params->id2)) {
+		if (isset($this->_params->id2)) {
 			// is IP address provided
-			if($this->_params->id=="cidr") {
+			if ($this->_params->id == "cidr") {
 				$result = $this->read_search_subnet ();
 				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(404, "No subnets found"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception (404, "No subnets found"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 			else {
 				// validate id
@@ -194,48 +194,48 @@ 
 			}
 
 			// addresses in subnet
-			if($this->_params->id2=="addresses") {
+			if ($this->_params->id2 == "addresses") {
 				$result = $this->read_subnet_addresses ();
 				// check result
-				if($result===false)						{ $this->Response->throw_exception(404, "No addresses found"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, true)); }
+				if ($result === false) { $this->Response->throw_exception (404, "No addresses found"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, true)); }
 			}
 			// slaves
-			elseif($this->_params->id2=="slaves") {
+			elseif ($this->_params->id2 == "slaves") {
 				$result = $this->read_subnet_slaves ();
 				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(404, "No slaves"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception (404, "No slaves"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 			// slaves-recursive
-			elseif ($this->_params->id2=="slaves_recursive") {
+			elseif ($this->_params->id2 == "slaves_recursive") {
 				$result = $this->read_subnet_slaves_recursive ();
 				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(404, "No slaves"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception (404, "No slaves"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 			// usage
-			elseif ($this->_params->id2=="usage") 		{ return array("code"=>200, "data"=>$this->subnet_usage ()); }
+			elseif ($this->_params->id2 == "usage") { return array ("code"=>200, "data"=>$this->subnet_usage ()); }
 			// first available address
-			elseif ($this->_params->id2=="first_free") 	{ return array("code"=>200, "data"=>$this->subnet_first_free ());  }
+			elseif ($this->_params->id2 == "first_free") { return array ("code"=>200, "data"=>$this->subnet_first_free ()); }
 			// fail
-			else										{ $this->Response->throw_exception(400, 'Invalid request'); }
+			else { $this->Response->throw_exception (400, 'Invalid request'); }
 		}
 		// custom fields
-		elseif ($this->_params->id=="custom_fields") {
+		elseif ($this->_params->id == "custom_fields") {
 			// check result
-			if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-			else										{ return array("code"=>200, "data"=>$this->custom_fields); }
+			if (sizeof ($this->custom_fields) == 0) { $this->Response->throw_exception (404, 'No custom fields defined'); }
+			else { return array ("code"=>200, "data"=>$this->custom_fields); }
 		}
 		// id
-		elseif (is_numeric($this->_params->id)) {
+		elseif (is_numeric ($this->_params->id)) {
 			$result = $this->read_subnet ();
 			// check result
-			if($result==NULL)							{ $this->Response->throw_exception(404, "Invalid Id"); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+			if ($result == NULL) { $this->Response->throw_exception (404, "Invalid Id"); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
 		}
 		// false
-		else 											{ $this->Response->throw_exception(404, 'Invalid Id'); }
+		else { $this->Response->throw_exception (404, 'Invalid Id'); }
 	}
 
 
@@ -275,26 +275,26 @@ 
 		$this->validate_subnet_id ();
 
 		// check if id2 is set > additional methods
-		if(isset($this->_params->id2)) {
+		if (isset($this->_params->id2)) {
 			// resize
-			if($this->_params->id2=="resize") 			{ return $this->subnet_resize (); }
+			if ($this->_params->id2 == "resize") { return $this->subnet_resize (); }
 			// split
-			elseif($this->_params->id2=="split") 		{ return $this->subnet_split (); }
+			elseif ($this->_params->id2 == "split") { return $this->subnet_split (); }
 			// error
-			else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
+			else { $this->Response->throw_exception (400, 'Invalid parameters'); }
 		}
 		// ok, normal update
 		else {
 			// new section
-			if(isset($this->_params->sectionId)) 		{ $this->validate_section (); }
+			if (isset($this->_params->sectionId)) { $this->validate_section (); }
 
 			// validate vlan and vrf
 			$this->validate_vlan ();
 			$this->validate_vrf ();
 
 			// if subnet is provided die
-			if(isset($this->_params->subnet))			{ $this->Response->throw_exception(400, 'Subnet cannot be changed'); }
-			if(isset($this->_params->mask))				{ $this->Response->throw_exception(400, 'To change mask use resize method'); }
+			if (isset($this->_params->subnet)) { $this->Response->throw_exception (400, 'Subnet cannot be changed'); }
+			if (isset($this->_params->mask)) { $this->Response->throw_exception (400, 'To change mask use resize method'); }
 
 			# check for valid keys
 			$values = $this->validate_keys ();
@@ -302,10 +302,10 @@ 
 			$values["id"] = $this->_params->id;
 
 			# execute update
-			if(!$this->Subnets->modify_subnet ("edit", $values))
-														{ $this->Response->throw_exception(500, 'Subnet update failed'); }
+			if (!$this->Subnets->modify_subnet ("edit", $values))
+														{ $this->Response->throw_exception (500, 'Subnet update failed'); }
 			else {
-				return array("code"=>200, "data"=>"Subnet updated");
+				return array ("code"=>200, "data"=>"Subnet updated");
 			}
 		}
 	}
@@ -330,24 +330,24 @@ 
 		$this->validate_subnet_id ();
 
 		// check if id2 is set > additional methods
-		if(isset($this->_params->id2)) {
+		if (isset($this->_params->id2)) {
 			// truncate
-			if($this->_params->id2=="truncate") 		{ return $this->subnet_truncate (); }
+			if ($this->_params->id2 == "truncate") { return $this->subnet_truncate (); }
 			// error
-			else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
+			else { $this->Response->throw_exception (400, 'Invalid parameters'); }
 		}
 		// ok, delete subnet
 		else {
 			# set variables for delete
-			$values = array();
+			$values = array ();
 			$values["id"] = $this->_params->id;
 
 			# execute update
-			if(!$this->Subnets->modify_subnet ("delete", $values))
-														{ $this->Response->throw_exception(500, "Failed to delete subnet"); }
+			if (!$this->Subnets->modify_subnet ("delete", $values))
+														{ $this->Response->throw_exception (500, "Failed to delete subnet"); }
 			else {
 				//set result
-				return array("code"=>200, "data"=>"Subnet deleted");
+				return array ("code"=>200, "data"=>"Subnet deleted");
 			}
 		}
 	}
@@ -370,7 +370,7 @@ 
 		// ok, try to truncate
 		$this->Subnets->modify_subnet ("truncate", (array) $this->_params);
 		//set result
-		return array("code"=>200, "data"=>"Subnet truncated");
+		return array ("code"=>200, "data"=>"Subnet truncated");
 	}
 
 
@@ -390,7 +390,7 @@ 
 		$this->validate_subnet_id ();
 
 		// validate input parmeters
-		if(!isset($this->_params->mask))				{ $this->Response->throw_exception(400, "Subnet mask not provided"); }
+		if (!isset($this->_params->mask)) { $this->Response->throw_exception (400, "Subnet mask not provided"); }
 
 		// fetch old subnet
 		$old_subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id);
@@ -403,19 +403,19 @@ 
 			$subnet_new = $old_subnet->subnet;
 		}
 		else {
-			$new_boundaries = $this->Subnets->get_network_boundaries ($this->Subnets->transform_address($old_subnet->subnet, "dotted"), $this->_params->mask);
-			$subnet_new 	= $this->Subnets->transform_address($new_boundaries['network'], "decimal");
+			$new_boundaries = $this->Subnets->get_network_boundaries ($this->Subnets->transform_address ($old_subnet->subnet, "dotted"), $this->_params->mask);
+			$subnet_new = $this->Subnets->transform_address ($new_boundaries['network'], "decimal");
 		}
 
 		# set update values
-		$values = array("id"=>$this->_params->id,
+		$values = array ("id"=>$this->_params->id,
 						"subnet"=>$subnet_new,
 						"mask"=>$this->_params->mask
 						);
 		$this->Subnets->modify_subnet ("resize", $values);
 
 		//set result
-		return array("code"=>200, "data"=>"Subnet truncated");
+		return array ("code"=>200, "data"=>"Subnet truncated");
 	}
 
 
@@ -436,9 +436,9 @@ 
 		$this->validate_subnet_id ();
 
 		// validate input parmeters
-		if(!is_numeric($this->_params->number))			{ $this->Response->throw_exception(400, "Invalid number of new subnets"); }
-		if(!isset($this->_params->group))				{ $this->_params->group = "yes"; }
-		if(!isset($this->_params->strict))				{ $this->_params->strict = "yes"; }
+		if (!is_numeric ($this->_params->number)) { $this->Response->throw_exception (400, "Invalid number of new subnets"); }
+		if (!isset($this->_params->group)) { $this->_params->group = "yes"; }
+		if (!isset($this->_params->strict)) { $this->_params->strict = "yes"; }
 
 		// fetch old subnet
 		$subnet_old = $this->Subnets->fetch_subnet ("id", $this->_params->id);
@@ -446,7 +446,7 @@ 
 		$this->Subnets->subnet_split ($subnet_old, $this->_params->number, $this->_params->prefix, $this->_params->group, $this->_params->strict);
 
 		//set result
-		return array("code"=>200, "data"=>"Subnet splitted");
+		return array ("code"=>200, "data"=>"Subnet splitted");
 	}
 
 
@@ -461,20 +461,20 @@ 
 	 */
 	private function subnet_usage () {
 		# check that section exists
-		if(sizeof($subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id))==0)
-														{ $this->Response->throw_exception(400, "Subnet does not exist"); }
+		if (sizeof ($subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id)) == 0)
+														{ $this->Response->throw_exception (400, "Subnet does not exist"); }
 
 		# set slaves
 		$slaves = $this->Subnets->has_slaves ($this->_params->id) ? true : false;
 
 		# fetch all addresses and calculate usage
-		if($slaves) {
+		if ($slaves) {
 			$addresses = $this->Addresses->fetch_subnet_addresses_recursive ($this->_params->id, false);
 		} else {
 			$addresses = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
 		}
 		// calculate
-		$subnet_usage  = $this->Subnets->calculate_subnet_usage (gmp_strval(sizeof($addresses)), $subnet->mask, $subnet->subnet, $subnet->isFull );		//Calculate free/used etc
+		$subnet_usage = $this->Subnets->calculate_subnet_usage (gmp_strval (sizeof ($addresses)), $subnet->mask, $subnet->subnet, $subnet->isFull); //Calculate free/used etc
 
 		# return
 		return $subnet_usage;
@@ -496,8 +496,8 @@ 
 		// fetch
 		$first = $this->Addresses->get_first_available_address ($this->_params->id, $this->Subnets);
 		// available?
-		if($first===false)	{ $first = null; }
-		else				{ $first = $this->Addresses->transform_to_dotted($first); }
+		if ($first === false) { $first = null; }
+		else { $first = $this->Addresses->transform_to_dotted ($first); }
 
 		# return
 		return $first;
@@ -518,25 +518,25 @@ 
 	 */
 	private function read_subnet ($subnetId = null) {
 		// null
-		$subnetId = is_null($subnetId) ? $this->_params->id : $subnetId;
+		$subnetId = is_null ($subnetId) ? $this->_params->id : $subnetId;
 		// fetch
 		$result = $this->Subnets->fetch_subnet ("id", $subnetId);
         // add nameservers
-        if($result!==false) {
-            $ns = $this->read_subnet_nameserver($result->nameserverId);
-            if ($ns!==false) {
+        if ($result !== false) {
+            $ns = $this->read_subnet_nameserver ($result->nameserverId);
+            if ($ns !== false) {
                 $result->nameservers = $ns;
             }
         }
 		// fetch gateway
-		if(sizeof($result)>0) {
+		if (sizeof ($result) > 0) {
     		$gateway = $this->read_subnet_gateway ();
-    		if ( $gateway!== false) {
+    		if ($gateway !== false) {
         		$result->gatewayId = $gateway->id;
     		}
 		}
 		# result
-		return sizeof($result)==0 ? false : $result;
+		return sizeof ($result) == 0 ? false : $result;
 	}
 
 	/**
@@ -549,7 +549,7 @@ 
 		// fetch
 		$result = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
 		# result
-		return sizeof($result)==0 ? false : $result;
+		return sizeof ($result) == 0 ? false : $result;
 	}
 
 	/**
@@ -583,7 +583,7 @@ 
 		// fetch
 		$result = $this->Subnets->fetch_subnet_slaves ($this->_params->id);
 		# result
-		return $result===false ? NULL : $result;
+		return $result === false ? NULL : $result;
 	}
 
 	/**
@@ -596,11 +596,11 @@ 
 		// get array of ids
 		$this->Subnets->fetch_subnet_slaves_recursive ($this->_params->id);
 		// fetch all;
-		foreach($this->Subnets->slaves as $s) {
+		foreach ($this->Subnets->slaves as $s) {
 			$result[] = $this->read_subnet ($s);
 		}
 		# result
-		return $result===false ? NULL : $result;
+		return $result === false ? NULL : $result;
 	}
 
 	/**
@@ -615,9 +615,9 @@ 
 		// check
 		$subnet = $this->Tools->fetch_multiple_objects ("subnets", "subnet", $this->_params->id2);
 		// validate mask
-		if($subnet!==false) {
-			foreach($subnet as $s) {
-				if($s->mask == $this->_params->id3) {
+		if ($subnet !== false) {
+			foreach ($subnet as $s) {
+				if ($s->mask == $this->_params->id3) {
 					$result[] = $s;
 				}
 			}
@@ -643,7 +643,7 @@ 
 	 */
 	private function validate_create_parameters () {
 		# make sure subnet is in dotted format for checks
-		$this->_params->subnet = $this->Addresses->transform_address($this->_params->subnet ,"dotted");
+		$this->_params->subnet = $this->Addresses->transform_address ($this->_params->subnet, "dotted");
 
 		# cidr check
 		$this->validate_cidr ();
@@ -671,10 +671,10 @@ 
 	 */
 	private function validate_cidr () {
 		// not for folder
-		if($this->_params->isFolder!=1) {
+		if ($this->_params->isFolder != 1) {
 			// check
-			if(strlen($err = $this->Subnets->verify_cidr_address($this->_params->subnet."/".$this->_params->mask))>1)
-																									{ $this->Response->throw_exception(400, $err); }
+			if (strlen ($err = $this->Subnets->verify_cidr_address ($this->_params->subnet."/".$this->_params->mask)) > 1)
+																									{ $this->Response->throw_exception (400, $err); }
 		}
 	}
 
@@ -686,8 +686,8 @@ 
 	 */
 	private function validate_network () {
 		// not for folder
-		if($this->_params->isFolder!=1) {
-			if(!$this->Addresses->is_network ($this->_params->subnet, $this->_params->mask))		{ $this->Response->throw_exception(400, "Address is not subnet"); }
+		if ($this->_params->isFolder != 1) {
+			if (!$this->Addresses->is_network ($this->_params->subnet, $this->_params->mask)) { $this->Response->throw_exception (400, "Address is not subnet"); }
 		}
 	}
 
@@ -699,16 +699,16 @@ 
 	 */
 	private function validate_master_subnet () {
 		// set 0 if not set
-		if(!isset($this->_params->masterSubnetId) || $this->_params->masterSubnetId=="0") 			{ $this->_params->masterSubnetId = 0; }
+		if (!isset($this->_params->masterSubnetId) || $this->_params->masterSubnetId == "0") { $this->_params->masterSubnetId = 0; }
 		else {
 			// validate subnet
-			if(sizeof($this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId))==0)		{ $this->Response->throw_exception(400, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
+			if (sizeof ($this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId)) == 0) { $this->Response->throw_exception (400, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
 			// check that it is inside subnet
 			else {
 				// not fr folders
-				if(@$this->_params->isFolder!=1) {
-					if(!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
-																									{ $this->Response->throw_exception(400, "Subnet is not within boundaries of its master subnet"); }
+				if (@$this->_params->isFolder != 1) {
+					if (!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
+																									{ $this->Response->throw_exception (400, "Subnet is not within boundaries of its master subnet"); }
 				}
 			}
 		}
@@ -722,10 +722,10 @@ 
 	 */
 	private function validate_section () {
 		// Section Id must be present and numeric
-		if(!isset($this->_params->sectionId))														{ $this->Response->throw_exception(400, "Invalid Section (".$this->_params->sectionId.")"); }
-		elseif(!is_numeric($this->_params->sectionId))												{ $this->Response->throw_exception(400, "Section Id must be numeric (".$this->_params->sectionId.")"); }
+		if (!isset($this->_params->sectionId)) { $this->Response->throw_exception (400, "Invalid Section (".$this->_params->sectionId.")"); }
+		elseif (!is_numeric ($this->_params->sectionId)) { $this->Response->throw_exception (400, "Section Id must be numeric (".$this->_params->sectionId.")"); }
 		else {
-			if($this->Tools->fetch_object("sections", "id", $this->_params->sectionId)===false)		{ $this->Response->throw_exception(400, "Section id (".$this->_params->sectionId.") does not exist"); }
+			if ($this->Tools->fetch_object ("sections", "id", $this->_params->sectionId) === false) { $this->Response->throw_exception (400, "Section id (".$this->_params->sectionId.") does not exist"); }
 		}
 	}
 
@@ -737,9 +737,9 @@ 
 	 */
 	private function validate_subnet_id () {
 		// numberic
-		if(!is_numeric($this->_params->id))															{ $this->Response->throw_exception(400, "Subnet Id must be numeric (".$this->_params->id.")"); }
+		if (!is_numeric ($this->_params->id)) { $this->Response->throw_exception (400, "Subnet Id must be numeric (".$this->_params->id.")"); }
 		// check subnet
-		if(is_null($this->Subnets->fetch_subnet ("id", $this->_params->id)))						{ $this->Response->throw_exception(400, "Invalid subnet Id (".$this->_params->id.")"); }
+		if (is_null ($this->Subnets->fetch_subnet ("id", $this->_params->id))) { $this->Response->throw_exception (400, "Invalid subnet Id (".$this->_params->id.")"); }
 	}
 
 	/**
@@ -750,11 +750,11 @@ 
 	 */
 	private function validate_folder () {
 		// only fo folders
-		if(@$this->_params->isFolder==1) {
+		if (@$this->_params->isFolder == 1) {
 			// if parent is set it must be a folder!
-			if($this->_params->masterSubnetId!=0) {
+			if ($this->_params->masterSubnetId != 0) {
 				$parent = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
-				if($parent->isFolder!=1) 															{ $this->Response->throw_exception(400, "Parent is not a folder"); }
+				if ($parent->isFolder != 1) { $this->Response->throw_exception (400, "Parent is not a folder"); }
 			}
 		}
 	}
@@ -768,40 +768,40 @@ 
 	private function validate_overlapping () {
 		// section details
 		$section = $this->Tools->fetch_object ("sections", "id", $this->_params->sectionId);
-		if($section===false)																		{ $this->Response->throw_exception(400, "Invalid section Id"); }
+		if ($section === false) { $this->Response->throw_exception (400, "Invalid section Id"); }
 		// settings
 		$this->settings = $this->Tools->fetch_object ("settings", "id", 1);
 
 		# get master subnet details for folder overrides
-		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; }
+		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; }
 		}
-		else 									{ $parent_is_folder = false; }
+		else { $parent_is_folder = false; }
 
 		// create cidr address
-		$cidr = $this->Addresses->transform_address($this->_params->subnet,"dotted")."/".$this->_params->mask;
+		$cidr = $this->Addresses->transform_address ($this->_params->subnet, "dotted")."/".$this->_params->mask;
 
 		// root subnet
-		if($this->_params->masterSubnetId==0) {
+		if ($this->_params->masterSubnetId == 0) {
 			// check overlapping
-			if($section->strictMode==1 && !$parent_is_folder) {
+			if ($section->strictMode == 1 && !$parent_is_folder) {
 		    	/* verify that no overlapping occurs if we are adding root subnet only check for overlapping if vrf is empty or not exists! */
 		    	$overlap = $this->Subnets->verify_subnet_overlapping ($this->_params->sectionId, $cidr, $this->_params->vrfId);
-		    	if($overlap!==false) 																{ $this->Response->throw_exception(400, $overlap); }
+		    	if ($overlap !== false) { $this->Response->throw_exception (400, $overlap); }
 			}
 		}
 		// not root
 		else {
 		    //disable checks for folders and if strict check enabled
-		    if($section->strictMode==1 && !$parent_is_folder ) {
+		    if ($section->strictMode == 1 && !$parent_is_folder) {
 			    //verify that nested subnet is inside root subnet
-		        if (!$this->Subnets->verify_subnet_nesting($this->_params->masterSubnetId, $cidr)) 	{ $this->Response->throw_exception(400, "Nested subnet not in root subnet"); }
+		        if (!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $cidr)) { $this->Response->throw_exception (400, "Nested subnet not in root subnet"); }
 
 			    //nested?
-		        $overlap = $this->Subnets->verify_nested_subnet_overlapping($this->_params->sectionId, $cidr, $this->_params->vrfId, $this->_params->masterSubnetId);
-				if($overlap!==false) 																{ $this->Response->throw_exception(400, $overlap); }
+		        $overlap = $this->Subnets->verify_nested_subnet_overlapping ($this->_params->sectionId, $cidr, $this->_params->vrfId, $this->_params->masterSubnetId);
+				if ($overlap !== false) { $this->Response->throw_exception (400, $overlap); }
 		    }
 		}
 	}
@@ -813,8 +813,8 @@ 
 	 * @return void
 	 */
 	private function validate_vlan () {
-		if(isset($this->_params->vlanId)) {
-			if($this->Tools->fetch_object("vlans", "vlanId", $this->_params->vlanId)===false)		{ $this->Response->throw_exception(400, "Vlan does not exist"); }
+		if (isset($this->_params->vlanId)) {
+			if ($this->Tools->fetch_object ("vlans", "vlanId", $this->_params->vlanId) === false) { $this->Response->throw_exception (400, "Vlan does not exist"); }
 		}
 	}
 
@@ -825,8 +825,8 @@ 
 	 * @return void
 	 */
 	private function validate_vrf () {
-		if(isset($this->_params->vrfId)) {
-			if($this->Tools->fetch_object("vrf", "vrfId", $this->_params->vrfId)===false)			{ $this->Response->throw_exception(400, "VRF does not exist"); }
+		if (isset($this->_params->vrfId)) {
+			if ($this->Tools->fetch_object ("vrf", "vrfId", $this->_params->vrfId) === false) { $this->Response->throw_exception (400, "VRF does not exist"); }
 		}
 	}
 

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");
+		}
+		}
 	}
 
 	/**

Spacing +78 added lines, -78 removed lines

@@ -90,10 +90,10 @@ 
 	 * @param mixed $params		// post/get values
 	 * @param class $Response
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
 		$this->Response = $Response;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		// init required objects
 		$this->init_object ("Admin", $Database);
@@ -123,7 +123,7 @@ 
 	 * @return void
 	 */
 	private function define_tools_controllers () {
-		$this->subcontrollers = array("ipTags"=>"tags",
+		$this->subcontrollers = array ("ipTags"=>"tags",
 									  "devices"=>"devices",
 									  "deviceTypes"=>"devicetypes",
 									  "vlans"=>"vlans",
@@ -140,14 +140,14 @@ 
 	 * @return void
 	 */
 	private function define_available_identifiers () {
-		$this->identifiers = array(
-								"ipTags"=>array("id2", "id3"),
-								"devices"=>array("id2", "id3"),
-								"deviceTypes"=>array("id2", "id3"),
-								"vlans"=>array("id2", "id3"),
-								"vrf"=>array("id2", "id3"),
-								"nameservers"=>array("id2"),
-								"scanAgents"=>array("id2")
+		$this->identifiers = array (
+								"ipTags"=>array ("id2", "id3"),
+								"devices"=>array ("id2", "id3"),
+								"deviceTypes"=>array ("id2", "id3"),
+								"vlans"=>array ("id2", "id3"),
+								"vrf"=>array ("id2", "id3"),
+								"nameservers"=>array ("id2"),
+								"scanAgents"=>array ("id2")
 								);
 	}
 
@@ -159,10 +159,10 @@ 
 	 */
 	private function define_sort_key () {
 		// deviceTypes
-		if ($this->_params->id == "deviceTypes")	{ $this->sort_key = "tid"; }
-		elseif ($this->_params->id == "vlans")		{ $this->sort_key = "vlanId"; }
-		elseif ($this->_params->id == "vrf")		{ $this->sort_key = "vrfId"; }
-		else										{ $this->sort_key = "id"; }
+		if ($this->_params->id == "deviceTypes") { $this->sort_key = "tid"; }
+		elseif ($this->_params->id == "vlans") { $this->sort_key = "vlanId"; }
+		elseif ($this->_params->id == "vrf") { $this->sort_key = "vrfId"; }
+		else { $this->sort_key = "id"; }
 	}
 
 
@@ -185,19 +185,19 @@ 
 		$app = $this->Tools->fetch_object ("api", "app_id", $this->_params->app_id);
 
 		// controllers
-		$controllers = array(
-						array("rel"=>"sections",	"href"=>"/api/".$_GET['app_id']."/sections/"),
-						array("rel"=>"subnets",		"href"=>"/api/".$_GET['app_id']."/subnets/"),
-						array("rel"=>"folders",		"href"=>"/api/".$_GET['app_id']."/folders/"),
-						array("rel"=>"addresses",	"href"=>"/api/".$_GET['app_id']."/addresses/"),
-						array("rel"=>"vlans",		"href"=>"/api/".$_GET['app_id']."/vlans/"),
-						array("rel"=>"vrfs",		"href"=>"/api/".$_GET['app_id']."/vrfs/"),
-						array("rel"=>"nameservers",	"href"=>"/api/".$_GET['app_id']."/nameservers/"),
-						array("rel"=>"scanAgents",	"href"=>"/api/".$_GET['app_id']."/scanagents/"),
-						array("rel"=>"tools",		"href"=>"/api/".$_GET['app_id']."/tools/")
+		$controllers = array (
+						array ("rel"=>"sections", "href"=>"/api/".$_GET['app_id']."/sections/"),
+						array ("rel"=>"subnets", "href"=>"/api/".$_GET['app_id']."/subnets/"),
+						array ("rel"=>"folders", "href"=>"/api/".$_GET['app_id']."/folders/"),
+						array ("rel"=>"addresses", "href"=>"/api/".$_GET['app_id']."/addresses/"),
+						array ("rel"=>"vlans", "href"=>"/api/".$_GET['app_id']."/vlans/"),
+						array ("rel"=>"vrfs", "href"=>"/api/".$_GET['app_id']."/vrfs/"),
+						array ("rel"=>"nameservers", "href"=>"/api/".$_GET['app_id']."/nameservers/"),
+						array ("rel"=>"scanAgents", "href"=>"/api/".$_GET['app_id']."/scanagents/"),
+						array ("rel"=>"tools", "href"=>"/api/".$_GET['app_id']."/tools/")
 					);
 		# Response
-		return array("code"=>200, "data"=>array("permissions"=>$this->Subnets->parse_permissions($app->app_permissions), "controllers"=>$controllers));
+		return array ("code"=>200, "data"=>array ("permissions"=>$this->Subnets->parse_permissions ($app->app_permissions), "controllers"=>$controllers));
 	}
 
 
@@ -225,47 +225,47 @@ 
 
 		# all ?
 		if (!isset($this->_params->id2)) {
-			$result = $this->Tools->fetch_all_objects ($this->_params->id,  $this->sort_key);
+			$result = $this->Tools->fetch_all_objects ($this->_params->id, $this->sort_key);
 			// result
-			if($result===false)							{ $this->Response->throw_exception(404, 'No objects found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, false)); }
+			if ($result === false) { $this->Response->throw_exception (404, 'No objects found'); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, false)); }
 		}
 		# by parameter
 		elseif (isset($this->_params->id3)) {
 			// devices (for deviceTypes)
-			if ($this->_params->id == "deviceTypes" && $this->_params->id3=="devices") {
+			if ($this->_params->id == "deviceTypes" && $this->_params->id3 == "devices") {
 				// fetch
 				$result = $this->Tools->fetch_multiple_objects ("devices", "type", $this->_params->id2, "id", true);
 			}
 			// vlans
-			elseif ($this->_params->id == "vlans" && $this->_params->id3=="subnets") {
+			elseif ($this->_params->id == "vlans" && $this->_params->id3 == "subnets") {
 				// fetch
 				$result = $this->Tools->fetch_multiple_objects ("subnets", "vlanId", $this->_params->id2, "id", true);
                 // add gateway
-    			if($result!=false) {
+    			if ($result != false) {
     				foreach ($result as $k=>$r) {
         				//gateway
                 		$gateway = $this->read_subnet_gateway ($r->id);
-                		if ( $gateway!== false) {
+                		if ($gateway !== false) {
                     		$result[$k]->gatewayId = $gateway->id;
                 		}
                     	//nameservers
                 		$ns = $this->read_subnet_nameserver ();
-                        if ($ns!==false) {
+                        if ($ns !== false) {
                             $result[$k]->nameservers = $ns;
                         }
     				}
     			}
 			}
 			// vrfs
-			elseif ($this->_params->id == "vrf" && $this->_params->id3=="subnets") {
+			elseif ($this->_params->id == "vrf" && $this->_params->id3 == "subnets") {
 				// fetch
 				$result = $this->Tools->fetch_multiple_objects ("subnets", "vrfId", $this->_params->id2, "id", true);
                 // add gateway
-    			if($result!=false) {
+    			if ($result != false) {
     				foreach ($result as $k=>$r) {
                 		$gateway = $this->read_subnet_gateway ($r->id);
-                		if ( $gateway!== false) {
+                		if ($gateway !== false) {
                     		$result[$k]->gatewayId = $gateway->id;
                 		}
     				}
@@ -274,28 +274,28 @@ 
 			else {
     			$field = string;
 				// id3 can only be addresses
-				if ($this->_params->id3 != "addresses")	{ $this->Response->throw_exception(400, 'Invalid parameter'); }
+				if ($this->_params->id3 != "addresses") { $this->Response->throw_exception (400, 'Invalid parameter'); }
 				// define identifier
-				if ($this->_params->id == "ipTags") 	{ $field = "state"; }
-				elseif ($this->_params->id == "devices"){ $field = "switch"; }
-				else									{ $this->Response->throw_exception(400, 'Invalid parameter'); }
+				if ($this->_params->id == "ipTags") { $field = "state"; }
+				elseif ($this->_params->id == "devices") { $field = "switch"; }
+				else { $this->Response->throw_exception (400, 'Invalid parameter'); }
 				// fetch
 				$result = $this->Tools->fetch_multiple_objects ("ipaddresses", $field, $this->_params->id2, $this->sort_key, true);
 			}
 			// result
-			if($result===false)							{ $this->Response->throw_exception(404, 'No objects found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, true)); }
+			if ($result === false) { $this->Response->throw_exception (404, 'No objects found'); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, true)); }
 
 		}
 		# by id
 		else {
 			// numeric
-			if(!is_numeric($this->_params->id2)) 		{ $this->Response->throw_exception(404, 'Identifier must be numeric'); }
+			if (!is_numeric ($this->_params->id2)) { $this->Response->throw_exception (404, 'Identifier must be numeric'); }
 
 			$result = $this->Tools->fetch_object ($this->_params->id, $this->sort_key, $this->_params->id2);
 			// result
-			if($result===false)							{ $this->Response->throw_exception(404, 'No objects found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, false)); }
+			if ($result === false) { $this->Response->throw_exception (404, 'No objects found'); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, false)); }
 		}
 	}
 
@@ -316,8 +316,8 @@ 
 	 */
 	public function POST () {
 		# vlans, vrfs
-		if ($this->_params->id=="vlans" || $this->_params->id=="vrf")
-													{ $this->Response->throw_exception(400, 'Please use '.$this->_params->id.' controller'); }
+		if ($this->_params->id == "vlans" || $this->_params->id == "vrf")
+													{ $this->Response->throw_exception (400, 'Please use '.$this->_params->id.' controller'); }
 
 		# check for valid keys
 		$values = $this->validate_keys ();
@@ -326,14 +326,14 @@ 
 		$this->validate_post_patch ();
 
 		# only 1 parameter ?
-		if (sizeof($values)==1)						{ $this->Response->throw_exception(400, 'No parameters'); }
+		if (sizeof ($values) == 1) { $this->Response->throw_exception (400, 'No parameters'); }
 
 		# execute update
-		if(!$this->Admin->object_modify ($this->_params->id, "add", "", $values))
-													{ $this->Response->throw_exception(500, $this->_params->id." object creation failed"); }
+		if (!$this->Admin->object_modify ($this->_params->id, "add", "", $values))
+													{ $this->Response->throw_exception (500, $this->_params->id." object creation failed"); }
 		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."/");
+			return array ("code"=>201, "data"=>$this->_params->id." object created", "location"=>"/api/".$this->_params->app_id."/tools/".$this->_params->id."/".$this->Admin->lastId."/");
 		}
 
 	}
@@ -365,8 +365,8 @@ 
 	 */
 	public function PATCH () {
 		# vlans, vrfs
-		if ($this->_params->id=="vlans" || $this->_params->id=="vrf")
-													{ $this->Response->throw_exception(400, 'Please use '.$this->_params->id.' controller'); }
+		if ($this->_params->id == "vlans" || $this->_params->id == "vrf")
+													{ $this->Response->throw_exception (400, 'Please use '.$this->_params->id.' controller'); }
 
 		# verify object
 		$this->validate_tools_object ();
@@ -383,14 +383,14 @@ 
 		$values = $this->validate_keys ();
 
 		# only 1 parameter ?
-		if (sizeof($values)==1)						{ $this->Response->throw_exception(400, 'No parameters'); }
+		if (sizeof ($values) == 1) { $this->Response->throw_exception (400, 'No parameters'); }
 
 		# execute update
-		if(!$this->Admin->object_modify ($table_name, "edit",  $this->sort_key, $values))
-													{ $this->Response->throw_exception(500, $table_name." object edit failed"); }
+		if (!$this->Admin->object_modify ($table_name, "edit", $this->sort_key, $values))
+													{ $this->Response->throw_exception (500, $table_name." object edit failed"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>$table_name." object updated");
+			return array ("code"=>200, "data"=>$table_name." object updated");
 		}
 	}
 
@@ -406,30 +406,30 @@ 
 	 */
 	public function DELETE () {
 		# vlans, vrfs
-		if ($this->_params->id=="vlans" || $this->_params->id=="vrf")
-													{ $this->Response->throw_exception(400, 'Please use '.$this->_params->id.' controller'); }
+		if ($this->_params->id == "vlans" || $this->_params->id == "vrf")
+													{ $this->Response->throw_exception (400, 'Please use '.$this->_params->id.' controller'); }
 
 		# verify object
 		$this->validate_tools_object ();
 
 		# set variables for delete
-		$values = array();
+		$values = array ();
 		$values[$this->sort_key] = $this->_params->id2;
 
 		# 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"); }
+		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 {
 			// set update field
-			if ($this->_params->id == "devices")	{ $update_field = "switch"; }
-			elseif ($this->_params->id == "ipTags")	{ $update_field = "state"; }
+			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);
 
 			// set result
-			return array("code"=>200, "data"=>$this->_params->id." object deleted");
+			return array ("code"=>200, "data"=>$this->_params->id." object deleted");
 		}
 	}
 
@@ -452,8 +452,8 @@ 
 	 */
 	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"); }
 	}
 
 	/**
@@ -465,11 +465,11 @@ 
 	private function validate_subcontroller_identifier () {
 		// id3
 		if (isset($this->_params->id3)) {
-			if(!in_array("id3", $this->identifiers[$this->_params->id]))	{ $this->Response->throw_exception(400, "Invalid subcontroller identifier"); }
+			if (!in_array ("id3", $this->identifiers[$this->_params->id])) { $this->Response->throw_exception (400, "Invalid subcontroller identifier"); }
 		}
 		// id2
 		if (isset($this->_params->id2)) {
-			if(!in_array("id2", $this->identifiers[$this->_params->id]))	{ $this->Response->throw_exception(400, "Invalid subcontroller identifier"); }
+			if (!in_array ("id2", $this->identifiers[$this->_params->id])) { $this->Response->throw_exception (400, "Invalid subcontroller identifier"); }
 		}
 	}
 
@@ -480,7 +480,7 @@ 
 	 * @return void
 	 */
 	private function rewrite_subcontroller () {
-		$this->_params->id = array_search($this->_params->id, $this->subcontrollers);
+		$this->_params->id = array_search ($this->_params->id, $this->subcontrollers);
 	}
 
 	/**
@@ -490,8 +490,8 @@ 
 	 * @return void
 	 */
 	private function validate_tools_object () {
-		if ($this->Tools->fetch_object ($this->_params->id, $this->sort_key, $this->_params->id2)===false)
-																			{ $this->Response->throw_exception(400, "Invalid identifier"); }
+		if ($this->Tools->fetch_object ($this->_params->id, $this->sort_key, $this->_params->id2) === false)
+																			{ $this->Response->throw_exception (400, "Invalid identifier"); }
 	}
 
 	/**
@@ -514,10 +514,10 @@ 
 	private function validate_device_type () {
 		if ($this->_params->id == "devices" && isset($this->_params->type)) {
 			// numeric
-			if (!is_numeric($this->_params->type))							{ $this->Response->throw_exception(400, "Invalid devicetype identifier"); }
+			if (!is_numeric ($this->_params->type)) { $this->Response->throw_exception (400, "Invalid devicetype identifier"); }
 			// check
-			if ($this->Tools->fetch_object ("deviceTypes", "tid", $this->_params->type)===false)
-																			{ $this->Response->throw_exception(400, "Device type does not exist"); }
+			if ($this->Tools->fetch_object ("deviceTypes", "tid", $this->_params->type) === false)
+																			{ $this->Response->throw_exception (400, "Device type does not exist"); }
 		}
 	}
 
@@ -530,8 +530,8 @@ 
 	private function validate_ip () {
 		if (isset($this->_params->ip_addr)) {
 			// check
-			if(strlen($err = $this->Subnets->verify_cidr_address($this->_params->ip_addr."/32"))>1)
-																			{ $this->Response->throw_exception(400, $err); }
+			if (strlen ($err = $this->Subnets->verify_cidr_address ($this->_params->ip_addr."/32")) > 1)
+																			{ $this->Response->throw_exception (400, $err); }
 
 		}
 	}