phpipam / phpipam

functions/classes/class.Rewrite.php

Indentation +225 added lines, -225 removed lines

@@ -38,246 +38,246 @@
  */
 class Rewrite {
 
-	/**
-	 * Flag if API is used
-	 *
-	 * @var bool
-	 */
-	private $is_api = false;
+    /**
+     * Flag if API is used
+     *
+     * @var bool
+     */
+    private $is_api = false;
 
-	/**
-	 * Array of passthroughs
-	 *
-	 * @var array
-	 */
-	private $uri_passthroughs = array('app', '?switch=back');
+    /**
+     * Array of passthroughs
+     *
+     * @var array
+     */
+    private $uri_passthroughs = array('app', '?switch=back');
 
-	/**
-	 * URI parts from $_SERVER['REQUEST_URI']
-	 *
-	 * [0=>subnets, 1=>7, 2=>detals]
-	 *
-	 * @var array
-	 */
-	private $uri_parts = array();
+    /**
+     * URI parts from $_SERVER['REQUEST_URI']
+     *
+     * [0=>subnets, 1=>7, 2=>detals]
+     *
+     * @var array
+     */
+    private $uri_parts = array();
 
-	/**
-	 * Final GET params to be returned
-	 *
-	 * @var array
-	 */
-	private $get_params = array();
+    /**
+     * Final GET params to be returned
+     *
+     * @var array
+     */
+    private $get_params = array();
 
 
 
 
-	/**
-	 * Constructior
-	 *
-	 * @method __construct
-	 */
-	public function __construct () {
-		// process request URI
-		$this->process_request_uri ();
-		// formulate GET request
-		$this->create_get_params ();
-	}
+    /**
+     * Constructior
+     *
+     * @method __construct
+     */
+    public function __construct () {
+        // process request URI
+        $this->process_request_uri ();
+        // formulate GET request
+        $this->create_get_params ();
+    }
 
-	/**
-	 * Set API flag
-	 *
-	 * @method set_api_flag
-	 *
-	 * @return void
-	 */
-	private function set_api_flag () {
-		if($this->uri_parts[0]=="api") {
-			$this->is_api = true;
-		}
-	}
+    /**
+     * Set API flag
+     *
+     * @method set_api_flag
+     *
+     * @return void
+     */
+    private function set_api_flag () {
+        if($this->uri_parts[0]=="api") {
+            $this->is_api = true;
+        }
+    }
 
-	/**
-	 * [get_url_params description]
-	 *
-	 * @method get_url_params
-	 *
-	 * @return array
-	 */
-	public function get_url_params () {
-		return $this->get_params;
-	}
+    /**
+     * [get_url_params description]
+     *
+     * @method get_url_params
+     *
+     * @return array
+     */
+    public function get_url_params () {
+        return $this->get_params;
+    }
 
-	/**
-	 * Checks if API is requested
-	 *
-	 * @method is_api
-	 *
-	 * @return bool
-	 */
-	public function is_api () {
-		return $this->is_api;
-	}
+    /**
+     * Checks if API is requested
+     *
+     * @method is_api
+     *
+     * @return bool
+     */
+    public function is_api () {
+        return $this->is_api;
+    }
 
-	/**
-	 * Process request URI
-	 *
-	 * Remove url and base and save raw request to array
-	 *
-	 * @method process_request_uri
-	 *
-	 * @return void
-	 */
-	private function process_request_uri () {
-		// ignore for direct access
-		if(strpos($_SERVER['REQUEST_URI'], "index.php")===false) {
-			if(BASE!="/") {
-				$this->uri_parts = array_values(array_filter(explode("/", str_replace(BASE, "", $_SERVER['REQUEST_URI']))));
-			}
-			else {
-				$this->uri_parts = array_values(array_filter(explode("/", $_SERVER['REQUEST_URI'])));
-			}
-			// set api flag
-			$this->set_api_flag ();
-		}
-		// no rewrites - rewurn default
-		else {
-			$this->get_params = $_GET;
-		}
-	}
+    /**
+     * Process request URI
+     *
+     * Remove url and base and save raw request to array
+     *
+     * @method process_request_uri
+     *
+     * @return void
+     */
+    private function process_request_uri () {
+        // ignore for direct access
+        if(strpos($_SERVER['REQUEST_URI'], "index.php")===false) {
+            if(BASE!="/") {
+                $this->uri_parts = array_values(array_filter(explode("/", str_replace(BASE, "", $_SERVER['REQUEST_URI']))));
+            }
+            else {
+                $this->uri_parts = array_values(array_filter(explode("/", $_SERVER['REQUEST_URI'])));
+            }
+            // set api flag
+            $this->set_api_flag ();
+        }
+        // no rewrites - rewurn default
+        else {
+            $this->get_params = $_GET;
+        }
+    }
 
-	/**
-	 * Create get parameters based on api or non-api
-	 *
-	 * @method create_get_params
-	 *
-	 * @return void
-	 */
-	private function create_get_params () {
-		$this->is_api ? $this->create_get_params_api () : $this->create_get_params_ui ();
-	}
+    /**
+     * Create get parameters based on api or non-api
+     *
+     * @method create_get_params
+     *
+     * @return void
+     */
+    private function create_get_params () {
+        $this->is_api ? $this->create_get_params_api () : $this->create_get_params_ui ();
+    }
 
-	/**
-	 * Create GET parameters for UI
-	 *
-	 * @method create_get_params_ui
-	 *
-	 * @return void
-	 */
-	private function create_get_params_ui () {
-		// process uri parts
-		if(sizeof($this->uri_parts)>0) {
-			if(in_array($this->uri_parts[0], $this->uri_passthroughs)) {
-				$this->get_params = $_GET;
-			} else {
-				foreach ($this->uri_parts as $k=>$l) {
-					switch ($k) {
-						case 0  : $this->get_params['page'] 	= $l;	break;
-						case 1  : $this->get_params['section']  = $l;	break;
-						case 2  : $this->get_params['subnetId'] = $l;	break;
-						case 3  : $this->get_params['sPage']    = $l;	break;
-						case 4  : $this->get_params['ipaddrid'] = $l;	break;
-						case 5  : $this->get_params['tab']      = $l;	break;
-						default : $this->get_params[$k]         = $l;	break;
-					}
-				}
-			}
-		}
-		elseif(sizeof($this->get_params)==0) {
-			$this->get_params['page'] = "dashboard";
-		}
-		// apppend QSA
-		$this->append_qsa();
-		// apply fixes
-		$this->fix_ui_params ();
-	}
+    /**
+     * Create GET parameters for UI
+     *
+     * @method create_get_params_ui
+     *
+     * @return void
+     */
+    private function create_get_params_ui () {
+        // process uri parts
+        if(sizeof($this->uri_parts)>0) {
+            if(in_array($this->uri_parts[0], $this->uri_passthroughs)) {
+                $this->get_params = $_GET;
+            } else {
+                foreach ($this->uri_parts as $k=>$l) {
+                    switch ($k) {
+                        case 0  : $this->get_params['page'] 	= $l;	break;
+                        case 1  : $this->get_params['section']  = $l;	break;
+                        case 2  : $this->get_params['subnetId'] = $l;	break;
+                        case 3  : $this->get_params['sPage']    = $l;	break;
+                        case 4  : $this->get_params['ipaddrid'] = $l;	break;
+                        case 5  : $this->get_params['tab']      = $l;	break;
+                        default : $this->get_params[$k]         = $l;	break;
+                    }
+                }
+            }
+        }
+        elseif(sizeof($this->get_params)==0) {
+            $this->get_params['page'] = "dashboard";
+        }
+        // apppend QSA
+        $this->append_qsa();
+        // apply fixes
+        $this->fix_ui_params ();
+    }
 
-	/**
-	 * Check if some additional parameters were passed and add them to uri_parts
-	 *
-	 * @method append_qsa
-	 * @return void
-	 */
-	private function append_qsa () {
-		if(strpos($_SERVER['REQUEST_URI'], "?")!==false) {
-			$parts = explode("?", $_SERVER['REQUEST_URI']);
-			$parts = $parts[1];
-			// parse
-			parse_str ($parts, $out);
-			// append
-			$this->get_params = (array_merge($this->get_params, $out));
-		}
-	}
+    /**
+     * Check if some additional parameters were passed and add them to uri_parts
+     *
+     * @method append_qsa
+     * @return void
+     */
+    private function append_qsa () {
+        if(strpos($_SERVER['REQUEST_URI'], "?")!==false) {
+            $parts = explode("?", $_SERVER['REQUEST_URI']);
+            $parts = $parts[1];
+            // parse
+            parse_str ($parts, $out);
+            // append
+            $this->get_params = (array_merge($this->get_params, $out));
+        }
+    }
 
-	/**
-	 * Fix UI parameters - exceptions
-	 *
-	 * @method fix_ui_params
-	 *
-	 * @return void
-	 */
-	private function fix_ui_params () {
-		if(isset($this->get_params['page'])) {
-			// dashboard fix for index
-			if($this->get_params['page']=="login" || $this->get_params['page']=="logout") {
-				if(isset($this->get_params['section'])) {
-					if($this->get_params['section']=="dashboard") {
-						$this->get_params['page'] = "dashboard";
-						unset($this->get_params['section']);
-					}
-				}
-			}
-			// search fix
-			elseif ($this->get_params['page']=="tools") {
-				if (isset($this->get_params['section']) && isset($this->get_params['subnetId'])) {
-					if ($this->get_params['section']=="search") {
-						$this->get_params['ip'] = $this->get_params['subnetId'];
-						$this->get_params['ip'] = $this->get_params['ip'];
-						unset($this->get_params['subnetId']);
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Fix UI parameters - exceptions
+     *
+     * @method fix_ui_params
+     *
+     * @return void
+     */
+    private function fix_ui_params () {
+        if(isset($this->get_params['page'])) {
+            // dashboard fix for index
+            if($this->get_params['page']=="login" || $this->get_params['page']=="logout") {
+                if(isset($this->get_params['section'])) {
+                    if($this->get_params['section']=="dashboard") {
+                        $this->get_params['page'] = "dashboard";
+                        unset($this->get_params['section']);
+                    }
+                }
+            }
+            // search fix
+            elseif ($this->get_params['page']=="tools") {
+                if (isset($this->get_params['section']) && isset($this->get_params['subnetId'])) {
+                    if ($this->get_params['section']=="search") {
+                        $this->get_params['ip'] = $this->get_params['subnetId'];
+                        $this->get_params['ip'] = $this->get_params['ip'];
+                        unset($this->get_params['subnetId']);
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Create GET parameters for API
-	 *
-	 * @method create_get_params_api
-	 *
-	 * @return void
-	 */
-	private function create_get_params_api () {
-		// if requested from /api/ remove it and reindex array_values
-		$this->remove_api_from_uri_params ();
-		// create
-		if(sizeof($this->uri_parts)>0) {
-			foreach ($this->uri_parts as $k=>$l) {
-				switch ($k) {
-					case 0  : $this->get_params['app_id']     = $l;	break;
-					case 1  : $this->get_params['controller'] = $l;	break;
-					case 2  : $this->get_params['id']    	  = $l;	break;
-					case 3  : $this->get_params['id2'] 		  = $l;	break;
-					case 4  : $this->get_params['id3']        = $l;	break;
-					case 5  : $this->get_params['id4']        = $l;	break;
-					default : $this->get_params[$k]           = $l;	break;
-				}
-			}
-		}
-		// apppend QSA
-		$this->append_qsa();
-	}
+    /**
+     * Create GET parameters for API
+     *
+     * @method create_get_params_api
+     *
+     * @return void
+     */
+    private function create_get_params_api () {
+        // if requested from /api/ remove it and reindex array_values
+        $this->remove_api_from_uri_params ();
+        // create
+        if(sizeof($this->uri_parts)>0) {
+            foreach ($this->uri_parts as $k=>$l) {
+                switch ($k) {
+                    case 0  : $this->get_params['app_id']     = $l;	break;
+                    case 1  : $this->get_params['controller'] = $l;	break;
+                    case 2  : $this->get_params['id']    	  = $l;	break;
+                    case 3  : $this->get_params['id2'] 		  = $l;	break;
+                    case 4  : $this->get_params['id3']        = $l;	break;
+                    case 5  : $this->get_params['id4']        = $l;	break;
+                    default : $this->get_params[$k]           = $l;	break;
+                }
+            }
+        }
+        // apppend QSA
+        $this->append_qsa();
+    }
 
-	/**
-	 * Remove api from uri parameters and reindex request array
-	 *
-	 * @method remove_api_from_uri_params
-	 *
-	 * @return [type]
-	 */
-	private function remove_api_from_uri_params () {
-		if($this->uri_parts[0]=="api") {
-			unset($this->uri_parts[0]);
-			$this->uri_parts = array_values($this->uri_parts);
-		}
-	}
+    /**
+     * Remove api from uri parameters and reindex request array
+     *
+     * @method remove_api_from_uri_params
+     *
+     * @return [type]
+     */
+    private function remove_api_from_uri_params () {
+        if($this->uri_parts[0]=="api") {
+            unset($this->uri_parts[0]);
+            $this->uri_parts = array_values($this->uri_parts);
+        }
+    }
 }
\ No newline at end of file

api/index.php

Indentation +173 added lines, -173 removed lines

@@ -42,77 +42,77 @@ 
 
 # set empty controller for options
 if($_SERVER['REQUEST_METHOD']=="OPTIONS") {
-	if( !isset($_GET['controller']) || $_GET['controller']=="")	{ $_GET['controller'] = "Tools"; }
+    if( !isset($_GET['controller']) || $_GET['controller']=="")	{ $_GET['controller'] = "Tools"; }
 }
 
 /* wrap in a try-catch block to catch exceptions */
 try {
-	// start measuring
-	$start = microtime(true);
-
-	/* Validate application ---------- */
-
-	// verify that API is enabled on server
-	if($settings->api!=1) 									{ $Response->throw_exception(503, "API server disabled");}
-
-	# fetch app
-	$app = $Tools->fetch_object ("api", "app_id", $_GET['app_id']);
-
-	// verify app_id
-	if($app === false) 										{ $Response->throw_exception(400, "Invalid application id"); }
-	// check that app is enabled
-	if($app->app_permissions==="0") 						{ $Response->throw_exception(503, "Application disabled"); }
-
-
-	/* Check app security and prepare request parameters ---------- */
-
-	// crypt check
-	if($app->app_security=="crypt") {
-		// verify php extensions
-		foreach (array("mcrypt") as $extension) {
-	    	if (!in_array($extension, get_loaded_extensions()))
-	    													{ $Response->throw_exception(500, 'php extension '.$extension.' missing'); }
-		}
-		// decrypt request - form_encoded
-		if(strpos($_SERVER['CONTENT_TYPE'], "application/x-www-form-urlencoded")!==false) {
-			$decoded = $User->Crypto->decrypt($_GET['enc_request'], $app->app_code);
-			if ($decoded === false) $Response->throw_exception(503, 'Invalid enc_request');
-			$decoded = $decoded[0]=="?" ? substr($decoded, 1) : $decoded;
-			parse_str($decoded, $encrypted_params);
-			$encrypted_params['app_id'] = $_GET['app_id'];
-			$params = (object) $encrypted_params;
-		}
-		// json_encoded
-		else {
-			$encrypted_params = $User->Crypto->decrypt($_GET['enc_request'], $app->app_code);
-			if ($encrypted_params === false) $Response->throw_exception(503, 'Invalid enc_request');
-			$encrypted_params = json_decode($encrypted_params, true);
-			$encrypted_params['app_id'] = $_GET['app_id'];
-			$params = (object) $encrypted_params;
-		}
-	}
-	// SSL checks
-	elseif($app->app_security=="ssl") {
-		// verify SSL
-		if (!((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443)) {
-															{ $Response->throw_exception(503, 'App requires SSL connection'); }
-		}
-		// save request parameters
-		$params = (object) $_GET;
-	}
-	// no security
-	elseif($app->app_security=="none") {
-		$params = (object) $_GET;
-	}
-	// error, invalid security
-	else {
-		$Response->throw_exception(503, 'Invalid app security');
-	}
-
-
-	// append POST parameters if POST or PATCH
-	if($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH" || $_SERVER['REQUEST_METHOD']=="DELETE") {
-		// if application tupe is JSON (application/json)
+    // start measuring
+    $start = microtime(true);
+
+    /* Validate application ---------- */
+
+    // verify that API is enabled on server
+    if($settings->api!=1) 									{ $Response->throw_exception(503, "API server disabled");}
+
+    # fetch app
+    $app = $Tools->fetch_object ("api", "app_id", $_GET['app_id']);
+
+    // verify app_id
+    if($app === false) 										{ $Response->throw_exception(400, "Invalid application id"); }
+    // check that app is enabled
+    if($app->app_permissions==="0") 						{ $Response->throw_exception(503, "Application disabled"); }
+
+
+    /* Check app security and prepare request parameters ---------- */
+
+    // crypt check
+    if($app->app_security=="crypt") {
+        // verify php extensions
+        foreach (array("mcrypt") as $extension) {
+            if (!in_array($extension, get_loaded_extensions()))
+                                                            { $Response->throw_exception(500, 'php extension '.$extension.' missing'); }
+        }
+        // decrypt request - form_encoded
+        if(strpos($_SERVER['CONTENT_TYPE'], "application/x-www-form-urlencoded")!==false) {
+            $decoded = $User->Crypto->decrypt($_GET['enc_request'], $app->app_code);
+            if ($decoded === false) $Response->throw_exception(503, 'Invalid enc_request');
+            $decoded = $decoded[0]=="?" ? substr($decoded, 1) : $decoded;
+            parse_str($decoded, $encrypted_params);
+            $encrypted_params['app_id'] = $_GET['app_id'];
+            $params = (object) $encrypted_params;
+        }
+        // json_encoded
+        else {
+            $encrypted_params = $User->Crypto->decrypt($_GET['enc_request'], $app->app_code);
+            if ($encrypted_params === false) $Response->throw_exception(503, 'Invalid enc_request');
+            $encrypted_params = json_decode($encrypted_params, true);
+            $encrypted_params['app_id'] = $_GET['app_id'];
+            $params = (object) $encrypted_params;
+        }
+    }
+    // SSL checks
+    elseif($app->app_security=="ssl") {
+        // verify SSL
+        if (!((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443)) {
+                                                            { $Response->throw_exception(503, 'App requires SSL connection'); }
+        }
+        // save request parameters
+        $params = (object) $_GET;
+    }
+    // no security
+    elseif($app->app_security=="none") {
+        $params = (object) $_GET;
+    }
+    // error, invalid security
+    else {
+        $Response->throw_exception(503, 'Invalid app security');
+    }
+
+
+    // append POST parameters if POST or PATCH
+    if($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH" || $_SERVER['REQUEST_METHOD']=="DELETE") {
+        // if application tupe is JSON (application/json)
         if(strpos($_SERVER['CONTENT_TYPE'], "application/json")!==false){
             $rawPostData = file_get_contents('php://input');
             $json = json_decode($rawPostData,true);
@@ -120,7 +120,7 @@ 
             $params = array_merge((array) $params, $json);
             $params = (object) $params;
         }
-		// if application tupe is XML (application/json)
+        // if application tupe is XML (application/json)
         elseif(strpos($_SERVER['CONTENT_TYPE'], "application/xml")!==false){
             $rawPostData = file_get_contents('php://input');
             $xml = $Response->xml_to_array($rawPostData);
@@ -128,7 +128,7 @@ 
             $params = array_merge((array) $params, $xml);
             $params = (object) $params;
         }
-		//if application type is default (application/x-www-form-urlencoded)
+        //if application type is default (application/x-www-form-urlencoded)
         elseif(sizeof(@$_POST)>0) {
             $params = array_merge((array) $params, $_POST);
             $params = (object) $params;
@@ -147,102 +147,102 @@ 
         }
     }
 
-	/* Sanitise input ---------- (user/User/USER) */
-	if (isset($params->controller)) $params->controller = strtolower($params->controller);
-
-	/* Authentication ---------- */
-
-	// authenticate user if required
-	if (@$params->controller != "user" && $enable_authentication) {
-		if($app->app_security=="ssl" || $app->app_security=="none") {
-			// start auth class and validate connection
-			require( dirname(__FILE__) . '/controllers/User.php');				// authentication and token handling
-			$Authentication = new User_controller ($Database, $Tools, $params, $Response);
-			$Authentication->check_auth ();
-		}
-	}
-
-
-	/* verify request ---------- */
-
-	// check if the request is valid by checking if it's an array and looking for the controller and action
-	if( $params == false || isset($params->controller) == false ) {
-		$Response->throw_exception(400, 'Request is not valid');
-	}
-	// verify permissions for delete/create/edit if controller is not user (needed for auth)
-	if (@$params->controller != "user") {
-    	if( ($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH"
-    	  || $_SERVER['REQUEST_METHOD']=="PUT"  || $_SERVER['REQUEST_METHOD']=="DELETE"
-    	  )
-    	  && $app->app_permissions<2) {
-    		$Response->throw_exception(401, 'invalid permissions');
-    	}
-	}
-	// verify content type
-	$Response->validate_content_type ();
-
-
-	/* Initialize controller ---------- */
-
-	// get the controller and format it correctly
-	$controller 	 = ucfirst(strtolower($params->controller))."_controller";
-	$controller_file = ucfirst(strtolower($params->controller));
-
-	// check if the controller exists. if not, throw an exception
-	if( file_exists( dirname(__FILE__) . "/controllers/$controller_file.php") ) {
-		require( dirname(__FILE__) . "/controllers/$controller_file.php");
-	}
-	// check custom controllers
-	elseif( file_exists( dirname(__FILE__) . "/controllers/custom/$controller_file.php") ) {
-		require( dirname(__FILE__) . "/controllers/custom/$controller_file.php");
-	}
-	else {
-		$Response->throw_exception(400, 'Invalid controller');
-	}
-
-	// create a new instance of the controller, and pass
-	// it the parameters from the request and Database object
-	$controller = new $controller($Database, $Tools, $params, $Response);
-
-	// pass app params for links result
-	$controller->app = $app;
-
-	// Unmarshal the custom_fields JSON object into the main object for
-	// POST and PATCH. This only works for controllers that support custom
-	// fields and if the app has nested custom fields enabled, otherwise
-	// this is skipped.
-	if (strtoupper($_SERVER['REQUEST_METHOD']) == 'POST' || strtoupper($_SERVER['REQUEST_METHOD']) == 'PATCH') {
-		$controller->unmarshal_nested_custom_fields();
-	}
-
-	// check if the action exists in the controller. if not, throw an exception.
-	if( method_exists($controller, strtolower($_SERVER['REQUEST_METHOD'])) === false ) {
-		$Response->throw_exception(501, $Response->errors[501]);
-	}
-
-	// if lock is enabled wait until it clears
-	if( $app->app_lock==1 && strtoupper($_SERVER['REQUEST_METHOD'])=="POST") {
-    	// set transaction lock file name
-    	$controller->set_transaction_lock_file ($lock_file);
-
-    	// check if locked form previous process
-    	while ($controller->is_transaction_locked ()) {
-        	// max ?
-        	if ((microtime(true) - $start) > $app->app_lock_wait) {
-            	$Response->throw_exception(503, "Transaction timed out after $app->app_lock_wait seconds because of transaction lock");
-        	}
-        	// add random delay
-        	usleep(rand(250000,500000));
-    	}
-
-    	// add new lock
-    	$controller->add_transaction_lock ();
-    	// execute the action
-    	$result = $controller->{$_SERVER['REQUEST_METHOD']} ();
+    /* Sanitise input ---------- (user/User/USER) */
+    if (isset($params->controller)) $params->controller = strtolower($params->controller);
+
+    /* Authentication ---------- */
+
+    // authenticate user if required
+    if (@$params->controller != "user" && $enable_authentication) {
+        if($app->app_security=="ssl" || $app->app_security=="none") {
+            // start auth class and validate connection
+            require( dirname(__FILE__) . '/controllers/User.php');				// authentication and token handling
+            $Authentication = new User_controller ($Database, $Tools, $params, $Response);
+            $Authentication->check_auth ();
+        }
+    }
+
+
+    /* verify request ---------- */
+
+    // check if the request is valid by checking if it's an array and looking for the controller and action
+    if( $params == false || isset($params->controller) == false ) {
+        $Response->throw_exception(400, 'Request is not valid');
+    }
+    // verify permissions for delete/create/edit if controller is not user (needed for auth)
+    if (@$params->controller != "user") {
+        if( ($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH"
+          || $_SERVER['REQUEST_METHOD']=="PUT"  || $_SERVER['REQUEST_METHOD']=="DELETE"
+            )
+          && $app->app_permissions<2) {
+            $Response->throw_exception(401, 'invalid permissions');
+        }
+    }
+    // verify content type
+    $Response->validate_content_type ();
+
+
+    /* Initialize controller ---------- */
+
+    // get the controller and format it correctly
+    $controller 	 = ucfirst(strtolower($params->controller))."_controller";
+    $controller_file = ucfirst(strtolower($params->controller));
+
+    // check if the controller exists. if not, throw an exception
+    if( file_exists( dirname(__FILE__) . "/controllers/$controller_file.php") ) {
+        require( dirname(__FILE__) . "/controllers/$controller_file.php");
+    }
+    // check custom controllers
+    elseif( file_exists( dirname(__FILE__) . "/controllers/custom/$controller_file.php") ) {
+        require( dirname(__FILE__) . "/controllers/custom/$controller_file.php");
+    }
+    else {
+        $Response->throw_exception(400, 'Invalid controller');
+    }
+
+    // create a new instance of the controller, and pass
+    // it the parameters from the request and Database object
+    $controller = new $controller($Database, $Tools, $params, $Response);
+
+    // pass app params for links result
+    $controller->app = $app;
+
+    // Unmarshal the custom_fields JSON object into the main object for
+    // POST and PATCH. This only works for controllers that support custom
+    // fields and if the app has nested custom fields enabled, otherwise
+    // this is skipped.
+    if (strtoupper($_SERVER['REQUEST_METHOD']) == 'POST' || strtoupper($_SERVER['REQUEST_METHOD']) == 'PATCH') {
+        $controller->unmarshal_nested_custom_fields();
+    }
+
+    // check if the action exists in the controller. if not, throw an exception.
+    if( method_exists($controller, strtolower($_SERVER['REQUEST_METHOD'])) === false ) {
+        $Response->throw_exception(501, $Response->errors[501]);
+    }
+
+    // if lock is enabled wait until it clears
+    if( $app->app_lock==1 && strtoupper($_SERVER['REQUEST_METHOD'])=="POST") {
+        // set transaction lock file name
+        $controller->set_transaction_lock_file ($lock_file);
+
+        // check if locked form previous process
+        while ($controller->is_transaction_locked ()) {
+            // max ?
+            if ((microtime(true) - $start) > $app->app_lock_wait) {
+                $Response->throw_exception(503, "Transaction timed out after $app->app_lock_wait seconds because of transaction lock");
+            }
+            // add random delay
+            usleep(rand(250000,500000));
+        }
+
+        // add new lock
+        $controller->add_transaction_lock ();
+        // execute the action
+        $result = $controller->{$_SERVER['REQUEST_METHOD']} ();
     }
     else {
-    	// execute the action
-    	$result = $controller->{$_SERVER['REQUEST_METHOD']} ();
+        // execute the action
+        $result = $controller->{$_SERVER['REQUEST_METHOD']} ();
     }
 
     // remove transaction lock
@@ -252,16 +252,16 @@ 
         }
     }
 } catch ( Exception $e ) {
-	// catch any exceptions and report the problem
-	$result = $e->getMessage();
-
-	// set flag if it came from Result, just to be sure
-	if($Response->exception!==true) {
-		$Response->exception = true;
-		$Response->result['success'] = 0;
-		$Response->result['code'] 	 = 500;
-		$Response->result['message'] = $result;
-	}
+    // catch any exceptions and report the problem
+    $result = $e->getMessage();
+
+    // set flag if it came from Result, just to be sure
+    if($Response->exception!==true) {
+        $Response->exception = true;
+        $Response->result['success'] = 0;
+        $Response->result['code'] 	 = 500;
+        $Response->result['message'] = $result;
+    }
 
     // remove transaction lock
     if(is_object($controller) && $app->app_lock==1 && strtoupper($_SERVER['REQUEST_METHOD'])=="POST") {

Braces +24 added lines, -13 removed lines

@@ -18,8 +18,10 @@ 
  */
 
 # include functions
-if(!function_exists("create_link"))
-require_once( dirname(__FILE__) . '/../functions/functions.php' );		// functions and objects from phpipam
+if(!function_exists("create_link")) {
+    require_once( dirname(__FILE__) . '/../functions/functions.php' );
+}
+// functions and objects from phpipam
 
 # include common API controllers
 require( dirname(__FILE__) . '/controllers/Common.php');			// common methods
@@ -37,8 +39,9 @@ 
 $Response = new Responses ();
 
 # get phpipam settings
-if(SETTINGS===null)
-$settings = $Tools->fetch_object ("settings", "id", 1);
+if(SETTINGS===null) {
+    $settings = $Tools->fetch_object ("settings", "id", 1);
+}
 
 # set empty controller for options
 if($_SERVER['REQUEST_METHOD']=="OPTIONS") {
@@ -76,7 +79,9 @@ 
 		// decrypt request - form_encoded
 		if(strpos($_SERVER['CONTENT_TYPE'], "application/x-www-form-urlencoded")!==false) {
 			$decoded = $User->Crypto->decrypt($_GET['enc_request'], $app->app_code);
-			if ($decoded === false) $Response->throw_exception(503, 'Invalid enc_request');
+			if ($decoded === false) {
+			    $Response->throw_exception(503, 'Invalid enc_request');
+			}
 			$decoded = $decoded[0]=="?" ? substr($decoded, 1) : $decoded;
 			parse_str($decoded, $encrypted_params);
 			$encrypted_params['app_id'] = $_GET['app_id'];
@@ -85,7 +90,9 @@ 
 		// json_encoded
 		else {
 			$encrypted_params = $User->Crypto->decrypt($_GET['enc_request'], $app->app_code);
-			if ($encrypted_params === false) $Response->throw_exception(503, 'Invalid enc_request');
+			if ($encrypted_params === false) {
+			    $Response->throw_exception(503, 'Invalid enc_request');
+			}
 			$encrypted_params = json_decode($encrypted_params, true);
 			$encrypted_params['app_id'] = $_GET['app_id'];
 			$params = (object) $encrypted_params;
@@ -113,19 +120,21 @@ 
 	// append POST parameters if POST or PATCH
 	if($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH" || $_SERVER['REQUEST_METHOD']=="DELETE") {
 		// if application tupe is JSON (application/json)
-        if(strpos($_SERVER['CONTENT_TYPE'], "application/json")!==false){
+        if(strpos($_SERVER['CONTENT_TYPE'], "application/json")!==false) {
             $rawPostData = file_get_contents('php://input');
             $json = json_decode($rawPostData,true);
-            if(is_array($json))
-            $params = array_merge((array) $params, $json);
+            if(is_array($json)) {
+                        $params = array_merge((array) $params, $json);
+            }
             $params = (object) $params;
         }
 		// if application tupe is XML (application/json)
-        elseif(strpos($_SERVER['CONTENT_TYPE'], "application/xml")!==false){
+        elseif(strpos($_SERVER['CONTENT_TYPE'], "application/xml")!==false) {
             $rawPostData = file_get_contents('php://input');
             $xml = $Response->xml_to_array($rawPostData);
-            if(is_array($xml))
-            $params = array_merge((array) $params, $xml);
+            if(is_array($xml)) {
+                        $params = array_merge((array) $params, $xml);
+            }
             $params = (object) $params;
         }
 		//if application type is default (application/x-www-form-urlencoded)
@@ -148,7 +157,9 @@ 
     }
 
 	/* Sanitise input ---------- (user/User/USER) */
-	if (isset($params->controller)) $params->controller = strtolower($params->controller);
+	if (isset($params->controller)) {
+	    $params->controller = strtolower($params->controller);
+	}
 
 	/* Authentication ---------- */
 

api/controllers/Subnets.php

Indentation +991 added lines, -991 removed lines

@@ -7,143 +7,143 @@ 
  */
 class Subnets_controller extends Common_api_functions {
 
-	/**
-	 * _params provided
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
-
-	/**
-	 * custom_fields
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	public $custom_fields;
-
-	/**
-	 * settings
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $settings;
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Response handler
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Response;
-
-	/**
-	 * Master Subnets object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Subnets;
-
-	/**
-	 * Master  Addresses object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Addresses;
-
-	/**
-	 * Master Tools object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 * @param class $Database
-	 * @param class $Tools
-	 * @param mixed $params		// post/get values
-	 */
-	public function __construct($Database, $Tools, $params, $Response) {
-		$this->Database = $Database;
-		$this->Tools 	= $Tools;
-		$this->_params 	= $params;
-		$this->Response = $Response;
-		// init required objects
-		$this->init_object ("Subnets", $Database);
-		$this->init_object ("Addresses", $Database);
-		$this->init_object ("User", $Database);
-		// set valid keys
-		$this->set_valid_keys ("subnets");
-	}
-
-
-
-
-
-	/**
-	 * Returns json encoded options
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function OPTIONS () {
-		// validate
-		$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
-		return array("code"=>200, "data"=>$result);
-	}
-
-
-
-
-	/**
-	 * Creates new subnet
-	 *
-	 *	required params : subnet, mask, name
-	 *	optional params : all subnet values
-	 *
-	 *      - /subnets/{id}/first_subnet/{mask}/       // creates first free subnet under master with specified mask
-	 *      - /subnets/{id}/last_subnet/{mask}/        // creates last free subnet under master with specified mask
-	 *
-	 * @access public
-	 * @return array
-	 */
-	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     ($this->_params->id2=="first_subnet") { $this->post_find_free_subnet(Subnets::SEARCH_FIND_FIRST); }
-		elseif ($this->_params->id2=="last_subnet")  { $this->post_find_free_subnet(Subnets::SEARCH_FIND_LAST); }
-
-		# validate parameters
+    /**
+     * _params provided
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
+
+    /**
+     * custom_fields
+     *
+     * @var mixed
+     * @access protected
+     */
+    public $custom_fields;
+
+    /**
+     * settings
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $settings;
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Response handler
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Response;
+
+    /**
+     * Master Subnets object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Subnets;
+
+    /**
+     * Master  Addresses object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Addresses;
+
+    /**
+     * Master Tools object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+
+    /**
+     * __construct function
+     *
+     * @access public
+     * @param class $Database
+     * @param class $Tools
+     * @param mixed $params		// post/get values
+     */
+    public function __construct($Database, $Tools, $params, $Response) {
+        $this->Database = $Database;
+        $this->Tools 	= $Tools;
+        $this->_params 	= $params;
+        $this->Response = $Response;
+        // init required objects
+        $this->init_object ("Subnets", $Database);
+        $this->init_object ("Addresses", $Database);
+        $this->init_object ("User", $Database);
+        // set valid keys
+        $this->set_valid_keys ("subnets");
+    }
+
+
+
+
+
+    /**
+     * Returns json encoded options
+     *
+     * @access public
+     * @return array
+     */
+    public function OPTIONS () {
+        // validate
+        $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
+        return array("code"=>200, "data"=>$result);
+    }
+
+
+
+
+    /**
+     * Creates new subnet
+     *
+     *	required params : subnet, mask, name
+     *	optional params : all subnet values
+     *
+     *      - /subnets/{id}/first_subnet/{mask}/       // creates first free subnet under master with specified mask
+     *      - /subnets/{id}/last_subnet/{mask}/        // creates last free subnet under master with specified mask
+     *
+     * @access public
+     * @return array
+     */
+    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     ($this->_params->id2=="first_subnet") { $this->post_find_free_subnet(Subnets::SEARCH_FIND_FIRST); }
+        elseif ($this->_params->id2=="last_subnet")  { $this->post_find_free_subnet(Subnets::SEARCH_FIND_LAST); }
+
+        # validate parameters
         $this->validate_create_parameters ();
         # check for valid keys
         $values = $this->validate_keys ();
@@ -151,418 +151,418 @@ 
         # transform subnet to decimal format
         $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");
-		}
-		else {
-			//set result
-			return array("code"=>201, "message"=>"Subnet created", "id"=>$this->Subnets->lastInsertId, "data"=>$this->Addresses->transform_address($values['subnet'] ,"dotted")."/".$values['mask'], "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
-		}
-	}
-
-	/**
-	 * Populate subnet details from first/last available subnet
-	 * @access private
-	 * @param  integer
-	 * @return void
-	 */
-	private function post_find_free_subnet($direction = Subnets::SEARCH_FIND_FIRST) {
-		$subnet_tmp = explode("/", $this->subnet_find_free (1, $direction));
-
-		// get master subnet
-		$master = $this->read_subnet ();
-
-		$this->_params->subnet = $subnet_tmp[0];
-		$this->_params->mask = $subnet_tmp[1];
-		$this->_params->sectionId = $master->sectionId;
-		$this->_params->masterSubnetId = $master->id;
-		$this->_params->permissions = $master->permissions;
-		unset($this->_params->id2, $this->_params->id3);
-		// description
-		if(!isset($this->_params->description))    { $this->_params->description = "API autocreated"; }
-	}
-
-
-
-
-	/**
-	 * Reads subnet functions
-	 *
-	 *	Identifier can be:
-	 *		- /{id}/
-	 *		- /custom_fields/				// returns custom fields
-	 *		- /cidr/{subnet}/				// subnets in CIDR format
-	 *		- /search/{subnet}/				// subnets in CIDR format (same as above)
-	 *		- /{id}/usage/				    // returns subnet usage
-	 *		- /{id}/slaves/ 			    // returns all immediate slave subnets
-	 *		- /{id}/slaves_recursive/ 	    // returns all slave subnets recursively
-	 *		- /{id}/addresses/			    // returns all IP addresses in subnet
-	 *      - /{id}/addresses/{ip}/         // returns IP address from subnet
-	 *		- /{id}/first_free/			    // returns first free address in subnet
-	 *      - /{id}/first_subnet/{mask}/    // returns first available subnets with specified mask
-	 *      - /{id}/last_subnet/{mask}/     // returns last available subnets with specified mask
-	 *      - /{id}/all_subnets/{mask}/     // returns all available subnets with specified mask
-	 *		- /all/							// returns all subnets in all sections
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function GET () {
-		// cidr check
-		// check if id2 is set ?
-		if(isset($this->_params->id2)) {
-			// is IP address provided
-			if($this->_params->id=="cidr") {
-				$result = $this->read_search_subnet ();
-				// check result
-				if($result==false)						{ $this->Response->throw_exception(200, "No subnets found"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-			}
-			else {
-				// validate id
-				$this->validate_subnet_id ();
-			}
-
-			// addresses in subnet
-			if($this->_params->id2=="addresses") {
-				$result = $this->read_subnet_addresses ();
-				// if {ip} is set filter it out
-				if(isset($this->_params->id3)) {
-					if(is_array($result)) {
-	    				foreach ($result as $k=>$r) {
-	        				if ($r->ip !== $this->_params->id3) {
-	            				unset($result[$k]);
-	        				}
-	    				}
-	    			}
+        # execute
+        if(!$this->Subnets->modify_subnet ("add", $values)) {
+            $this->Response->throw_exception(500, "Failed to create subnet");
+        }
+        else {
+            //set result
+            return array("code"=>201, "message"=>"Subnet created", "id"=>$this->Subnets->lastInsertId, "data"=>$this->Addresses->transform_address($values['subnet'] ,"dotted")."/".$values['mask'], "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
+        }
+    }
+
+    /**
+     * Populate subnet details from first/last available subnet
+     * @access private
+     * @param  integer
+     * @return void
+     */
+    private function post_find_free_subnet($direction = Subnets::SEARCH_FIND_FIRST) {
+        $subnet_tmp = explode("/", $this->subnet_find_free (1, $direction));
+
+        // get master subnet
+        $master = $this->read_subnet ();
+
+        $this->_params->subnet = $subnet_tmp[0];
+        $this->_params->mask = $subnet_tmp[1];
+        $this->_params->sectionId = $master->sectionId;
+        $this->_params->masterSubnetId = $master->id;
+        $this->_params->permissions = $master->permissions;
+        unset($this->_params->id2, $this->_params->id3);
+        // description
+        if(!isset($this->_params->description))    { $this->_params->description = "API autocreated"; }
+    }
+
+
+
+
+    /**
+     * Reads subnet functions
+     *
+     *	Identifier can be:
+     *		- /{id}/
+     *		- /custom_fields/				// returns custom fields
+     *		- /cidr/{subnet}/				// subnets in CIDR format
+     *		- /search/{subnet}/				// subnets in CIDR format (same as above)
+     *		- /{id}/usage/				    // returns subnet usage
+     *		- /{id}/slaves/ 			    // returns all immediate slave subnets
+     *		- /{id}/slaves_recursive/ 	    // returns all slave subnets recursively
+     *		- /{id}/addresses/			    // returns all IP addresses in subnet
+     *      - /{id}/addresses/{ip}/         // returns IP address from subnet
+     *		- /{id}/first_free/			    // returns first free address in subnet
+     *      - /{id}/first_subnet/{mask}/    // returns first available subnets with specified mask
+     *      - /{id}/last_subnet/{mask}/     // returns last available subnets with specified mask
+     *      - /{id}/all_subnets/{mask}/     // returns all available subnets with specified mask
+     *		- /all/							// returns all subnets in all sections
+     *
+     * @access public
+     * @return array
+     */
+    public function GET () {
+        // cidr check
+        // check if id2 is set ?
+        if(isset($this->_params->id2)) {
+            // is IP address provided
+            if($this->_params->id=="cidr") {
+                $result = $this->read_search_subnet ();
+                // check result
+                if($result==false)						{ $this->Response->throw_exception(200, "No subnets found"); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+            }
+            else {
+                // validate id
+                $this->validate_subnet_id ();
+            }
+
+            // addresses in subnet
+            if($this->_params->id2=="addresses") {
+                $result = $this->read_subnet_addresses ();
+                // if {ip} is set filter it out
+                if(isset($this->_params->id3)) {
+                    if(is_array($result)) {
+                        foreach ($result as $k=>$r) {
+                            if ($r->ip !== $this->_params->id3) {
+                                unset($result[$k]);
+                            }
+                        }
+                    }
                     if(sizeof($result)==0) { $result = false; }
-				}
-				// check result
-				if($result===false)						{ $this->Response->throw_exception(200, "No addresses found"); }
-				else {
-					$this->custom_fields = $this->Tools->fetch_custom_fields('ipaddresses');
-					return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, true));
-				}
-			}
-			// slaves
-			elseif($this->_params->id2=="slaves") {
-				$result = $this->read_subnet_slaves ();
-				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(200, "No slaves"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-			}
-			// slaves-recursive
-			elseif ($this->_params->id2=="slaves_recursive") {
-				$result = $this->read_subnet_slaves_recursive ();
-				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(200, "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 ()); }
-			// first available address
-			elseif ($this->_params->id2=="first_free") 	{ return array("code"=>200, "data"=>$this->subnet_first_free_address ());  }
-			// search for new free subnet
-			elseif ($this->_params->id2=="all_subnets") { return array("code"=>200, "data"=>$this->subnet_find_free (Subnets::SEARCH_FIND_ALL, Subnets::SEARCH_FIND_FIRST));  }
-			// search for new free subnet
-			elseif ($this->_params->id2=="first_subnet"){ return array("code"=>200, "data"=>$this->subnet_find_free (1, Subnets::SEARCH_FIND_FIRST));  }
-			// search for new free subnet
-			elseif ($this->_params->id2=="last_subnet") { return array("code"=>200, "data"=>$this->subnet_find_free (1, Subnets::SEARCH_FIND_LAST));  }
-			// fail
-			else										{ $this->Response->throw_exception(400, 'Invalid request'); }
-		}
-		// custom fields
-		elseif ($this->_params->id=="custom_fields") {
-			// check result
-			if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(200, 'No custom fields defined'); }
-			else										{ return array("code"=>200, "data"=>$this->custom_fields); }
-		}
-		// id
-		elseif (is_numeric($this->_params->id)) {
-			$result = $this->read_subnet ();
-			// check result
-			if($result==false)							{ $this->Response->throw_exception(400, "Invalid subnet Id (".$this->_params->id.")"); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
-		}
-		// all
-		elseif ($this->_params->id=="all") {
-			$result = $this->read_all_subnets();
-			// check result
-			if ($result===false)						{ $this->Response->throw_exception(500, "Unable to read subnets"); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result($result, "subnets", true, true)); }
-		}
-		// false
-		else 											{ $this->Response->throw_exception(404, 'Invalid Id'); }
-	}
-
-
-
-
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
-
-
-
-
-
-
-	/**
-	 * Updates existing subnet
-	 *
-	 *	required params : id
-	 *	forbidden params : subnet, mask
-	 *
-	 *	if id2 is present than execute:
-	 *		- {id}/resize/
-	 *		- {id}/split/
-	 *      - {id}/permissions/               // changes permissions (?3=2&41=1 || ?groupname1=3&groupname2=1) 0=na, 1=ro, 2=rw, 3=rwa
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function PATCH () {
-		// Check for id
-		$this->validate_subnet_id ();
-
-		// check if id2 is set > additional methods
-		if(isset($this->_params->id2)) {
-			// resize
-			if($this->_params->id2=="resize") 			{ return $this->subnet_resize (); }
-			// split
-			elseif($this->_params->id2=="split") 		{ return $this->subnet_split (); }
-			// permissions
-    		elseif ($this->_params->id2=="permissions") { return $this->subnet_change_permissions (); }
-			// error
-			else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
-		}
-		// ok, normal update
-		else {
-			// new 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'); }
-
-			# check for valid keys
-			$values = $this->validate_keys ();
-			// add id
-			$values["id"] = $this->_params->id;
-
-			# execute update
-			if(!$this->Subnets->modify_subnet ("edit", $values))
-														{ $this->Response->throw_exception(500, 'Subnet update failed'); }
-			else {
-				return array("code"=>200, "message"=>"Subnet updated");
-			}
-		}
-	}
-
-
-
-
-
-	/**
-	 * Deletes existing subnet along with and addresses
-	 *
-	 *	required params : id
-	 *
-	 *	if id2 is present than execute:
-	 *		- {id}/truncate/
-	 *		- {id}/permissions/
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function DELETE () {
-		// Check for id
-		$this->validate_subnet_id ();
-
-		// check if id2 is set > additional methods
-		if(isset($this->_params->id2)) {
-			// truncate
-			if($this->_params->id2=="truncate") 		{ return $this->subnet_truncate (); }
-			// remove
-			elseif ($this->_params->id2=="permissions") { return $this->subnet_remove_permissions (); }
-			// error
-			else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
-		}
-		// ok, delete subnet
-		else {
-			# set variables for delete
-			$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"); }
-			else {
-				//set result
-				return array("code"=>200, "message"=>"Subnet deleted");
-			}
-		}
-	}
-
-
-
-
-
-	/**
-	 * Truncates subnet
-	 *
-	 *	required params : id
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function subnet_truncate () {
-		// Check for id
-		$this->validate_subnet_id ();
-		// ok, try to truncate
-		$this->Subnets->modify_subnet ("truncate", (array) $this->_params);
-		//set result
-		return array("code"=>200, "message"=>"Subnet truncated");
-	}
-
-
-
-
-	/**
-	 * Resize subnet
-	 *
-	 *	required params : id, mask
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function subnet_resize () {
-		// Check for id
-		$this->validate_subnet_id ();
-
-		// validate input parmeters
-		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);
-
-		// validate resizing
-		$this->Subnets->verify_subnet_resize ($old_subnet->subnet, $this->_params->mask, $this->_params->id, $old_subnet->vrfId, $old_subnet->masterSubnetId, $old_subnet->mask, $old_subnet->sectionId);
-
-		// regenerate subnet if needed
-		if ($old_subnet->mask < $this->_params->mask) {
-			$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");
-		}
-
-		# set update values
-		$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, "message"=>"Subnet resized");
-	}
-
-
-
-
-
-	/**
-	 * Splits existing network into new networks
-	 *
-	 *	required params : id, number
-	 *	optional params : group (default yes), strict (default yes), prefix, copy_custom (default: yes)
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function subnet_split () {
-		// Check for id
-		$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(!isset($this->_params->copy_custom))			{ $this->_params->copy_custom = "yes"; }
-
-		// fetch old subnet
-		$subnet_old = $this->Subnets->fetch_subnet ("id", $this->_params->id);
-		// create new subnets and move addresses
-		$this->Subnets->subnet_split ($subnet_old, $this->_params->number, $this->_params->prefix, $this->_params->group, $this->_params->strict, $this->_params->copy_custom);
-
-		//set result
-		return array("code"=>200, "message"=>"Subnet splitted");
-	}
+                }
+                // check result
+                if($result===false)						{ $this->Response->throw_exception(200, "No addresses found"); }
+                else {
+                    $this->custom_fields = $this->Tools->fetch_custom_fields('ipaddresses');
+                    return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, true));
+                }
+            }
+            // slaves
+            elseif($this->_params->id2=="slaves") {
+                $result = $this->read_subnet_slaves ();
+                // check result
+                if($result==NULL)						{ $this->Response->throw_exception(200, "No slaves"); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+            }
+            // slaves-recursive
+            elseif ($this->_params->id2=="slaves_recursive") {
+                $result = $this->read_subnet_slaves_recursive ();
+                // check result
+                if($result==NULL)						{ $this->Response->throw_exception(200, "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 ()); }
+            // first available address
+            elseif ($this->_params->id2=="first_free") 	{ return array("code"=>200, "data"=>$this->subnet_first_free_address ());  }
+            // search for new free subnet
+            elseif ($this->_params->id2=="all_subnets") { return array("code"=>200, "data"=>$this->subnet_find_free (Subnets::SEARCH_FIND_ALL, Subnets::SEARCH_FIND_FIRST));  }
+            // search for new free subnet
+            elseif ($this->_params->id2=="first_subnet"){ return array("code"=>200, "data"=>$this->subnet_find_free (1, Subnets::SEARCH_FIND_FIRST));  }
+            // search for new free subnet
+            elseif ($this->_params->id2=="last_subnet") { return array("code"=>200, "data"=>$this->subnet_find_free (1, Subnets::SEARCH_FIND_LAST));  }
+            // fail
+            else										{ $this->Response->throw_exception(400, 'Invalid request'); }
+        }
+        // custom fields
+        elseif ($this->_params->id=="custom_fields") {
+            // check result
+            if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(200, 'No custom fields defined'); }
+            else										{ return array("code"=>200, "data"=>$this->custom_fields); }
+        }
+        // id
+        elseif (is_numeric($this->_params->id)) {
+            $result = $this->read_subnet ();
+            // check result
+            if($result==false)							{ $this->Response->throw_exception(400, "Invalid subnet Id (".$this->_params->id.")"); }
+            else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+        }
+        // all
+        elseif ($this->_params->id=="all") {
+            $result = $this->read_all_subnets();
+            // check result
+            if ($result===false)						{ $this->Response->throw_exception(500, "Unable to read subnets"); }
+            else										{ return array("code"=>200, "data"=>$this->prepare_result($result, "subnets", true, true)); }
+        }
+        // false
+        else 											{ $this->Response->throw_exception(404, 'Invalid Id'); }
+    }
+
+
+
+
+
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return array
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
+
+
+
+
+
+
+    /**
+     * Updates existing subnet
+     *
+     *	required params : id
+     *	forbidden params : subnet, mask
+     *
+     *	if id2 is present than execute:
+     *		- {id}/resize/
+     *		- {id}/split/
+     *      - {id}/permissions/               // changes permissions (?3=2&41=1 || ?groupname1=3&groupname2=1) 0=na, 1=ro, 2=rw, 3=rwa
+     *
+     * @access public
+     * @return array
+     */
+    public function PATCH () {
+        // Check for id
+        $this->validate_subnet_id ();
+
+        // check if id2 is set > additional methods
+        if(isset($this->_params->id2)) {
+            // resize
+            if($this->_params->id2=="resize") 			{ return $this->subnet_resize (); }
+            // split
+            elseif($this->_params->id2=="split") 		{ return $this->subnet_split (); }
+            // permissions
+            elseif ($this->_params->id2=="permissions") { return $this->subnet_change_permissions (); }
+            // error
+            else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
+        }
+        // ok, normal update
+        else {
+            // new 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'); }
+
+            # check for valid keys
+            $values = $this->validate_keys ();
+            // add id
+            $values["id"] = $this->_params->id;
+
+            # execute update
+            if(!$this->Subnets->modify_subnet ("edit", $values))
+                                                        { $this->Response->throw_exception(500, 'Subnet update failed'); }
+            else {
+                return array("code"=>200, "message"=>"Subnet updated");
+            }
+        }
+    }
+
+
+
+
+
+    /**
+     * Deletes existing subnet along with and addresses
+     *
+     *	required params : id
+     *
+     *	if id2 is present than execute:
+     *		- {id}/truncate/
+     *		- {id}/permissions/
+     *
+     * @access public
+     * @return array
+     */
+    public function DELETE () {
+        // Check for id
+        $this->validate_subnet_id ();
+
+        // check if id2 is set > additional methods
+        if(isset($this->_params->id2)) {
+            // truncate
+            if($this->_params->id2=="truncate") 		{ return $this->subnet_truncate (); }
+            // remove
+            elseif ($this->_params->id2=="permissions") { return $this->subnet_remove_permissions (); }
+            // error
+            else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
+        }
+        // ok, delete subnet
+        else {
+            # set variables for delete
+            $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"); }
+            else {
+                //set result
+                return array("code"=>200, "message"=>"Subnet deleted");
+            }
+        }
+    }
+
+
+
+
+
+    /**
+     * Truncates subnet
+     *
+     *	required params : id
+     *
+     * @access private
+     * @return array
+     */
+    private function subnet_truncate () {
+        // Check for id
+        $this->validate_subnet_id ();
+        // ok, try to truncate
+        $this->Subnets->modify_subnet ("truncate", (array) $this->_params);
+        //set result
+        return array("code"=>200, "message"=>"Subnet truncated");
+    }
+
+
+
+
+    /**
+     * Resize subnet
+     *
+     *	required params : id, mask
+     *
+     * @access private
+     * @return array
+     */
+    private function subnet_resize () {
+        // Check for id
+        $this->validate_subnet_id ();
+
+        // validate input parmeters
+        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);
+
+        // validate resizing
+        $this->Subnets->verify_subnet_resize ($old_subnet->subnet, $this->_params->mask, $this->_params->id, $old_subnet->vrfId, $old_subnet->masterSubnetId, $old_subnet->mask, $old_subnet->sectionId);
+
+        // regenerate subnet if needed
+        if ($old_subnet->mask < $this->_params->mask) {
+            $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");
+        }
+
+        # set update values
+        $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, "message"=>"Subnet resized");
+    }
+
 
 
 
 
+    /**
+     * Splits existing network into new networks
+     *
+     *	required params : id, number
+     *	optional params : group (default yes), strict (default yes), prefix, copy_custom (default: yes)
+     *
+     * @access private
+     * @return array
+     */
+    private function subnet_split () {
+        // Check for id
+        $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(!isset($this->_params->copy_custom))			{ $this->_params->copy_custom = "yes"; }
 
-	/**
-	 * Changes subnet permissions
-	 *
-	 *	required params : id, number
-	 *	optional params : group (default yes), strict (default yes), prefix
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function subnet_change_permissions () {
-		// Check for id
-		$this->validate_subnet_id ();
+        // fetch old subnet
+        $subnet_old = $this->Subnets->fetch_subnet ("id", $this->_params->id);
+        // create new subnets and move addresses
+        $this->Subnets->subnet_split ($subnet_old, $this->_params->number, $this->_params->prefix, $this->_params->group, $this->_params->strict, $this->_params->copy_custom);
 
-		// validate groups, permissions and save to _params
+        //set result
+        return array("code"=>200, "message"=>"Subnet splitted");
+    }
+
+
+
+
+
+
+    /**
+     * Changes subnet permissions
+     *
+     *	required params : id, number
+     *	optional params : group (default yes), strict (default yes), prefix
+     *
+     * @access private
+     * @return array
+     */
+    private function subnet_change_permissions () {
+        // Check for id
+        $this->validate_subnet_id ();
+
+        // validate groups, permissions and save to _params
         $this->validate_create_permissions ();
         // save perms
         $values['id'] = $this->_params->id;
         $values['permissions'] = $this->_params->permissions;
 
-		# execute update
-		if(!$this->Subnets->modify_subnet ("edit", $values))
-													{ $this->Response->throw_exception(500, 'Subnet permissions update failed'); }
-		else {
-			return array("code"=>200, "message"=>"Subnet permissions updated", "data"=>$this->_params->permissions_text);
-		}
-	}
-
-	/**
-	 * Validates update permission groups
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_create_permissions () {
-    	// set valid permissions array
-    	$valid_permissions_array = $this->get_possible_permissions ();
-    	// requested permissions
-    	$requested_permissions = array();
-    	$requested_permissions_full = array();
-    	// save ids
-    	$id = $this->_params->id;
-    	unset($this->_params->controller, $this->_params->app_id, $this->_params->id, $this->_params->id2, $this->_params->isFolder);
-
-    	// loop and validate
-    	if(sizeof($this->_params)>0) {
+        # execute update
+        if(!$this->Subnets->modify_subnet ("edit", $values))
+                                                    { $this->Response->throw_exception(500, 'Subnet permissions update failed'); }
+        else {
+            return array("code"=>200, "message"=>"Subnet permissions updated", "data"=>$this->_params->permissions_text);
+        }
+    }
+
+    /**
+     * Validates update permission groups
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_create_permissions () {
+        // set valid permissions array
+        $valid_permissions_array = $this->get_possible_permissions ();
+        // requested permissions
+        $requested_permissions = array();
+        $requested_permissions_full = array();
+        // save ids
+        $id = $this->_params->id;
+        unset($this->_params->controller, $this->_params->app_id, $this->_params->id, $this->_params->id2, $this->_params->isFolder);
+
+        // loop and validate
+        if(sizeof($this->_params)>0) {
             foreach ($this->_params as $gid=>$perm) {
 
                 // fetch and validate group
@@ -595,118 +595,118 @@ 
         else {
             $this->Response->throw_exception(500, "Cannot remove permissions, use DELETE call");
         }
-	}
+    }
 
 
 
 
 
 
-	/**
-	 * Removes permissions
-	 *
-	 *	required params : id
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function subnet_remove_permissions () {
-		// Check for id
-		$this->validate_subnet_id ();
-		// ok, try to truncate
-		$this->Subnets->modify_subnet ("edit", array("id"=>$this->_params->id, "permissions"=>""));
-		//set result
-		return array("code"=>200, "message"=>"Subnet permissions removed");
-	}
+    /**
+     * Removes permissions
+     *
+     *	required params : id
+     *
+     * @access private
+     * @return array
+     */
+    private function subnet_remove_permissions () {
+        // Check for id
+        $this->validate_subnet_id ();
+        // ok, try to truncate
+        $this->Subnets->modify_subnet ("edit", array("id"=>$this->_params->id, "permissions"=>""));
+        //set result
+        return array("code"=>200, "message"=>"Subnet permissions removed");
+    }
 
 
 
 
 
 
-	/**
-	 * Calculates subnet usage
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function subnet_usage () {
-		# check that section exists
-		$subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id);
-		if($subnet===false)
-														{ $this->Response->throw_exception(400, "Subnet does not exist"); }
-		# get usage
-		$subnet_usage = $this->Subnets->calculate_subnet_usage ($subnet, true);
-		# return
-		return $subnet_usage;
-	}
+    /**
+     * Calculates subnet usage
+     *
+     * @access private
+     * @return array
+     */
+    private function subnet_usage () {
+        # check that section exists
+        $subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id);
+        if($subnet===false)
+                                                        { $this->Response->throw_exception(400, "Subnet does not exist"); }
+        # get usage
+        $subnet_usage = $this->Subnets->calculate_subnet_usage ($subnet, true);
+        # return
+        return $subnet_usage;
+    }
 
 
 
 
 
-	/**
-	 * Returns first available address in subnet
-	 *
-	 * @access public
-	 * @return array|string
-	 */
-	public function subnet_first_free_address () {
-		// Check for id
-		$this->validate_subnet_id ();
-		// check for isFull
-		$subnet = $this->read_subnet ();
-		if($subnet->isFull==1)                              { $this->Response->throw_exception(200, "No free addresses found"); }
+    /**
+     * Returns first available address in subnet
+     *
+     * @access public
+     * @return array|string
+     */
+    public function subnet_first_free_address () {
+        // Check for id
+        $this->validate_subnet_id ();
+        // check for isFull
+        $subnet = $this->read_subnet ();
+        if($subnet->isFull==1)                              { $this->Response->throw_exception(200, "No free addresses found"); }
         // slaves
         if($this->Subnets->has_slaves ($this->_params->id)) { $this->Response->throw_exception(409, "Subnet contains subnets"); }
-		// fetch
-		$first = $this->Addresses->get_first_available_address ($this->_params->id, $this->Subnets);
-		// available?
-		if($first===false)	{ $this->Response->throw_exception(200, "No free addresses found"); }
-		else				{ $first = $this->Addresses->transform_to_dotted($first); }
-
-		# return
-		return $first;
-	}
-
-	/**
-	 * Returns first|last $count available subnets with specified mask
-	 *
-	 * @access public
-	 * @param integer $count (default: Subnets::SEARCH_FIND_ALL)
-	 * @param integer $direction (default: Subnets::SEARCH_FIND_FIRST)
-	 * @return array|string
-	 */
-	public function subnet_find_free ($count = Subnets::SEARCH_FIND_ALL, $direction = Subnets::SEARCH_FIND_FIRST) {
-		// Check for id
-		$this->validate_subnet_id ();
-
-		$found = $this->Subnets->search_available_subnets ($this->_params->id, $this->_params->id3, $count, $direction);
-
-		if ($found===false) {
-			$this->Response->throw_exception(200, "No subnets found");
-		}
-
-		return ($count == 1) ?  $found[0] : $found;
-	}
-
-
-
-
-
-	/* @helper methods ---------- */
-
-	/**
-	 * Fetches subnet by id
-	 *
-	 * @access private
-	 * @return array|false
-	 */
-	private function read_subnet ($subnetId = null) {
-		// null
-		$subnetId = is_null($subnetId) ? $this->_params->id : $subnetId;
-		// fetch
-		$result = $this->Subnets->fetch_subnet ("id", $subnetId);
+        // fetch
+        $first = $this->Addresses->get_first_available_address ($this->_params->id, $this->Subnets);
+        // available?
+        if($first===false)	{ $this->Response->throw_exception(200, "No free addresses found"); }
+        else				{ $first = $this->Addresses->transform_to_dotted($first); }
+
+        # return
+        return $first;
+    }
+
+    /**
+     * Returns first|last $count available subnets with specified mask
+     *
+     * @access public
+     * @param integer $count (default: Subnets::SEARCH_FIND_ALL)
+     * @param integer $direction (default: Subnets::SEARCH_FIND_FIRST)
+     * @return array|string
+     */
+    public function subnet_find_free ($count = Subnets::SEARCH_FIND_ALL, $direction = Subnets::SEARCH_FIND_FIRST) {
+        // Check for id
+        $this->validate_subnet_id ();
+
+        $found = $this->Subnets->search_available_subnets ($this->_params->id, $this->_params->id3, $count, $direction);
+
+        if ($found===false) {
+            $this->Response->throw_exception(200, "No subnets found");
+        }
+
+        return ($count == 1) ?  $found[0] : $found;
+    }
+
+
+
+
+
+    /* @helper methods ---------- */
+
+    /**
+     * Fetches subnet by id
+     *
+     * @access private
+     * @return array|false
+     */
+    private function read_subnet ($subnetId = null) {
+        // null
+        $subnetId = is_null($subnetId) ? $this->_params->id : $subnetId;
+        // fetch
+        $result = $this->Subnets->fetch_subnet ("id", $subnetId);
         // add nameservers, GW and calculation
         if($result!==false) {
             $ns = $this->read_subnet_nameserver($result->nameserverId);
@@ -714,367 +714,367 @@ 
                 $result->nameservers = $ns;
             }
 
-    		$gateway = $this->read_subnet_gateway ();
-    		if ( $gateway!== false) {
-        		$result->gatewayId = $gateway->id;
-        		$gateway = $this->transform_address ($gateway);
-        		$result->gateway = $gateway;
-    		}
-
-    		if (!$result->isFolder)
-		    {
-			    $result->calculation = $this->Tools->calculate_ip_calc_results($this->Subnets->transform_address($result->subnet, "dotted") . "/" . $result->mask);
-		    }
-		}
-
-		# result
-		return empty($result) ? false : $result;
-	}
-
-	/**
-	 * Fetches all subnets in database
-	 *
-	 * @access private
-	 * @return array|false
-	 */
-	private function read_all_subnets() {
-		// fetch
-		$results = $this->Subnets->fetch_all_subnets();
-
-		// add nameservers, GW, permission and location for each network found
-		if($results!==false) {
-			foreach($results as $key => $result) {
-				$ns = $this->read_subnet_nameserver($result->nameserverId);
-				if ($ns!==false) {
-					$result->nameservers = $ns;
-				}
-
-				$gateway = $this->read_subnet_gateway ($result->id);
-				if ( $gateway!== false) {
-					$result->gatewayId = $gateway->id;
-					$gateway = $this->transform_address ($gateway);
-					$result->gateway = $gateway;
-				}
-
-				$result->permissions = $this->User->get_user_permissions_from_json($result->permissions);
-
-				// location details
-				if(!empty($result->location)) {
-					$result->location = $this->Tools->fetch_object ("locations", "id", $result->location);
-				} else {
-					$result->location = array();
-				}
-
-    			// erase old values
-    			$results[$key] = $result;
-			}
-		}
-
-		# result
-		return sizeof($results)==0 ? false : $results;
-	}
-
-	/**
-	 * Fetches all addresses in subnet
-	 *
-	 * @access private
-	 * @return array|false
-	 */
-	private function read_subnet_addresses () {
-		// fetch
-		$result = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
-		# result
-		return sizeof($result)==0 ? false : $result;
-	}
-
-	/**
-	 * Returns id of subnet gateay
-	 *
-	 * @access private
-	 * @return int|bool
-	 */
-	private function read_subnet_gateway ($id=NULL) {
-		return $id === NULL ? $this->Subnets->find_gateway ($this->_params->id) : $this->Subnets->find_gateway ($id);
-	}
-
-	/**
-	 * Returns nameserver details
-	 *
-	 * @access private
-	 * @param mixed $nsid
-	 * @return array|false
-	 */
-	private function read_subnet_nameserver ($nsid) {
-    	return $this->Tools->fetch_object ("nameservers", "id", $nsid);
-	}
-
-	/**
-	 * Returns all immediate subnet slaves
-	 *
-	 * @access private
-	 * @return array|false
-	 */
-	private function read_subnet_slaves () {
-		// fetch
-		$result = $this->Subnets->fetch_subnet_slaves ($this->_params->id);
-		# result
-		return $result===false ? NULL : $result;
-	}
-
-	/**
-	 * Returns all subnet slaves (recursive)
-	 *
-	 * @access private
-	 * @return array|NULL
-	 */
-	private function read_subnet_slaves_recursive () {
-		// get array of ids
-		$this->Subnets->fetch_subnet_slaves_recursive ($this->_params->id);
-		// init result
-		$result = array ();
-		// fetch all;
-		foreach($this->Subnets->slaves as $s) {
-			$result[] = $this->read_subnet ($s);
-		}
-		# result
-		return sizeof($result)==0 ? NULL : $result;
-	}
-
-	/**
-	 * Searches for subnet in database
-	 *
-	 * @access private
-	 * @return array|false
-	 */
-	private function read_search_subnet () {
-		// transform
-		$this->_params->id2 = $this->Subnets->transform_address ($this->_params->id2, "decimal");
-		// 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) {
-					$result[] = $s;
-				}
-			}
-		}
-		# result
-		return !isset($result) ? false : $result;
-	}
-
-
-
-
-
-
-	/* @validations ---------- */
-
-	/**
-	 * Validates create parameters before adding new subnet
-	 *
-	 *	checks and validations - cidr check, issubnet, mastersubnet, sectionId
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function validate_create_parameters () {
-		# make sure subnet is in dotted format for checks
-		$this->_params->subnet = $this->Addresses->transform_address($this->_params->subnet ,"dotted");
-
-		# cidr check
-		$this->validate_cidr ();
-		# verify that it is subnet
-		$this->validate_network ();
-		# verify that master subnet exists
-		$this->validate_master_subnet ();
-		# verify section
-		$this->validate_section ();
-		# verify folder
-		$this->validate_folder ();
-		# verify overlapping
-		$this->validate_overlapping ();
-		# verify vlan
-		$this->validate_vlan ();
-		# verify vrf
-		$this->validate_vrf ();
-	}
-
-	/**
-	 * Validates provided CIDR address
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_cidr () {
-		// not for folder
-		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); }
-		}
-	}
-
-	/**
-	 * Validates that provided subnet is network and not host
-	 *
-	 * @access private
-	 * @return void
-	 */
-	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"); }
-		}
-	}
-
-	/**
-	 * Validates master subnet
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_master_subnet () {
-		// set 0 if not set
-		if(!isset($this->_params->masterSubnetId) || $this->_params->masterSubnetId=="0") 			{ $this->_params->masterSubnetId = 0; }
-		else {
-			// validate master subnet
-			$master_subnet = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
-			if($master_subnet===false)		                                                        { $this->Response->throw_exception(404, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
-			// check that it is inside subnet
-			else {
-				// not for folders
-				if(@$this->_params->isFolder!=1 && $master_subnet->isFolder!=1) {
-					if(!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
-																									{ $this->Response->throw_exception(409, "Subnet is not within boundaries of its master subnet"); }
-				}
-				// set permissions
-				$this->_params->permissions = $master_subnet->permissions;
-			}
-		}
-	}
-
-	/**
-	 * Validates section
-	 *
-	 * @access private
-	 * @return void
-	 */
-	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.")"); }
-		else {
-    		$master = $this->Tools->fetch_object("sections", "id", $this->_params->sectionId);
-			if($master===false)		{ $this->Response->throw_exception(400, "Section id (".$this->_params->sectionId.") does not exist"); }
-			else {
-    			// inherit permissions from section
-    			if($this->_params->masterSubnetId == 0) {
-        			$this->_params->permissions = $master->permissions;
-    			}
-			}
-		}
-	}
-
-	/**
-	 * Validates subnet by Id
-	 *
-	 * @access private
-	 * @return void
-	 */
-	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.")"); }
-		// check subnet
-		if($this->Subnets->fetch_subnet ("id", $this->_params->id)===false) 						{ $this->Response->throw_exception(404, "Invalid subnet Id (".$this->_params->id.")"); }
-	}
-
-	/**
-	 * Folder validation
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_folder () {
-		// only fo folders
-		if(@$this->_params->isFolder==1) {
-			// if parent is set it must be a folder!
-			if($this->_params->masterSubnetId!=0) {
-				$parent = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
-				if($parent->isFolder!=1) 															{ $this->Response->throw_exception(409, "Parent is not a folder"); }
-			}
-		}
-	}
-
-	/**
-	 * Validates overlapping for newly created subnet
-	 *
-	 * @access private
-	 * @return void
-	 */
-	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"); }
-		// 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; }
-		}
-		else 									{ $parent_is_folder = false; }
-
-		// create cidr address
-		$cidr = $this->Addresses->transform_address($this->_params->subnet,"dotted")."/".$this->_params->mask;
-
-		// root subnet
-		if($this->_params->masterSubnetId==0) {
-			// check overlapping
-			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(409, $overlap); }
-			}
-		}
-		// not root
-		else {
-		    //disable checks for folders and if strict check enabled
-		    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(409, "Nested subnet not in root subnet"); }
-
-			    //nested?
-		        $overlap = $this->Subnets->verify_nested_subnet_overlapping($cidr, $this->_params->vrfId, $this->_params->masterSubnetId);
-				if($overlap!==false) 																{ $this->Response->throw_exception(409, $overlap); }
-		    }
-		}
-	}
-
-	/**
-	 * Validates VLAN id
-	 *
-	 * @access private
-	 * @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(404, "Vlan does not exist"); }
-		}
-	}
-
-	/**
-	 * Validates VRF id
-	 *
-	 * @access private
-	 * @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(404, "VRF does not exist"); }
-		}
-	}
+            $gateway = $this->read_subnet_gateway ();
+            if ( $gateway!== false) {
+                $result->gatewayId = $gateway->id;
+                $gateway = $this->transform_address ($gateway);
+                $result->gateway = $gateway;
+            }
+
+            if (!$result->isFolder)
+            {
+                $result->calculation = $this->Tools->calculate_ip_calc_results($this->Subnets->transform_address($result->subnet, "dotted") . "/" . $result->mask);
+            }
+        }
+
+        # result
+        return empty($result) ? false : $result;
+    }
+
+    /**
+     * Fetches all subnets in database
+     *
+     * @access private
+     * @return array|false
+     */
+    private function read_all_subnets() {
+        // fetch
+        $results = $this->Subnets->fetch_all_subnets();
+
+        // add nameservers, GW, permission and location for each network found
+        if($results!==false) {
+            foreach($results as $key => $result) {
+                $ns = $this->read_subnet_nameserver($result->nameserverId);
+                if ($ns!==false) {
+                    $result->nameservers = $ns;
+                }
+
+                $gateway = $this->read_subnet_gateway ($result->id);
+                if ( $gateway!== false) {
+                    $result->gatewayId = $gateway->id;
+                    $gateway = $this->transform_address ($gateway);
+                    $result->gateway = $gateway;
+                }
+
+                $result->permissions = $this->User->get_user_permissions_from_json($result->permissions);
+
+                // location details
+                if(!empty($result->location)) {
+                    $result->location = $this->Tools->fetch_object ("locations", "id", $result->location);
+                } else {
+                    $result->location = array();
+                }
+
+                // erase old values
+                $results[$key] = $result;
+            }
+        }
+
+        # result
+        return sizeof($results)==0 ? false : $results;
+    }
+
+    /**
+     * Fetches all addresses in subnet
+     *
+     * @access private
+     * @return array|false
+     */
+    private function read_subnet_addresses () {
+        // fetch
+        $result = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
+        # result
+        return sizeof($result)==0 ? false : $result;
+    }
+
+    /**
+     * Returns id of subnet gateay
+     *
+     * @access private
+     * @return int|bool
+     */
+    private function read_subnet_gateway ($id=NULL) {
+        return $id === NULL ? $this->Subnets->find_gateway ($this->_params->id) : $this->Subnets->find_gateway ($id);
+    }
+
+    /**
+     * Returns nameserver details
+     *
+     * @access private
+     * @param mixed $nsid
+     * @return array|false
+     */
+    private function read_subnet_nameserver ($nsid) {
+        return $this->Tools->fetch_object ("nameservers", "id", $nsid);
+    }
+
+    /**
+     * Returns all immediate subnet slaves
+     *
+     * @access private
+     * @return array|false
+     */
+    private function read_subnet_slaves () {
+        // fetch
+        $result = $this->Subnets->fetch_subnet_slaves ($this->_params->id);
+        # result
+        return $result===false ? NULL : $result;
+    }
+
+    /**
+     * Returns all subnet slaves (recursive)
+     *
+     * @access private
+     * @return array|NULL
+     */
+    private function read_subnet_slaves_recursive () {
+        // get array of ids
+        $this->Subnets->fetch_subnet_slaves_recursive ($this->_params->id);
+        // init result
+        $result = array ();
+        // fetch all;
+        foreach($this->Subnets->slaves as $s) {
+            $result[] = $this->read_subnet ($s);
+        }
+        # result
+        return sizeof($result)==0 ? NULL : $result;
+    }
+
+    /**
+     * Searches for subnet in database
+     *
+     * @access private
+     * @return array|false
+     */
+    private function read_search_subnet () {
+        // transform
+        $this->_params->id2 = $this->Subnets->transform_address ($this->_params->id2, "decimal");
+        // 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) {
+                    $result[] = $s;
+                }
+            }
+        }
+        # result
+        return !isset($result) ? false : $result;
+    }
+
+
+
+
+
+
+    /* @validations ---------- */
+
+    /**
+     * Validates create parameters before adding new subnet
+     *
+     *	checks and validations - cidr check, issubnet, mastersubnet, sectionId
+     *
+     * @access public
+     * @return void
+     */
+    public function validate_create_parameters () {
+        # make sure subnet is in dotted format for checks
+        $this->_params->subnet = $this->Addresses->transform_address($this->_params->subnet ,"dotted");
+
+        # cidr check
+        $this->validate_cidr ();
+        # verify that it is subnet
+        $this->validate_network ();
+        # verify that master subnet exists
+        $this->validate_master_subnet ();
+        # verify section
+        $this->validate_section ();
+        # verify folder
+        $this->validate_folder ();
+        # verify overlapping
+        $this->validate_overlapping ();
+        # verify vlan
+        $this->validate_vlan ();
+        # verify vrf
+        $this->validate_vrf ();
+    }
+
+    /**
+     * Validates provided CIDR address
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_cidr () {
+        // not for folder
+        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); }
+        }
+    }
+
+    /**
+     * Validates that provided subnet is network and not host
+     *
+     * @access private
+     * @return void
+     */
+    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"); }
+        }
+    }
+
+    /**
+     * Validates master subnet
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_master_subnet () {
+        // set 0 if not set
+        if(!isset($this->_params->masterSubnetId) || $this->_params->masterSubnetId=="0") 			{ $this->_params->masterSubnetId = 0; }
+        else {
+            // validate master subnet
+            $master_subnet = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
+            if($master_subnet===false)		                                                        { $this->Response->throw_exception(404, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
+            // check that it is inside subnet
+            else {
+                // not for folders
+                if(@$this->_params->isFolder!=1 && $master_subnet->isFolder!=1) {
+                    if(!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
+                                                                                                    { $this->Response->throw_exception(409, "Subnet is not within boundaries of its master subnet"); }
+                }
+                // set permissions
+                $this->_params->permissions = $master_subnet->permissions;
+            }
+        }
+    }
+
+    /**
+     * Validates section
+     *
+     * @access private
+     * @return void
+     */
+    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.")"); }
+        else {
+            $master = $this->Tools->fetch_object("sections", "id", $this->_params->sectionId);
+            if($master===false)		{ $this->Response->throw_exception(400, "Section id (".$this->_params->sectionId.") does not exist"); }
+            else {
+                // inherit permissions from section
+                if($this->_params->masterSubnetId == 0) {
+                    $this->_params->permissions = $master->permissions;
+                }
+            }
+        }
+    }
+
+    /**
+     * Validates subnet by Id
+     *
+     * @access private
+     * @return void
+     */
+    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.")"); }
+        // check subnet
+        if($this->Subnets->fetch_subnet ("id", $this->_params->id)===false) 						{ $this->Response->throw_exception(404, "Invalid subnet Id (".$this->_params->id.")"); }
+    }
+
+    /**
+     * Folder validation
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_folder () {
+        // only fo folders
+        if(@$this->_params->isFolder==1) {
+            // if parent is set it must be a folder!
+            if($this->_params->masterSubnetId!=0) {
+                $parent = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
+                if($parent->isFolder!=1) 															{ $this->Response->throw_exception(409, "Parent is not a folder"); }
+            }
+        }
+    }
+
+    /**
+     * Validates overlapping for newly created subnet
+     *
+     * @access private
+     * @return void
+     */
+    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"); }
+        // 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; }
+        }
+        else 									{ $parent_is_folder = false; }
+
+        // create cidr address
+        $cidr = $this->Addresses->transform_address($this->_params->subnet,"dotted")."/".$this->_params->mask;
+
+        // root subnet
+        if($this->_params->masterSubnetId==0) {
+            // check overlapping
+            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(409, $overlap); }
+            }
+        }
+        // not root
+        else {
+            //disable checks for folders and if strict check enabled
+            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(409, "Nested subnet not in root subnet"); }
+
+                //nested?
+                $overlap = $this->Subnets->verify_nested_subnet_overlapping($cidr, $this->_params->vrfId, $this->_params->masterSubnetId);
+                if($overlap!==false) 																{ $this->Response->throw_exception(409, $overlap); }
+            }
+        }
+    }
+
+    /**
+     * Validates VLAN id
+     *
+     * @access private
+     * @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(404, "Vlan does not exist"); }
+        }
+    }
+
+    /**
+     * Validates VRF id
+     *
+     * @access private
+     * @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(404, "VRF does not exist"); }
+        }
+    }
 
 }

Spacing +229 added lines, -229 removed lines

@@ -82,15 +82,15 @@ 
 	 */
 	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
