phpipam / phpipam

api/controllers/_template.php

Indentation +120 added lines, -120 removed lines

@@ -17,164 +17,164 @@
 class Tools_controller extends Common_api_functions {
 
 
-	/**
-	 * sets output - JSON or XML
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $result_type;
-
-	/**
-	 * result
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $result;
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Response object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Response;
+    /**
+     * sets output - JSON or XML
+     *
+     * @var mixed
+     * @access public
+     */
+    public $result_type;
+
+    /**
+     * result
+     *
+     * @var mixed
+     * @access public
+     */
+    public $result;
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Response object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Response;
 
-	/**
-	 * Tools object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
+    /**
+     * Tools object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
 
-	/**
-	 * Parameters
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
+    /**
+     * Parameters
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
 
 
-	/**
-	 * __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->Response = $Response;
-		$this->Tools 	= $Tools;
-		$this->_params 	= $params;
-		// init required objects
-		$this->init_object ("Subnets", $Database);
-		// set valid keys
-		$this->set_valid_keys ("mydatabase");
-	}
+    /**
+     * __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->Response = $Response;
+        $this->Tools 	= $Tools;
+        $this->_params 	= $params;
+        // init required objects
+        $this->init_object ("Subnets", $Database);
+        // set valid keys
+        $this->set_valid_keys ("mydatabase");
+    }
 
 
 
 
 
-	/**
-	 * returns general options
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
+    /**
+     * returns general options
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
 
-	}
+    }
 
 
 
 
 
 
-	/**
-	 * Creates new object
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		// remap keys if needed
-		$this->remap_keys ();
-		// check for valid keys
-		$this->validate_keys ();
-	}
+    /**
+     * Creates new object
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        // remap keys if needed
+        $this->remap_keys ();
+        // check for valid keys
+        $this->validate_keys ();
+    }
 
 
 
 
 
-	/**
-	 * Reads object
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
+    /**
+     * Reads object
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
 
-	}
+    }
 
 
 
 
 
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
 
 
 
 
 
-	/**
-	 * Update object
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		// remap keys if needed
-		$this->remap_keys ();
-		// check for valid keys
-		$this->validate_keys ();
-	}
+    /**
+     * Update object
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        // remap keys if needed
+        $this->remap_keys ();
+        // check for valid keys
+        $this->validate_keys ();
+    }
 
 
 
 
 
-	/**
-	 * Deletes existing object
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
+    /**
+     * Deletes existing object
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
 
-	}
+    }
 }
 
 ?>
\ No newline at end of file

api/controllers/Responses.php

Indentation +363 added lines, -363 removed lines

@@ -8,369 +8,369 @@
 class Responses {
 
 
-	/**
-	 * error code handler
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $errors;
-
-	/**
-	 * result handler
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $result = null;
-
-	/**
-	 * Sets result type
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	private $result_type;
-
-	/**
-	 * is exception set?
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access public
-	 */
-	public $exception = false;
-
-
-
-
-
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 */
-	public function __construct() {
-		# set error codes
-		$this->set_error_codes ();
-	}
-
-	/**
-	 * Sets error code object
-	 *
-	 *	http://www.restapitutorial.com/httpstatuscodes.html
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function set_error_codes () {
-		// OK
-		$this->errors[200] = "OK";
-		$this->errors[201] = "Created";
-		$this->errors[202] = "Accepted";
-		$this->errors[204] = "No Content";
-		// Client errors
-		$this->errors[400] = "Bad Request";
-		$this->errors[401] = "Unauthorized";
-		$this->errors[403] = "Forbidden";
-		$this->errors[404] = "Not Found";
-		$this->errors[405] = "Method Not Allowed";
-		$this->errors[415] = "Unsupported Media Type";
-		// Server errors
-		$this->errors[500] = "Internal Server Error";
-		$this->errors[501] = "Not Implemented";
-		$this->errors[503] = "Service Unavailable";
-		$this->errors[505] = "HTTP Version Not Supported";
-		$this->errors[511] = "Network Authentication Required";
-	}
-
-	/**
-	 * Sets new header and throws exception
-	 *
-	 * @access public
-	 * @param int $code (default: 400)
-	 * @param mixed $exception
-	 * @return void
-	 */
-	public function throw_exception ($code = 400, $exception) {
-		// set failed
-		$this->exception = true;
-
-		// set success
-		$this->result['success'] = false;
-		// set exit code
-		$this->result['code'] = $code;
-		// set message
-		$this->result['message'] = $exception;
-
-		// set header
-		$this->set_header ();
-		// throw exception
-		throw new Exception($exception);
-	}
-
-	/**
-	 * Sets header based on provided HTTP code
-	 *
-	 * @access private
-	 * @param mixed $code
-	 * @return void
-	 */
-	private function set_header () {
-		// wrong code
-		if(!isset($this->exception))		{ header("HTTP/1.1 500 Invalid result code"); }
-		else								{ header("HTTP/1.1 ".$this->result['code']." ".$this->errors[$this->result['code']]); }
-
-		// 401 - add location
-		if ($this->result['code']==401) {
-			$this->set_location_header ("/api/".$_REQUEST['app_id']."/user/");
-		}
-	}
-
-	/**
-	 * Formulates result to JSON or XML
-	 *
-	 * @access public
-	 * @param mixed $result
-	 * @return void
-	 */
-	public function formulate_result ($result) {
-		// make sure result is array
-		$this->result = is_null($this->result) ? (array) $result : $this->result;
-
-		// get requested content type
-		$this->get_request_content_type ();
-
-		// set result contrnt type
-		$this->set_content_type_header ();
-		// set cache header
-		$this->set_cache_header ();
-		// set result header if not already set with $result['success']=false
-		$this->exception===true ? : $this->set_success_header ();
-
-		// return result
-		return $this->create_result ();
-	}
-
-	/**
-	 * Validates that proper content type is set in request
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function validate_content_type () {
-		// not set, presume json
-		if( !isset($_SERVER['CONTENT_TYPE']) ) {}
-		// post
-		elseif($_SERVER['CONTENT_TYPE']=="application/x-www-form-urlencoded") {}
-		// set, verify
-		elseif (!($_SERVER['CONTENT_TYPE']=="application/xml" || $_SERVER['CONTENT_TYPE']=="application/json")) {
-			$this->throw_exception (415, "Invalid Content type ".$_SERVER['CONTENT_TYPE']);
-		}
-	}
-
-	/**
-	 * Sets request content type
-	 *
-	 * @access public
-	 * @return void
-	 */
-	private function get_request_content_type () {
-		$this->result_type = $_SERVER['CONTENT_TYPE']=="application/xml" ? "xml" : "json";
-	}
-
-	/**
-	 * Sets result content type
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function set_content_type_header () {
-		// content_type
-		$this->result_type == "xml" ? header('Content-Type: application/xml') : header('Content-Type: application/json');
-	}
-
-	/**
-	 * Sets Cache header.
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function set_cache_header ($seconds = NULL) {
-		// none
-		if($seconds===NULL) {
-			header("Cache-Control: no-cache");
-			header("Pragma: no-cache");
-		}
-		// cache
-		else {
-			header("Cache-Control: $seconds");
-		}
-	}
-
-	/**
-	 * Sets success header
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function set_success_header () {
-		// check fo location
-		if(isset($this->result['location'])) {
-			$this->set_location_header ($this->result['location']);
-		}
-
-		// set success
-		$this->result['success'] = true;
-
-		// set header
-		$this->set_header ();
-
-	}
-
-	/**
-	 * Sets location header for newly created objects
-	 *
-	 * @access private
-	 * @param mixed $location
-	 * @return void
-	 */
-	private function set_location_header ($location) {
-		header("Location: ".$location);
-	}
-
-	/**
-	 * Outputs result
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function create_result () {
-		// reorder
-		$this->reorder_result ();
-		// creates result
-		return $this->result_type == "xml" ? $this->create_xml () : $this->create_json ();
-	}
-
-	/**
-	 * Reorders result to proper format
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function reorder_result () {
-		$tmp = $this->result;
-		unset($this->result);
-		// reset
-		$this->result['code'] = $tmp['code'];
-		$this->result['success'] = $tmp['success'];
-		if(isset($tmp['message']))	{ $this->result['message'] = $tmp['message']; }
-		if(isset($tmp['data']))		{ $this->result['data'] = $tmp['data']; }
-		if(isset($tmp['ip']))	    { $this->result['ip'] = $tmp['ip']; }
-	}
-
-	/**
-	 * Creates XML result
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function create_xml () {
-		// convert whole object to array
-		$this->result = $this->object_to_array($this->result);
-
-		// new SimpleXMLElement object
-		$xml = new SimpleXMLElement('<'.$_GET['controller'].'/>');
-		// generate xml from result
-		$this->array_to_xml($xml, $this->result);
-
-		// return XML result
-		return $xml->asXML();
-	}
-
-	/**
-	 * Transforms array to XML
-	 *
-	 * @access private
-	 * @param SimpleXMLElement $object
-	 * @param array $data
-	 * @return void
-	 */
-	private function array_to_xml(SimpleXMLElement $object, array $data) {
-		// loop through values
-	    foreach ($data as $key => $value) {
-		    // if spaces exist in key replace them with underscores
-		    if(strpos($key, " ")>0)	{ $key = str_replace(" ", "_", $key); }
-
-		    // if key is numeric append item
-		    if(is_numeric($key)) $key = "item".$key;
-
-			// if array add child
-	        if (is_array($value)) {
-	            $new_object = $object->addChild($key);
-	            $this->array_to_xml($new_object, $value);
-	        }
-	        // else write value
-	        else {
-	            $object->addChild($key, $value);
-	        }
-	    }
-	}
-
-	/**
-	 * function xml2array
-	 *
-	 * This function is part of the PHP manual.
-	 *
-	 * The PHP manual text and comments are covered by the Creative Commons
-	 * Attribution 3.0 License, copyright (c) the PHP Documentation Group
-	 *
-	 * @author  k dot antczak at livedata dot pl
-	 * @date    2011-04-22 06:08 UTC
-	 * @link    http://www.php.net/manual/en/ref.simplexml.php#103617
-	 * @license http://www.php.net/license/index.php#doc-lic
-	 * @license http://creativecommons.org/licenses/by/3.0/
-	 * @license CC-BY-3.0 <http://spdx.org/licenses/CC-BY-3.0>
-	 */
-	public function xml_to_array ( $xmlObject, $out = array () ) {
-	    foreach ( (array) $xmlObject as $index => $node )
-	        $out[$index] = ( is_object ( $node ) ) ? $this->xml_to_array ( $node ) : $node;
-
-	    return $out;
-	}
-
-	/**
-	 * Transforms object to array
-	 *
-	 * @access private
-	 * @param mixed $obj
-	 * @return void
-	 */
-	private function object_to_array ($obj) {
-		// object to array
-	    if(is_object($obj)) $obj = (array) $obj;
-	    if(is_array($obj)) {
-	        $new = array();
-	        foreach($obj as $key => $val) {
-	            $new[$key] = $this->object_to_array($val);
-	        }
-	    }
-	    else $new = $obj;
-	    return $new;
-	}
-
-	/**
-	 * Creates JSON result
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function create_json () {
-		return json_encode((array) $this->result);
-	}
+    /**
+     * error code handler
+     *
+     * @var mixed
+     * @access public
+     */
+    public $errors;
+
+    /**
+     * result handler
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access public
+     */
+    public $result = null;
+
+    /**
+     * Sets result type
+     *
+     * @var mixed
+     * @access private
+     */
+    private $result_type;
+
+    /**
+     * is exception set?
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access public
+     */
+    public $exception = false;
+
+
+
+
+
+    /**
+     * __construct function
+     *
+     * @access public
+     */
+    public function __construct() {
+        # set error codes
+        $this->set_error_codes ();
+    }
+
+    /**
+     * Sets error code object
+     *
+     *	http://www.restapitutorial.com/httpstatuscodes.html
+     *
+     * @access private
+     * @return void
+     */
+    private function set_error_codes () {
+        // OK
+        $this->errors[200] = "OK";
+        $this->errors[201] = "Created";
+        $this->errors[202] = "Accepted";
+        $this->errors[204] = "No Content";
+        // Client errors
+        $this->errors[400] = "Bad Request";
+        $this->errors[401] = "Unauthorized";
+        $this->errors[403] = "Forbidden";
+        $this->errors[404] = "Not Found";
+        $this->errors[405] = "Method Not Allowed";
+        $this->errors[415] = "Unsupported Media Type";
+        // Server errors
+        $this->errors[500] = "Internal Server Error";
+        $this->errors[501] = "Not Implemented";
+        $this->errors[503] = "Service Unavailable";
+        $this->errors[505] = "HTTP Version Not Supported";
+        $this->errors[511] = "Network Authentication Required";
+    }
+
+    /**
+     * Sets new header and throws exception
+     *
+     * @access public
+     * @param int $code (default: 400)
+     * @param mixed $exception
+     * @return void
+     */
+    public function throw_exception ($code = 400, $exception) {
+        // set failed
+        $this->exception = true;
+
+        // set success
+        $this->result['success'] = false;
+        // set exit code
+        $this->result['code'] = $code;
+        // set message
+        $this->result['message'] = $exception;
+
+        // set header
+        $this->set_header ();
+        // throw exception
+        throw new Exception($exception);
+    }
+
+    /**
+     * Sets header based on provided HTTP code
+     *
+     * @access private
+     * @param mixed $code
+     * @return void
+     */
+    private function set_header () {
+        // wrong code
+        if(!isset($this->exception))		{ header("HTTP/1.1 500 Invalid result code"); }
+        else								{ header("HTTP/1.1 ".$this->result['code']." ".$this->errors[$this->result['code']]); }
+
+        // 401 - add location
+        if ($this->result['code']==401) {
+            $this->set_location_header ("/api/".$_REQUEST['app_id']."/user/");
+        }
+    }
+
+    /**
+     * Formulates result to JSON or XML
+     *
+     * @access public
+     * @param mixed $result
+     * @return void
+     */
+    public function formulate_result ($result) {
+        // make sure result is array
+        $this->result = is_null($this->result) ? (array) $result : $this->result;
+
+        // get requested content type
+        $this->get_request_content_type ();
+
+        // set result contrnt type
+        $this->set_content_type_header ();
+        // set cache header
+        $this->set_cache_header ();
+        // set result header if not already set with $result['success']=false
+        $this->exception===true ? : $this->set_success_header ();
+
+        // return result
+        return $this->create_result ();
+    }
+
+    /**
+     * Validates that proper content type is set in request
+     *
+     * @access public
+     * @return void
+     */
+    public function validate_content_type () {
+        // not set, presume json
+        if( !isset($_SERVER['CONTENT_TYPE']) ) {}
+        // post
+        elseif($_SERVER['CONTENT_TYPE']=="application/x-www-form-urlencoded") {}
+        // set, verify
+        elseif (!($_SERVER['CONTENT_TYPE']=="application/xml" || $_SERVER['CONTENT_TYPE']=="application/json")) {
+            $this->throw_exception (415, "Invalid Content type ".$_SERVER['CONTENT_TYPE']);
+        }
+    }
+
+    /**
+     * Sets request content type
+     *
+     * @access public
+     * @return void
+     */
+    private function get_request_content_type () {
+        $this->result_type = $_SERVER['CONTENT_TYPE']=="application/xml" ? "xml" : "json";
+    }
+
+    /**
+     * Sets result content type
+     *
+     * @access private
+     * @return void
+     */
+    private function set_content_type_header () {
+        // content_type
+        $this->result_type == "xml" ? header('Content-Type: application/xml') : header('Content-Type: application/json');
+    }
+
+    /**
+     * Sets Cache header.
+     *
+     * @access private
+     * @return void
+     */
+    private function set_cache_header ($seconds = NULL) {
+        // none
+        if($seconds===NULL) {
+            header("Cache-Control: no-cache");
+            header("Pragma: no-cache");
+        }
+        // cache
+        else {
+            header("Cache-Control: $seconds");
+        }
+    }
+
+    /**
+     * Sets success header
+     *
+     * @access private
+     * @return void
+     */
+    private function set_success_header () {
+        // check fo location
+        if(isset($this->result['location'])) {
+            $this->set_location_header ($this->result['location']);
+        }
+
+        // set success
+        $this->result['success'] = true;
+
+        // set header
+        $this->set_header ();
+
+    }
+
+    /**
+     * Sets location header for newly created objects
+     *
+     * @access private
+     * @param mixed $location
+     * @return void
+     */
+    private function set_location_header ($location) {
+        header("Location: ".$location);
+    }
+
+    /**
+     * Outputs result
+     *
+     * @access private
+     * @return void
+     */
+    private function create_result () {
+        // reorder
+        $this->reorder_result ();
+        // creates result
+        return $this->result_type == "xml" ? $this->create_xml () : $this->create_json ();
+    }
+
+    /**
+     * Reorders result to proper format
+     *
+     * @access private
+     * @return void
+     */
+    private function reorder_result () {
+        $tmp = $this->result;
+        unset($this->result);
+        // reset
+        $this->result['code'] = $tmp['code'];
+        $this->result['success'] = $tmp['success'];
+        if(isset($tmp['message']))	{ $this->result['message'] = $tmp['message']; }
+        if(isset($tmp['data']))		{ $this->result['data'] = $tmp['data']; }
+        if(isset($tmp['ip']))	    { $this->result['ip'] = $tmp['ip']; }
+    }
+
+    /**
+     * Creates XML result
+     *
+     * @access private
+     * @return void
+     */
+    private function create_xml () {
+        // convert whole object to array
+        $this->result = $this->object_to_array($this->result);
+
+        // new SimpleXMLElement object
+        $xml = new SimpleXMLElement('<'.$_GET['controller'].'/>');
+        // generate xml from result
+        $this->array_to_xml($xml, $this->result);
+
+        // return XML result
+        return $xml->asXML();
+    }
+
+    /**
+     * Transforms array to XML
+     *
+     * @access private
+     * @param SimpleXMLElement $object
+     * @param array $data
+     * @return void
+     */
+    private function array_to_xml(SimpleXMLElement $object, array $data) {
+        // loop through values
+        foreach ($data as $key => $value) {
+            // if spaces exist in key replace them with underscores
+            if(strpos($key, " ")>0)	{ $key = str_replace(" ", "_", $key); }
+
+            // if key is numeric append item
+            if(is_numeric($key)) $key = "item".$key;
+
+            // if array add child
+            if (is_array($value)) {
+                $new_object = $object->addChild($key);
+                $this->array_to_xml($new_object, $value);
+            }
+            // else write value
+            else {
+                $object->addChild($key, $value);
+            }
+        }
+    }
+
+    /**
+     * function xml2array
+     *
+     * This function is part of the PHP manual.
+     *
+     * The PHP manual text and comments are covered by the Creative Commons
+     * Attribution 3.0 License, copyright (c) the PHP Documentation Group
+     *
+     * @author  k dot antczak at livedata dot pl
+     * @date    2011-04-22 06:08 UTC
+     * @link    http://www.php.net/manual/en/ref.simplexml.php#103617
+     * @license http://www.php.net/license/index.php#doc-lic
+     * @license http://creativecommons.org/licenses/by/3.0/
+     * @license CC-BY-3.0 <http://spdx.org/licenses/CC-BY-3.0>
+     */
+    public function xml_to_array ( $xmlObject, $out = array () ) {
+        foreach ( (array) $xmlObject as $index => $node )
+            $out[$index] = ( is_object ( $node ) ) ? $this->xml_to_array ( $node ) : $node;
+
+        return $out;
+    }
+
+    /**
+     * Transforms object to array
+     *
+     * @access private
+     * @param mixed $obj
+     * @return void
+     */
+    private function object_to_array ($obj) {
+        // object to array
+        if(is_object($obj)) $obj = (array) $obj;
+        if(is_array($obj)) {
+            $new = array();
+            foreach($obj as $key => $val) {
+                $new[$key] = $this->object_to_array($val);
+            }
+        }
+        else $new = $obj;
+        return $new;
+    }
+
+    /**
+     * Creates JSON result
+     *
+     * @access private
+     * @return void
+     */
+    private function create_json () {
+        return json_encode((array) $this->result);
+    }
 
 
 }