-		$this->init_object ("Subnets", $Database);
-		$this->init_object ("Addresses", $Database);
-		$this->init_object ("User", $Database);
+		$this->init_object("Subnets", $Database);
+		$this->init_object("Addresses", $Database);
+		$this->init_object("User", $Database);
 		// set valid keys
-		$this->set_valid_keys ("subnets");
+		$this->set_valid_keys("subnets");
 	}
 
 
@@ -103,15 +103,15 @@ 
 	 * @access public
 	 * @return array
 	 */
-	public function OPTIONS () {
+	public function OPTIONS() {
 		// validate
-		$this->validate_options_request ();
+		$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("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"))),
@@ -135,29 +135,29 @@ 
 	 * @access public
 	 * @return array
 	 */
-	public function POST () {
+	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); }
 
-		if     ($this->_params->id2=="first_subnet") { $this->post_find_free_subnet(Subnets::SEARCH_FIND_FIRST); }
-		elseif ($this->_params->id2=="last_subnet")  { $this->post_find_free_subnet(Subnets::SEARCH_FIND_LAST); }
+		if ($this->_params->id2 == "first_subnet") { $this->post_find_free_subnet(Subnets::SEARCH_FIND_FIRST); }
+		elseif ($this->_params->id2 == "last_subnet") { $this->post_find_free_subnet(Subnets::SEARCH_FIND_LAST); }
 
 		# validate parameters