api/controllers/Addresses.php

Indentation +478 added lines, -478 removed lines

@@ -8,497 +8,497 @@
 class Addresses_controller extends Common_api_functions  {
 
 
-	/**
-	 * Input parameters
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
-
-	/**
-	 * Custom address fields
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $custom_fields;
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Sections object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Sections;
-
-	/**
-	 * Response handler
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Response;
-
-	/**
-	 * Tools object from master Tools class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-	/**
-	 * Subnets object from master Subnets class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	public $Subnets;
-
-	/**
-	 * Addresses object from master Addresses class
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Addresses;
-
-	/**
-	 * Admin class form master Admin class
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Admin;
-
-	/**
-	 * Saves details of currnt subnet
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	private $subnet_details;
-
-	/**
-	 * Old address values
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	private $old_address;
-
-
-	/**
-	 * __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);
-		// set valid keys
-		$this->set_valid_keys ("ipaddresses");
-	}
-
-
-
-
-
-	/**
-	 * Returns json encoded options
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
-		// validate
-		$this->validate_options_request ();
-
-		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/addresses/", 	"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/addresses/{id}/","methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																												 array("rel"=>"create", "method"=>"POST"),
-																												 array("rel"=>"update", "method"=>"PATCH"),
-																												 array("rel"=>"delete", "method"=>"DELETE"))),
-							);
-		# result
-		return array("code"=>200, "data"=>$result);
-	}
-
-
-
-
-
-	/**
-	 * Read address functions
-	 *
-	 *	identifiers can be:
-	 *		- {id}
-	 *		- {id}/ping/					// pings address
-	 *		- /search/{ip_address}/			// searches for addresses in database, returns multiple if found
-	 *		- custom_fields
-	 *		- tags							// all tags
-	 *		- tags/{id}/					// specific tag
-	 *		- tags/{id}/addresses			// returns all addresses that are tagged with this tag ***if subnetId is provided it will be filtered to specific subnet
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		// subnet Id > read all addresses in subnet
-		if($this->_params->id=="custom_fields") {
-			// check result
-			if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-			else										{ return array("code"=>200, "data"=>$this->custom_fields); }
-		}
-		// tags
-		elseif($this->_params->id=="tags") {
-			// validate
-			$this->validate_tag ();
-			// all addresses with tag
-			if (@$this->_params->id3=="addresses") {
-				// fetch
-				$result = $this->Tools->fetch_multiple_objects ("ipaddresses", "state", $this->_params->id2);
-
-				// filter by subnetId
-				if ($result!==false) {
-					if(isset($this->_params->subnetId)) {
-						if (is_numeric($this->_params->subnetId)) {
-							// filter
-							foreach ($result as $k=>$v) {
-								if ($v->subnetId != $this->_params->subnetId) {
-									unset($result[$k]);
-								}
-							}
-							// any left
-							if (sizeof($result)==0) {
-								$result = false;
-							}
-						}
-					}
-				}
-
-				// result
-				if($result===false)						{ $this->Response->throw_exception(404, 'No addresses found'); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, false)); }
-			}
-			// tags
-			else {
-				// fetch all by tag
-				if(isset($this->_params->id2)) {
-					// numeric
-					if(is_numeric($this->_params->id2)) { $result = $this->Tools->fetch_object ("ipTags", "id", $this->_params->id2); }
-					// type
-					else 								{ $result = $this->Tools->fetch_multiple_objects ("ipTags", "type", $this->_params->id2); }
-				}
-				// all tags
-				else 									{ $result = $this->Tools->fetch_all_objects ("ipTags"); }
-
-				// result
-				if($result===false)						{ $this->Response->throw_exception(404, 'Tag not found'); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses/tags", true, false)); }
-			}
-		}
-		// id not set
-		elseif (!isset($this->_params->id)) {
-														{ $this->Response->throw_exception(400, 'Address ID is required'); }
-		}
-		// id
-		elseif (is_numeric($this->_params->id)) {
-			// ping
-			if(@$this->_params->id2=="ping") {
-				# scan class
-				$Scan = new Scan ($this->Database);
-				$Scan->ping_set_exit (false);
-				// check address
-				$this->validate_address_id ();
-
-				// set result
-				$result = array();
-				$result['scan_type'] = $Scan->icmp_type;
-				$result['exit_code'] = $Scan->ping_address ($this->old_address->ip_addr);
-
-				// success
-				if($result['exit_code']==0) 			{ $Scan->ping_update_lastseen ($this->_params->id); return array("code"=>200, "data"=>$result); }
-				else									{ $this->Response->throw_exception(404, "Address offline. Exit code: ".$result['exit_code']."( ".$Scan->ping_exit_explain ($result['exit_code'])." )"); }
-			}
-			else {
-				// fetch
-				$result = $this->Addresses->fetch_address ("id", $this->_params->id);
-				// check result
-				if($result==false)						{ $this->Response->throw_exception(404, "Invalid Id"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
-			}
-		}
-		// ip address ?
-		elseif (@$this->_params->id=="search") {
-			// validate
-			if(!$this->Addresses->validate_address ($this->_params->id2))
-														{ $this->Response->throw_exception(404, 'Invalid address'); }
-			// search
-			$result = $this->Tools->fetch_multiple_objects ("ipaddresses", "ip_addr", $this->Subnets->transform_address ($this->_params->id2, "decimal"));
-			// check result
-			if($result===false)							{ $this->Response->throw_exception(404, 'Address not found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
-		}
-		// false
-		else											{  $this->Response->throw_exception(400, "Invalid Id"); }
-	}
-
-
-
-
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
-
-
-
-
-
-	/**
-	 * Creates new address
-	 *
-	 *	required parameters: ip, subnetId
-	 *
-	 *   {subnetId}/first_free/     will search for first free address in subnet, creating ip_addr
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		// remap keys
-		$this->remap_keys ();
-
-		// first free
-		if($this->_params->id=="first_free")   {
-    		$this->_params->ip_addr = $this->Addresses->get_first_available_address ($this->_params->subnetId, $this->Subnets);
-    		// null
-    		if ($this->_params->ip_addr==false)          { $this->Response->throw_exception(404, 'No free addresses found'); }
+    /**
+     * Input parameters
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
+
+    /**
+     * Custom address fields
+     *
+     * @var mixed
+     * @access public
+     */
+    public $custom_fields;
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Sections object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Sections;
+
+    /**
+     * Response handler
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Response;
+
+    /**
+     * Tools object from master Tools class
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+    /**
+     * Subnets object from master Subnets class
+     *
+     * @var mixed
+     * @access protected
+     */
+    public $Subnets;
+
+    /**
+     * Addresses object from master Addresses class
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Addresses;
+
+    /**
+     * Admin class form master Admin class
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Admin;
+
+    /**
+     * Saves details of currnt subnet
+     *
+     * @var mixed
+     * @access private
+     */
+    private $subnet_details;
+
+    /**
+     * Old address values
+     *
+     * @var mixed
+     * @access private
+     */
+    private $old_address;
+
+
+    /**
+     * __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);
+        // set valid keys
+        $this->set_valid_keys ("ipaddresses");
+    }
+
+
+
+
+
+    /**
+     * Returns json encoded options
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
+        // validate
+        $this->validate_options_request ();
+
+        // methods
+        $result = array();
+        $result['methods'] = array(
+                                array("href"=>"/api/".$this->_params->app_id."/addresses/", 	"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
+                                array("href"=>"/api/".$this->_params->app_id."/addresses/{id}/","methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
+                                                                                                                    array("rel"=>"create", "method"=>"POST"),
+                                                                                                                    array("rel"=>"update", "method"=>"PATCH"),
+                                                                                                                    array("rel"=>"delete", "method"=>"DELETE"))),
+                            );
+        # result
+        return array("code"=>200, "data"=>$result);
+    }
+
+
+
+
+
+    /**
+     * Read address functions
+     *
+     *	identifiers can be:
+     *		- {id}
+     *		- {id}/ping/					// pings address
+     *		- /search/{ip_address}/			// searches for addresses in database, returns multiple if found
+     *		- custom_fields
+     *		- tags							// all tags
+     *		- tags/{id}/					// specific tag
+     *		- tags/{id}/addresses			// returns all addresses that are tagged with this tag ***if subnetId is provided it will be filtered to specific subnet
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        // subnet Id > read all addresses in subnet
+        if($this->_params->id=="custom_fields") {
+            // check result
+            if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
+            else										{ return array("code"=>200, "data"=>$this->custom_fields); }
+        }
+        // tags
+        elseif($this->_params->id=="tags") {
+            // validate
+            $this->validate_tag ();
+            // all addresses with tag
+            if (@$this->_params->id3=="addresses") {
+                // fetch
+                $result = $this->Tools->fetch_multiple_objects ("ipaddresses", "state", $this->_params->id2);
+
+                // filter by subnetId
+                if ($result!==false) {
+                    if(isset($this->_params->subnetId)) {
+                        if (is_numeric($this->_params->subnetId)) {
+                            // filter
+                            foreach ($result as $k=>$v) {
+                                if ($v->subnetId != $this->_params->subnetId) {
+                                    unset($result[$k]);
+                                }
+                            }
+                            // any left
+                            if (sizeof($result)==0) {
+                                $result = false;
+                            }
+                        }
+                    }
+                }
+
+                // result
+                if($result===false)						{ $this->Response->throw_exception(404, 'No addresses found'); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, false)); }
+            }
+            // tags
+            else {
+                // fetch all by tag
+                if(isset($this->_params->id2)) {
+                    // numeric
+                    if(is_numeric($this->_params->id2)) { $result = $this->Tools->fetch_object ("ipTags", "id", $this->_params->id2); }
+                    // type
+                    else 								{ $result = $this->Tools->fetch_multiple_objects ("ipTags", "type", $this->_params->id2); }
+                }
+                // all tags
+                else 									{ $result = $this->Tools->fetch_all_objects ("ipTags"); }
+
+                // result
+                if($result===false)						{ $this->Response->throw_exception(404, 'Tag not found'); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses/tags", true, false)); }
+            }
+        }
+        // id not set
+        elseif (!isset($this->_params->id)) {
+                                                        { $this->Response->throw_exception(400, 'Address ID is required'); }
+        }
+        // id
+        elseif (is_numeric($this->_params->id)) {
+            // ping
+            if(@$this->_params->id2=="ping") {
+                # scan class
+                $Scan = new Scan ($this->Database);
+                $Scan->ping_set_exit (false);
+                // check address
+                $this->validate_address_id ();
+
+                // set result
+                $result = array();
+                $result['scan_type'] = $Scan->icmp_type;
+                $result['exit_code'] = $Scan->ping_address ($this->old_address->ip_addr);
+
+                // success
+                if($result['exit_code']==0) 			{ $Scan->ping_update_lastseen ($this->_params->id); return array("code"=>200, "data"=>$result); }
+                else									{ $this->Response->throw_exception(404, "Address offline. Exit code: ".$result['exit_code']."( ".$Scan->ping_exit_explain ($result['exit_code'])." )"); }
+            }
+            else {
+                // fetch
+                $result = $this->Addresses->fetch_address ("id", $this->_params->id);
+                // check result
+                if($result==false)						{ $this->Response->throw_exception(404, "Invalid Id"); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
+            }
+        }
+        // ip address ?
+        elseif (@$this->_params->id=="search") {
+            // validate
+            if(!$this->Addresses->validate_address ($this->_params->id2))
+                                                        { $this->Response->throw_exception(404, 'Invalid address'); }
+            // search
+            $result = $this->Tools->fetch_multiple_objects ("ipaddresses", "ip_addr", $this->Subnets->transform_address ($this->_params->id2, "decimal"));
+            // check result
+            if($result===false)							{ $this->Response->throw_exception(404, 'Address not found'); }
+            else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
+        }
+        // false
+        else											{  $this->Response->throw_exception(400, "Invalid Id"); }
+    }
+
+
+
+
+
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
+
+
+
+
+
+    /**
+     * Creates new address
+     *
+     *	required parameters: ip, subnetId
+     *
+     *   {subnetId}/first_free/     will search for first free address in subnet, creating ip_addr
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        // remap keys
+        $this->remap_keys ();
+
+        // first free
+        if($this->_params->id=="first_free")   {
+            $this->_params->ip_addr = $this->Addresses->get_first_available_address ($this->_params->subnetId, $this->Subnets);
+            // null
+            if ($this->_params->ip_addr==false)          { $this->Response->throw_exception(404, 'No free addresses found'); }
             else                                         { $this->_params->ip_addr = $this->Addresses->transform_address ($this->_params->ip_addr, "dotted"); }
-		}
+        }
 
-		// validate ip address - format, proper subnet, subnet/broadcast check
-		$this->validate_create_parameters ();
+        // validate ip address - format, proper subnet, subnet/broadcast check
+        $this->validate_create_parameters ();
 
-		// check for valid keys
-		$values = $this->validate_keys ();
+        // check for valid keys
+        $values = $this->validate_keys ();
 
-		// transform address to decimal format
-		$values['ip_addr'] = $this->Addresses->transform_address($values['ip_addr'] ,"decimal");
-		// set action
-		$values['action'] = "add";
+        // transform address to decimal format
+        $values['ip_addr'] = $this->Addresses->transform_address($values['ip_addr'] ,"decimal");
+        // set action
+        $values['action'] = "add";
 
-		# execute
-		if(!$this->Addresses->modify_address ($values)) {
-			$this->Response->throw_exception(500, "Failed to create address");
-		}
-		else {
-    		//set result
-    		if($this->_params->id=="first_free")   {
-        	    return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/", "ip"=>$this->Addresses->transform_address ($this->_params->ip_addr, "dotted"));
-    		}
-    		else {
-        	    return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/");
-    		}
-		}
-	}
+        # execute
+        if(!$this->Addresses->modify_address ($values)) {
+            $this->Response->throw_exception(500, "Failed to create address");
+        }
+        else {
+            //set result
+            if($this->_params->id=="first_free")   {
+                return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/", "ip"=>$this->Addresses->transform_address ($this->_params->ip_addr, "dotted"));
+            }
+            else {
+                return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/");
+            }
+        }
+    }
 
 
 
 
 
 
-	/**
-	 * Updates existing address
-	 *
-	 *	forbidden parameters: ip, subnetId
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		// remap keys
-		$this->remap_keys ();
+    /**
+     * Updates existing address
+     *
+     *	forbidden parameters: ip, subnetId
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        // remap keys
+        $this->remap_keys ();
 
-		// we dont allow address or subnet change
-		if(isset($this->_params->ip_addr))			{ $this->Response->throw_exception(400, "IP address cannot be changed"); }
-		if(isset($this->_params->subnetId))			{ $this->Response->throw_exception(400, "Subnet cannot be changed"); }
+        // we dont allow address or subnet change
+        if(isset($this->_params->ip_addr))			{ $this->Response->throw_exception(400, "IP address cannot be changed"); }
+        if(isset($this->_params->subnetId))			{ $this->Response->throw_exception(400, "Subnet cannot be changed"); }
 
-		// validations
-		$this->validate_update_parameters ();
-
-		# check for valid keys
-		$values = $this->validate_keys ();
-		// add action and id
-		$values["id"] = $this->_params->id;
-
-		# we need admin object
-		$this->init_object ("Admin", $this->Database);
-
-		# execute
-		if(!$this->Admin->object_modify ("ipaddresses", "edit", "id", $values)) {
-			$this->Response->throw_exception(500, "Failed to update address");
-		}
-		else {
-			//set result
-			return array("code"=>200, "data"=>"Address updated");
-		}
-
-	}
-
-
-
-
-
-	/**
-	 * Deletes existing address
-	 *
-	 *	required parameters: id
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		// Check for id
-		$this->validate_address_id ();
-
-		// set variables for delete
-		$values = array();
-		$values["id"] 	  = $this->_params->id;
-		$values["action"] = "delete";
-
-		# execute update
-		if(!$this->Addresses->modify_address ($values))
-													{ $this->Response->throw_exception(500, "Failed to delete address"); }
-		else {
-			//set result
-			return array("code"=>200, "data"=>"Address deleted");
-		}
-
-	}
-
-
-
-
-
-
-
-
-
-	/* @validations ---------- */
-
-	/**
-	 * Make sure the address exists in database.
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_address_id () {
-		if(!$this->old_address = $this->Addresses->fetch_address ("id", $this->_params->id)){ $this->Response->throw_exception(404, "Address does not exist"); }
-	}
-
-	/**
-	 * Validate IP tag
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_tag () {
-		// numeric
-		if(!is_numeric(@$this->_params->id2))												{ $this->Response->throw_exception(400, 'Invalid tag identifier'); }
-		// check db
-		if (!$this->Tools->fetch_object ("ipTags", "id", $this->_params->id2))				{ $this->Response->throw_exception(404, "Address tag does not exist"); }
-	}
-
-	/**
-	 * Validates subnet
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_subnet () {
-		// numberic
-		if(!is_numeric($this->_params->subnetId))											{ $this->Response->throw_exception(400, "Subnet Id must be numeric"); }
-		// check subnet
-		if(is_null($res = $this->Subnets->fetch_subnet ("id", $this->_params->subnetId)))	{ $this->Response->throw_exception(400, "Invalid subnet Id"); }
-		else																				{ $this->subnet_details = $res; }
-	}
-
-	/**
-	 * Validates address on creation
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_create_parameters () {
-		// validate subnet
-		$this->validate_subnet ();
-
-		// validate overlapping
-		if($this->Addresses->address_exists ($this->_params->ip_addr, $this->_params->subnetId))	{ $this->Response->throw_exception(400, "IP address already exists"); }
-
-		// fetch subnet
-		$subnet = $this->subnet_details;
-		// formulate CIDR
-		$subnet = $this->Subnets->transform_to_dotted ($subnet->subnet)."/".$subnet->mask;
-
-		// validate address, that it is inside subnet, not subnet/broadcast
-		$this->Addresses->verify_address( $this->_params->ip_addr, $subnet, false, true );
-
-		// validate device
-		if(isset($this->_params->switch)) {
-		if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
-		// validate state
-		if(isset($this->_params->state)) {
-		if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
-		else { $this->_params->state = 2; }
-	}
-
-	/**
-	 * Validation of PATCH parameters
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_update_parameters () {
-		// make sure address exists
-		$this->validate_address_id ();
-
-		// validate device
-		if(isset($this->_params->switch)) {
-		if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
-		// validate state
-		if(isset($this->_params->state)) {
-		if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
-		else { $this->_params->state = 2; }
-	}
+        // validations
+        $this->validate_update_parameters ();
+
+        # check for valid keys
+        $values = $this->validate_keys ();
+        // add action and id
+        $values["id"] = $this->_params->id;
+
+        # we need admin object
+        $this->init_object ("Admin", $this->Database);
+
+        # execute
+        if(!$this->Admin->object_modify ("ipaddresses", "edit", "id", $values)) {
+            $this->Response->throw_exception(500, "Failed to update address");
+        }
+        else {
+            //set result
+            return array("code"=>200, "data"=>"Address updated");
+        }
+
+    }
+
+
+
+
+
+    /**
+     * Deletes existing address
+     *
+     *	required parameters: id
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        // Check for id
+        $this->validate_address_id ();
+
+        // set variables for delete
+        $values = array();
+        $values["id"] 	  = $this->_params->id;
+        $values["action"] = "delete";
+
+        # execute update
+        if(!$this->Addresses->modify_address ($values))
+                                                    { $this->Response->throw_exception(500, "Failed to delete address"); }
+        else {
+            //set result
+            return array("code"=>200, "data"=>"Address deleted");
+        }
+
+    }
+
+
+
+
+
+
+
+
+
+    /* @validations ---------- */
+
+    /**
+     * Make sure the address exists in database.
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_address_id () {
+        if(!$this->old_address = $this->Addresses->fetch_address ("id", $this->_params->id)){ $this->Response->throw_exception(404, "Address does not exist"); }
+    }
+
+    /**
+     * Validate IP tag
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_tag () {
+        // numeric
+        if(!is_numeric(@$this->_params->id2))												{ $this->Response->throw_exception(400, 'Invalid tag identifier'); }
+        // check db
+        if (!$this->Tools->fetch_object ("ipTags", "id", $this->_params->id2))				{ $this->Response->throw_exception(404, "Address tag does not exist"); }
+    }
+
+    /**
+     * Validates subnet
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_subnet () {
+        // numberic
+        if(!is_numeric($this->_params->subnetId))											{ $this->Response->throw_exception(400, "Subnet Id must be numeric"); }
+        // check subnet
+        if(is_null($res = $this->Subnets->fetch_subnet ("id", $this->_params->subnetId)))	{ $this->Response->throw_exception(400, "Invalid subnet Id"); }
+        else																				{ $this->subnet_details = $res; }
+    }
+
+    /**
+     * Validates address on creation
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_create_parameters () {
+        // validate subnet
+        $this->validate_subnet ();
+
+        // validate overlapping
+        if($this->Addresses->address_exists ($this->_params->ip_addr, $this->_params->subnetId))	{ $this->Response->throw_exception(400, "IP address already exists"); }
+
+        // fetch subnet
+        $subnet = $this->subnet_details;
+        // formulate CIDR
+        $subnet = $this->Subnets->transform_to_dotted ($subnet->subnet)."/".$subnet->mask;
+
+        // validate address, that it is inside subnet, not subnet/broadcast
+        $this->Addresses->verify_address( $this->_params->ip_addr, $subnet, false, true );
+
+        // validate device
+        if(isset($this->_params->switch)) {
+        if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
+        // validate state
+        if(isset($this->_params->state)) {
+        if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
+        else { $this->_params->state = 2; }
+    }
+
+    /**
+     * Validation of PATCH parameters
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_update_parameters () {
+        // make sure address exists
+        $this->validate_address_id ();
+
+        // validate device
+        if(isset($this->_params->switch)) {
+        if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
+        // validate state
+        if(isset($this->_params->state)) {
+        if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
+        else { $this->_params->state = 2; }
+    }
 }
 
 ?>
\ No newline at end of file

app/dashboard/widgets/iprequest.php

Indentation +33 added lines, -33 removed lines

@@ -2,14 +2,14 @@ 
 
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Sections	= new Sections ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Result	    = new Result ();
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Sections	= new Sections ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Result	    = new Result ();
 
 }
 
@@ -24,31 +24,31 @@ 
 $subnets_count = 0;
 if ($sections!==false) {
     foreach ($sections as $section) {
-    	# cast
-    	$section = (array) $section;
+        # cast
+        $section = (array) $section;
 
-    	# check permission
-    	$permission = $Sections->check_permission ($User->user, $section['id']);
-    	if($permission > 0) {
-    		$subnets = $Subnets->fetch_section_subnets ($section['id']);
-    		if ($subnets!==false) {
-        		foreach($subnets as $subnet) {
-        			# check permission
-        			$subpermission = $Subnets->check_permission ($User->user, $subnet->id);
-        			if($subpermission > 0) {
-        				/* show only subnets that allow IP exporting */
-        				if($subnet->allowRequests == 1) {
-        					$subnets_count ++;
-        					/* must not have any nested subnets! */
-        					if(!$Subnets->has_slaves($subnet->id))
-        					{
-        						$html[] = '<option value="'. $subnet->id .'">' . $Subnets->transform_to_dotted($subnet->subnet) .'/'. $subnet->mask .' ['. $subnet->description .']</option>';
-        					}
-        				}
-        			}
-        		}
-    		}
-    	}
+        # check permission
+        $permission = $Sections->check_permission ($User->user, $section['id']);
+        if($permission > 0) {
+            $subnets = $Subnets->fetch_section_subnets ($section['id']);
+            if ($subnets!==false) {
+                foreach($subnets as $subnet) {
+                    # check permission
+                    $subpermission = $Subnets->check_permission ($User->user, $subnet->id);
+                    if($subpermission > 0) {
+                        /* show only subnets that allow IP exporting */
+                        if($subnet->allowRequests == 1) {
+                            $subnets_count ++;
+                            /* must not have any nested subnets! */
+                            if(!$Subnets->has_slaves($subnet->id))
+                            {
+                                $html[] = '<option value="'. $subnet->id .'">' . $Subnets->transform_to_dotted($subnet->subnet) .'/'. $subnet->mask .' ['. $subnet->description .']</option>';
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 ?>
@@ -73,7 +73,7 @@ 
         foreach ($html as $h) {
             print $h;
         }
-    	?>
+        ?>
 		</select>
 
 	</td>

app/dashboard/widgets/changelog.php

Indentation +87 added lines, -87 removed lines

@@ -6,15 +6,15 @@ 
 
 # required functions if requested via AJAX
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Sections 	= new Sections ($Database);
-	$Log		= new Logging ($Database);
-	$Result 	= new Result ();
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Sections 	= new Sections ($Database);
+    $Log		= new Logging ($Database);
+    $Result 	= new Result ();
 }
 
 # user must be authenticated
@@ -22,98 +22,98 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools","changelog"));
+    header("Location: ".create_link("tools","changelog"));
 }
 
 # changelog to syslog
 if ($User->settings->log!="syslog") {
-	/* get logs */
-	$clogs = $Log->fetch_all_changelogs (false, "", 50);
+    /* get logs */
+    $clogs = $Log->fetch_all_changelogs (false, "", 50);
 }
 
 # syslog
 if ($User->settings->log=="syslog") {
-	$Result->show("warning", _("Changelog files are sent to syslog"), false);
+    $Result->show("warning", _("Changelog files are sent to syslog"), false);
 }
 # none
 elseif(sizeof($clogs)==0) {
-	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<p>"._("No changelogs available")."</p>";
-	print "<small>"._("No changelog entries are available")."</small>";
-	print "</blockquote>";
+    print "<blockquote style='margin-top:20px;margin-left:20px;'>";
+    print "<p>"._("No changelogs available")."</p>";
+    print "<small>"._("No changelog entries are available")."</small>";
+    print "</blockquote>";
 }
 # print
 else {
 
-	# printout
-	print "<table class='table changelog table-hover table-top table-condensed'>";
-
-	# headers
-	print "<tr>";
-	print "	<th>"._('User')."</th>";
-	print "	<th>"._('Type')."</th>";
-	print "	<th>"._('Object')."</th>";
-	print "	<th>"._('Date')."</th>";
-	print "	<th>"._('Change')."</th>";
-	print "</tr>";
-
-	# logs
-	$pc = 0;					//print count
-	foreach($clogs as $l) {
-
-		# cast
-		$l = (array) $l;
-
-		if($pc < 5) {
-			# permissions
-			if($l['ctype']=="subnet")		{ $permission = $Subnets->check_permission ($User->user, $l['tid']); }
-			elseif($l['ctype']=="ip_addr")	{ $permission = $Subnets->check_permission ($User->user, $l['subnetId']); }
-			elseif($l['ctype']=="section")	{ $permission = $Sections->check_permission ($User->user, $l['sectionId']); }
-			else							{ $permission = 0; }
-
-			# if 0 ignore
-			if($permission > 0)	{
-				# format diff
-				$l['cdiff'] = str_replace("\n\n", "", trim($l['cdiff']));
-				$l['cdiff'] = str_replace("\n", "; ", $l['cdiff']);
-
-				# format type
-				switch($l['ctype']) {
-					case "ip_addr":							{ $l['ctype'] = "IP address";	break; }
-					case "subnet":  if($l['isFolder']==1) 	{ $l['ctype'] = "Folder"; }
-									else 					{ $l['ctype'] = "Subnet"; }
-					break;
-
-					case "section":							{ $l['ctype'] = "Section";	break; }
-				}
-
-				print "<tr>";
-				print "	<td>$l[real_name]</td>";
-				print "	<td>$l[ctype] / $l[caction] $l[cresult]</td>";
-
-				# subnet, section or ip address
-				if($l['ctype']=="IP address")	{
-					print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['subnetId'],"address-details",$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."</a></td>";
-				}
-				elseif($l['ctype']=="Subnet")   {
-					print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."/$l[mask]</a></td>";
-				}
-				elseif($l['ctype']=="Folder")   {
-					print "	<td><a href='".create_link("folder",$l['sectionId'],$l['tid'])."'>$l[sDescription]</a></td>";
-				}
-				elseif($l['ctype']=="Section")   {
-					print "	<td><a href='".create_link("subnets",$l['tid'])."'>$l[sDescription]</a></td>";
-				}
-				print "	<td>$l[cdate]</td>";
-				print "	<td>$l[cdiff]</td>";
-				print "</tr>";
-
-				// next item
-				$pc++;
-			}
-		}
-	}
-
-	print "</table>";
+    # printout
+    print "<table class='table changelog table-hover table-top table-condensed'>";
+
+    # headers
+    print "<tr>";
+    print "	<th>"._('User')."</th>";
+    print "	<th>"._('Type')."</th>";
+    print "	<th>"._('Object')."</th>";
+    print "	<th>"._('Date')."</th>";
+    print "	<th>"._('Change')."</th>";
+    print "</tr>";
+
+    # logs
+    $pc = 0;					//print count
+    foreach($clogs as $l) {
+
+        # cast
+        $l = (array) $l;
+
+        if($pc < 5) {
+            # permissions
+            if($l['ctype']=="subnet")		{ $permission = $Subnets->check_permission ($User->user, $l['tid']); }
+            elseif($l['ctype']=="ip_addr")	{ $permission = $Subnets->check_permission ($User->user, $l['subnetId']); }
+            elseif($l['ctype']=="section")	{ $permission = $Sections->check_permission ($User->user, $l['sectionId']); }
+            else							{ $permission = 0; }
+
+            # if 0 ignore
+            if($permission > 0)	{
+                # format diff
+                $l['cdiff'] = str_replace("\n\n", "", trim($l['cdiff']));
+                $l['cdiff'] = str_replace("\n", "; ", $l['cdiff']);
+
+                # format type
+                switch($l['ctype']) {
+                    case "ip_addr":							{ $l['ctype'] = "IP address";	break; }
+                    case "subnet":  if($l['isFolder']==1) 	{ $l['ctype'] = "Folder"; }
+                                    else 					{ $l['ctype'] = "Subnet"; }
+                    break;
+
+                    case "section":							{ $l['ctype'] = "Section";	break; }
+                }
+
+                print "<tr>";
+                print "	<td>$l[real_name]</td>";
+                print "	<td>$l[ctype] / $l[caction] $l[cresult]</td>";
+
+                # subnet, section or ip address
+                if($l['ctype']=="IP address")	{
+                    print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['subnetId'],"address-details",$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."</a></td>";
+                }
+                elseif($l['ctype']=="Subnet")   {
+                    print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."/$l[mask]</a></td>";
+                }
+                elseif($l['ctype']=="Folder")   {
+                    print "	<td><a href='".create_link("folder",$l['sectionId'],$l['tid'])."'>$l[sDescription]</a></td>";
+                }
+                elseif($l['ctype']=="Section")   {
+                    print "	<td><a href='".create_link("subnets",$l['tid'])."'>$l[sDescription]</a></td>";
+                }
+                print "	<td>$l[cdate]</td>";
+                print "	<td>$l[cdiff]</td>";
+                print "</tr>";
+
+                // next item
+                $pc++;
+            }
+        }
+    }
+
+    print "</table>";
 }
 ?>
\ No newline at end of file

app/dashboard/widgets/ipcalc.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Addresses 	= new Addresses ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Addresses 	= new Addresses ($Database);
 }
 
 # user must be authenticated
@@ -15,7 +15,7 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools", "ip-calculator"));
+    header("Location: ".create_link("tools", "ip-calculator"));
 }
 ?>
 

app/dashboard/widgets/template.php

Indentation +6 added lines, -6 removed lines

@@ -8,11 +8,11 @@ 
 
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
 }
 
 # user must be authenticated
@@ -20,7 +20,7 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("administration","logs"));
+    header("Location: ".create_link("administration","logs"));
 }
 
 /* You can check who requested this, to adjust parameters  */