-        $this->validate_create_parameters ();
+        $this->validate_create_parameters();
         # check for valid keys
-        $values = $this->validate_keys ();
+        $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)) {
+		if (!$this->Subnets->modify_subnet("add", $values)) {
 			$this->Response->throw_exception(500, "Failed to create subnet");
 		}
 		else {
 			//set result
-			return array("code"=>201, "message"=>"Subnet created", "id"=>$this->Subnets->lastInsertId, "data"=>$this->Addresses->transform_address($values['subnet'] ,"dotted")."/".$values['mask'], "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
+			return array("code"=>201, "message"=>"Subnet created", "id"=>$this->Subnets->lastInsertId, "data"=>$this->Addresses->transform_address($values['subnet'], "dotted")."/".$values['mask'], "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
 		}
 	}
 
@@ -168,10 +168,10 @@ 
 	 * @return void
 	 */
 	private function post_find_free_subnet($direction = Subnets::SEARCH_FIND_FIRST) {
-		$subnet_tmp = explode("/", $this->subnet_find_free (1, $direction));
+		$subnet_tmp = explode("/", $this->subnet_find_free(1, $direction));
 
 		// get master subnet
-		$master = $this->read_subnet ();
+		$master = $this->read_subnet();
 
 		$this->_params->subnet = $subnet_tmp[0];
 		$this->_params->mask = $subnet_tmp[1];
@@ -180,7 +180,7 @@ 
 		$this->_params->permissions = $master->permissions;
 		unset($this->_params->id2, $this->_params->id3);
 		// description
-		if(!isset($this->_params->description))    { $this->_params->description = "API autocreated"; }
+		if (!isset($this->_params->description)) { $this->_params->description = "API autocreated"; }
 	}
 
 
@@ -208,92 +208,92 @@ 
 	 * @access public
 	 * @return array
 	 */
-	public function GET () {
+	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") {
-				$result = $this->read_search_subnet ();
+			if ($this->_params->id == "cidr") {
+				$result = $this->read_search_subnet();
 				// check result
-				if($result==false)						{ $this->Response->throw_exception(200, "No subnets found"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == false) { $this->Response->throw_exception(200, "No subnets found"); }
+				else { return array("code"=>200, "data"=>$this->prepare_result($result, null, true, true)); }
 			}
 			else {
 				// validate id
-				$this->validate_subnet_id ();
+				$this->validate_subnet_id();
 			}
 
 			// addresses in subnet
-			if($this->_params->id2=="addresses") {
-				$result = $this->read_subnet_addresses ();
+			if ($this->_params->id2 == "addresses") {
+				$result = $this->read_subnet_addresses();
 				// if {ip} is set filter it out
-				if(isset($this->_params->id3)) {
-					if(is_array($result)) {
+				if (isset($this->_params->id3)) {
+					if (is_array($result)) {
 	    				foreach ($result as $k=>$r) {
 	        				if ($r->ip !== $this->_params->id3) {
 	            				unset($result[$k]);
 	        				}
 	    				}
 	    			}
-                    if(sizeof($result)==0) { $result = false; }
+                    if (sizeof($result) == 0) { $result = false; }
 				}
 				// check result
-				if($result===false)						{ $this->Response->throw_exception(200, "No addresses found"); }
+				if ($result === false) { $this->Response->throw_exception(200, "No addresses found"); }
 				else {
 					$this->custom_fields = $this->Tools->fetch_custom_fields('ipaddresses');
-					return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, true));
+					return array("code"=>200, "data"=>$this->prepare_result($result, "addresses", true, true));
 				}
 			}
 			// slaves
-			elseif($this->_params->id2=="slaves") {
-				$result = $this->read_subnet_slaves ();
+			elseif ($this->_params->id2 == "slaves") {
+				$result = $this->read_subnet_slaves();
 				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(200, "No slaves"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception(200, "No slaves"); }
+				else { return array("code"=>200, "data"=>$this->prepare_result($result, null, true, true)); }
 			}
 			// slaves-recursive
-			elseif ($this->_params->id2=="slaves_recursive") {
-				$result = $this->read_subnet_slaves_recursive ();
+			elseif ($this->_params->id2 == "slaves_recursive") {
+				$result = $this->read_subnet_slaves_recursive();
 				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(200, "No slaves"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception(200, "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_address ());  }
+			elseif ($this->_params->id2 == "first_free") { return array("code"=>200, "data"=>$this->subnet_first_free_address()); }
 			// search for new free subnet
-			elseif ($this->_params->id2=="all_subnets") { return array("code"=>200, "data"=>$this->subnet_find_free (Subnets::SEARCH_FIND_ALL, Subnets::SEARCH_FIND_FIRST));  }
+			elseif ($this->_params->id2 == "all_subnets") { return array("code"=>200, "data"=>$this->subnet_find_free(Subnets::SEARCH_FIND_ALL, Subnets::SEARCH_FIND_FIRST)); }
 			// search for new free subnet
-			elseif ($this->_params->id2=="first_subnet"){ return array("code"=>200, "data"=>$this->subnet_find_free (1, Subnets::SEARCH_FIND_FIRST));  }
+			elseif ($this->_params->id2 == "first_subnet") { return array("code"=>200, "data"=>$this->subnet_find_free(1, Subnets::SEARCH_FIND_FIRST)); }
 			// search for new free subnet
-			elseif ($this->_params->id2=="last_subnet") { return array("code"=>200, "data"=>$this->subnet_find_free (1, Subnets::SEARCH_FIND_LAST));  }
+			elseif ($this->_params->id2 == "last_subnet") { return array("code"=>200, "data"=>$this->subnet_find_free(1, Subnets::SEARCH_FIND_LAST)); }
 			// 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(200, 'No custom fields defined'); }
-			else										{ return array("code"=>200, "data"=>$this->custom_fields); }
+			if (sizeof($this->custom_fields) == 0) { $this->Response->throw_exception(200, 'No custom fields defined'); }
+			else { return array("code"=>200, "data"=>$this->custom_fields); }
 		}
 		// id
 		elseif (is_numeric($this->_params->id)) {
-			$result = $this->read_subnet ();
+			$result = $this->read_subnet();
 			// check result
-			if($result==false)							{ $this->Response->throw_exception(400, "Invalid subnet Id (".$this->_params->id.")"); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+			if ($result == false) { $this->Response->throw_exception(400, "Invalid subnet Id (".$this->_params->id.")"); }
+			else { return array("code"=>200, "data"=>$this->prepare_result($result, "subnets", true, true)); }
 		}
 		// all
-		elseif ($this->_params->id=="all") {
+		elseif ($this->_params->id == "all") {
 			$result = $this->read_all_subnets();
 			// check result
-			if ($result===false)						{ $this->Response->throw_exception(500, "Unable to read subnets"); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result($result, "subnets", true, true)); }
+			if ($result === false) { $this->Response->throw_exception(500, "Unable to read subnets"); }
+			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'); }
 	}
 
 
@@ -306,8 +306,8 @@ 
 	 * @access public
 	 * @return array
 	 */
-	public function HEAD () {
-		return $this->GET ();
+	public function HEAD() {
+		return $this->GET();
 	}
 
 
@@ -329,41 +329,41 @@ 
 	 * @access public
 	 * @return array
 	 */
-	public function PATCH () {
+	public function PATCH() {
 		// Check for id
-		$this->validate_subnet_id ();
+		$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(); }
 			// permissions
-    		elseif ($this->_params->id2=="permissions") { return $this->subnet_change_permissions (); }
+    		elseif ($this->_params->id2 == "permissions") { return $this->subnet_change_permissions(); }
 			// 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 ();
+			$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 ();
+			$values = $this->validate_keys();
 			// add id
 			$values["id"] = $this->_params->id;
 
 			# execute update
-			if(!$this->Subnets->modify_subnet ("edit", $values))
+			if (!$this->Subnets->modify_subnet("edit", $values))
 														{ $this->Response->throw_exception(500, 'Subnet update failed'); }
 			else {
 				return array("code"=>200, "message"=>"Subnet updated");
@@ -387,18 +387,18 @@ 
 	 * @access public
 	 * @return array
 	 */
-	public function DELETE () {
+	public function DELETE() {
 		// Check for id
-		$this->validate_subnet_id ();
+		$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(); }
 			// remove
-			elseif ($this->_params->id2=="permissions") { return $this->subnet_remove_permissions (); }
+			elseif ($this->_params->id2 == "permissions") { return $this->subnet_remove_permissions(); }
 			// error
-			else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
+			else { $this->Response->throw_exception(400, 'Invalid parameters'); }
 		}
 		// ok, delete subnet
 		else {
@@ -407,7 +407,7 @@ 
 			$values["id"] = $this->_params->id;
 
 			# execute update
-			if(!$this->Subnets->modify_subnet ("delete", $values))
+			if (!$this->Subnets->modify_subnet("delete", $values))
 														{ $this->Response->throw_exception(500, "Failed to delete subnet"); }
 			else {
 				//set result
@@ -428,11 +428,11 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function subnet_truncate () {
+	private function subnet_truncate() {
 		// Check for id
-		$this->validate_subnet_id ();
+		$this->validate_subnet_id();
 		// ok, try to truncate
-		$this->Subnets->modify_subnet ("truncate", (array) $this->_params);
+		$this->Subnets->modify_subnet("truncate", (array) $this->_params);
 		//set result
 		return array("code"=>200, "message"=>"Subnet truncated");
 	}
@@ -448,26 +448,26 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function subnet_resize () {
+	private function subnet_resize() {
 		// Check for id
-		$this->validate_subnet_id ();
+		$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);
+		$old_subnet = $this->Subnets->fetch_subnet("id", $this->_params->id);
 
 		// validate resizing
-		$this->Subnets->verify_subnet_resize ($old_subnet->subnet, $this->_params->mask, $this->_params->id, $old_subnet->vrfId, $old_subnet->masterSubnetId, $old_subnet->mask, $old_subnet->sectionId);
+		$this->Subnets->verify_subnet_resize($old_subnet->subnet, $this->_params->mask, $this->_params->id, $old_subnet->vrfId, $old_subnet->masterSubnetId, $old_subnet->mask, $old_subnet->sectionId);
 
 		// regenerate subnet if needed
 		if ($old_subnet->mask < $this->_params->mask) {
 			$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
@@ -475,7 +475,7 @@ 
 						"subnet"=>$subnet_new,
 						"mask"=>$this->_params->mask
 						);
-		$this->Subnets->modify_subnet ("resize", $values);
+		$this->Subnets->modify_subnet("resize", $values);
 
 		//set result
 		return array("code"=>200, "message"=>"Subnet resized");
@@ -494,20 +494,20 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function subnet_split () {
+	private function subnet_split() {
 		// Check for id
-		$this->validate_subnet_id ();
+		$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(!isset($this->_params->copy_custom))			{ $this->_params->copy_custom = "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"; }
+		if (!isset($this->_params->copy_custom)) { $this->_params->copy_custom = "yes"; }
 
 		// fetch old subnet
-		$subnet_old = $this->Subnets->fetch_subnet ("id", $this->_params->id);
+		$subnet_old = $this->Subnets->fetch_subnet("id", $this->_params->id);
 		// create new subnets and move addresses
-		$this->Subnets->subnet_split ($subnet_old, $this->_params->number, $this->_params->prefix, $this->_params->group, $this->_params->strict, $this->_params->copy_custom);
+		$this->Subnets->subnet_split($subnet_old, $this->_params->number, $this->_params->prefix, $this->_params->group, $this->_params->strict, $this->_params->copy_custom);
 
 		//set result
 		return array("code"=>200, "message"=>"Subnet splitted");
@@ -527,18 +527,18 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function subnet_change_permissions () {
+	private function subnet_change_permissions() {
 		// Check for id
-		$this->validate_subnet_id ();
+		$this->validate_subnet_id();
 
 		// validate groups, permissions and save to _params
-        $this->validate_create_permissions ();
+        $this->validate_create_permissions();
         // save perms
         $values['id'] = $this->_params->id;
         $values['permissions'] = $this->_params->permissions;
 
 		# execute update
-		if(!$this->Subnets->modify_subnet ("edit", $values))
+		if (!$this->Subnets->modify_subnet("edit", $values))
 													{ $this->Response->throw_exception(500, 'Subnet permissions update failed'); }
 		else {
 			return array("code"=>200, "message"=>"Subnet permissions updated", "data"=>$this->_params->permissions_text);
@@ -551,9 +551,9 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function validate_create_permissions () {
+	private function validate_create_permissions() {
     	// set valid permissions array
-    	$valid_permissions_array = $this->get_possible_permissions ();
+    	$valid_permissions_array = $this->get_possible_permissions();
     	// requested permissions
     	$requested_permissions = array();
     	$requested_permissions_full = array();
@@ -562,21 +562,21 @@ 
     	unset($this->_params->controller, $this->_params->app_id, $this->_params->id, $this->_params->id2, $this->_params->isFolder);
 
     	// loop and validate
-    	if(sizeof($this->_params)>0) {
+    	if (sizeof($this->_params) > 0) {
             foreach ($this->_params as $gid=>$perm) {
 
                 // fetch and validate group
                 $group = is_numeric($gid) ? $this->Tools->fetch_object("userGroups", "g_id", $gid) : $this->Tools->fetch_object("userGroups", "g_name", $gid);
-                if ($group===false)             $this->Response->throw_exception(500, "Invalid group identifier ".$gid);
+                if ($group === false)             $this->Response->throw_exception(500, "Invalid group identifier ".$gid);
 
                 // validate permissions
-                if(is_numeric($perm)) {
-                    if(!in_array($perm, $valid_permissions_array)) {
+                if (is_numeric($perm)) {
+                    if (!in_array($perm, $valid_permissions_array)) {
                                                 $this->Response->throw_exception(500, "Invalid permissions ".$perm);
                     }
                 }
                 else {
-                    if(!array_key_exists($perm, $valid_permissions_array)) {
+                    if (!array_key_exists($perm, $valid_permissions_array)) {
                                                 $this->Response->throw_exception(500, "Invalid permissions ".$perm);
                     }
                     else {
@@ -610,11 +610,11 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function subnet_remove_permissions () {
+	private function subnet_remove_permissions() {
 		// Check for id
-		$this->validate_subnet_id ();
+		$this->validate_subnet_id();
 		// ok, try to truncate
-		$this->Subnets->modify_subnet ("edit", array("id"=>$this->_params->id, "permissions"=>""));
+		$this->Subnets->modify_subnet("edit", array("id"=>$this->_params->id, "permissions"=>""));
 		//set result
 		return array("code"=>200, "message"=>"Subnet permissions removed");
 	}
@@ -630,13 +630,13 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function subnet_usage () {
+	private function subnet_usage() {
 		# check that section exists
-		$subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id);
-		if($subnet===false)
+		$subnet = $this->Subnets->fetch_subnet("id", $this->_params->id);
+		if ($subnet === false)
 														{ $this->Response->throw_exception(400, "Subnet does not exist"); }
 		# get usage
-		$subnet_usage = $this->Subnets->calculate_subnet_usage ($subnet, true);
+		$subnet_usage = $this->Subnets->calculate_subnet_usage($subnet, true);
 		# return
 		return $subnet_usage;
 	}
@@ -651,19 +651,19 @@ 
 	 * @access public
 	 * @return array|string
 	 */
-	public function subnet_first_free_address () {
+	public function subnet_first_free_address() {
 		// Check for id
-		$this->validate_subnet_id ();
+		$this->validate_subnet_id();
 		// check for isFull
-		$subnet = $this->read_subnet ();
-		if($subnet->isFull==1)                              { $this->Response->throw_exception(200, "No free addresses found"); }
+		$subnet = $this->read_subnet();
+		if ($subnet->isFull == 1) { $this->Response->throw_exception(200, "No free addresses found"); }
         // slaves
-        if($this->Subnets->has_slaves ($this->_params->id)) { $this->Response->throw_exception(409, "Subnet contains subnets"); }
+        if ($this->Subnets->has_slaves($this->_params->id)) { $this->Response->throw_exception(409, "Subnet contains subnets"); }
 		// fetch
-		$first = $this->Addresses->get_first_available_address ($this->_params->id, $this->Subnets);
+		$first = $this->Addresses->get_first_available_address($this->_params->id, $this->Subnets);
 		// available?
-		if($first===false)	{ $this->Response->throw_exception(200, "No free addresses found"); }
-		else				{ $first = $this->Addresses->transform_to_dotted($first); }
+		if ($first === false) { $this->Response->throw_exception(200, "No free addresses found"); }
+		else { $first = $this->Addresses->transform_to_dotted($first); }
 
 		# return
 		return $first;
@@ -677,17 +677,17 @@ 
 	 * @param integer $direction (default: Subnets::SEARCH_FIND_FIRST)
 	 * @return array|string
 	 */
-	public function subnet_find_free ($count = Subnets::SEARCH_FIND_ALL, $direction = Subnets::SEARCH_FIND_FIRST) {
+	public function subnet_find_free($count = Subnets::SEARCH_FIND_ALL, $direction = Subnets::SEARCH_FIND_FIRST) {
 		// Check for id
-		$this->validate_subnet_id ();
+		$this->validate_subnet_id();
 
-		$found = $this->Subnets->search_available_subnets ($this->_params->id, $this->_params->id3, $count, $direction);
+		$found = $this->Subnets->search_available_subnets($this->_params->id, $this->_params->id3, $count, $direction);
 
-		if ($found===false) {
+		if ($found === false) {
 			$this->Response->throw_exception(200, "No subnets found");
 		}
 
-		return ($count == 1) ?  $found[0] : $found;
+		return ($count == 1) ? $found[0] : $found;
 	}
 
 
@@ -702,28 +702,28 @@ 
 	 * @access private
 	 * @return array|false
 	 */
-	private function read_subnet ($subnetId = null) {
+	private function read_subnet($subnetId = null) {
 		// null
 		$subnetId = is_null($subnetId) ? $this->_params->id : $subnetId;
 		// fetch
-		$result = $this->Subnets->fetch_subnet ("id", $subnetId);
+		$result = $this->Subnets->fetch_subnet("id", $subnetId);
         // add nameservers, GW and calculation
-        if($result!==false) {
+        if ($result !== false) {
             $ns = $this->read_subnet_nameserver($result->nameserverId);
-            if ($ns!==false) {
+            if ($ns !== false) {
                 $result->nameservers = $ns;
             }
 
-    		$gateway = $this->read_subnet_gateway ();
-    		if ( $gateway!== false) {
+    		$gateway = $this->read_subnet_gateway();
+    		if ($gateway !== false) {
         		$result->gatewayId = $gateway->id;
-        		$gateway = $this->transform_address ($gateway);
+        		$gateway = $this->transform_address($gateway);
         		$result->gateway = $gateway;
     		}
 
     		if (!$result->isFolder)
 		    {
-			    $result->calculation = $this->Tools->calculate_ip_calc_results($this->Subnets->transform_address($result->subnet, "dotted") . "/" . $result->mask);
+			    $result->calculation = $this->Tools->calculate_ip_calc_results($this->Subnets->transform_address($result->subnet, "dotted")."/".$result->mask);
 		    }
 		}
 
@@ -742,25 +742,25 @@ 
 		$results = $this->Subnets->fetch_all_subnets();
 
 		// add nameservers, GW, permission and location for each network found
-		if($results!==false) {
-			foreach($results as $key => $result) {
+		if ($results !== false) {
+			foreach ($results as $key => $result) {
 				$ns = $this->read_subnet_nameserver($result->nameserverId);
-				if ($ns!==false) {
+				if ($ns !== false) {
 					$result->nameservers = $ns;
 				}
 
-				$gateway = $this->read_subnet_gateway ($result->id);
-				if ( $gateway!== false) {
+				$gateway = $this->read_subnet_gateway($result->id);
+				if ($gateway !== false) {
 					$result->gatewayId = $gateway->id;
-					$gateway = $this->transform_address ($gateway);
+					$gateway = $this->transform_address($gateway);
 					$result->gateway = $gateway;
 				}
 
 				$result->permissions = $this->User->get_user_permissions_from_json($result->permissions);
 
 				// location details
-				if(!empty($result->location)) {
-					$result->location = $this->Tools->fetch_object ("locations", "id", $result->location);
+				if (!empty($result->location)) {
+					$result->location = $this->Tools->fetch_object("locations", "id", $result->location);
 				} else {
 					$result->location = array();
 				}
@@ -771,7 +771,7 @@ 
 		}
 
 		# result
-		return sizeof($results)==0 ? false : $results;
+		return sizeof($results) == 0 ? false : $results;
 	}
 
 	/**
@@ -780,11 +780,11 @@ 
 	 * @access private
 	 * @return array|false
 	 */
-	private function read_subnet_addresses () {
+	private function read_subnet_addresses() {
 		// fetch
-		$result = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
+		$result = $this->Addresses->fetch_subnet_addresses($this->_params->id);
 		# result
-		return sizeof($result)==0 ? false : $result;
+		return sizeof($result) == 0 ? false : $result;
 	}
 
 	/**
@@ -793,8 +793,8 @@ 
 	 * @access private
 	 * @return int|bool
 	 */
-	private function read_subnet_gateway ($id=NULL) {
-		return $id === NULL ? $this->Subnets->find_gateway ($this->_params->id) : $this->Subnets->find_gateway ($id);
+	private function read_subnet_gateway($id = NULL) {
+		return $id === NULL ? $this->Subnets->find_gateway($this->_params->id) : $this->Subnets->find_gateway($id);
 	}
 
 	/**
@@ -804,8 +804,8 @@ 
 	 * @param mixed $nsid
 	 * @return array|false
 	 */
-	private function read_subnet_nameserver ($nsid) {
-    	return $this->Tools->fetch_object ("nameservers", "id", $nsid);
+	private function read_subnet_nameserver($nsid) {
+    	return $this->Tools->fetch_object("nameservers", "id", $nsid);
 	}
 
 	/**
@@ -814,11 +814,11 @@ 
 	 * @access private
 	 * @return array|false
 	 */
-	private function read_subnet_slaves () {
+	private function read_subnet_slaves() {
 		// fetch
-		$result = $this->Subnets->fetch_subnet_slaves ($this->_params->id);
+		$result = $this->Subnets->fetch_subnet_slaves($this->_params->id);
 		# result
-		return $result===false ? NULL : $result;
+		return $result === false ? NULL : $result;
 	}
 
 	/**
@@ -827,17 +827,17 @@ 
 	 * @access private
 	 * @return array|NULL
 	 */
-	private function read_subnet_slaves_recursive () {
+	private function read_subnet_slaves_recursive() {
 		// get array of ids
-		$this->Subnets->fetch_subnet_slaves_recursive ($this->_params->id);
+		$this->Subnets->fetch_subnet_slaves_recursive($this->_params->id);
 		// init result
-		$result = array ();
+		$result = array();
 		// fetch all;
-		foreach($this->Subnets->slaves as $s) {
-			$result[] = $this->read_subnet ($s);
+		foreach ($this->Subnets->slaves as $s) {
+			$result[] = $this->read_subnet($s);
 		}
 		# result
-		return sizeof($result)==0 ? NULL : $result;
+		return sizeof($result) == 0 ? NULL : $result;
 	}
 
 	/**
@@ -846,15 +846,15 @@ 
 	 * @access private
 	 * @return array|false
 	 */
-	private function read_search_subnet () {
+	private function read_search_subnet() {
 		// transform
-		$this->_params->id2 = $this->Subnets->transform_address ($this->_params->id2, "decimal");
+		$this->_params->id2 = $this->Subnets->transform_address($this->_params->id2, "decimal");
 		// check
-		$subnet = $this->Tools->fetch_multiple_objects ("subnets", "subnet", $this->_params->id2);
+		$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;
 				}
 			}
@@ -878,26 +878,26 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function validate_create_parameters () {
+	public 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 ();
+		$this->validate_cidr();
 		# verify that it is subnet
-		$this->validate_network ();
+		$this->validate_network();
 		# verify that master subnet exists
-		$this->validate_master_subnet ();
+		$this->validate_master_subnet();
 		# verify section
-		$this->validate_section ();
+		$this->validate_section();
 		# verify folder
-		$this->validate_folder ();
+		$this->validate_folder();
 		# verify overlapping
-		$this->validate_overlapping ();
+		$this->validate_overlapping();
 		# verify vlan
-		$this->validate_vlan ();
+		$this->validate_vlan();
 		# verify vrf
-		$this->validate_vrf ();
+		$this->validate_vrf();
 	}
 
 	/**
@@ -906,11 +906,11 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function validate_cidr () {
+	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)
+			if (strlen($err = $this->Subnets->verify_cidr_address($this->_params->subnet."/".$this->_params->mask)) > 1)
 																									{ $this->Response->throw_exception(400, $err); }
 		}
 	}
@@ -921,10 +921,10 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function validate_network () {
+	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"); }
 		}
 	}
 
@@ -934,18 +934,18 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function validate_master_subnet () {
+	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 master subnet
-			$master_subnet = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
-			if($master_subnet===false)		                                                        { $this->Response->throw_exception(404, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
+			$master_subnet = $this->Subnets->fetch_subnet("id", $this->_params->masterSubnetId);
+			if ($master_subnet === false) { $this->Response->throw_exception(404, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
 			// check that it is inside subnet
 			else {
 				// not for folders
-				if(@$this->_params->isFolder!=1 && $master_subnet->isFolder!=1) {
-					if(!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
+				if (@$this->_params->isFolder != 1 && $master_subnet->isFolder != 1) {
+					if (!$this->Subnets->verify_subnet_nesting($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
 																									{ $this->Response->throw_exception(409, "Subnet is not within boundaries of its master subnet"); }
 				}
 				// set permissions
@@ -960,16 +960,16 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function validate_section () {
+	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 {
     		$master = $this->Tools->fetch_object("sections", "id", $this->_params->sectionId);
-			if($master===false)		{ $this->Response->throw_exception(400, "Section id (".$this->_params->sectionId.") does not exist"); }
+			if ($master === false) { $this->Response->throw_exception(400, "Section id (".$this->_params->sectionId.") does not exist"); }
 			else {
     			// inherit permissions from section
-    			if($this->_params->masterSubnetId == 0) {
+    			if ($this->_params->masterSubnetId == 0) {
         			$this->_params->permissions = $master->permissions;
     			}
 			}
@@ -982,11 +982,11 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function validate_subnet_id () {
+	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($this->Subnets->fetch_subnet ("id", $this->_params->id)===false) 						{ $this->Response->throw_exception(404, "Invalid subnet Id (".$this->_params->id.")"); }
+		if ($this->Subnets->fetch_subnet("id", $this->_params->id) === false) { $this->Response->throw_exception(404, "Invalid subnet Id (".$this->_params->id.")"); }
 	}
 
 	/**
@@ -995,13 +995,13 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function validate_folder () {
+	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) {
-				$parent = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
-				if($parent->isFolder!=1) 															{ $this->Response->throw_exception(409, "Parent is not a folder"); }
+			if ($this->_params->masterSubnetId != 0) {
+				$parent = $this->Subnets->fetch_subnet("id", $this->_params->masterSubnetId);
+				if ($parent->isFolder != 1) { $this->Response->throw_exception(409, "Parent is not a folder"); }
 			}
 		}
 	}
@@ -1012,43 +1012,43 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function validate_overlapping () {
+	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"); }
+		$section = $this->Tools->fetch_object("sections", "id", $this->_params->sectionId);
+		if ($section === false) { $this->Response->throw_exception(400, "Invalid section Id"); }
 		// settings
-		$this->settings = $this->Tools->fetch_object ("settings", "id", 1);
+		$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; }
+			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(409, $overlap); }
+		    	$overlap = $this->Subnets->verify_subnet_overlapping($this->_params->sectionId, $cidr, $this->_params->vrfId);
+		    	if ($overlap !== false) { $this->Response->throw_exception(409, $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(409, "Nested subnet not in root subnet"); }
+		        if (!$this->Subnets->verify_subnet_nesting($this->_params->masterSubnetId, $cidr)) { $this->Response->throw_exception(409, "Nested subnet not in root subnet"); }
 
 			    //nested?
 		        $overlap = $this->Subnets->verify_nested_subnet_overlapping($cidr, $this->_params->vrfId, $this->_params->masterSubnetId);
-				if($overlap!==false) 																{ $this->Response->throw_exception(409, $overlap); }
+				if ($overlap !== false) { $this->Response->throw_exception(409, $overlap); }
 		    }
 		}
 	}
@@ -1059,9 +1059,9 @@ 
 	 * @access private
 	 * @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(404, "Vlan does not exist"); }
+	private function validate_vlan() {
+		if (isset($this->_params->vlanId)) {
+			if ($this->Tools->fetch_object("vlans", "vlanId", $this->_params->vlanId) === false) { $this->Response->throw_exception(404, "Vlan does not exist"); }
 		}
 	}
 
@@ -1071,9 +1071,9 @@ 
 	 * @access private
 	 * @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(404, "VRF does not exist"); }
+	private function validate_vrf() {
+		if (isset($this->_params->vrfId)) {
+			if ($this->Tools->fetch_object("vrf", "vrfId", $this->_params->vrfId) === false) { $this->Response->throw_exception(404, "VRF does not exist"); }
 		}
 	}