app/dashboard/widgets/tools.php

Indentation +22 added lines, -22 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Addresses 	= new Addresses ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Addresses 	= new Addresses ($Database);
 }
 
 # user must be authenticated
@@ -15,7 +15,7 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools"));
+    header("Location: ".create_link("tools"));
 }
 
 # set items
@@ -80,21 +80,21 @@ 
 <?php
 # print
 foreach($tools_menu as $k=>$tool) {
-	# items
-	foreach($tool as $t) {
-		# remove unneeded
-		print "	<div class='col-xs-12 col-md-6 col-lg-6 widget-dash1'>";
-		print "	<div class='inner thumbnail'>";
-		print "		<div class='hContent'>";
-		print "			<div class='icon'><a href='".create_link("tools",$t['href'])."'><i class='fa $t[icon]'></i></a></div>";
-		print "			<div class='text'><a href='".create_link("tools",$t['href'])."'>"._($t['name'])."</a><hr><span class='text-muted'>"._($t['description'])."</span></div>";
-		print "		</div>";
-		print "	</div>";
-		print "	</div>";
-	}
+    # items
+    foreach($tool as $t) {
+        # remove unneeded
+        print "	<div class='col-xs-12 col-md-6 col-lg-6 widget-dash1'>";
+        print "	<div class='inner thumbnail'>";
+        print "		<div class='hContent'>";
+        print "			<div class='icon'><a href='".create_link("tools",$t['href'])."'><i class='fa $t[icon]'></i></a></div>";
+        print "			<div class='text'><a href='".create_link("tools",$t['href'])."'>"._($t['name'])."</a><hr><span class='text-muted'>"._($t['description'])."</span></div>";
+        print "		</div>";
+        print "	</div>";
+        print "	</div>";
+    }
 
-	# clear and break
-	print "<div class='clearfix'></div>";
+    # clear and break
+    print "<div class='clearfix'></div>";
 }
 ?>
 </div>

app/dashboard/widgets/statistics.php

Indentation +5 added lines, -5 removed lines

@@ -2,11 +2,11 @@
 
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
 }
 
 # user must be authenticated