phpipam / phpipam

install/index.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 <!-- page header -->
 <div id="header">
 <div class="hero-unit">
-	<a href="<?php print create_link(null); ?>">phpIPAM installation error</a>
+	<a href="<?php print create_link (null); ?>">phpIPAM installation error</a>
 </div>
 </div>
 
@@ -55,7 +55,7 @@ 
 		Make sure BASE directive is set for your installation. This is used to properly detect phpIPAM directory. It must be set in config.php and in .htaccess
 
 		<div class="well" style="padding:5px;margin-top:5px;">
-		Detected BASE: <?php print str_replace("install/", "", $_SERVER['REQUEST_URI']);  ?>
+		Detected BASE: <?php print str_replace ("install/", "", $_SERVER['REQUEST_URI']); ?>
 		</div>
 
 		<h4>2.) Enable mod_rewrite</h4>

functions/checks/check_db_install.php

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 # initialize install class
 $Install = new Install ($Database);
 # try to connect, if it fails redirect to install
-$Install->check_db_connection(true);
+$Install->check_db_connection (true);
 # connection is ok, check that table exists
-$Install->check_table("vrf", true);
+$Install->check_table ("vrf", true);
 
 ?>
\ No newline at end of file

functions/classes/class.PDO.php

Braces +76 added lines, -33 removed lines

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

Doc Comments +9 added lines, -9 removed lines

@@ -88,7 +88,7 @@ 
 	 * @access public
 	 * @param mixed $username (default: null)
 	 * @param mixed $password (default: null)
-	 * @param mixed $charset (default: null)
+	 * @param string $charset (default: null)
 	 * @param mixed $ssl (default: null)
 	 * @return void
 	 */
@@ -108,7 +108,7 @@ 
 	 * @access public
 	 * @static
 	 * @param mixed $date (default: null)
-	 * @return void
+	 * @return string
 	 */
 	public static function toDate($date = null) {
 		if (is_int($date)) {
@@ -152,7 +152,7 @@ 
 	 * makeDsn function.
 	 *
 	 * @access protected
-	 * @return void
+	 * @return string
 	 */
 	protected function makeDsn() {
 		return ':charset=' . $this->charset;
@@ -218,7 +218,7 @@ 
 	 * Are we currently connected to the database
 	 *
 	 * @access public
-	 * @return void
+	 * @return boolean
 	 */
 	public function isConnected() {
 		return ($this->pdo !== null);
@@ -239,7 +239,7 @@ 
 	 * Note: no objects are fetched
 	 *
 	 * @access public
-	 * @param mixed $query
+	 * @param string $query
 	 * @param array $values (default: array())
 	 * @return void
 	 */
@@ -463,7 +463,7 @@ 
 	 * @param string $query (default: null)
 	 * @param array $values (default: array())
 	 * @param mixed $id (default: null)
-	 * @return void
+	 * @return boolean
 	 */
 	public function objectExists($tableName, $query = null, $values = array(), $id = null) {
 		return is_object($this->getObject($tableName, $id));
@@ -520,7 +520,7 @@ 
 	 * @param mixed $query (default: null)
 	 * @param array $values (default: array())
 	 * @param mixed $callback (default: null)
-	 * @return void
+	 * @return boolean
 	 */
 	public function getObjectsQueryIncremental($query = null, $values = array(), $callback = null) {
 		if (!$this->isConnected()) $this->connect();
@@ -578,7 +578,7 @@ 
 	 * Get a single object from the database
 	 *
 	 * @access public
-	 * @param mixed $tableName
+	 * @param string $tableName
 	 * @param mixed $id (default: null)
 	 * @param string $class (default: 'stdClass')
 	 * @return void
@@ -906,7 +906,7 @@ 
 	 * makeDsn function
 	 *
 	 * @access protected
-	 * @return void
+	 * @return string
 	 */
 	protected function makeDsn() {
 		# for installation

Indentation +936 added lines, -936 removed lines

@@ -8,777 +8,777 @@ 
 abstract class DB {
 
 
-	/**
-	 * Default db username
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $username = null;
-
-	/**
-	 * Default db password
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $password = null;
-
-	/**
-	 * charset
-	 *
-	 * (default value: 'utf8')
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $charset = 'utf8';
-
-	/**
-	 * pdo
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $pdo = null;
-
-	/**
-	 * Database name - needed for check
-	 *
-	 * (default value: '')
-	 *
-	 * @var string
-	 * @access public
-	 */
-	public $dbname 	= '';		// needed for DB check
-
-	/**
-	 * hosnamr
-	 *
-	 * (default value: 'localhost')
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $host 	= 'localhost';
-
-	/**
-	 * Default port number
-	 *
-	 * (default value: '3306')
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $port 	= '3306';
-
-
-
-
-
-	/**
-	 * __construct function.
-	 *
-	 * @access public
-	 * @param mixed $username (default: null)
-	 * @param mixed $password (default: null)
-	 * @param mixed $charset (default: null)
-	 * @param mixed $ssl (default: null)
-	 * @return void
-	 */
-	public function __construct($username = null, $password = null, $charset = null, $ssl = null) {
-		if (isset($username)) $this->username = $username;
-		if (isset($password)) $this->password = $password;
-		if (isset($charset))  $this->charset = $charset;
-		# ssl
-		if ($ssl) {
-			$this->ssl = $ssl;
-		}
-	}
-
-	/**
-	 * convert a date object/string ready for use in sql
-	 *
-	 * @access public
-	 * @static
-	 * @param mixed $date (default: null)
-	 * @return void
-	 */
-	public static function toDate($date = null) {
-		if (is_int($date)) {
-			return date('Y-m-d H:i:s', $date);
-		} else if (is_string($date)) {
-			return date('Y-m-d H:i:s', strtotime($date));
-		} else {
-			return date('Y-m-d H:i:s');
-		}
-	}
-
-	/**
-	 * Connect to the database
-	 * Call whenever a connection is needed to be made
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function connect() {
-		$dsn = $this->makeDsn();
-
-		try {
-			# ssl?
-			if ($this->ssl) {
-				$this->pdo = new \PDO($dsn, $this->username, $this->password, $this->ssl);
-			}
-			else {
-				$this->pdo = new \PDO($dsn, $this->username, $this->password);
-			}
-
-			$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-
-		} catch (\PDOException $e) {
-			throw new Exception ("Could not connect to database! ".$e->getMessage());
-		}
-
-		@$this->pdo->query('SET NAMES \'' . $this->charset . '\';');
-	}
-
-	/**
-	 * makeDsn function.
-	 *
-	 * @access protected
-	 * @return void
-	 */
-	protected function makeDsn() {
-		return ':charset=' . $this->charset;
-	}
-
-	/**
-	 * resets conection.
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function resetConn() {
-		unset($this->pdo);
-		$this->install = false;
-	}
-
-	/**
-	 * logs queries to file
-	 *
-	 * @access private
-	 * @param mixed $query
-	 * @return void
-	 */
-	private function log_query ($query) {
-		if($this->debug) {
-
-			$myFile = "/tmp/queries.txt";
-			$fh = fopen($myFile, 'a') or die("can't open file");
-			fwrite($fh, $query->queryString."\n");
-			fclose($fh);
-		}
-	}
-
-	/**
-	 * Remove outer quotes from a string
-	 *
-	 * @access public
-	 * @static
-	 * @param mixed $str
-	 * @return void
-	 */
-	public static function unquote_outer($str) {
-		$len = strlen($str);
-
-		if ($len>1) {
-			if ($str[0] == "'" && $str[$len-1] == "'") {
-				return substr($str, 1, -1);
-			} else if ($str[0] == "'") {
-				return substr($str, 1);
-			} else if ($str[$len-1] == "'") {
-				return substr($str, 0, -1);
-			}
-		} else if ($len>0) {
-			if ($str[0] == "'") {
-				return '';
-			}
-		}
-
-		return $str;
-	}
-
-	/**
-	 * Are we currently connected to the database
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function isConnected() {
-		return ($this->pdo !== null);
-	}
-
-	/**
-	 * Returns last insert ID
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function lastInsertId() {
-		return $this->pdo->lastInsertId();
-	}
-
-	/**
-	 * Run a statement on the database
-	 * Note: no objects are fetched
-	 *
-	 * @access public
-	 * @param mixed $query
-	 * @param array $values (default: array())
-	 * @return void
-	 */
-	public function runQuery($query, $values = array()) {
-		if (!$this->isConnected()) $this->connect();
-
-		$statement = $this->pdo->prepare($query);
-		//debuq
-		$this->log_query ($statement);
-		return $statement->execute((array)$values); //this array cast allows single values to be used as the parameter
-	}
-
-	/**
-	 * Allow a value to be escaped, ready for insertion as a mysql parameter
-	 * Note: for usage as a value (rather than prepared statements), you MUST manually quote around.
-	 *
-	 * @access public
-	 * @param mixed $str
-	 * @return void
-	 */
-	public function escape($str) {
-		if (!$this->isConnected()) $this->connect();
-
-		return $this->unquote_outer($this->pdo->quote((string)$str));
-	}
-
-	/**
-	 * Get a quick number of objects in a table
-	 *
-	 * @access public
-	 * @param mixed $tableName
-	 * @return void
-	 */
-	public function numObjects($tableName) {
-		if (!$this->isConnected()) $this->connect();
-
-		$tableName = $this->escape($tableName);
-		$statement = $this->pdo->prepare('SELECT COUNT(*) as `num` FROM `'.$tableName.'`;');
-
-		//debuq
-		$this->log_query ($statement);
-		$statement->execute();
-
-		return $statement->fetchColumn();
-    }
-
-	/**
-	 * Get a quick number of objects in a table for filtered field
-	 *
-	 * @access public
-	 * @param mixed $tableName
-	 * @param mixed $method
-	 * @param boolean $like (default: false)
-	 * @param mixed $value
-	 * @return void
-	 */
-	public function numObjectsFilter($tableName, $method, $value, $like = false) {
-		if (!$this->isConnected()) $this->connect();
-
-		$like === true ? $operator = "LIKE" : $operator = "=";
-
-		$tableName = $this->escape($tableName);
-		$statement = $this->pdo->prepare('SELECT COUNT(*) as `num` FROM `'.$tableName.'` where `'.$method.'` '.$operator.' ?;');
-
-		//debuq
-		$this->log_query ($statement);
-		$statement->execute(array($value));
-
-		return $statement->fetchColumn();
-	}
-
-	/**
-	 * Update an object in a table with values given
-	 *
-	 * Note: the id of the object is assumed to be in.
-	 *
-	 * @access public
-	 * @param mixed $tableName
-	 * @param mixed $obj
-	 * @param string $primarykey (default: 'id')
-	 * @param mixed $primarykey2 (default: null)
-	 * @return void
-	 */
-	public function updateObject($tableName, $obj, $primarykey = 'id', $primarykey2 = null) {
-		if (!$this->isConnected()) $this->connect();
-
-		$obj = (array)$obj;
-
-		//we cannot update an object without an id specified so quit
-		if (!isset($obj[$primarykey])) {
-			throw new Exception('Missing primary key');
-			return false;
-		}
-
-		$tableName = $this->escape($tableName);
-
-		//get the objects id from the provided object and knock it off from the object so we dont try to update it
-		$objId[] = $obj[$primarykey];
-		unset($obj[$primarykey]);
-
-		//secondary primary key?
-		if(!is_null($primarykey2)) {
-		$objId[] = $obj[$primarykey2];
-		unset($obj[$primarykey2]);
-		}
-
-		//TODO: validate given object parameters with that of the table (this validates parameters names)
-
-		//formulate an update statement based on the object parameters
-		$objParams = array_keys($obj);
-
-		$preparedParamArr = array();
-		foreach ($objParams as $objParam) {
-			$preparedParamArr[] = '`' . $this->escape($objParam) . '`=?';
-		}
-
-		$preparedParamStr = implode(',', $preparedParamArr);
-
-		//primary key 2?
-		if(!is_null($primarykey2))
-		$statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=? AND `' . $primarykey2 . '`=?;');
-		else
-		$statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=?;');
-
-		//merge the parameters and values
-		$paramValues = array_merge(array_values($obj), $objId);
-
-		//debuq
-		$this->log_query ($statement);
-		//run the update on the object
-		return $statement->execute($paramValues);
-	}
-
-	/**
-	 * Update multiple objects at once.
-	 *
-	 * @access public
-	 * @param string $tableName
-	 * @param array $ids
-	 * @param array $values
-	 * @return void
-	 */
-	public function updateMultipleObjects($tableName, $ids, $values) {
-		$tableName = $this->escape($tableName);
-		//set ids
-		$num = count($ids);
-		$idParts = array_fill(0, $num, '`id`=?');
-		//set values
-		$objParams = array_keys($values);
-		$preparedParamArr = array();
-		foreach ($objParams as $objParam) {
-			$preparedParamArr[] = '`' . $this->escape($objParam) . '`=?';
-		}
-		//set values
-		$all_values = array_merge(array_values($values),$ids);
-		//execute
-		return $this->runQuery('UPDATE `'.$tableName.'` SET '.implode(',', $preparedParamArr).'  WHERE '.implode(' OR ', $idParts), $all_values);
-	}
-
-	/**
-	 * Insert an object into a table
-	 * Note: an id field is ignored if specified.
-	 *
-	 * @access public
-	 * @param string $tableName
-	 * @param object|array $obj
-	 * @param bool $raw (default: false)
-	 * @param bool $replace (default: false)
-	 * @param bool $ignoreId (default: true)
-	 * @return void
-	 */
-	public function insertObject($tableName, $obj, $raw = false, $replace = false, $ignoreId = true) {
-		if (!$this->isConnected()) $this->connect();
-
-		$obj = (array)$obj;
-
-		$tableName = $this->escape($tableName);
-
-		if (!$raw && array_key_exists('id', $obj) && $ignoreId) {
-			unset($obj['id']);
-		}
-
-		if (count($obj)<1) {
-			return true;
-		}
-
-		//formulate an update statement based on the object parameters
-		$objValues = array_values($obj);
-
-		$preparedParamsArr = array();
-		foreach ($obj as $key => $value) {
-			$preparedParamsArr[] = '`' . $this->escape($key) . '`';
-		}
-
-		$preparedParamsStr = implode(', ', $preparedParamsArr);
-		$preparedValuesStr = implode(', ', array_fill(0, count($objValues), '?'));
-
-		if ($replace) {
-			$statement = $this->pdo->prepare('REPLACE INTO `' . $tableName . '` (' . $preparedParamsStr . ') VALUES (' . $preparedValuesStr . ');');
-		} else {
-			$statement = $this->pdo->prepare('INSERT INTO `' . $tableName . '` (' . $preparedParamsStr . ') VALUES (' . $preparedValuesStr . ');');
-		}
-
-		//run the update on the object
-		if (!$statement->execute($objValues)) {
-			$errObj = $statement->errorInfo();
-
-			//return false;
-			throw new Exception($errObj[2]);
-		}
-
-		return $this->pdo->lastInsertId();
-	}
-
-
-	/**
-	 * Check if an object exists.
-	 *
-	 * @access public
-	 * @param string $tableName
-	 * @param string $query (default: null)
-	 * @param array $values (default: array())
-	 * @param mixed $id (default: null)
-	 * @return void
-	 */
-	public function objectExists($tableName, $query = null, $values = array(), $id = null) {
-		return is_object($this->getObject($tableName, $id));
-	}
-
-	/**
-	 * Get a filtered list of objects from the database.
-	 *
-	 * @access public
-	 * @param string $tableName
-	 * @param string $sortField (default: 'id')
-	 * @param bool $sortAsc (default: true)
-	 * @param mixed $numRecords (default: null)
-	 * @param int $offset (default: 0)
-	 * @param string $class (default: 'stdClass')
-	 * @return void
-	 */
-	public function getObjects($tableName, $sortField = 'id', $sortAsc = true, $numRecords = null, $offset = 0, $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
-
-		$sortStr = '';
-		if (!$sortAsc) {
-			$sortStr = 'DESC';
-		}
-
-		//we should escape all of the params that we need to
-		$tableName = $this->escape($tableName);
-		$sortField = $this->escape($sortField);
-
-		if ($numRecords === null) {
-			//get all (no limit)
-			$statement = $this->pdo->query('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.';');
-		} else {
-			//get a limited range of objects
-			$statement = $this->pdo->query('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.' LIMIT '.$numRecords.' OFFSET '.$offset.';');
-		}
-
-		$results = array();
-
-		if (is_object($statement)) {
-			while ($newObj = $statement->fetchObject($class)) {
-				$results[] = $newObj;
-			}
-		}
-
-		return $results;
-	}
-
-
-	/**
-	 * use this function to conserve memory and read rows one by one rather than reading all of them
-	 *
-	 * @access public
-	 * @param mixed $query (default: null)
-	 * @param array $values (default: array())
-	 * @param mixed $callback (default: null)
-	 * @return void
-	 */
-	public function getObjectsQueryIncremental($query = null, $values = array(), $callback = null) {
-		if (!$this->isConnected()) $this->connect();
-
-		$statement = $this->pdo->prepare($query);
-
-		//debuq
-		$this->log_query ($statement);
-		$statement->execute((array)$values);
-
-		if (is_object($statement)) {
-			if ($callback) {
-				while ($newObj = $statement->fetchObject('stdClass')) {
-					if ($callback($newObj)===false) {
-						return false;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Get all objects matching values
-	 *
-	 * @access public
-	 * @param mixed $query (default: null)
-	 * @param array $values (default: array())
-	 * @param string $class (default: 'stdClass')
-	 * @return void
-	 */
-	public function getObjectsQuery($query = null, $values = array(), $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
-
-		$statement = $this->pdo->prepare($query);
-
-		//debug
-		$this->log_query ($statement);
-		$statement->execute((array)$values);
-
-		$results = array();
-
-		if (is_object($statement)) {
-			while ($newObj = $statement->fetchObject($class)) {
-				$results[] = $newObj;
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Get a single object from the database
-	 *
-	 * @access public
-	 * @param mixed $tableName
-	 * @param mixed $id (default: null)
-	 * @param string $class (default: 'stdClass')
-	 * @return void
-	 */
-	public function getObject($tableName, $id = null, $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
-		$id = intval($id);
-
-		//has a custom query been provided?
-		$tableName = $this->escape($tableName);
-
-		//prepare a statement to get a single object from the database
-		if ($id !== null) {
-			$statement = $this->pdo->prepare('SELECT * FROM `'.$tableName.'` WHERE `id`=? LIMIT 1;');
-			$statement->bindParam(1, $id, \PDO::PARAM_INT);
-		} else {
-			$statement = $this->pdo->prepare('SELECT * FROM `'.$tableName.'` LIMIT 1;');
-		}
-
-		//debuq
-		$this->log_query ($statement);
-		$statement->execute();
-
-		//we can then extract the single object (if we have a result)
-		$resultObj = $statement->fetchObject($class);
-
-		if ($resultObj === false) {
-			return null;
-		} else {
-			return $resultObj;
-		}
-	}
-
-	/**
-	 * Fetches single object from provided query
-	 *
-	 * @access public
-	 * @param mixed $query (default: null)
-	 * @param array $values (default: array())
-	 * @param string $class (default: 'stdClass')
-	 * @return void
-	 */
-	public function getObjectQuery($query = null, $values = array(), $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
-
-		$statement = $this->pdo->prepare($query);
-		//debuq
-		$this->log_query ($statement);
-		$statement->execute((array)$values);
-
-		$resultObj = $statement->fetchObject($class);
-
-		if ($resultObj === false) {
-			return null;
-		} else {
-			return $resultObj;
-		}
-	}
-
-	/**
-	 * Get single value
-	 *
-	 * @access public
-	 * @param mixed $query (default: null)
-	 * @param array $values (default: array())
-	 * @param string $class (default: 'stdClass')
-	 * @return void
-	 */
-	public function getValueQuery($query = null, $values = array(), $class = 'stdClass') {
-		$obj = $this->getObjectQuery($query, $values, $class);
-
-		if (is_object($obj)) {
-			$obj = (array)$obj;
-			return reset($obj);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Searches for object in database
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @param mixed $field
-	 * @param mixed $value
-	 * @param string $sortField (default: 'id')
-	 * @param bool $sortAsc (default: true)
-	 * @param bool $like (default: false)
-	 * @param bool $negate (default: false)
-	 * @return void
-	 */
-	public function findObjects($table, $field, $value, $sortField = 'id', $sortAsc = true, $like = false, $negate = false) {
-		$table = $this->escape($table);
-		$field = $this->escape($field);
-		$sortField = $this->escape($sortField);
-		$like === true ? $operator = "LIKE" : $operator = "=";
-		$negate === true ? $negate_operator = "NOT " : $negate_operator = "";
-
-		return $this->getObjectsQuery('SELECT * FROM `' . $table . '` WHERE `'. $field .'`'.$negate_operator. $operator .'? ORDER BY `'.$sortField.'` ' . ($sortAsc ? '' : 'DESC') . ';', array($value));
-	}
-
-	/**
-	 * Searches for single object.
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @param mixed $field
-	 * @param mixed $value
-	 * @return void
-	 */
-	public function findObject($table, $field, $value) {
-		$table = $this->escape($table);
-		$field = $this->escape($field);
-
-		return $this->getObjectQuery('SELECT * FROM `' . $table . '` WHERE `' . $field . '` = ? LIMIT 1;', array($value));
-	}
-
-	/**
-	 * Get list of items.
-	 *
-	 * @access public
-	 * @param mixed $query (default: null)
-	 * @param array $values (default: array())
-	 * @param string $class (default: 'stdClass')
-	 * @return void
-	 */
-	public function getList($query = null, $values = array(), $class = 'stdClass') {
-		$objs = $this->getObjectsQuery($query, $values, $class);
-
-		$list = array();
-		foreach ($objs as $obj) {
-			$columns = array_values((array)$obj);
-			$list[] = $columns[0];
-		}
-
-		return $list;
-	}
-
-	/**
-	* Delete an object from the database
-	*
-	* @param {string} table name
-	* @param {int} object id
-	* @return {boolean} success
-	*/
-	public function deleteObject($tableName, $id) {
-		$tableName = $this->escape($tableName);
-
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `id`=?;', array($id));
-	}
-
-	/**
-	* Delete a list of objects from the database
-	*
-	* @param {string} table name
-	* @param {array} list of ids
-	* @return {boolean} success
-	*/
-	public function deleteObjects($tableName, $ids) {
-		$tableName = $this->escape($tableName);
-		$num = count($ids);
-		$idParts = array_fill(0, $num, '`id`=?');
-
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE ' . implode(' OR ', $idParts), $ids);
-	}
-
-	/**
-	 * Delete specified row
-	 *
-	 * @access public
-	 * @param {string} $tableName
-	 * @param {string $field
-	 * @param {string $value
-	 * @return void
-	 */
-	public function deleteRow($tableName, $field, $value, $field2=null, $value2 = null) {
-		$tableName = $this->escape($tableName);
-		$field = $this->escape($field);
-
-		//multiple
-		if(!is_null($field2))
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=? and `'.$field2.'`=?;', array($value, $value2));
-		else
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=?;', array($value));
-	}
-
-	/**
-	 * truncate specified table
-	 *
-	 * @access public
-	 * @param {string} $tableName
-	 * @return void
-	 */
-	public function emptyTable($tableName) {
-		//escape talbe name
-		$tableName = $this->escape($tableName);
-		//execute
-		return $this->runQuery('TRUNCATE TABLE `'.$tableName.'`;');
-	}
+    /**
+     * Default db username
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $username = null;
+
+    /**
+     * Default db password
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $password = null;
+
+    /**
+     * charset
+     *
+     * (default value: 'utf8')
+     *
+     * @var string
+     * @access protected
+     */
+    protected $charset = 'utf8';
+
+    /**
+     * pdo
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $pdo = null;
+
+    /**
+     * Database name - needed for check
+     *
+     * (default value: '')
+     *
+     * @var string
+     * @access public
+     */
+    public $dbname 	= '';		// needed for DB check
+
+    /**
+     * hosnamr
+     *
+     * (default value: 'localhost')
+     *
+     * @var string
+     * @access protected
+     */
+    protected $host 	= 'localhost';
+
+    /**
+     * Default port number
+     *
+     * (default value: '3306')
+     *
+     * @var string
+     * @access protected
+     */
+    protected $port 	= '3306';
+
+
+
+
+
+    /**
+     * __construct function.
+     *
+     * @access public
+     * @param mixed $username (default: null)
+     * @param mixed $password (default: null)
+     * @param mixed $charset (default: null)
+     * @param mixed $ssl (default: null)
+     * @return void
+     */
+    public function __construct($username = null, $password = null, $charset = null, $ssl = null) {
+        if (isset($username)) $this->username = $username;
+        if (isset($password)) $this->password = $password;
+        if (isset($charset))  $this->charset = $charset;
+        # ssl
+        if ($ssl) {
+            $this->ssl = $ssl;
+        }
+    }
+
+    /**
+     * convert a date object/string ready for use in sql
+     *
+     * @access public
+     * @static
+     * @param mixed $date (default: null)
+     * @return void
+     */
+    public static function toDate($date = null) {
+        if (is_int($date)) {
+            return date('Y-m-d H:i:s', $date);
+        } else if (is_string($date)) {
+            return date('Y-m-d H:i:s', strtotime($date));
+        } else {
+            return date('Y-m-d H:i:s');
+        }
+    }
+
+    /**
+     * Connect to the database
+     * Call whenever a connection is needed to be made
+     *
+     * @access public
+     * @return void
+     */
+    public function connect() {
+        $dsn = $this->makeDsn();
+
+        try {
+            # ssl?
+            if ($this->ssl) {
+                $this->pdo = new \PDO($dsn, $this->username, $this->password, $this->ssl);
+            }
+            else {
+                $this->pdo = new \PDO($dsn, $this->username, $this->password);
+            }
+
+            $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+
+        } catch (\PDOException $e) {
+            throw new Exception ("Could not connect to database! ".$e->getMessage());
+        }
+
+        @$this->pdo->query('SET NAMES \'' . $this->charset . '\';');
+    }
+
+    /**
+     * makeDsn function.
+     *
+     * @access protected
+     * @return void
+     */
+    protected function makeDsn() {
+        return ':charset=' . $this->charset;
+    }
+
+    /**
+     * resets conection.
+     *
+     * @access public
+     * @return void
+     */
+    public function resetConn() {
+        unset($this->pdo);
+        $this->install = false;
+    }
+
+    /**
+     * logs queries to file
+     *
+     * @access private
+     * @param mixed $query
+     * @return void
+     */
+    private function log_query ($query) {
+        if($this->debug) {
+
+            $myFile = "/tmp/queries.txt";
+            $fh = fopen($myFile, 'a') or die("can't open file");
+            fwrite($fh, $query->queryString."\n");
+            fclose($fh);
+        }
+    }
+
+    /**
+     * Remove outer quotes from a string
+     *
+     * @access public
+     * @static
+     * @param mixed $str
+     * @return void
+     */
+    public static function unquote_outer($str) {
+        $len = strlen($str);
+
+        if ($len>1) {
+            if ($str[0] == "'" && $str[$len-1] == "'") {
+                return substr($str, 1, -1);
+            } else if ($str[0] == "'") {
+                return substr($str, 1);
+            } else if ($str[$len-1] == "'") {
+                return substr($str, 0, -1);
+            }
+        } else if ($len>0) {
+            if ($str[0] == "'") {
+                return '';
+            }
+        }
+
+        return $str;
+    }
+
+    /**
+     * Are we currently connected to the database
+     *
+     * @access public
+     * @return void
+     */
+    public function isConnected() {
+        return ($this->pdo !== null);
+    }
+
+    /**
+     * Returns last insert ID
+     *
+     * @access public
+     * @return void
+     */
+    public function lastInsertId() {
+        return $this->pdo->lastInsertId();
+    }
+
+    /**
+     * Run a statement on the database
+     * Note: no objects are fetched
+     *
+     * @access public
+     * @param mixed $query
+     * @param array $values (default: array())
+     * @return void
+     */
+    public function runQuery($query, $values = array()) {
+        if (!$this->isConnected()) $this->connect();
+
+        $statement = $this->pdo->prepare($query);
+        //debuq
+        $this->log_query ($statement);
+        return $statement->execute((array)$values); //this array cast allows single values to be used as the parameter
+    }
+
+    /**
+     * Allow a value to be escaped, ready for insertion as a mysql parameter
+     * Note: for usage as a value (rather than prepared statements), you MUST manually quote around.
+     *
+     * @access public
+     * @param mixed $str
+     * @return void
+     */
+    public function escape($str) {
+        if (!$this->isConnected()) $this->connect();
+
+        return $this->unquote_outer($this->pdo->quote((string)$str));
+    }
+
+    /**
+     * Get a quick number of objects in a table
+     *
+     * @access public
+     * @param mixed $tableName
+     * @return void
+     */
+    public function numObjects($tableName) {
+        if (!$this->isConnected()) $this->connect();
+
+        $tableName = $this->escape($tableName);
+        $statement = $this->pdo->prepare('SELECT COUNT(*) as `num` FROM `'.$tableName.'`;');
+
+        //debuq
+        $this->log_query ($statement);
+        $statement->execute();
+
+        return $statement->fetchColumn();
+    }
+
+    /**
+     * Get a quick number of objects in a table for filtered field
+     *
+     * @access public
+     * @param mixed $tableName
+     * @param mixed $method
+     * @param boolean $like (default: false)
+     * @param mixed $value
+     * @return void
+     */
+    public function numObjectsFilter($tableName, $method, $value, $like = false) {
+        if (!$this->isConnected()) $this->connect();
+
+        $like === true ? $operator = "LIKE" : $operator = "=";
+
+        $tableName = $this->escape($tableName);
+        $statement = $this->pdo->prepare('SELECT COUNT(*) as `num` FROM `'.$tableName.'` where `'.$method.'` '.$operator.' ?;');
+
+        //debuq
+        $this->log_query ($statement);
+        $statement->execute(array($value));
+
+        return $statement->fetchColumn();
+    }
+
+    /**
+     * Update an object in a table with values given
+     *
+     * Note: the id of the object is assumed to be in.
+     *
+     * @access public
+     * @param mixed $tableName
+     * @param mixed $obj
+     * @param string $primarykey (default: 'id')
+     * @param mixed $primarykey2 (default: null)
+     * @return void
+     */
+    public function updateObject($tableName, $obj, $primarykey = 'id', $primarykey2 = null) {
+        if (!$this->isConnected()) $this->connect();
+
+        $obj = (array)$obj;
+
+        //we cannot update an object without an id specified so quit
+        if (!isset($obj[$primarykey])) {
+            throw new Exception('Missing primary key');
+            return false;
+        }
+
+        $tableName = $this->escape($tableName);
+
+        //get the objects id from the provided object and knock it off from the object so we dont try to update it
+        $objId[] = $obj[$primarykey];
+        unset($obj[$primarykey]);
+
+        //secondary primary key?
+        if(!is_null($primarykey2)) {
+        $objId[] = $obj[$primarykey2];
+        unset($obj[$primarykey2]);
+        }
+
+        //TODO: validate given object parameters with that of the table (this validates parameters names)
+
+        //formulate an update statement based on the object parameters
+        $objParams = array_keys($obj);
+
+        $preparedParamArr = array();
+        foreach ($objParams as $objParam) {
+            $preparedParamArr[] = '`' . $this->escape($objParam) . '`=?';
+        }
+
+        $preparedParamStr = implode(',', $preparedParamArr);
+
+        //primary key 2?
+        if(!is_null($primarykey2))
+        $statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=? AND `' . $primarykey2 . '`=?;');
+        else
+        $statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=?;');
+
+        //merge the parameters and values
+        $paramValues = array_merge(array_values($obj), $objId);
+
+        //debuq
+        $this->log_query ($statement);
+        //run the update on the object
+        return $statement->execute($paramValues);
+    }
+
+    /**
+     * Update multiple objects at once.
+     *
+     * @access public
+     * @param string $tableName
+     * @param array $ids
+     * @param array $values
+     * @return void
+     */
+    public function updateMultipleObjects($tableName, $ids, $values) {
+        $tableName = $this->escape($tableName);
+        //set ids
+        $num = count($ids);
+        $idParts = array_fill(0, $num, '`id`=?');
+        //set values
+        $objParams = array_keys($values);
+        $preparedParamArr = array();
+        foreach ($objParams as $objParam) {
+            $preparedParamArr[] = '`' . $this->escape($objParam) . '`=?';
+        }
+        //set values
+        $all_values = array_merge(array_values($values),$ids);
+        //execute
+        return $this->runQuery('UPDATE `'.$tableName.'` SET '.implode(',', $preparedParamArr).'  WHERE '.implode(' OR ', $idParts), $all_values);
+    }
+
+    /**
+     * Insert an object into a table
+     * Note: an id field is ignored if specified.
+     *
+     * @access public
+     * @param string $tableName
+     * @param object|array $obj
+     * @param bool $raw (default: false)
+     * @param bool $replace (default: false)
+     * @param bool $ignoreId (default: true)
+     * @return void
+     */
+    public function insertObject($tableName, $obj, $raw = false, $replace = false, $ignoreId = true) {
+        if (!$this->isConnected()) $this->connect();
+
+        $obj = (array)$obj;
+
+        $tableName = $this->escape($tableName);
+
+        if (!$raw && array_key_exists('id', $obj) && $ignoreId) {
+            unset($obj['id']);
+        }
+
+        if (count($obj)<1) {
+            return true;
+        }
+
+        //formulate an update statement based on the object parameters
+        $objValues = array_values($obj);
+
+        $preparedParamsArr = array();
+        foreach ($obj as $key => $value) {
+            $preparedParamsArr[] = '`' . $this->escape($key) . '`';
+        }
+
+        $preparedParamsStr = implode(', ', $preparedParamsArr);
+        $preparedValuesStr = implode(', ', array_fill(0, count($objValues), '?'));
+
+        if ($replace) {
+            $statement = $this->pdo->prepare('REPLACE INTO `' . $tableName . '` (' . $preparedParamsStr . ') VALUES (' . $preparedValuesStr . ');');
+        } else {
+            $statement = $this->pdo->prepare('INSERT INTO `' . $tableName . '` (' . $preparedParamsStr . ') VALUES (' . $preparedValuesStr . ');');
+        }
+
+        //run the update on the object
+        if (!$statement->execute($objValues)) {
+            $errObj = $statement->errorInfo();
+
+            //return false;
+            throw new Exception($errObj[2]);
+        }
+
+        return $this->pdo->lastInsertId();
+    }
+
+
+    /**
+     * Check if an object exists.
+     *
+     * @access public
+     * @param string $tableName
+     * @param string $query (default: null)
+     * @param array $values (default: array())
+     * @param mixed $id (default: null)
+     * @return void
+     */
+    public function objectExists($tableName, $query = null, $values = array(), $id = null) {
+        return is_object($this->getObject($tableName, $id));
+    }
+
+    /**
+     * Get a filtered list of objects from the database.
+     *
+     * @access public
+     * @param string $tableName
+     * @param string $sortField (default: 'id')
+     * @param bool $sortAsc (default: true)
+     * @param mixed $numRecords (default: null)
+     * @param int $offset (default: 0)
+     * @param string $class (default: 'stdClass')
+     * @return void
+     */
+    public function getObjects($tableName, $sortField = 'id', $sortAsc = true, $numRecords = null, $offset = 0, $class = 'stdClass') {
+        if (!$this->isConnected()) $this->connect();
+
+        $sortStr = '';
+        if (!$sortAsc) {
+            $sortStr = 'DESC';
+        }
+
+        //we should escape all of the params that we need to
+        $tableName = $this->escape($tableName);
+        $sortField = $this->escape($sortField);
+
+        if ($numRecords === null) {
+            //get all (no limit)
+            $statement = $this->pdo->query('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.';');
+        } else {
+            //get a limited range of objects
+            $statement = $this->pdo->query('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.' LIMIT '.$numRecords.' OFFSET '.$offset.';');
+        }
+
+        $results = array();
+
+        if (is_object($statement)) {
+            while ($newObj = $statement->fetchObject($class)) {
+                $results[] = $newObj;
+            }
+        }
+
+        return $results;
+    }
+
+
+    /**
+     * use this function to conserve memory and read rows one by one rather than reading all of them
+     *
+     * @access public
+     * @param mixed $query (default: null)
+     * @param array $values (default: array())
+     * @param mixed $callback (default: null)
+     * @return void
+     */
+    public function getObjectsQueryIncremental($query = null, $values = array(), $callback = null) {
+        if (!$this->isConnected()) $this->connect();
+
+        $statement = $this->pdo->prepare($query);
+
+        //debuq
+        $this->log_query ($statement);
+        $statement->execute((array)$values);
+
+        if (is_object($statement)) {
+            if ($callback) {
+                while ($newObj = $statement->fetchObject('stdClass')) {
+                    if ($callback($newObj)===false) {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Get all objects matching values
+     *
+     * @access public
+     * @param mixed $query (default: null)
+     * @param array $values (default: array())
+     * @param string $class (default: 'stdClass')
+     * @return void
+     */
+    public function getObjectsQuery($query = null, $values = array(), $class = 'stdClass') {
+        if (!$this->isConnected()) $this->connect();
+
+        $statement = $this->pdo->prepare($query);
+
+        //debug
+        $this->log_query ($statement);
+        $statement->execute((array)$values);
+
+        $results = array();
+
+        if (is_object($statement)) {
+            while ($newObj = $statement->fetchObject($class)) {
+                $results[] = $newObj;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Get a single object from the database
+     *
+     * @access public
+     * @param mixed $tableName
+     * @param mixed $id (default: null)
+     * @param string $class (default: 'stdClass')
+     * @return void
+     */
+    public function getObject($tableName, $id = null, $class = 'stdClass') {
+        if (!$this->isConnected()) $this->connect();
+        $id = intval($id);
+
+        //has a custom query been provided?
+        $tableName = $this->escape($tableName);
+
+        //prepare a statement to get a single object from the database
+        if ($id !== null) {
+            $statement = $this->pdo->prepare('SELECT * FROM `'.$tableName.'` WHERE `id`=? LIMIT 1;');
+            $statement->bindParam(1, $id, \PDO::PARAM_INT);
+        } else {
+            $statement = $this->pdo->prepare('SELECT * FROM `'.$tableName.'` LIMIT 1;');
+        }
+
+        //debuq
+        $this->log_query ($statement);
+        $statement->execute();
+
+        //we can then extract the single object (if we have a result)
+        $resultObj = $statement->fetchObject($class);
+
+        if ($resultObj === false) {
+            return null;
+        } else {
+            return $resultObj;
+        }
+    }
+
+    /**
+     * Fetches single object from provided query
+     *
+     * @access public
+     * @param mixed $query (default: null)
+     * @param array $values (default: array())
+     * @param string $class (default: 'stdClass')
+     * @return void
+     */
+    public function getObjectQuery($query = null, $values = array(), $class = 'stdClass') {
+        if (!$this->isConnected()) $this->connect();
+
+        $statement = $this->pdo->prepare($query);
+        //debuq
+        $this->log_query ($statement);
+        $statement->execute((array)$values);
+
+        $resultObj = $statement->fetchObject($class);
+
+        if ($resultObj === false) {
+            return null;
+        } else {
+            return $resultObj;
+        }
+    }
+
+    /**
+     * Get single value
+     *
+     * @access public
+     * @param mixed $query (default: null)
+     * @param array $values (default: array())
+     * @param string $class (default: 'stdClass')
+     * @return void
+     */
+    public function getValueQuery($query = null, $values = array(), $class = 'stdClass') {
+        $obj = $this->getObjectQuery($query, $values, $class);
+
+        if (is_object($obj)) {
+            $obj = (array)$obj;
+            return reset($obj);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Searches for object in database
+     *
+     * @access public
+     * @param mixed $table
+     * @param mixed $field
+     * @param mixed $value
+     * @param string $sortField (default: 'id')
+     * @param bool $sortAsc (default: true)
+     * @param bool $like (default: false)
+     * @param bool $negate (default: false)
+     * @return void
+     */
+    public function findObjects($table, $field, $value, $sortField = 'id', $sortAsc = true, $like = false, $negate = false) {
+        $table = $this->escape($table);
+        $field = $this->escape($field);
+        $sortField = $this->escape($sortField);
+        $like === true ? $operator = "LIKE" : $operator = "=";
+        $negate === true ? $negate_operator = "NOT " : $negate_operator = "";
+
+        return $this->getObjectsQuery('SELECT * FROM `' . $table . '` WHERE `'. $field .'`'.$negate_operator. $operator .'? ORDER BY `'.$sortField.'` ' . ($sortAsc ? '' : 'DESC') . ';', array($value));
+    }
+
+    /**
+     * Searches for single object.
+     *
+     * @access public
+     * @param mixed $table
+     * @param mixed $field
+     * @param mixed $value
+     * @return void
+     */
+    public function findObject($table, $field, $value) {
+        $table = $this->escape($table);
+        $field = $this->escape($field);
+
+        return $this->getObjectQuery('SELECT * FROM `' . $table . '` WHERE `' . $field . '` = ? LIMIT 1;', array($value));
+    }
+
+    /**
+     * Get list of items.
+     *
+     * @access public
+     * @param mixed $query (default: null)
+     * @param array $values (default: array())
+     * @param string $class (default: 'stdClass')
+     * @return void
+     */
+    public function getList($query = null, $values = array(), $class = 'stdClass') {
+        $objs = $this->getObjectsQuery($query, $values, $class);
+
+        $list = array();
+        foreach ($objs as $obj) {
+            $columns = array_values((array)$obj);
+            $list[] = $columns[0];
+        }
+
+        return $list;
+    }
+
+    /**
+     * Delete an object from the database
+     *
+     * @param {string} table name
+     * @param {int} object id
+     * @return {boolean} success
+     */
+    public function deleteObject($tableName, $id) {
+        $tableName = $this->escape($tableName);
+
+        return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `id`=?;', array($id));
+    }
+
+    /**
+     * Delete a list of objects from the database
+     *
+     * @param {string} table name
+     * @param {array} list of ids
+     * @return {boolean} success
+     */
+    public function deleteObjects($tableName, $ids) {
+        $tableName = $this->escape($tableName);
+        $num = count($ids);
+        $idParts = array_fill(0, $num, '`id`=?');
+
+        return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE ' . implode(' OR ', $idParts), $ids);
+    }
+
+    /**
+     * Delete specified row
+     *
+     * @access public
+     * @param {string} $tableName
+     * @param {string $field
+     * @param {string $value
+     * @return void
+     */
+    public function deleteRow($tableName, $field, $value, $field2=null, $value2 = null) {
+        $tableName = $this->escape($tableName);
+        $field = $this->escape($field);
+
+        //multiple
+        if(!is_null($field2))
+        return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=? and `'.$field2.'`=?;', array($value, $value2));
+        else
+        return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=?;', array($value));
+    }
+
+    /**
+     * truncate specified table
+     *
+     * @access public
+     * @param {string} $tableName
+     * @return void
+     */
+    public function emptyTable($tableName) {
+        //escape talbe name
+        $tableName = $this->escape($tableName);
+        //execute
+        return $this->runQuery('TRUNCATE TABLE `'.$tableName.'`;');
+    }
 }
 
 
@@ -791,185 +791,185 @@ 
 class Database_PDO extends DB {
 
 
-	/**
-	 * SSL options for db connection
-	 *
-	 * (default value: array ())
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected $pdo_ssl_opts = array ();
-
-	/**
-	 * flag if installation is happenig!
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access public
-	 */
-	public $install = false;
-
-	/**
-	 * Debugging flag
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access protected
-	 */
-	protected $debug = false;
-
-
-
-
-
-
-	/**
-	 * __construct function.
-	 *
-	 * @access public
-	 * @param mixed $host (default: null)
-	 * @param mixed $port (default: null)
-	 * @param mixed $dbname (default: null)
-	 * @param mixed $username (default: null)
-	 * @param mixed $password (default: null)
-	 * @param mixed $charset (default: null)
-	 */
-	public function __construct($username=null, $password=null, $host=null, $port=null, $dbname=null, $charset=null) {
-		# set parameters
-		$this->set_db_params ();
-		# rewrite user/pass if requested - for installation
-		$username==null ? : $this->username = $username;
-		$password==null ? : $this->password = $password;
-		$host==null 	? : $this->host = $host;
-		$port==null 	? : $this->port = $port;
-		$dbname==null 	? : $this->dbname = $dbname;
-
-		# construct
-		parent::__construct($this->username, $this->password, $this->charset, $this->ssl);
-	}
-
-
-	/**
-	 * get database parameters from config.php
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function set_db_params () {
-		# use config file
-		require( dirname(__FILE__) . '/../../config.php' );
-		# set
-		$this->host 	= $db['host'];
-		$this->port 	= $db['port'];
-		$this->username = $db['user'];
-		$this->password = $db['pass'];
-		$this->dbname 	= $db['name'];
-
-		$this->ssl = false;
-		if ($db['ssl']===true) {
-
-			$this->pdo_ssl_opts = array (
-				'ssl_key'    => PDO::MYSQL_ATTR_SSL_KEY,
-				'ssl_cert'   => PDO::MYSQL_ATTR_SSL_CERT,
-				'ssl_ca'     => PDO::MYSQL_ATTR_SSL_CA,
-				'ssl_cipher' => PDO::MYSQL_ATTR_SSL_CIPHER,
-				'ssl_capath' => PDO::MYSQL_ATTR_SSL_CAPATH
-			);
-
-			$this->ssl = array();
-
-			foreach ($this->pdo_ssl_opts as $key => $pdoopt) {
-				if ($db[$key]) {
-					$this->ssl[$pdoopt] = $db[$key];
-				}
-			}
-
-		}
-
-	}
-
-	/**
-	 * connect function.
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function connect() {
-		parent::connect();
-		//@$this->pdo->query('SET NAMES \'' . $this->charset . '\';');
-	}
-
-	/**
-	 * makeDsn function
-	 *
-	 * @access protected
-	 * @return void
-	 */
-	protected function makeDsn() {
-		# for installation
-		if($this->install)	{ return 'mysql:host=' . $this->host . ';port=' . $this->port . ';charset=' . $this->charset; }
-		else				{ return 'mysql:host=' . $this->host . ';port=' . $this->port . ';dbname=' . $this->dbname . ';charset=' . $this->charset; }
-	}
-
-	/**
-	 * more generic static useful methods
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function getColumnInfo() {
-		$columns = $this->getObjectsQuery("
+    /**
+     * SSL options for db connection
+     *
+     * (default value: array ())
+     *
+     * @var array
+     * @access protected
+     */
+    protected $pdo_ssl_opts = array ();
+
+    /**
+     * flag if installation is happenig!
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access public
+     */
+    public $install = false;
+
+    /**
+     * Debugging flag
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access protected
+     */
+    protected $debug = false;
+
+
+
+
+
+
+    /**
+     * __construct function.
+     *
+     * @access public
+     * @param mixed $host (default: null)
+     * @param mixed $port (default: null)
+     * @param mixed $dbname (default: null)
+     * @param mixed $username (default: null)
+     * @param mixed $password (default: null)
+     * @param mixed $charset (default: null)
+     */
+    public function __construct($username=null, $password=null, $host=null, $port=null, $dbname=null, $charset=null) {
+        # set parameters
+        $this->set_db_params ();
+        # rewrite user/pass if requested - for installation
+        $username==null ? : $this->username = $username;
+        $password==null ? : $this->password = $password;
+        $host==null 	? : $this->host = $host;
+        $port==null 	? : $this->port = $port;
+        $dbname==null 	? : $this->dbname = $dbname;
+
+        # construct
+        parent::__construct($this->username, $this->password, $this->charset, $this->ssl);
+    }
+
+
+    /**
+     * get database parameters from config.php
+     *
+     * @access private
+     * @return void
+     */
+    private function set_db_params () {
+        # use config file
+        require( dirname(__FILE__) . '/../../config.php' );
+        # set
+        $this->host 	= $db['host'];
+        $this->port 	= $db['port'];
+        $this->username = $db['user'];
+        $this->password = $db['pass'];
+        $this->dbname 	= $db['name'];
+
+        $this->ssl = false;
+        if ($db['ssl']===true) {
+
+            $this->pdo_ssl_opts = array (
+                'ssl_key'    => PDO::MYSQL_ATTR_SSL_KEY,
+                'ssl_cert'   => PDO::MYSQL_ATTR_SSL_CERT,
+                'ssl_ca'     => PDO::MYSQL_ATTR_SSL_CA,
+                'ssl_cipher' => PDO::MYSQL_ATTR_SSL_CIPHER,
+                'ssl_capath' => PDO::MYSQL_ATTR_SSL_CAPATH
+            );
+
+            $this->ssl = array();
+
+            foreach ($this->pdo_ssl_opts as $key => $pdoopt) {
+                if ($db[$key]) {
+                    $this->ssl[$pdoopt] = $db[$key];
+                }
+            }
+
+        }
+
+    }
+
+    /**
+     * connect function.
+     *
+     * @access public
+     * @return void
+     */
+    public function connect() {
+        parent::connect();
+        //@$this->pdo->query('SET NAMES \'' . $this->charset . '\';');
+    }
+
+    /**
+     * makeDsn function
+     *
+     * @access protected
+     * @return void
+     */
+    protected function makeDsn() {
+        # for installation
+        if($this->install)	{ return 'mysql:host=' . $this->host . ';port=' . $this->port . ';charset=' . $this->charset; }
+        else				{ return 'mysql:host=' . $this->host . ';port=' . $this->port . ';dbname=' . $this->dbname . ';charset=' . $this->charset; }
+    }
+
+    /**
+     * more generic static useful methods
+     *
+     * @access public
+     * @return void
+     */
+    public function getColumnInfo() {
+        $columns = $this->getObjectsQuery("
 			SELECT `table_name`, `column_name`, `column_default`, `is_nullable`, `data_type`,`column_key`, `extra`
 			FROM `columns`
 			WHERE `table_schema`='" . $this->dbname . "';
 		");
 
-		$columnsByTable = array();
-		foreach ($columns as $column) {
-			if (!isset($columnsByTable[$column->table_name])) {
-				$columnsByTable[$column->table_name] = array();
-			}
-
-			$columnsByTable[$column->table_name][$column->column_name] = $column;
-		}
-
-		return $columnsByTable;
-	}
-
-	/**
-	 * getForeignKeyInfo function.
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function getForeignKeyInfo() {
-		$foreignLinks = $this->getObjectsQuery("
+        $columnsByTable = array();
+        foreach ($columns as $column) {
+            if (!isset($columnsByTable[$column->table_name])) {
+                $columnsByTable[$column->table_name] = array();
+            }
+
+            $columnsByTable[$column->table_name][$column->column_name] = $column;
+        }
+
+        return $columnsByTable;
+    }
+
+    /**
+     * getForeignKeyInfo function.
+     *
+     * @access public
+     * @return void
+     */
+    public function getForeignKeyInfo() {
+        $foreignLinks = $this->getObjectsQuery("
 			SELECT i.`table_name`, k.`column_name`, i.`constraint_type`, i.`constraint_name`, k.`referenced_table_name`, k.`referenced_column_name`
 			FROM `table_constraints` i
 			LEFT JOIN `key_column_usage` k ON i.`constraint_name` = k.`constraint_name`
 			WHERE i.`constraint_type` = 'FOREIGN KEY' AND i.`table_schema`='" . $this->dbname . "';
 		");
 
-		$foreignLinksByTable = array();
-		$foreignLinksByRefTable = array();
-		foreach ($foreignLinks as $foreignLink) {
-			if (!isset($foreignLinksByTable[$foreignLink->table_name])) {
-				$foreignLinksByTable[$foreignLink->table_name] = array();
-			}
+        $foreignLinksByTable = array();
+        $foreignLinksByRefTable = array();
+        foreach ($foreignLinks as $foreignLink) {
+            if (!isset($foreignLinksByTable[$foreignLink->table_name])) {
+                $foreignLinksByTable[$foreignLink->table_name] = array();
+            }
 
-			if (!isset($foreignLinksByRefTable[$foreignLink->referenced_table_name])) {
-				$foreignLinksByRefTable[$foreignLink->referenced_table_name] = array();
-			}
+            if (!isset($foreignLinksByRefTable[$foreignLink->referenced_table_name])) {
+                $foreignLinksByRefTable[$foreignLink->referenced_table_name] = array();
+            }
 
-			$foreignLinksByTable[$foreignLink->table_name][$foreignLink->column_name] = $foreignLink;
-			$foreignLinksByRefTable[$foreignLink->referenced_table_name][$foreignLink->table_name] = $foreignLink;
-		}
+            $foreignLinksByTable[$foreignLink->table_name][$foreignLink->column_name] = $foreignLink;
+            $foreignLinksByRefTable[$foreignLink->referenced_table_name][$foreignLink->table_name] = $foreignLink;
+        }
 
-		return array($foreignLinksByTable, $foreignLinksByRefTable);
-	}
+        return array($foreignLinksByTable, $foreignLinksByRefTable);
+    }
 }
 
 

Spacing +199 added lines, -199 removed lines

@@ -56,7 +56,7 @@ 
 	 * @var string
 	 * @access public
 	 */
-	public $dbname 	= '';		// needed for DB check
+	public $dbname = ''; // needed for DB check
 
 	/**
 	 * hosnamr
@@ -66,7 +66,7 @@ 
 	 * @var string
 	 * @access protected
 	 */
-	protected $host 	= 'localhost';
+	protected $host = 'localhost';
 
 	/**
 	 * Default port number
@@ -76,7 +76,7 @@ 
 	 * @var string
 	 * @access protected
 	 */
-	protected $port 	= '3306';
+	protected $port = '3306';
 
 
 
@@ -92,7 +92,7 @@ 
 	 * @param mixed $ssl (default: null)
 	 * @return void
 	 */
-	public function __construct($username = null, $password = null, $charset = null, $ssl = null) {
+	public function __construct ($username = null, $password = null, $charset = null, $ssl = null) {
 		if (isset($username)) $this->username = $username;
 		if (isset($password)) $this->password = $password;
 		if (isset($charset))  $this->charset = $charset;
@@ -110,13 +110,13 @@ 
 	 * @param mixed $date (default: null)
 	 * @return void
 	 */
-	public static function toDate($date = null) {
-		if (is_int($date)) {
-			return date('Y-m-d H:i:s', $date);
-		} else if (is_string($date)) {
-			return date('Y-m-d H:i:s', strtotime($date));
+	public static function toDate ($date = null) {
+		if (is_int ($date)) {
+			return date ('Y-m-d H:i:s', $date);
+		} else if (is_string ($date)) {
+			return date ('Y-m-d H:i:s', strtotime ($date));
 		} else {
-			return date('Y-m-d H:i:s');
+			return date ('Y-m-d H:i:s');
 		}
 	}
 
@@ -127,25 +127,25 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function connect() {
-		$dsn = $this->makeDsn();
+	public function connect () {
+		$dsn = $this->makeDsn ();
 
 		try {
 			# ssl?
 			if ($this->ssl) {
-				$this->pdo = new \PDO($dsn, $this->username, $this->password, $this->ssl);
+				$this->pdo = new \PDO ($dsn, $this->username, $this->password, $this->ssl);
 			}
 			else {
-				$this->pdo = new \PDO($dsn, $this->username, $this->password);
+				$this->pdo = new \PDO ($dsn, $this->username, $this->password);
 			}
 
-			$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+			$this->pdo->setAttribute (\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 
 		} catch (\PDOException $e) {
-			throw new Exception ("Could not connect to database! ".$e->getMessage());
+			throw new Exception ("Could not connect to database! ".$e->getMessage ());
 		}
 
-		@$this->pdo->query('SET NAMES \'' . $this->charset . '\';');
+		@$this->pdo->query ('SET NAMES \''.$this->charset.'\';');
 	}
 
 	/**
@@ -154,8 +154,8 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function makeDsn() {
-		return ':charset=' . $this->charset;
+	protected function makeDsn () {
+		return ':charset='.$this->charset;
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function resetConn() {
+	public function resetConn () {
 		unset($this->pdo);
 		$this->install = false;
 	}
@@ -177,12 +177,12 @@ 
 	 * @return void
 	 */
 	private function log_query ($query) {
-		if($this->debug) {
+		if ($this->debug) {
 
 			$myFile = "/tmp/queries.txt";
-			$fh = fopen($myFile, 'a') or die("can't open file");
-			fwrite($fh, $query->queryString."\n");
-			fclose($fh);
+			$fh = fopen ($myFile, 'a') or die("can't open file");
+			fwrite ($fh, $query->queryString."\n");
+			fclose ($fh);
 		}
 	}
 
@@ -194,18 +194,18 @@ 
 	 * @param mixed $str
 	 * @return void
 	 */
-	public static function unquote_outer($str) {
-		$len = strlen($str);
+	public static function unquote_outer ($str) {
+		$len = strlen ($str);
 
-		if ($len>1) {
-			if ($str[0] == "'" && $str[$len-1] == "'") {
-				return substr($str, 1, -1);
+		if ($len > 1) {
+			if ($str[0] == "'" && $str[$len - 1] == "'") {
+				return substr ($str, 1, -1);
 			} else if ($str[0] == "'") {
-				return substr($str, 1);
-			} else if ($str[$len-1] == "'") {
-				return substr($str, 0, -1);
+				return substr ($str, 1);
+			} else if ($str[$len - 1] == "'") {
+				return substr ($str, 0, -1);
 			}
-		} else if ($len>0) {
+		} else if ($len > 0) {
 			if ($str[0] == "'") {
 				return '';
 			}
@@ -220,7 +220,7 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function isConnected() {
+	public function isConnected () {
 		return ($this->pdo !== null);
 	}
 
@@ -230,8 +230,8 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function lastInsertId() {
-		return $this->pdo->lastInsertId();
+	public function lastInsertId () {
+		return $this->pdo->lastInsertId ();
 	}
 
 	/**
@@ -243,13 +243,13 @@ 
 	 * @param array $values (default: array())
 	 * @return void
 	 */
-	public function runQuery($query, $values = array()) {
-		if (!$this->isConnected()) $this->connect();
+	public function runQuery ($query, $values = array ()) {
+		if (!$this->isConnected ()) $this->connect ();
 
-		$statement = $this->pdo->prepare($query);
+		$statement = $this->pdo->prepare ($query);
 		//debuq
 		$this->log_query ($statement);
-		return $statement->execute((array)$values); //this array cast allows single values to be used as the parameter
+		return $statement->execute ((array) $values); //this array cast allows single values to be used as the parameter
 	}
 
 	/**
@@ -260,10 +260,10 @@ 
 	 * @param mixed $str
 	 * @return void
 	 */
-	public function escape($str) {
-		if (!$this->isConnected()) $this->connect();
+	public function escape ($str) {
+		if (!$this->isConnected ()) $this->connect ();
 
-		return $this->unquote_outer($this->pdo->quote((string)$str));
+		return $this->unquote_outer ($this->pdo->quote ((string) $str));
 	}
 
 	/**
@@ -273,17 +273,17 @@ 
 	 * @param mixed $tableName
 	 * @return void
 	 */
-	public function numObjects($tableName) {
-		if (!$this->isConnected()) $this->connect();
+	public function numObjects ($tableName) {
+		if (!$this->isConnected ()) $this->connect ();
 
-		$tableName = $this->escape($tableName);
-		$statement = $this->pdo->prepare('SELECT COUNT(*) as `num` FROM `'.$tableName.'`;');
+		$tableName = $this->escape ($tableName);
+		$statement = $this->pdo->prepare ('SELECT COUNT(*) as `num` FROM `'.$tableName.'`;');
 
 		//debuq
 		$this->log_query ($statement);
-		$statement->execute();
+		$statement->execute ();
 
-		return $statement->fetchColumn();
+		return $statement->fetchColumn ();
     }
 
 	/**
@@ -296,19 +296,19 @@ 
 	 * @param mixed $value
 	 * @return void
 	 */
-	public function numObjectsFilter($tableName, $method, $value, $like = false) {
-		if (!$this->isConnected()) $this->connect();
+	public function numObjectsFilter ($tableName, $method, $value, $like = false) {
+		if (!$this->isConnected ()) $this->connect ();
 
 		$like === true ? $operator = "LIKE" : $operator = "=";
 
-		$tableName = $this->escape($tableName);
-		$statement = $this->pdo->prepare('SELECT COUNT(*) as `num` FROM `'.$tableName.'` where `'.$method.'` '.$operator.' ?;');
+		$tableName = $this->escape ($tableName);
+		$statement = $this->pdo->prepare ('SELECT COUNT(*) as `num` FROM `'.$tableName.'` where `'.$method.'` '.$operator.' ?;');
 
 		//debuq
 		$this->log_query ($statement);
-		$statement->execute(array($value));
+		$statement->execute (array ($value));
 
-		return $statement->fetchColumn();
+		return $statement->fetchColumn ();
 	}
 
 	/**
@@ -323,25 +323,25 @@ 
 	 * @param mixed $primarykey2 (default: null)
 	 * @return void
 	 */
-	public function updateObject($tableName, $obj, $primarykey = 'id', $primarykey2 = null) {
-		if (!$this->isConnected()) $this->connect();
+	public function updateObject ($tableName, $obj, $primarykey = 'id', $primarykey2 = null) {
+		if (!$this->isConnected ()) $this->connect ();
 
-		$obj = (array)$obj;
+		$obj = (array) $obj;
 
 		//we cannot update an object without an id specified so quit
 		if (!isset($obj[$primarykey])) {
-			throw new Exception('Missing primary key');
+			throw new Exception ('Missing primary key');
 			return false;
 		}
 
-		$tableName = $this->escape($tableName);
+		$tableName = $this->escape ($tableName);
 
 		//get the objects id from the provided object and knock it off from the object so we dont try to update it
 		$objId[] = $obj[$primarykey];
 		unset($obj[$primarykey]);
 
 		//secondary primary key?
-		if(!is_null($primarykey2)) {
+		if (!is_null ($primarykey2)) {
 		$objId[] = $obj[$primarykey2];
 		unset($obj[$primarykey2]);
 		}
@@ -349,28 +349,28 @@ 
 		//TODO: validate given object parameters with that of the table (this validates parameters names)
 
 		//formulate an update statement based on the object parameters
-		$objParams = array_keys($obj);
+		$objParams = array_keys ($obj);
 
-		$preparedParamArr = array();
+		$preparedParamArr = array ();
 		foreach ($objParams as $objParam) {
-			$preparedParamArr[] = '`' . $this->escape($objParam) . '`=?';
+			$preparedParamArr[] = '`'.$this->escape ($objParam).'`=?';
 		}
 
-		$preparedParamStr = implode(',', $preparedParamArr);
+		$preparedParamStr = implode (',', $preparedParamArr);
 
 		//primary key 2?
-		if(!is_null($primarykey2))
-		$statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=? AND `' . $primarykey2 . '`=?;');
+		if (!is_null ($primarykey2))
+		$statement = $this->pdo->prepare ('UPDATE `'.$tableName.'` SET '.$preparedParamStr.' WHERE `'.$primarykey.'`=? AND `'.$primarykey2.'`=?;');
 		else
-		$statement = $this->pdo->prepare('UPDATE `' . $tableName . '` SET ' . $preparedParamStr . ' WHERE `' . $primarykey . '`=?;');
+		$statement = $this->pdo->prepare ('UPDATE `'.$tableName.'` SET '.$preparedParamStr.' WHERE `'.$primarykey.'`=?;');
 
 		//merge the parameters and values
-		$paramValues = array_merge(array_values($obj), $objId);
+		$paramValues = array_merge (array_values ($obj), $objId);
 
 		//debuq
 		$this->log_query ($statement);
 		//run the update on the object
-		return $statement->execute($paramValues);
+		return $statement->execute ($paramValues);
 	}
 
 	/**
@@ -382,21 +382,21 @@ 
 	 * @param array $values
 	 * @return void
 	 */
-	public function updateMultipleObjects($tableName, $ids, $values) {
-		$tableName = $this->escape($tableName);
+	public function updateMultipleObjects ($tableName, $ids, $values) {
+		$tableName = $this->escape ($tableName);
 		//set ids
-		$num = count($ids);
-		$idParts = array_fill(0, $num, '`id`=?');
+		$num = count ($ids);
+		$idParts = array_fill (0, $num, '`id`=?');
 		//set values
-		$objParams = array_keys($values);
-		$preparedParamArr = array();
+		$objParams = array_keys ($values);
+		$preparedParamArr = array ();
 		foreach ($objParams as $objParam) {
-			$preparedParamArr[] = '`' . $this->escape($objParam) . '`=?';
+			$preparedParamArr[] = '`'.$this->escape ($objParam).'`=?';
 		}
 		//set values
-		$all_values = array_merge(array_values($values),$ids);
+		$all_values = array_merge (array_values ($values), $ids);
 		//execute
-		return $this->runQuery('UPDATE `'.$tableName.'` SET '.implode(',', $preparedParamArr).'  WHERE '.implode(' OR ', $idParts), $all_values);
+		return $this->runQuery ('UPDATE `'.$tableName.'` SET '.implode (',', $preparedParamArr).'  WHERE '.implode (' OR ', $idParts), $all_values);
 	}
 
 	/**
@@ -411,47 +411,47 @@ 
 	 * @param bool $ignoreId (default: true)
 	 * @return void
 	 */
-	public function insertObject($tableName, $obj, $raw = false, $replace = false, $ignoreId = true) {
-		if (!$this->isConnected()) $this->connect();
+	public function insertObject ($tableName, $obj, $raw = false, $replace = false, $ignoreId = true) {
+		if (!$this->isConnected ()) $this->connect ();
 
-		$obj = (array)$obj;
+		$obj = (array) $obj;
 
-		$tableName = $this->escape($tableName);
+		$tableName = $this->escape ($tableName);
 
-		if (!$raw && array_key_exists('id', $obj) && $ignoreId) {
+		if (!$raw && array_key_exists ('id', $obj) && $ignoreId) {
 			unset($obj['id']);
 		}
 
-		if (count($obj)<1) {
+		if (count ($obj) < 1) {
 			return true;
 		}
 
 		//formulate an update statement based on the object parameters
-		$objValues = array_values($obj);
+		$objValues = array_values ($obj);
 
-		$preparedParamsArr = array();
+		$preparedParamsArr = array ();
 		foreach ($obj as $key => $value) {
-			$preparedParamsArr[] = '`' . $this->escape($key) . '`';
+			$preparedParamsArr[] = '`'.$this->escape ($key).'`';
 		}
 
-		$preparedParamsStr = implode(', ', $preparedParamsArr);
-		$preparedValuesStr = implode(', ', array_fill(0, count($objValues), '?'));
+		$preparedParamsStr = implode (', ', $preparedParamsArr);
+		$preparedValuesStr = implode (', ', array_fill (0, count ($objValues), '?'));
 
 		if ($replace) {
-			$statement = $this->pdo->prepare('REPLACE INTO `' . $tableName . '` (' . $preparedParamsStr . ') VALUES (' . $preparedValuesStr . ');');
+			$statement = $this->pdo->prepare ('REPLACE INTO `'.$tableName.'` ('.$preparedParamsStr.') VALUES ('.$preparedValuesStr.');');
 		} else {
-			$statement = $this->pdo->prepare('INSERT INTO `' . $tableName . '` (' . $preparedParamsStr . ') VALUES (' . $preparedValuesStr . ');');
+			$statement = $this->pdo->prepare ('INSERT INTO `'.$tableName.'` ('.$preparedParamsStr.') VALUES ('.$preparedValuesStr.');');
 		}
 
 		//run the update on the object
-		if (!$statement->execute($objValues)) {
-			$errObj = $statement->errorInfo();
+		if (!$statement->execute ($objValues)) {
+			$errObj = $statement->errorInfo ();
 
 			//return false;
-			throw new Exception($errObj[2]);
+			throw new Exception ($errObj[2]);
 		}
 
-		return $this->pdo->lastInsertId();
+		return $this->pdo->lastInsertId ();
 	}
 
 
@@ -465,8 +465,8 @@ 
 	 * @param mixed $id (default: null)
 	 * @return void
 	 */
-	public function objectExists($tableName, $query = null, $values = array(), $id = null) {
-		return is_object($this->getObject($tableName, $id));
+	public function objectExists ($tableName, $query = null, $values = array (), $id = null) {
+		return is_object ($this->getObject ($tableName, $id));
 	}
 
 	/**
@@ -481,8 +481,8 @@ 
 	 * @param string $class (default: 'stdClass')
 	 * @return void
 	 */
-	public function getObjects($tableName, $sortField = 'id', $sortAsc = true, $numRecords = null, $offset = 0, $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
+	public function getObjects ($tableName, $sortField = 'id', $sortAsc = true, $numRecords = null, $offset = 0, $class = 'stdClass') {
+		if (!$this->isConnected ()) $this->connect ();
 
 		$sortStr = '';
 		if (!$sortAsc) {
@@ -490,21 +490,21 @@ 
 		}
 
 		//we should escape all of the params that we need to
-		$tableName = $this->escape($tableName);
-		$sortField = $this->escape($sortField);
+		$tableName = $this->escape ($tableName);
+		$sortField = $this->escape ($sortField);
 
 		if ($numRecords === null) {
 			//get all (no limit)
-			$statement = $this->pdo->query('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.';');
+			$statement = $this->pdo->query ('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.';');
 		} else {
 			//get a limited range of objects
-			$statement = $this->pdo->query('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.' LIMIT '.$numRecords.' OFFSET '.$offset.';');
+			$statement = $this->pdo->query ('SELECT * FROM `'.$tableName.'` ORDER BY `'.$sortField.'` '.$sortStr.' LIMIT '.$numRecords.' OFFSET '.$offset.';');
 		}
 
-		$results = array();
+		$results = array ();
 
-		if (is_object($statement)) {
-			while ($newObj = $statement->fetchObject($class)) {
+		if (is_object ($statement)) {
+			while ($newObj = $statement->fetchObject ($class)) {
 				$results[] = $newObj;
 			}
 		}
@@ -522,19 +522,19 @@ 
 	 * @param mixed $callback (default: null)
 	 * @return void
 	 */
-	public function getObjectsQueryIncremental($query = null, $values = array(), $callback = null) {
-		if (!$this->isConnected()) $this->connect();
+	public function getObjectsQueryIncremental ($query = null, $values = array (), $callback = null) {
+		if (!$this->isConnected ()) $this->connect ();
 
-		$statement = $this->pdo->prepare($query);
+		$statement = $this->pdo->prepare ($query);
 
 		//debuq
 		$this->log_query ($statement);
-		$statement->execute((array)$values);
+		$statement->execute ((array) $values);
 
-		if (is_object($statement)) {
+		if (is_object ($statement)) {
 			if ($callback) {
-				while ($newObj = $statement->fetchObject('stdClass')) {
-					if ($callback($newObj)===false) {
+				while ($newObj = $statement->fetchObject ('stdClass')) {
+					if ($callback ($newObj) === false) {
 						return false;
 					}
 				}
@@ -554,19 +554,19 @@ 
 	 * @param string $class (default: 'stdClass')
 	 * @return void
 	 */
-	public function getObjectsQuery($query = null, $values = array(), $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
+	public function getObjectsQuery ($query = null, $values = array (), $class = 'stdClass') {
+		if (!$this->isConnected ()) $this->connect ();
 
-		$statement = $this->pdo->prepare($query);
+		$statement = $this->pdo->prepare ($query);
 
 		//debug
 		$this->log_query ($statement);
-		$statement->execute((array)$values);
+		$statement->execute ((array) $values);
 
-		$results = array();
+		$results = array ();
 
-		if (is_object($statement)) {
-			while ($newObj = $statement->fetchObject($class)) {
+		if (is_object ($statement)) {
+			while ($newObj = $statement->fetchObject ($class)) {
 				$results[] = $newObj;
 			}
 		}
@@ -583,27 +583,27 @@ 
 	 * @param string $class (default: 'stdClass')
 	 * @return void
 	 */
-	public function getObject($tableName, $id = null, $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
-		$id = intval($id);
+	public function getObject ($tableName, $id = null, $class = 'stdClass') {
+		if (!$this->isConnected ()) $this->connect ();
+		$id = intval ($id);
 
 		//has a custom query been provided?
-		$tableName = $this->escape($tableName);
+		$tableName = $this->escape ($tableName);
 
 		//prepare a statement to get a single object from the database
 		if ($id !== null) {
-			$statement = $this->pdo->prepare('SELECT * FROM `'.$tableName.'` WHERE `id`=? LIMIT 1;');
-			$statement->bindParam(1, $id, \PDO::PARAM_INT);
+			$statement = $this->pdo->prepare ('SELECT * FROM `'.$tableName.'` WHERE `id`=? LIMIT 1;');
+			$statement->bindParam (1, $id, \PDO::PARAM_INT);
 		} else {
-			$statement = $this->pdo->prepare('SELECT * FROM `'.$tableName.'` LIMIT 1;');
+			$statement = $this->pdo->prepare ('SELECT * FROM `'.$tableName.'` LIMIT 1;');
 		}
 
 		//debuq
 		$this->log_query ($statement);
-		$statement->execute();
+		$statement->execute ();
 
 		//we can then extract the single object (if we have a result)
-		$resultObj = $statement->fetchObject($class);
+		$resultObj = $statement->fetchObject ($class);
 
 		if ($resultObj === false) {
 			return null;
@@ -621,15 +621,15 @@ 
 	 * @param string $class (default: 'stdClass')
 	 * @return void
 	 */
-	public function getObjectQuery($query = null, $values = array(), $class = 'stdClass') {
-		if (!$this->isConnected()) $this->connect();
+	public function getObjectQuery ($query = null, $values = array (), $class = 'stdClass') {
+		if (!$this->isConnected ()) $this->connect ();
 
-		$statement = $this->pdo->prepare($query);
+		$statement = $this->pdo->prepare ($query);
 		//debuq
 		$this->log_query ($statement);
-		$statement->execute((array)$values);
+		$statement->execute ((array) $values);
 
-		$resultObj = $statement->fetchObject($class);
+		$resultObj = $statement->fetchObject ($class);
 
 		if ($resultObj === false) {
 			return null;
@@ -647,12 +647,12 @@ 
 	 * @param string $class (default: 'stdClass')
 	 * @return void
 	 */
-	public function getValueQuery($query = null, $values = array(), $class = 'stdClass') {
-		$obj = $this->getObjectQuery($query, $values, $class);
+	public function getValueQuery ($query = null, $values = array (), $class = 'stdClass') {
+		$obj = $this->getObjectQuery ($query, $values, $class);
 
-		if (is_object($obj)) {
-			$obj = (array)$obj;
-			return reset($obj);
+		if (is_object ($obj)) {
+			$obj = (array) $obj;
+			return reset ($obj);
 		} else {
 			return null;
 		}
@@ -671,14 +671,14 @@ 
 	 * @param bool $negate (default: false)
 	 * @return void
 	 */
-	public function findObjects($table, $field, $value, $sortField = 'id', $sortAsc = true, $like = false, $negate = false) {
-		$table = $this->escape($table);
-		$field = $this->escape($field);
-		$sortField = $this->escape($sortField);
+	public function findObjects ($table, $field, $value, $sortField = 'id', $sortAsc = true, $like = false, $negate = false) {
+		$table = $this->escape ($table);
+		$field = $this->escape ($field);
+		$sortField = $this->escape ($sortField);
 		$like === true ? $operator = "LIKE" : $operator = "=";
 		$negate === true ? $negate_operator = "NOT " : $negate_operator = "";
 
-		return $this->getObjectsQuery('SELECT * FROM `' . $table . '` WHERE `'. $field .'`'.$negate_operator. $operator .'? ORDER BY `'.$sortField.'` ' . ($sortAsc ? '' : 'DESC') . ';', array($value));
+		return $this->getObjectsQuery ('SELECT * FROM `'.$table.'` WHERE `'.$field.'`'.$negate_operator.$operator.'? ORDER BY `'.$sortField.'` '.($sortAsc ? '' : 'DESC').';', array ($value));
 	}
 
 	/**
@@ -690,11 +690,11 @@ 
 	 * @param mixed $value
 	 * @return void
 	 */
-	public function findObject($table, $field, $value) {
-		$table = $this->escape($table);
-		$field = $this->escape($field);
+	public function findObject ($table, $field, $value) {
+		$table = $this->escape ($table);
+		$field = $this->escape ($field);
 
-		return $this->getObjectQuery('SELECT * FROM `' . $table . '` WHERE `' . $field . '` = ? LIMIT 1;', array($value));
+		return $this->getObjectQuery ('SELECT * FROM `'.$table.'` WHERE `'.$field.'` = ? LIMIT 1;', array ($value));
 	}
 
 	/**
@@ -706,12 +706,12 @@ 
 	 * @param string $class (default: 'stdClass')
 	 * @return void
 	 */
-	public function getList($query = null, $values = array(), $class = 'stdClass') {
-		$objs = $this->getObjectsQuery($query, $values, $class);
+	public function getList ($query = null, $values = array (), $class = 'stdClass') {
+		$objs = $this->getObjectsQuery ($query, $values, $class);
 
-		$list = array();
+		$list = array ();
 		foreach ($objs as $obj) {
-			$columns = array_values((array)$obj);
+			$columns = array_values ((array) $obj);
 			$list[] = $columns[0];
 		}
 
@@ -725,10 +725,10 @@ 
 	* @param {int} object id
 	* @return {boolean} success
 	*/
-	public function deleteObject($tableName, $id) {
-		$tableName = $this->escape($tableName);
+	public function deleteObject ($tableName, $id) {
+		$tableName = $this->escape ($tableName);
 
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `id`=?;', array($id));
+		return $this->runQuery ('DELETE FROM `'.$tableName.'` WHERE `id`=?;', array ($id));
 	}
 
 	/**
@@ -738,12 +738,12 @@ 
 	* @param {array} list of ids
 	* @return {boolean} success
 	*/
-	public function deleteObjects($tableName, $ids) {
-		$tableName = $this->escape($tableName);
-		$num = count($ids);
-		$idParts = array_fill(0, $num, '`id`=?');
+	public function deleteObjects ($tableName, $ids) {
+		$tableName = $this->escape ($tableName);
+		$num = count ($ids);
+		$idParts = array_fill (0, $num, '`id`=?');
 
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE ' . implode(' OR ', $idParts), $ids);
+		return $this->runQuery ('DELETE FROM `'.$tableName.'` WHERE '.implode (' OR ', $idParts), $ids);
 	}
 
 	/**
@@ -755,15 +755,15 @@ 
 	 * @param {string $value
 	 * @return void
 	 */
-	public function deleteRow($tableName, $field, $value, $field2=null, $value2 = null) {
-		$tableName = $this->escape($tableName);
-		$field = $this->escape($field);
+	public function deleteRow ($tableName, $field, $value, $field2 = null, $value2 = null) {
+		$tableName = $this->escape ($tableName);
+		$field = $this->escape ($field);
 
 		//multiple
-		if(!is_null($field2))
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=? and `'.$field2.'`=?;', array($value, $value2));
+		if (!is_null ($field2))
+		return $this->runQuery ('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=? and `'.$field2.'`=?;', array ($value, $value2));
 		else
-		return $this->runQuery('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=?;', array($value));
+		return $this->runQuery ('DELETE FROM `'.$tableName.'` WHERE `'.$field.'`=?;', array ($value));
 	}
 
 	/**
@@ -773,11 +773,11 @@ 
 	 * @param {string} $tableName
 	 * @return void
 	 */
-	public function emptyTable($tableName) {
+	public function emptyTable ($tableName) {
 		//escape talbe name
-		$tableName = $this->escape($tableName);
+		$tableName = $this->escape ($tableName);
 		//execute
-		return $this->runQuery('TRUNCATE TABLE `'.$tableName.'`;');
+		return $this->runQuery ('TRUNCATE TABLE `'.$tableName.'`;');
 	}
 }
 
@@ -837,18 +837,18 @@ 
 	 * @param mixed $password (default: null)
 	 * @param mixed $charset (default: null)
 	 */
-	public function __construct($username=null, $password=null, $host=null, $port=null, $dbname=null, $charset=null) {
+	public function __construct ($username = null, $password = null, $host = null, $port = null, $dbname = null, $charset = null) {
 		# set parameters
 		$this->set_db_params ();
 		# rewrite user/pass if requested - for installation
-		$username==null ? : $this->username = $username;
-		$password==null ? : $this->password = $password;
-		$host==null 	? : $this->host = $host;
-		$port==null 	? : $this->port = $port;
-		$dbname==null 	? : $this->dbname = $dbname;
+		$username == null ? : $this->username = $username;
+		$password == null ? : $this->password = $password;
+		$host == null ? : $this->host = $host;
+		$port == null ? : $this->port = $port;
+		$dbname == null ? : $this->dbname = $dbname;
 
 		# construct
-		parent::__construct($this->username, $this->password, $this->charset, $this->ssl);
+		parent::__construct ($this->username, $this->password, $this->charset, $this->ssl);
 	}
 
 
@@ -860,16 +860,16 @@ 
 	 */
 	private function set_db_params () {
 		# use config file
-		require( dirname(__FILE__) . '/../../config.php' );
+		require(dirname (__FILE__).'/../../config.php');
 		# set
 		$this->host 	= $db['host'];
 		$this->port 	= $db['port'];
 		$this->username = $db['user'];
 		$this->password = $db['pass'];
-		$this->dbname 	= $db['name'];
+		$this->dbname = $db['name'];
 
 		$this->ssl = false;
-		if ($db['ssl']===true) {
+		if ($db['ssl'] === true) {
 
 			$this->pdo_ssl_opts = array (
 				'ssl_key'    => PDO::MYSQL_ATTR_SSL_KEY,
@@ -879,7 +879,7 @@ 
 				'ssl_capath' => PDO::MYSQL_ATTR_SSL_CAPATH
 			);
 
-			$this->ssl = array();
+			$this->ssl = array ();
 
 			foreach ($this->pdo_ssl_opts as $key => $pdoopt) {
 				if ($db[$key]) {
@@ -897,8 +897,8 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function connect() {
-		parent::connect();
+	public function connect () {
+		parent::connect ();
 		//@$this->pdo->query('SET NAMES \'' . $this->charset . '\';');
 	}
 
@@ -908,10 +908,10 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function makeDsn() {
+	protected function makeDsn () {
 		# for installation
-		if($this->install)	{ return 'mysql:host=' . $this->host . ';port=' . $this->port . ';charset=' . $this->charset; }
-		else				{ return 'mysql:host=' . $this->host . ';port=' . $this->port . ';dbname=' . $this->dbname . ';charset=' . $this->charset; }
+		if ($this->install) { return 'mysql:host='.$this->host.';port='.$this->port.';charset='.$this->charset; }
+		else { return 'mysql:host='.$this->host.';port='.$this->port.';dbname='.$this->dbname.';charset='.$this->charset; }
 	}
 
 	/**
@@ -920,17 +920,17 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function getColumnInfo() {
-		$columns = $this->getObjectsQuery("
+	public function getColumnInfo () {
+		$columns = $this->getObjectsQuery ("
 			SELECT `table_name`, `column_name`, `column_default`, `is_nullable`, `data_type`,`column_key`, `extra`
 			FROM `columns`
-			WHERE `table_schema`='" . $this->dbname . "';
+			WHERE `table_schema`='" . $this->dbname."';
 		");
 
-		$columnsByTable = array();
+		$columnsByTable = array ();
 		foreach ($columns as $column) {
 			if (!isset($columnsByTable[$column->table_name])) {
-				$columnsByTable[$column->table_name] = array();
+				$columnsByTable[$column->table_name] = array ();
 			}
 
 			$columnsByTable[$column->table_name][$column->column_name] = $column;
@@ -945,30 +945,30 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function getForeignKeyInfo() {
-		$foreignLinks = $this->getObjectsQuery("
+	public function getForeignKeyInfo () {
+		$foreignLinks = $this->getObjectsQuery ("
 			SELECT i.`table_name`, k.`column_name`, i.`constraint_type`, i.`constraint_name`, k.`referenced_table_name`, k.`referenced_column_name`
 			FROM `table_constraints` i
 			LEFT JOIN `key_column_usage` k ON i.`constraint_name` = k.`constraint_name`
-			WHERE i.`constraint_type` = 'FOREIGN KEY' AND i.`table_schema`='" . $this->dbname . "';
+			WHERE i.`constraint_type` = 'FOREIGN KEY' AND i.`table_schema`='" . $this->dbname."';
 		");
 
-		$foreignLinksByTable = array();
-		$foreignLinksByRefTable = array();
+		$foreignLinksByTable = array ();
+		$foreignLinksByRefTable = array ();
 		foreach ($foreignLinks as $foreignLink) {
 			if (!isset($foreignLinksByTable[$foreignLink->table_name])) {
-				$foreignLinksByTable[$foreignLink->table_name] = array();
+				$foreignLinksByTable[$foreignLink->table_name] = array ();
 			}
 
 			if (!isset($foreignLinksByRefTable[$foreignLink->referenced_table_name])) {
-				$foreignLinksByRefTable[$foreignLink->referenced_table_name] = array();
+				$foreignLinksByRefTable[$foreignLink->referenced_table_name] = array ();
 			}
 
 			$foreignLinksByTable[$foreignLink->table_name][$foreignLink->column_name] = $foreignLink;
 			$foreignLinksByRefTable[$foreignLink->referenced_table_name][$foreignLink->table_name] = $foreignLink;
 		}
 
-		return array($foreignLinksByTable, $foreignLinksByRefTable);
+		return array ($foreignLinksByTable, $foreignLinksByRefTable);
 	}
 }
 

functions/version.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /* set latest version */
-define("VERSION", "1.21");									//version changes if database structure changes
+define ("VERSION", "1.21"); //version changes if database structure changes
 /* set latest revision */
-define("REVISION", "001");									//revision always changes, verision only if database structure changes
+define ("REVISION", "001"); //revision always changes, verision only if database structure changes
 /* set last possible upgrade */
-define("LAST_POSSIBLE", "1.1");								//minimum required version to be able to upgrade
+define ("LAST_POSSIBLE", "1.1"); //minimum required version to be able to upgrade
 ?>

index.php

Braces +6 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 	# make upgrade and php build checks
 	include('functions/checks/check_db_upgrade.php'); 	# check if database needs upgrade
 	include('functions/checks/check_php_build.php');	# check for support for PHP modules and database connection
-	if($_GET['switch'] && $_SESSION['realipamusername'] && $_GET['switch'] == "back"){
+	if($_GET['switch'] && $_SESSION['realipamusername'] && $_GET['switch'] == "back") {
 		$_SESSION['ipamusername'] = $_SESSION['realipamusername'];
 		unset($_SESSION['realipamusername']);
 		print	'<script>window.location.href = "'.create_link(null).'";</script>';
@@ -158,7 +158,10 @@ 
 <!-- page sections / menu -->
 <div class="content">
 <div id="sections_overlay">
-    <?php if($_GET['page']!="login" && $_GET['page']!="request_ip" && $_GET['page']!="upgrade" && $_GET['page']!="install" && $User->user->passChange!="Yes")  include('app/sections/index.php');?>
+    <?php if($_GET['page']!="login" && $_GET['page']!="request_ip" && $_GET['page']!="upgrade" && $_GET['page']!="install" && $User->user->passChange!="Yes") {
+    include('app/sections/index.php');
+}
+?>
 </div>
 </div>
 
@@ -210,7 +213,7 @@ 
 				print "<div id='leftMenu' class='menu-$_GET[page]'>";
 					if($_GET['page'] == "subnets" || $_GET['page'] == "vlan" ||
 					   $_GET['page'] == "vrf" 	  || $_GET['page'] == "folder")			{ include("app/subnets/subnets-menu.php"); }
-					else if ($_GET['page'] == "tools")									{ include("app/tools/tools-menu.php"); }
+					   else if ($_GET['page'] == "tools")									{ include("app/tools/tools-menu.php"); }
 					else if ($_GET['page'] == "administration")							{ include("app/admin/admin-menu.php"); }
 				print "</div>";
 				print "</td>";

Indentation +124 added lines, -124 removed lines

@@ -13,23 +13,23 @@ 
 
 # if not install fetch settings etc
 if($_GET['page']!="install" ) {
-	# database object
-	$Database 	= new Database_PDO;
-
-	# check if this is a new installation
-	require('functions/checks/check_db_install.php');
-
-	# initialize objects
-	$Result		= new Result;
-	$User		= new User ($Database);
-	$Sections	= new Sections ($Database);
-	$Subnets	= new Subnets ($Database);
-	$Tools	    = new Tools ($Database);
-	$Addresses	= new Addresses ($Database);
-	$Log 		= new Logging ($Database);
-
-	# reset url for base
-	$url = $User->createURL ();
+    # database object
+    $Database 	= new Database_PDO;
+
+    # check if this is a new installation
+    require('functions/checks/check_db_install.php');
+
+    # initialize objects
+    $Result		= new Result;
+    $User		= new User ($Database);
+    $Sections	= new Sections ($Database);
+    $Subnets	= new Subnets ($Database);
+    $Tools	    = new Tools ($Database);
+    $Addresses	= new Addresses ($Database);
+    $Log 		= new Logging ($Database);
+
+    # reset url for base
+    $url = $User->createURL ();
 }
 
 /** include proper subpage **/
@@ -39,17 +39,17 @@ 
 elseif($_GET['page']=="temp_share")	{ require("app/temp_share/index.php"); }
 elseif($_GET['page']=="request_ip")	{ require("app/login/index.php"); }
 else {
-	# verify that user is logged in
-	$User->check_user_session();
-
-	# make upgrade and php build checks
-	include('functions/checks/check_db_upgrade.php'); 	# check if database needs upgrade
-	include('functions/checks/check_php_build.php');	# check for support for PHP modules and database connection
-	if($_GET['switch'] && $_SESSION['realipamusername'] && $_GET['switch'] == "back"){
-		$_SESSION['ipamusername'] = $_SESSION['realipamusername'];
-		unset($_SESSION['realipamusername']);
-		print	'<script>window.location.href = "'.create_link(null).'";</script>';
-	}
+    # verify that user is logged in
+    $User->check_user_session();
+
+    # make upgrade and php build checks
+    include('functions/checks/check_db_upgrade.php'); 	# check if database needs upgrade
+    include('functions/checks/check_php_build.php');	# check for support for PHP modules and database connection
+    if($_GET['switch'] && $_SESSION['realipamusername'] && $_GET['switch'] == "back"){
+        $_SESSION['ipamusername'] = $_SESSION['realipamusername'];
+        unset($_SESSION['realipamusername']);
+        print	'<script>window.location.href = "'.create_link(null).'";</script>';
+    }
 ?>
 <!DOCTYPE HTML>
 <html lang="en">
@@ -168,102 +168,102 @@ 
 <div class="container-fluid" id="mainContainer">
 		<?php
 
-		/* error */
-		if($_GET['page'] == "error") {
-			print "<div id='error' class='container'>";
-			include_once('app/error.php');
-			print "</div>";
-		}
-		/* password reset required */
-		elseif($User->user->passChange=="Yes") {
-			print "<div id='dashboard' class='container'>";
-			include_once("app/tools/pass-change/form.php");
-			print "</div>";
-		}
-		/* dashboard */
-		elseif(!isset($_GET['page']) || $_GET['page'] == "dashboard") {
-			print "<div id='dashboard'>";
-			include_once("app/dashboard/index.php");
-			print "</div>";
-		}
-		/* widgets */
-		elseif($_GET['page']=="widgets") {
-			print "<div id='dashboard' class='container'>";
-			include_once("app/dashboard/widgets/index.php");
-			print "</div>";
-		}
-		/* content */
-		else {
-			print "<table id='subnetsMenu'>";
-			print "<tr>";
-
-			# fix for empty section
-			if( isset($_GET['section']) && (strlen($_GET['section']) == 0) )			{ unset($_GET['section']); }
-
-			# hide left menu
-			if( ($_GET['page']=="tools"||$_GET['page']=="administration") && !isset($_GET['section'])) {
-				//we dont display left menu on empty tools and administration
-			}
-			else {
-				# left menu
-				print "<td id='subnetsLeft'>";
-				print "<div id='leftMenu' class='menu-$_GET[page]'>";
-					if($_GET['page'] == "subnets" || $_GET['page'] == "vlan" ||
-					   $_GET['page'] == "vrf" 	  || $_GET['page'] == "folder")			{ include("app/subnets/subnets-menu.php"); }
-					else if ($_GET['page'] == "tools")									{ include("app/tools/tools-menu.php"); }
-					else if ($_GET['page'] == "administration")							{ include("app/admin/admin-menu.php"); }
-				print "</div>";
-				print "</td>";
-
-			}
-
-			# content
-			print "<td id='subnetsContent'>";
-			print "<div class='row menu-$_GET[page]' id='content'>";
-				# subnets
-				if ($_GET['page']=="subnets") {
-					if(@$_GET['sPage'] == "address-details")							{ include("app/subnets/addresses/address-details.php"); }
-					elseif(@$_GET['sPage'] == "changelog")								{ include("app/subnets/subnet-changelog.php"); }
-					elseif(!isset($_GET['subnetId']))									{ include("app/sections/section-subnets.php"); }
-					else																{ include("app/subnets/index.php"); }
-				}
-				# vrf
-				elseif ($_GET['page']=="vrf") 											{ include("app/vrf/index.php"); }
-				# vlan
-				elseif ($_GET['page']=="vlan") 											{ include("app/vlan/index.php"); }
-				# folder
-				elseif ($_GET['page']=="folder") 										{ include("app/folder/index.php"); }
-				# tools
-				elseif ($_GET['page']=="tools") {
-					if (!isset($_GET['section']))										{ include("app/tools/index.php"); }
-					else {
-						if(!file_exists("app/tools/$_GET[section]/index.php")) 			{ header("Location: ".create_link("error","404")); }
-						else 															{ include("app/tools/$_GET[section]/index.php"); }
-					}
-				}
-				# admin
-				elseif ($_GET['page']=="administration") {
-					# Admin object
-					$Admin = new Admin ($Database);
-
-					if (!isset($_GET['section']))										{ include("app/admin/index.php"); }
-					elseif (@$_GET['subnetId']=="section-changelog")					{ include("app/sections/section-changelog.php"); }
-					else {
-						if(!file_exists("app/admin/$_GET[section]/index.php")) 			{ header("Location: ".create_link("error","404")); }
-						else 															{ include("app/admin/$_GET[section]/index.php"); }
-					}
-				}
-				# default - error
-				else {
-																						{ header("Location: ".create_link("error","404")); }
-				}
-			print "</div>";
-			print "</td>";
-
-			print "</tr>";
-			print "</table>";
-    	}
-    	?>
+        /* error */
+        if($_GET['page'] == "error") {
+            print "<div id='error' class='container'>";
+            include_once('app/error.php');
+            print "</div>";
+        }
+        /* password reset required */
+        elseif($User->user->passChange=="Yes") {
+            print "<div id='dashboard' class='container'>";
+            include_once("app/tools/pass-change/form.php");
+            print "</div>";
+        }
+        /* dashboard */
+        elseif(!isset($_GET['page']) || $_GET['page'] == "dashboard") {
+            print "<div id='dashboard'>";
+            include_once("app/dashboard/index.php");
+            print "</div>";
+        }
+        /* widgets */
+        elseif($_GET['page']=="widgets") {
+            print "<div id='dashboard' class='container'>";
+            include_once("app/dashboard/widgets/index.php");
+            print "</div>";
+        }
+        /* content */
+        else {
+            print "<table id='subnetsMenu'>";
+            print "<tr>";
+
+            # fix for empty section
+            if( isset($_GET['section']) && (strlen($_GET['section']) == 0) )			{ unset($_GET['section']); }
+
+            # hide left menu
+            if( ($_GET['page']=="tools"||$_GET['page']=="administration") && !isset($_GET['section'])) {
+                //we dont display left menu on empty tools and administration
+            }
+            else {
+                # left menu
+                print "<td id='subnetsLeft'>";
+                print "<div id='leftMenu' class='menu-$_GET[page]'>";
+                    if($_GET['page'] == "subnets" || $_GET['page'] == "vlan" ||
+                       $_GET['page'] == "vrf" 	  || $_GET['page'] == "folder")			{ include("app/subnets/subnets-menu.php"); }
+                    else if ($_GET['page'] == "tools")									{ include("app/tools/tools-menu.php"); }
+                    else if ($_GET['page'] == "administration")							{ include("app/admin/admin-menu.php"); }
+                print "</div>";
+                print "</td>";
+
+            }
+
+            # content
+            print "<td id='subnetsContent'>";
+            print "<div class='row menu-$_GET[page]' id='content'>";
+                # subnets
+                if ($_GET['page']=="subnets") {
+                    if(@$_GET['sPage'] == "address-details")							{ include("app/subnets/addresses/address-details.php"); }
+                    elseif(@$_GET['sPage'] == "changelog")								{ include("app/subnets/subnet-changelog.php"); }
+                    elseif(!isset($_GET['subnetId']))									{ include("app/sections/section-subnets.php"); }
+                    else																{ include("app/subnets/index.php"); }
+                }
+                # vrf
+                elseif ($_GET['page']=="vrf") 											{ include("app/vrf/index.php"); }
+                # vlan
+                elseif ($_GET['page']=="vlan") 											{ include("app/vlan/index.php"); }
+                # folder
+                elseif ($_GET['page']=="folder") 										{ include("app/folder/index.php"); }
+                # tools
+                elseif ($_GET['page']=="tools") {
+                    if (!isset($_GET['section']))										{ include("app/tools/index.php"); }
+                    else {
+                        if(!file_exists("app/tools/$_GET[section]/index.php")) 			{ header("Location: ".create_link("error","404")); }
+                        else 															{ include("app/tools/$_GET[section]/index.php"); }
+                    }
+                }
+                # admin
+                elseif ($_GET['page']=="administration") {
+                    # Admin object
+                    $Admin = new Admin ($Database);
+
+                    if (!isset($_GET['section']))										{ include("app/admin/index.php"); }
+                    elseif (@$_GET['subnetId']=="section-changelog")					{ include("app/sections/section-changelog.php"); }
+                    else {
+                        if(!file_exists("app/admin/$_GET[section]/index.php")) 			{ header("Location: ".create_link("error","404")); }
+                        else 															{ include("app/admin/$_GET[section]/index.php"); }
+                    }
+                }
+                # default - error
+                else {
+                                                                                        { header("Location: ".create_link("error","404")); }
+                }
+            print "</div>";
+            print "</td>";
+
+            print "</tr>";
+            print "</table>";
+        }
+        ?>
 
 </div>
 </div>

Spacing +55 added lines, -55 removed lines

@@ -1,55 +1,55 @@ 
 <?php
-ob_start();
+ob_start ();
 
 /* config */
-if (!file_exists("config.php"))	{ die("<br><hr>-- config.php file missing! Please copy default config file `config.dist.php` to `config.php` and set configuration! --<hr><br>phpipam installation documentation: <a href='http://phpipam.net/documents/installation/'>http://phpipam.net/documents/installation/</a>"); }
-else 							{ require('config.php'); }
+if (!file_exists ("config.php")) { die("<br><hr>-- config.php file missing! Please copy default config file `config.dist.php` to `config.php` and set configuration! --<hr><br>phpipam installation documentation: <a href='http://phpipam.net/documents/installation/'>http://phpipam.net/documents/installation/</a>"); }
+else { require('config.php'); }
 
 /* site functions */
 require('functions/functions.php');
 
 # set default page
-if(!isset($_GET['page'])) { $_GET['page'] = "dashboard"; }
+if (!isset($_GET['page'])) { $_GET['page'] = "dashboard"; }
 
 # if not install fetch settings etc
-if($_GET['page']!="install" ) {
+if ($_GET['page'] != "install") {
 	# database object
-	$Database 	= new Database_PDO;
+	$Database = new Database_PDO;
 
 	# check if this is a new installation
 	require('functions/checks/check_db_install.php');
 
 	# initialize objects
 	$Result		= new Result;
-	$User		= new User ($Database);
-	$Sections	= new Sections ($Database);
+	$User = new User ($Database);
+	$Sections = new Sections ($Database);
 	$Subnets	= new Subnets ($Database);
 	$Tools	    = new Tools ($Database);
 	$Addresses	= new Addresses ($Database);
-	$Log 		= new Logging ($Database);
+	$Log = new Logging ($Database);
 
 	# reset url for base
 	$url = $User->createURL ();
 }
 
 /** include proper subpage **/
-if($_GET['page']=="install")		{ require("app/install/index.php"); }
-elseif($_GET['page']=="upgrade")	{ require("app/upgrade/index.php"); }
-elseif($_GET['page']=="login")		{ require("app/login/index.php"); }
-elseif($_GET['page']=="temp_share")	{ require("app/temp_share/index.php"); }
-elseif($_GET['page']=="request_ip")	{ require("app/login/index.php"); }
-elseif($_GET['page']=="opensearch")	{ require("app/tools/search/opensearch.php"); }
+if ($_GET['page'] == "install") { require("app/install/index.php"); }
+elseif ($_GET['page'] == "upgrade") { require("app/upgrade/index.php"); }
+elseif ($_GET['page'] == "login") { require("app/login/index.php"); }
+elseif ($_GET['page'] == "temp_share") { require("app/temp_share/index.php"); }
+elseif ($_GET['page'] == "request_ip") { require("app/login/index.php"); }
+elseif ($_GET['page'] == "opensearch") { require("app/tools/search/opensearch.php"); }
 else {
 	# verify that user is logged in
-	$User->check_user_session();
+	$User->check_user_session ();
 
 	# make upgrade and php build checks
-	include('functions/checks/check_db_upgrade.php'); 	# check if database needs upgrade
-	include('functions/checks/check_php_build.php');	# check for support for PHP modules and database connection
-	if($_GET['switch'] && $_SESSION['realipamusername'] && $_GET['switch'] == "back"){
+	include('functions/checks/check_db_upgrade.php'); # check if database needs upgrade
+	include('functions/checks/check_php_build.php'); # check for support for PHP modules and database connection
+	if ($_GET['switch'] && $_SESSION['realipamusername'] && $_GET['switch'] == "back") {
 		$_SESSION['ipamusername'] = $_SESSION['realipamusername'];
 		unset($_SESSION['realipamusername']);
-		print	'<script>window.location.href = "'.create_link(null).'";</script>';
+		print	'<script>window.location.href = "'.create_link (null).'";</script>';
 	}
 ?>
 <!DOCTYPE HTML>
@@ -87,7 +87,7 @@ 
 	<!-- js -->
 	<script type="text/javascript" src="js/1.2/jquery-2.1.3.min.js"></script>
 	<script type="text/javascript" src="js/1.2/jclock.jquery.js"></script>
-	<?php if($_GET['page']=="login" || $_GET['page']=="request_ip") { ?>
+	<?php if ($_GET['page'] == "login" || $_GET['page'] == "request_ip") { ?>
 	<script type="text/javascript" src="js/1.2/login.js"></script>
 	<?php } ?>
 	<script type="text/javascript" src="js/1.2/magic.js"></script>
@@ -102,7 +102,7 @@ 
 	     if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
 	});
 	</script>
-	<?php if ($User->settings->enableThreshold=="1") { ?>
+	<?php if ($User->settings->enableThreshold == "1") { ?>
 	<link rel="stylesheet" type="text/css" href="css/1.2/slider.css">
 	<script type="text/javascript" src="js/1.2/bootstrap-slider.js"></script>
     <?php }	?>
@@ -121,7 +121,7 @@ 
 <div class="jqueryError">
 	<div class='alert alert-danger' style="width:400px;margin:auto">jQuery error!</div>
 	<div class="jqueryErrorText"></div><br>
-	<a href="<?php print create_link(null); ?>" class="btn btn-sm btn-default" id="hideError" style="margin-top:0px;">Hide</a>
+	<a href="<?php print create_link (null); ?>" class="btn btn-sm btn-default" id="hideError" style="margin-top:0px;">Hide</a>
 </div>
 
 <!-- Popups -->
@@ -141,7 +141,7 @@ 
 </div>
 
 <!-- loader -->
-<div class="loading"><?php print _('Loading');?>...<br><i class="fa fa-spinner fa-spin"></i></div>
+<div class="loading"><?php print _ ('Loading'); ?>...<br><i class="fa fa-spinner fa-spin"></i></div>
 
 <!-- header -->
 <div class="row" id="header">
@@ -153,7 +153,7 @@ 
 	<div class="col-lg-6 col-lg-offset-3 col-md-6 col-md-offset-3 col-sm-12 col-xs-12">
 		<div class="hero-pusher hidden-xs hidden-sm"></div>
 		<div class="hero-unit">
-			<a href="<?php print create_link(null); ?>"><?php print $User->settings->siteTitle; ?></a>
+			<a href="<?php print create_link (null); ?>"><?php print $User->settings->siteTitle; ?></a>
 		</div>
 	</div>
 </div>
@@ -162,7 +162,7 @@ 
 <!-- page sections / menu -->
 <div class="content">
 <div id="sections_overlay">
-    <?php if($_GET['page']!="login" && $_GET['page']!="request_ip" && $_GET['page']!="upgrade" && $_GET['page']!="install" && $User->user->passChange!="Yes")  include('app/sections/index.php');?>
+    <?php if ($_GET['page'] != "login" && $_GET['page'] != "request_ip" && $_GET['page'] != "upgrade" && $_GET['page'] != "install" && $User->user->passChange != "Yes")  include('app/sections/index.php'); ?>
 </div>
 </div>
 
@@ -173,25 +173,25 @@ 
 		<?php
 
 		/* error */
-		if($_GET['page'] == "error") {
+		if ($_GET['page'] == "error") {
 			print "<div id='error' class='container'>";
 			include_once('app/error.php');
 			print "</div>";
 		}
 		/* password reset required */
-		elseif($User->user->passChange=="Yes") {
+		elseif ($User->user->passChange == "Yes") {
 			print "<div id='dashboard' class='container'>";
 			include_once("app/tools/pass-change/form.php");
 			print "</div>";
 		}
 		/* dashboard */
-		elseif(!isset($_GET['page']) || $_GET['page'] == "dashboard") {
+		elseif (!isset($_GET['page']) || $_GET['page'] == "dashboard") {
 			print "<div id='dashboard'>";
 			include_once("app/dashboard/index.php");
 			print "</div>";
 		}
 		/* widgets */
-		elseif($_GET['page']=="widgets") {
+		elseif ($_GET['page'] == "widgets") {
 			print "<div id='dashboard' class='container'>";
 			include_once("app/dashboard/widgets/index.php");
 			print "</div>";
@@ -202,20 +202,20 @@ 
 			print "<tr>";
 
 			# fix for empty section
-			if( isset($_GET['section']) && (strlen($_GET['section']) == 0) )			{ unset($_GET['section']); }
+			if (isset($_GET['section']) && (strlen ($_GET['section']) == 0)) { unset($_GET['section']); }
 
 			# hide left menu
-			if( ($_GET['page']=="tools"||$_GET['page']=="administration") && !isset($_GET['section'])) {
+			if (($_GET['page'] == "tools" || $_GET['page'] == "administration") && !isset($_GET['section'])) {
 				//we dont display left menu on empty tools and administration
 			}
 			else {
 				# left menu
 				print "<td id='subnetsLeft'>";
 				print "<div id='leftMenu' class='menu-$_GET[page]'>";
-					if($_GET['page'] == "subnets" || $_GET['page'] == "vlan" ||
-					   $_GET['page'] == "vrf" 	  || $_GET['page'] == "folder")			{ include("app/subnets/subnets-menu.php"); }
-					else if ($_GET['page'] == "tools")									{ include("app/tools/tools-menu.php"); }
-					else if ($_GET['page'] == "administration")							{ include("app/admin/admin-menu.php"); }
+					if ($_GET['page'] == "subnets" || $_GET['page'] == "vlan" ||
+					   $_GET['page'] == "vrf" || $_GET['page'] == "folder") { include("app/subnets/subnets-menu.php"); }
+					else if ($_GET['page'] == "tools") { include("app/tools/tools-menu.php"); }
+					else if ($_GET['page'] == "administration") { include("app/admin/admin-menu.php"); }
 				print "</div>";
 				print "</td>";
 
@@ -225,41 +225,41 @@ 
 			print "<td id='subnetsContent'>";
 			print "<div class='row menu-$_GET[page]' id='content'>";
 				# subnets
-				if ($_GET['page']=="subnets") {
-					if(@$_GET['sPage'] == "address-details")							{ include("app/subnets/addresses/address-details.php"); }
-					elseif(@$_GET['sPage'] == "changelog")								{ include("app/subnets/subnet-changelog.php"); }
-					elseif(!isset($_GET['subnetId']))									{ include("app/sections/section-subnets.php"); }
-					else																{ include("app/subnets/index.php"); }
+				if ($_GET['page'] == "subnets") {
+					if (@$_GET['sPage'] == "address-details") { include("app/subnets/addresses/address-details.php"); }
+					elseif (@$_GET['sPage'] == "changelog") { include("app/subnets/subnet-changelog.php"); }
+					elseif (!isset($_GET['subnetId'])) { include("app/sections/section-subnets.php"); }
+					else { include("app/subnets/index.php"); }
 				}
 				# vrf
-				elseif ($_GET['page']=="vrf") 											{ include("app/vrf/index.php"); }
+				elseif ($_GET['page'] == "vrf") { include("app/vrf/index.php"); }
 				# vlan
-				elseif ($_GET['page']=="vlan") 											{ include("app/vlan/index.php"); }
+				elseif ($_GET['page'] == "vlan") { include("app/vlan/index.php"); }
 				# folder
-				elseif ($_GET['page']=="folder") 										{ include("app/folder/index.php"); }
+				elseif ($_GET['page'] == "folder") { include("app/folder/index.php"); }
 				# tools
-				elseif ($_GET['page']=="tools") {
-					if (!isset($_GET['section']))										{ include("app/tools/index.php"); }
+				elseif ($_GET['page'] == "tools") {
+					if (!isset($_GET['section'])) { include("app/tools/index.php"); }
 					else {
-						if(!file_exists("app/tools/$_GET[section]/index.php")) 			{ header("Location: ".create_link("error","404")); }
-						else 															{ include("app/tools/$_GET[section]/index.php"); }
+						if (!file_exists ("app/tools/$_GET[section]/index.php")) { header ("Location: ".create_link ("error", "404")); }
+						else { include("app/tools/$_GET[section]/index.php"); }
 					}
 				}
 				# admin
-				elseif ($_GET['page']=="administration") {
+				elseif ($_GET['page'] == "administration") {
 					# Admin object
 					$Admin = new Admin ($Database);
 
-					if (!isset($_GET['section']))										{ include("app/admin/index.php"); }
-					elseif (@$_GET['subnetId']=="section-changelog")					{ include("app/sections/section-changelog.php"); }
+					if (!isset($_GET['section'])) { include("app/admin/index.php"); }
+					elseif (@$_GET['subnetId'] == "section-changelog") { include("app/sections/section-changelog.php"); }
 					else {
-						if(!file_exists("app/admin/$_GET[section]/index.php")) 			{ header("Location: ".create_link("error","404")); }
-						else 															{ include("app/admin/$_GET[section]/index.php"); }
+						if (!file_exists ("app/admin/$_GET[section]/index.php")) { header ("Location: ".create_link ("error", "404")); }
+						else { include("app/admin/$_GET[section]/index.php"); }
 					}
 				}
 				# default - error
 				else {
-																						{ header("Location: ".create_link("error","404")); }
+																						{ header ("Location: ".create_link ("error", "404")); }
 				}
 			print "</div>";
 			print "</td>";
@@ -293,5 +293,5 @@ 
 <!-- end body -->
 </body>
 </html>
-<?php ob_end_flush(); ?>
+<?php ob_end_flush (); ?>
 <?php } ?>
\ No newline at end of file

api/controllers/Folders.php

Indentation +82 added lines, -82 removed lines

@@ -8,88 +8,88 @@
  */
 class Folders_controller extends Common_api_functions {
 
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 * @param class $Database
-	 * @param class $Tools
-	 * @param mixed $params		// post/get values
-	 * @param mixed $Response
-	 */
-	public function __construct($Database, $Tools, $params, $Response) {
-		// include
-		require("Subnets.php");
-		// subnets
-		$this->Subnets_controller = new Subnets_controller ($Database, $Tools, $params, $Response);
-	}
-
-
-
-
-	/**
-	 * Options
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
-		return $this->Subnets_controller->OPTIONS ();
-	}
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->Subnets_controller->GET ();
-	}
-
-
-	/**
-	 * Creates new folder
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		return $this->Subnets_controller->POST ();
-	}
-
-
-	/**
-	 * Read folder functions
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		return $this->Subnets_controller->GET ();
-	}
-
-
-	/**
-	 * Updates existing subnet
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		return $this->Subnets_controller->PATCH ();
-	}
-
-
-	/**
-	 * Deletes existing subnet along with and addresses
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		return $this->Subnets_controller->DELETE ();
-	}
+    /**
+     * __construct function
+     *
+     * @access public
+     * @param class $Database
+     * @param class $Tools
+     * @param mixed $params		// post/get values
+     * @param mixed $Response
+     */
+    public function __construct($Database, $Tools, $params, $Response) {
+        // include
+        require("Subnets.php");
+        // subnets
+        $this->Subnets_controller = new Subnets_controller ($Database, $Tools, $params, $Response);
+    }
+
+
+
+
+    /**
+     * Options
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
+        return $this->Subnets_controller->OPTIONS ();
+    }
+
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->Subnets_controller->GET ();
+    }
+
+
+    /**
+     * Creates new folder
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        return $this->Subnets_controller->POST ();
+    }
+
+
+    /**
+     * Read folder functions
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        return $this->Subnets_controller->GET ();
+    }
+
+
+    /**
+     * Updates existing subnet
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        return $this->Subnets_controller->PATCH ();
+    }
+
+
+    /**
+     * Deletes existing subnet along with and addresses
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        return $this->Subnets_controller->DELETE ();
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	 * @param mixed $params		// post/get values
 	 * @param mixed $Response
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		// include
 		require("Subnets.php");
 		// subnets

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

Spacing +2 added lines, -2 removed lines

@@ -17,9 +17,9 @@
 	 * @param mixed $params		// post/get values
 	 * @param mixed $Response
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		$this->Response = $Response;
 		// include

api/controllers/L2domains.php

Braces +3 added lines, -3 removed lines

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

Spacing +43 added lines, -43 removed lines

@@ -66,9 +66,9 @@ 
 	 * @param class $Tools
 	 * @param mixed $params		// post/get values
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		$this->Response = $Response;
 		// init required objects
@@ -94,16 +94,16 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/l2domains/".$this->_params->app_id."/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/l2domains/".$this->_params->app_id."/{id}/", 	"methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																												 	array("rel"=>"create", "method"=>"POST"),
-																												 	array("rel"=>"update", "method"=>"PATCH"),
-																												 	array("rel"=>"delete", "method"=>"DELETE"))),
+		$result = array ();
+		$result['methods'] = array (
+								array ("href"=>"/api/l2domains/".$this->_params->app_id."/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/l2domains/".$this->_params->app_id."/{id}/", "methods"=>array (array ("rel"=>"read", "method"=>"GET"),
+																												 	array ("rel"=>"create", "method"=>"POST"),
+																												 	array ("rel"=>"update", "method"=>"PATCH"),
+																												 	array ("rel"=>"delete", "method"=>"DELETE"))),
 							);
 		# result
-		return array("code"=>200, "data"=>$result);
+		return array ("code"=>200, "data"=>$result);
 	}
 
 
@@ -124,28 +124,28 @@ 
 	 */
 	public function GET () {
 		// all domains
-		if(!isset($this->_params->id)) {
+		if (!isset($this->_params->id)) {
 			$result = $this->Tools->fetch_all_objects ("vlanDomains", 'id', true);
 			// check result
-			if($result===false)						{ $this->Response->throw_exception(404, 'No domains configured'); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+			if ($result === false) { $this->Response->throw_exception (404, 'No domains configured'); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 		}
 		// set
 		else {
 			// custom fields
-			if($this->_params->id=="custom_fields") {
-				if(sizeof($this->custom_fields)==0)	{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-				else								{ return array("code"=>200, "data"=>$this->custom_fields); }
+			if ($this->_params->id == "custom_fields") {
+				if (sizeof ($this->custom_fields) == 0) { $this->Response->throw_exception (404, 'No custom fields defined'); }
+				else { return array ("code"=>200, "data"=>$this->custom_fields); }
 			}
 			// vlans
-			elseif (@$this->_params->id2=="vlans") {
+			elseif (@$this->_params->id2 == "vlans") {
 				// validate domain
 				$this->validate_domain ();
 				// save result
 				$result = $this->Tools->fetch_multiple_objects ("vlans", "domainId", $this->_params->id, 'vlanId', true);
 				// check result
-				if($result==NULL)					{ $this->Response->throw_exception(404, "No vlans belonging to this domain"); }
-				else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception (404, "No vlans belonging to this domain"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 			// id
 			else {
@@ -154,8 +154,8 @@ 
 				// result
 				$result = $this->Tools->fetch_object ("vlanDomains", "id", $this->_params->id);
 				// check result
-				if($result==NULL)					{ $this->Response->throw_exception(404, "Invalid domain id"); }
-				else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception (404, "Invalid domain id"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 
 		}
@@ -193,11 +193,11 @@ 
 		$this->validate_domain_edit ();
 
 		# execute update
-		if(!$this->Admin->object_modify ("vlanDomains", "add", "id", $values))
-													{ $this->Response->throw_exception(500, "Domain creation failed"); }
+		if (!$this->Admin->object_modify ("vlanDomains", "add", "id", $values))
+													{ $this->Response->throw_exception (500, "Domain creation failed"); }
 		else {
 			//set result
-			return array("code"=>201, "data"=>"L2 domain created", "location"=>"/api/".$this->_params->app_id."/l2domains/".$this->Admin->lastId."/");
+			return array ("code"=>201, "data"=>"L2 domain created", "location"=>"/api/".$this->_params->app_id."/l2domains/".$this->Admin->lastId."/");
 		}
 	}
 
@@ -221,11 +221,11 @@ 
 		$values = $this->validate_keys ();
 
 		# execute update
-		if(!$this->Admin->object_modify ("vlanDomains", "edit", "id", $values))
-													{ $this->Response->throw_exception(500, "Domain edit failed"); }
+		if (!$this->Admin->object_modify ("vlanDomains", "edit", "id", $values))
+													{ $this->Response->throw_exception (500, "Domain edit failed"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>"L2 domain updated");
+			return array ("code"=>200, "data"=>"L2 domain updated");
 		}
 	}
 
@@ -246,18 +246,18 @@ 
 		$this->validate_domain ();
 
 		# set variables for update
-		$values = array();
+		$values = array ();
 		$values["id"] = $this->_params->id;
 
 		# execute delete
-		if(!$this->Admin->object_modify ("vlanDomains", "delete", "id", $values))
-													{ $this->Response->throw_exception(500, "L2 domain delete failed"); }
+		if (!$this->Admin->object_modify ("vlanDomains", "delete", "id", $values))
+													{ $this->Response->throw_exception (500, "L2 domain delete failed"); }
 		else {
 			// delete references, reset to default
 			$this->Admin->update_object_references ("vlans", "domainId", $this->_params->id, 1);
 
 			// set result
-			return array("code"=>200, "data"=>"L2 domain deleted and vlans migrated to default domain");
+			return array ("code"=>200, "data"=>"L2 domain deleted and vlans migrated to default domain");
 		}
 	}
 
@@ -279,12 +279,12 @@ 
 	 */
 	private function validate_domain () {
 		// validate id
-		if(!isset($this->_params->id))														{ $this->_params->id = 1; }
+		if (!isset($this->_params->id)) { $this->_params->id = 1; }
 		// validate number
-		if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Domain id must be numeric"); }
+		if (!is_numeric ($this->_params->id)) { $this->Response->throw_exception (400, "Domain id must be numeric"); }
 		// check that it exists
-		if($this->Tools->fetch_object ("vlanDomains", "id", $this->_params->id) === false )
-																							{ $this->Response->throw_exception(400, "Invalid domain id"); }
+		if ($this->Tools->fetch_object ("vlanDomains", "id", $this->_params->id) === false)
+																							{ $this->Response->throw_exception (400, "Invalid domain id"); }
 	}
 
 
@@ -296,23 +296,23 @@ 
 	 */
 	private function validate_domain_edit () {
 		// delete checks
-		if($_SERVER['REQUEST_METHOD']=="DELETE") {
+		if ($_SERVER['REQUEST_METHOD'] == "DELETE") {
 			// we cannot delete default domain
-			if(@$this->_params->id==1 && $_SERVER['REQUEST_METHOD']=="DELETE")				{ $this->Response->throw_exception(400, "Default domain cannot be deleted"); }
+			if (@$this->_params->id == 1 && $_SERVER['REQUEST_METHOD'] == "DELETE") { $this->Response->throw_exception (400, "Default domain cannot be deleted"); }
 			// ID must be numeric
-			if(!is_numeric($this->_params->id))												{ $this->Response->throw_exception(400, "Invalid domain id"); }
+			if (!is_numeric ($this->_params->id)) { $this->Response->throw_exception (400, "Invalid domain id"); }
 		}
 		// create checks
-		elseif ($_SERVER['REQUEST_METHOD']=="POST") {
+		elseif ($_SERVER['REQUEST_METHOD'] == "POST") {
 			// name must be present
-			if(@$this->_params->name == "" || !isset($this->_params->name)) 				{ $this->Response->throw_exception(400, "Domain name is mandatory"); }
+			if (@$this->_params->name == "" || !isset($this->_params->name)) { $this->Response->throw_exception (400, "Domain name is mandatory"); }
 		}
 		// update checks
-		elseif ($_SERVER['REQUEST_METHOD']=="PATCH") {
+		elseif ($_SERVER['REQUEST_METHOD'] == "PATCH") {
 			// ID must be numeric
-			if(!is_numeric($this->_params->id))												{ $this->Response->throw_exception(400, "Invalid domain id"); }
+			if (!is_numeric ($this->_params->id)) { $this->Response->throw_exception (400, "Invalid domain id"); }
 			// name must be present
-			if(@$this->_params->name == "" && isset($this->_params->name)) 					{ $this->Response->throw_exception(400, "Domain name is mandatory"); }
+			if (@$this->_params->name == "" && isset($this->_params->name)) { $this->Response->throw_exception (400, "Domain name is mandatory"); }
 		}
 
 	}

Indentation +285 added lines, -285 removed lines

@@ -9,257 +9,257 @@ 
 class L2domains_controller extends Common_api_functions {
 
 
-	/**
-	 * _params provided
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
-
-	/**
-	 * custom_fields
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	public $custom_fields;
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * master Sections object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Sections;
-
-	/**
-	 * Master Tools object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-	/**
-	 * Master Admin object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Admin;
-
-
-	/**
-	 * __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 ("Admin", $Database);
-		$this->init_object ("Subnets", $Database);
-		// set valid keys
-		$this->set_valid_keys ("vlanDomains");
-	}
-
-
-
-
-
-
-	/**
-	 * 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/l2domains/".$this->_params->app_id."/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/l2domains/".$this->_params->app_id."/{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 domain functions
-	 *
-	 *	identifier can be:
-	 *		- NONE 				// will return all domains
-	 *		- {id}
-	 *		- {id}/vlans/
-	 *		- custom_fields
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		// all domains
-		if(!isset($this->_params->id)) {
-			$result = $this->Tools->fetch_all_objects ("vlanDomains", 'id', true);
-			// check result
-			if($result===false)						{ $this->Response->throw_exception(404, 'No domains configured'); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-		}
-		// set
-		else {
-			// custom fields
-			if($this->_params->id=="custom_fields") {
-				if(sizeof($this->custom_fields)==0)	{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-				else								{ return array("code"=>200, "data"=>$this->custom_fields); }
-			}
-			// vlans
-			elseif (@$this->_params->id2=="vlans") {
-				// validate domain
-				$this->validate_domain ();
-				// save result
-				$result = $this->Tools->fetch_multiple_objects ("vlans", "domainId", $this->_params->id, 'vlanId', true);
-				// check result
-				if($result==NULL)					{ $this->Response->throw_exception(404, "No vlans belonging to this domain"); }
-				else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-			}
-			// id
-			else {
-				// validate domain
-				$this->validate_domain ();
-				// result
-				$result = $this->Tools->fetch_object ("vlanDomains", "id", $this->_params->id);
-				// check result
-				if($result==NULL)					{ $this->Response->throw_exception(404, "Invalid domain id"); }
-				else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-			}
-
-		}
-	}
-
-
-
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
+    /**
+     * _params provided
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
+
+    /**
+     * custom_fields
+     *
+     * @var mixed
+     * @access protected
+     */
+    public $custom_fields;
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * master Sections object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Sections;
+
+    /**
+     * Master Tools object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+    /**
+     * Master Admin object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Admin;
+
+
+    /**
+     * __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 ("Admin", $Database);
+        $this->init_object ("Subnets", $Database);
+        // set valid keys
+        $this->set_valid_keys ("vlanDomains");
+    }
+
+
+
+
+
+
+    /**
+     * 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/l2domains/".$this->_params->app_id."/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
+                                array("href"=>"/api/l2domains/".$this->_params->app_id."/{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 domain functions
+     *
+     *	identifier can be:
+     *		- NONE 				// will return all domains
+     *		- {id}
+     *		- {id}/vlans/
+     *		- custom_fields
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        // all domains
+        if(!isset($this->_params->id)) {
+            $result = $this->Tools->fetch_all_objects ("vlanDomains", 'id', true);
+            // check result
+            if($result===false)						{ $this->Response->throw_exception(404, 'No domains configured'); }
+            else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+        }
+        // set
+        else {
+            // custom fields
+            if($this->_params->id=="custom_fields") {
+                if(sizeof($this->custom_fields)==0)	{ $this->Response->throw_exception(404, 'No custom fields defined'); }
+                else								{ return array("code"=>200, "data"=>$this->custom_fields); }
+            }
+            // vlans
+            elseif (@$this->_params->id2=="vlans") {
+                // validate domain
+                $this->validate_domain ();
+                // save result
+                $result = $this->Tools->fetch_multiple_objects ("vlans", "domainId", $this->_params->id, 'vlanId', true);
+                // check result
+                if($result==NULL)					{ $this->Response->throw_exception(404, "No vlans belonging to this domain"); }
+                else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+            }
+            // id
+            else {
+                // validate domain
+                $this->validate_domain ();
+                // result
+                $result = $this->Tools->fetch_object ("vlanDomains", "id", $this->_params->id);
+                // check result
+                if($result==NULL)					{ $this->Response->throw_exception(404, "Invalid domain id"); }
+                else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+            }
+
+        }
+    }
+
+
+
+
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
 
 
 
 
 
 
-	/**
-	 * Creates new domain
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		# check for valid keys
-		$values = $this->validate_keys ();
-
-		# validate input
-		$this->validate_domain_edit ();
-
-		# execute update
-		if(!$this->Admin->object_modify ("vlanDomains", "add", "id", $values))
-													{ $this->Response->throw_exception(500, "Domain creation failed"); }
-		else {
-			//set result
-			return array("code"=>201, "data"=>"L2 domain created", "location"=>"/api/".$this->_params->app_id."/l2domains/".$this->Admin->lastId."/");
-		}
-	}
-
-
-
-
-
-	/**
-	 * Updates existing domain
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		# verify
-		$this->validate_domain_edit ();
-		# check that it exists
-		$this->validate_domain ();
-
-		# validate and prepare keys
-		$values = $this->validate_keys ();
-
-		# execute update
-		if(!$this->Admin->object_modify ("vlanDomains", "edit", "id", $values))
-													{ $this->Response->throw_exception(500, "Domain edit failed"); }
-		else {
-			//set result
-			return array("code"=>200, "data"=>"L2 domain updated");
-		}
-	}
-
-
-
-
-
-
-
-	/**
-	 * Deletes existing domain
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		# check that domain exists
-		$this->validate_domain ();
+    /**
+     * Creates new domain
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        # check for valid keys
+        $values = $this->validate_keys ();
+
+        # validate input
+        $this->validate_domain_edit ();
+
+        # execute update
+        if(!$this->Admin->object_modify ("vlanDomains", "add", "id", $values))
+                                                    { $this->Response->throw_exception(500, "Domain creation failed"); }
+        else {
+            //set result
+            return array("code"=>201, "data"=>"L2 domain created", "location"=>"/api/".$this->_params->app_id."/l2domains/".$this->Admin->lastId."/");
+        }
+    }
+
+
+
+
+
+    /**
+     * Updates existing domain
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        # verify
+        $this->validate_domain_edit ();
+        # check that it exists
+        $this->validate_domain ();
+
+        # validate and prepare keys
+        $values = $this->validate_keys ();
+
+        # execute update
+        if(!$this->Admin->object_modify ("vlanDomains", "edit", "id", $values))
+                                                    { $this->Response->throw_exception(500, "Domain edit failed"); }
+        else {
+            //set result
+            return array("code"=>200, "data"=>"L2 domain updated");
+        }
+    }
+
+
+
+
+
+
+
+    /**
+     * Deletes existing domain
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        # check that domain exists
+        $this->validate_domain ();
 
-		# set variables for update
-		$values = array();
-		$values["id"] = $this->_params->id;
+        # set variables for update
+        $values = array();
+        $values["id"] = $this->_params->id;
 
-		# execute delete
-		if(!$this->Admin->object_modify ("vlanDomains", "delete", "id", $values))
-													{ $this->Response->throw_exception(500, "L2 domain delete failed"); }
-		else {
-			// delete references, reset to default
-			$this->Admin->update_object_references ("vlans", "domainId", $this->_params->id, 1);
+        # execute delete
+        if(!$this->Admin->object_modify ("vlanDomains", "delete", "id", $values))
+                                                    { $this->Response->throw_exception(500, "L2 domain delete failed"); }
+        else {
+            // delete references, reset to default
+            $this->Admin->update_object_references ("vlans", "domainId", $this->_params->id, 1);
 
-			// set result
-			return array("code"=>200, "data"=>"L2 domain deleted and vlans migrated to default domain");
-		}
-	}
+            // set result
+            return array("code"=>200, "data"=>"L2 domain deleted and vlans migrated to default domain");
+        }
+    }
 
 
 
@@ -269,53 +269,53 @@ 
 
 
 
-	/* @validations ---------- */
+    /* @validations ---------- */
 
-	/**
-	 * Validates domains
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_domain () {
-		// validate id
-		if(!isset($this->_params->id))														{ $this->_params->id = 1; }
-		// validate number
-		if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Domain id must be numeric"); }
-		// check that it exists
-		if($this->Tools->fetch_object ("vlanDomains", "id", $this->_params->id) === false )
-																							{ $this->Response->throw_exception(400, "Invalid domain id"); }
-	}
+    /**
+     * Validates domains
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_domain () {
+        // validate id
+        if(!isset($this->_params->id))														{ $this->_params->id = 1; }
+        // validate number
+        if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Domain id must be numeric"); }
+        // check that it exists
+        if($this->Tools->fetch_object ("vlanDomains", "id", $this->_params->id) === false )
+                                                                                            { $this->Response->throw_exception(400, "Invalid domain id"); }
+    }
 
 
-	/**
-	 * Validates domain on edit
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_domain_edit () {
-		// delete checks
-		if($_SERVER['REQUEST_METHOD']=="DELETE") {
-			// we cannot delete default domain
-			if(@$this->_params->id==1 && $_SERVER['REQUEST_METHOD']=="DELETE")				{ $this->Response->throw_exception(400, "Default domain cannot be deleted"); }
-			// ID must be numeric
-			if(!is_numeric($this->_params->id))												{ $this->Response->throw_exception(400, "Invalid domain id"); }
-		}
-		// create checks
-		elseif ($_SERVER['REQUEST_METHOD']=="POST") {
-			// name must be present
-			if(@$this->_params->name == "" || !isset($this->_params->name)) 				{ $this->Response->throw_exception(400, "Domain name is mandatory"); }
-		}
-		// update checks
-		elseif ($_SERVER['REQUEST_METHOD']=="PATCH") {
-			// ID must be numeric
-			if(!is_numeric($this->_params->id))												{ $this->Response->throw_exception(400, "Invalid domain id"); }
-			// name must be present
-			if(@$this->_params->name == "" && isset($this->_params->name)) 					{ $this->Response->throw_exception(400, "Domain name is mandatory"); }
-		}
+    /**
+     * Validates domain on edit
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_domain_edit () {
+        // delete checks
+        if($_SERVER['REQUEST_METHOD']=="DELETE") {
+            // we cannot delete default domain
+            if(@$this->_params->id==1 && $_SERVER['REQUEST_METHOD']=="DELETE")				{ $this->Response->throw_exception(400, "Default domain cannot be deleted"); }
+            // ID must be numeric
+            if(!is_numeric($this->_params->id))												{ $this->Response->throw_exception(400, "Invalid domain id"); }
+        }
+        // create checks
+        elseif ($_SERVER['REQUEST_METHOD']=="POST") {
+            // name must be present
+            if(@$this->_params->name == "" || !isset($this->_params->name)) 				{ $this->Response->throw_exception(400, "Domain name is mandatory"); }
+        }
+        // update checks
+        elseif ($_SERVER['REQUEST_METHOD']=="PATCH") {
+            // ID must be numeric
+            if(!is_numeric($this->_params->id))												{ $this->Response->throw_exception(400, "Invalid domain id"); }
+            // name must be present
+            if(@$this->_params->name == "" && isset($this->_params->name)) 					{ $this->Response->throw_exception(400, "Domain name is mandatory"); }
+        }
 
-	}
+    }
 }
 
 ?>
\ No newline at end of file

api/controllers/Vlans.php

Braces +3 added lines, -3 removed lines

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

Spacing +53 added lines, -53 removed lines

@@ -75,9 +75,9 @@ 
 	 * @param mixed $params		// post/get values
 	 * @param class $Response
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		$this->Response = $Response;
 		// init required objects
@@ -103,15 +103,15 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/vlans/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/vlans/{id}/", 	"methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																												 array("rel"=>"create", "method"=>"POST"),
-																												 array("rel"=>"update", "method"=>"PATCH"),
-																												 array("rel"=>"delete", "method"=>"DELETE"))),
+		$result['methods'] = array (
+								array ("href"=>"/api/".$this->_params->app_id."/vlans/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/".$this->_params->app_id."/vlans/{id}/", "methods"=>array (array ("rel"=>"read", "method"=>"GET"),
+																												 array ("rel"=>"create", "method"=>"POST"),
+																												 array ("rel"=>"update", "method"=>"PATCH"),
+																												 array ("rel"=>"delete", "method"=>"DELETE"))),
 							);
 		# result
-		return array("code"=>200, "data"=>$result);
+		return array ("code"=>200, "data"=>$result);
 	}
 
 
@@ -133,17 +133,17 @@ 
 	 */
 	public function GET () {
 		// check weather to read belonging subnets
-		if(@$this->_params->id2=="subnets") {
+		if (@$this->_params->id2 == "subnets") {
 			// first validate
 			$this->validate_vlan ();
 			// save result
 			$result = $this->Tools->fetch_multiple_objects ("subnets", "vlanId", $this->_params->id, 'id', true);
 
 			// only 1 section ?
-			if(isset($this->_params->id3)) {
-				if($result!=NULL) {
+			if (isset($this->_params->id3)) {
+				if ($result != NULL) {
 					foreach ($result as $k=>$r) {
-						if($r->sectionId!=$this->_params->id3) {
+						if ($r->sectionId != $this->_params->id3) {
 							unset($result[$k]);
 						}
 					}
@@ -151,38 +151,38 @@ 
 			}
 
 			// add gateway
-			if($result!=NULL) {
+			if ($result != NULL) {
 				foreach ($result as $k=>$r) {
             		$gateway = $this->read_subnet_gateway ($r->id);
-            		if ( $gateway!== false) {
+            		if ($gateway !== false) {
                 		$result[$k]->gatewayId = $gateway->id;
             		}
 				}
 			}
 
 			// check result
-			if($result==NULL)						{ $this->Response->throw_exception(404, "No subnets found"); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+			if ($result == NULL) { $this->Response->throw_exception (404, "No subnets found"); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
 		}
 		// custom fields
-		elseif (@$this->_params->id=="custom_fields") {
+		elseif (@$this->_params->id == "custom_fields") {
 			// check result
-			if(sizeof($this->custom_fields)==0)		{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-			else									{ return array("code"=>200, "data"=>$this->custom_fields); }
+			if (sizeof ($this->custom_fields) == 0) { $this->Response->throw_exception (404, 'No custom fields defined'); }
+			else { return array ("code"=>200, "data"=>$this->custom_fields); }
 		}
 		// search
-		elseif (@$this->_params->id=="search") {
+		elseif (@$this->_params->id == "search") {
 			$result = $this->Tools->fetch_multiple_objects ("vlans", "number", $this->_params->id2, "vlanId");
 			// check result
-			if($result==NULL)						{ $this->Response->throw_exception(404, "Vlans not found"); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+			if ($result == NULL) { $this->Response->throw_exception (404, "Vlans not found"); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 		}
 		// read vlan details
 		else {
 			$result = $this->Tools->fetch_object ("vlans", "vlanId", $this->_params->id);
 			// check result
-			if($result==NULL)						{ $this->Response->throw_exception(404, "Vlan not found"); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+			if ($result == NULL) { $this->Response->throw_exception (404, "Vlan not found"); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 		}
 	}
 
@@ -220,11 +220,11 @@ 
 		$this->validate_vlan_edit ();
 
 		# execute update
-		if(!$this->Admin->object_modify ("vlans", "add", "vlanId", $values))
-													{ $this->Response->throw_exception(500, "Vlan creation failed"); }
+		if (!$this->Admin->object_modify ("vlans", "add", "vlanId", $values))
+													{ $this->Response->throw_exception (500, "Vlan creation failed"); }
 		else {
 			//set result
-			return array("code"=>201, "data"=>"Vlan created", "location"=>"/api/".$this->_params->app_id."/vlans/".$this->Admin->lastId."/");
+			return array ("code"=>201, "data"=>"Vlan created", "location"=>"/api/".$this->_params->app_id."/vlans/".$this->Admin->lastId."/");
 		}
 	}
 
@@ -252,11 +252,11 @@ 
 		$values = $this->validate_keys ();
 
 		# execute update
-		if(!$this->Admin->object_modify ("vlans", "edit", "vlanId", $values))
-													{ $this->Response->throw_exception(500, "Vlan edit failed"); }
+		if (!$this->Admin->object_modify ("vlans", "edit", "vlanId", $values))
+													{ $this->Response->throw_exception (500, "Vlan edit failed"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>"Vlan updated");
+			return array ("code"=>200, "data"=>"Vlan updated");
 		}
 	}
 
@@ -277,18 +277,18 @@ 
 		$this->validate_vlan ();
 
 		# set variables for update
-		$values = array();
+		$values = array ();
 		$values["vlanId"] = $this->_params->id;
 
 		# execute delete
-		if(!$this->Admin->object_modify ("vlans", "delete", "vlanId", $values))
-													{ $this->Response->throw_exception(500, "Vlan delete failed"); }
+		if (!$this->Admin->object_modify ("vlans", "delete", "vlanId", $values))
+													{ $this->Response->throw_exception (500, "Vlan delete failed"); }
 		else {
 			// delete all references
 			$this->Admin->remove_object_references ("subnets", "vlanId", $this->_params->id);
 
 			// set result
-			return array("code"=>200, "data"=>"Vlan deleted");
+			return array ("code"=>200, "data"=>"Vlan deleted");
 		}
 	}
 
@@ -311,11 +311,11 @@ 
 	 */
 	private function validate_vlan () {
 		// validate id
-		if(!isset($this->_params->id))														{ $this->Response->throw_exception(400, "Vlan Id is required");  }
+		if (!isset($this->_params->id)) { $this->Response->throw_exception (400, "Vlan Id is required"); }
 		// validate number
-		if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Vlan Id must be numeric"); }
+		if (!is_numeric ($this->_params->id)) { $this->Response->throw_exception (400, "Vlan Id must be numeric"); }
 		// check that it exists
-		if($this->Tools->fetch_object ("vlans", "vlanId", $this->_params->id) === false )	{ $this->Response->throw_exception(400, "Invalid Vlan id"); }
+		if ($this->Tools->fetch_object ("vlans", "vlanId", $this->_params->id) === false) { $this->Response->throw_exception (400, "Invalid Vlan id"); }
 	}
 
 
@@ -330,25 +330,25 @@ 
 		$this->settings = $this->Admin->fetch_object ("settings", "id", 1);
 
 		//if it already exist die
-		if($this->settings->vlanDuplicate==0 && $_SERVER['REQUEST_METHOD']=="POST") {
+		if ($this->settings->vlanDuplicate == 0 && $_SERVER['REQUEST_METHOD'] == "POST") {
 			$check_vlan = $this->Admin->fetch_multiple_objects ("vlans", "domainId", $this->_params->domainId, "vlanId");
-			if($check_vlan!==false) {
-				foreach($check_vlan as $v) {
-					if($v->number == $this->_params->number) {
-																							{ $this->Response->throw_exception(400, "Vlan already exists"); }
+			if ($check_vlan !== false) {
+				foreach ($check_vlan as $v) {
+					if ($v->number == $this->_params->number) {
+																							{ $this->Response->throw_exception (400, "Vlan already exists"); }
 					}
 				}
 			}
 		}
 
 		//if number too high
-		if($this->_params->number>$this->settings->vlanMax && $_SERVER['REQUEST_METHOD']!="DELETE")
-																							{ $this->Response->throw_exception(400, 'Highest possible VLAN number is '.$this->settings->vlanMax.'!'); }
-		if($_SERVER['REQUEST_METHOD']=="POST") {
-			if($this->_params->number<0)													{ $this->Response->throw_exception(400, "Vlan number cannot be negative"); }
-			elseif(!is_numeric($this->_params->number))										{ $this->Response->throw_exception(400, "Vlan number must be number"); }
+		if ($this->_params->number > $this->settings->vlanMax && $_SERVER['REQUEST_METHOD'] != "DELETE")
+																							{ $this->Response->throw_exception (400, 'Highest possible VLAN number is '.$this->settings->vlanMax.'!'); }
+		if ($_SERVER['REQUEST_METHOD'] == "POST") {
+			if ($this->_params->number < 0) { $this->Response->throw_exception (400, "Vlan number cannot be negative"); }
+			elseif (!is_numeric ($this->_params->number)) { $this->Response->throw_exception (400, "Vlan number must be number"); }
 		}
-		if(strlen($this->_params->name)==0)													{ $this->Response->throw_exception(400, "Vlan name is required"); }
+		if (strlen ($this->_params->name) == 0) { $this->Response->throw_exception (400, "Vlan name is required"); }
 	}
 
 	/**
@@ -359,12 +359,12 @@ 
 	 */
 	private function validate_domain () {
 		// validate id
-		if(!isset($this->_params->domainId))												{ $this->_params->domainId = 1; }
+		if (!isset($this->_params->domainId)) { $this->_params->domainId = 1; }
 		// validate number
-		if(!is_numeric($this->_params->domainId))											{ $this->Response->throw_exception(400, "Domain id must be numeric"); }
+		if (!is_numeric ($this->_params->domainId)) { $this->Response->throw_exception (400, "Domain id must be numeric"); }
 		// check that it exists
-		if($this->Tools->fetch_object ("vlanDomains", "id", $this->_params->domainId) === false )
-																							{ $this->Response->throw_exception(400, "Invalid domain id"); }
+		if ($this->Tools->fetch_object ("vlanDomains", "id", $this->_params->domainId) === false)
+																							{ $this->Response->throw_exception (400, "Invalid domain id"); }
 	}
 
 	/**

Indentation +368 added lines, -368 removed lines

@@ -9,374 +9,374 @@
 class Vlans_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;
-
-	/**
-	 * Master Sections object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Sections;
-
-	/**
-	 * Master Tools object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-	/**
-	 * Master Admin object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Admin;
-
-
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 * @param class $Database
-	 * @param class $Tools
-	 * @param mixed $params		// post/get values
-	 * @param class $Response
-	 */
-	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 ("Admin", $Database);
-		$this->init_object ("Subnets", $Database);
-		// set valid keys
-		$this->set_valid_keys ("vlans");
-	}
-
-
-
-
-
-
-	/**
-	 * Returns json encoded options
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
-		// validate
-		$this->validate_options_request ();
-
-		// methods
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/vlans/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/vlans/{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 vlan/domain functions
-	 *
-	 * parameters:
-	 *		- {id}
-	 *		- {id}/subnets/				returns subnets belonging to this VLAN
-	 *		- {id}/subnets/{sectionId}/	returns subnets belonging to this VLAN inside one section
-	 *		- custom_fields				returns custom fields
-	 *		- search/{number}/			returns all vlans with specified number
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		// check weather to read belonging subnets
-		if(@$this->_params->id2=="subnets") {
-			// first validate
-			$this->validate_vlan ();
-			// save result
-			$result = $this->Tools->fetch_multiple_objects ("subnets", "vlanId", $this->_params->id, 'id', true);
-
-			// only 1 section ?
-			if(isset($this->_params->id3)) {
-				if($result!=NULL) {
-					foreach ($result as $k=>$r) {
-						if($r->sectionId!=$this->_params->id3) {
-							unset($result[$k]);
-						}
-					}
-				}
-			}
-
-			// add gateway
-			if($result!=NULL) {
-				foreach ($result as $k=>$r) {
-            		$gateway = $this->read_subnet_gateway ($r->id);
-            		if ( $gateway!== false) {
-                		$result[$k]->gatewayId = $gateway->id;
-            		}
-				}
-			}
-
-			// check result
-			if($result==NULL)						{ $this->Response->throw_exception(404, "No subnets found"); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
-		}
-		// custom fields
-		elseif (@$this->_params->id=="custom_fields") {
-			// check result
-			if(sizeof($this->custom_fields)==0)		{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-			else									{ return array("code"=>200, "data"=>$this->custom_fields); }
-		}
-		// search
-		elseif (@$this->_params->id=="search") {
-			$result = $this->Tools->fetch_multiple_objects ("vlans", "number", $this->_params->id2, "vlanId");
-			// check result
-			if($result==NULL)						{ $this->Response->throw_exception(404, "Vlans not found"); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-		}
-		// read vlan details
-		else {
-			$result = $this->Tools->fetch_object ("vlans", "vlanId", $this->_params->id);
-			// check result
-			if($result==NULL)						{ $this->Response->throw_exception(404, "Vlan not found"); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-		}
-	}
-
-
-
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
-
-
-
-
-
-	/**
-	 * Creates new vlan
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		# check for valid keys
-		$values = $this->validate_keys ();
-
-		# verify or set domain
-		$this->validate_domain ($this->_params->domainId);
-
-		# validate input
-		$this->validate_vlan_edit ();
-
-		# execute update
-		if(!$this->Admin->object_modify ("vlans", "add", "vlanId", $values))
-													{ $this->Response->throw_exception(500, "Vlan creation failed"); }
-		else {
-			//set result
-			return array("code"=>201, "data"=>"Vlan created", "location"=>"/api/".$this->_params->app_id."/vlans/".$this->Admin->lastId."/");
-		}
-	}
-
-
-
-
-
-	/**
-	 * Updates existing vlan/domain
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		# verify
-		$this->validate_vlan_edit ();
-		# check that it exists
-		$this->validate_vlan ();
-
-		# rewrite id
-		$this->_params->vlanId = $this->_params->id;
-		unset($this->_params->id);
-
-		# validate and prepare keys
-		$values = $this->validate_keys ();
-
-		# execute update
-		if(!$this->Admin->object_modify ("vlans", "edit", "vlanId", $values))
-													{ $this->Response->throw_exception(500, "Vlan edit failed"); }
-		else {
-			//set result
-			return array("code"=>200, "data"=>"Vlan updated");
-		}
-	}
-
-
-
-
-
-
-
-	/**
-	 * Deletes existing vlan
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		# verify
-		$this->validate_vlan ();
-
-		# set variables for update
-		$values = array();
-		$values["vlanId"] = $this->_params->id;
-
-		# execute delete
-		if(!$this->Admin->object_modify ("vlans", "delete", "vlanId", $values))
-													{ $this->Response->throw_exception(500, "Vlan delete failed"); }
-		else {
-			// delete all references
-			$this->Admin->remove_object_references ("subnets", "vlanId", $this->_params->id);
-
-			// set result
-			return array("code"=>200, "data"=>"Vlan deleted");
-		}
-	}
-
-
-
-
-
-
-
-
-
-	/* @validations ---------- */
-
-
-	/**
-	 * Validates Vlan - checks if it exists
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_vlan () {
-		// validate id
-		if(!isset($this->_params->id))														{ $this->Response->throw_exception(400, "Vlan Id is required");  }
-		// validate number
-		if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Vlan Id must be numeric"); }
-		// check that it exists
-		if($this->Tools->fetch_object ("vlans", "vlanId", $this->_params->id) === false )	{ $this->Response->throw_exception(400, "Invalid Vlan id"); }
-	}
-
-
-	/**
-	 * Validates VLAN on add and edit
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_vlan_edit () {
-		# get settings
-		$this->settings = $this->Admin->fetch_object ("settings", "id", 1);
-
-		//if it already exist die
-		if($this->settings->vlanDuplicate==0 && $_SERVER['REQUEST_METHOD']=="POST") {
-			$check_vlan = $this->Admin->fetch_multiple_objects ("vlans", "domainId", $this->_params->domainId, "vlanId");
-			if($check_vlan!==false) {
-				foreach($check_vlan as $v) {
-					if($v->number == $this->_params->number) {
-																							{ $this->Response->throw_exception(400, "Vlan already exists"); }
-					}
-				}
-			}
-		}
-
-		//if number too high
-		if($this->_params->number>$this->settings->vlanMax && $_SERVER['REQUEST_METHOD']!="DELETE")
-																							{ $this->Response->throw_exception(400, 'Highest possible VLAN number is '.$this->settings->vlanMax.'!'); }
-		if($_SERVER['REQUEST_METHOD']=="POST") {
-			if($this->_params->number<0)													{ $this->Response->throw_exception(400, "Vlan number cannot be negative"); }
-			elseif(!is_numeric($this->_params->number))										{ $this->Response->throw_exception(400, "Vlan number must be number"); }
-		}
-		if(strlen($this->_params->name)==0)													{ $this->Response->throw_exception(400, "Vlan name is required"); }
-	}
-
-	/**
-	 * Validates domains
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_domain () {
-		// validate id
-		if(!isset($this->_params->domainId))												{ $this->_params->domainId = 1; }
-		// validate number
-		if(!is_numeric($this->_params->domainId))											{ $this->Response->throw_exception(400, "Domain id must be numeric"); }
-		// check that it exists
-		if($this->Tools->fetch_object ("vlanDomains", "id", $this->_params->domainId) === false )
-																							{ $this->Response->throw_exception(400, "Invalid domain id"); }
-	}
-
-	/**
-	 * Returns id of subnet gateay
-	 *
-	 * @access private
-	 * @params mixed $subnetId
-	 * @return void
-	 */
-	private function read_subnet_gateway ($subnetId) {
-    	return $this->Subnets->find_gateway ($subnetId);
-	}
+    /**
+     * _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;
+
+    /**
+     * Master Sections object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Sections;
+
+    /**
+     * Master Tools object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+    /**
+     * Master Admin object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Admin;
+
+
+    /**
+     * __construct function
+     *
+     * @access public
+     * @param class $Database
+     * @param class $Tools
+     * @param mixed $params		// post/get values
+     * @param class $Response
+     */
+    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 ("Admin", $Database);
+        $this->init_object ("Subnets", $Database);
+        // set valid keys
+        $this->set_valid_keys ("vlans");
+    }
+
+
+
+
+
+
+    /**
+     * Returns json encoded options
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
+        // validate
+        $this->validate_options_request ();
+
+        // methods
+        $result['methods'] = array(
+                                array("href"=>"/api/".$this->_params->app_id."/vlans/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
+                                array("href"=>"/api/".$this->_params->app_id."/vlans/{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 vlan/domain functions
+     *
+     * parameters:
+     *		- {id}
+     *		- {id}/subnets/				returns subnets belonging to this VLAN
+     *		- {id}/subnets/{sectionId}/	returns subnets belonging to this VLAN inside one section
+     *		- custom_fields				returns custom fields
+     *		- search/{number}/			returns all vlans with specified number
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        // check weather to read belonging subnets
+        if(@$this->_params->id2=="subnets") {
+            // first validate
+            $this->validate_vlan ();
+            // save result
+            $result = $this->Tools->fetch_multiple_objects ("subnets", "vlanId", $this->_params->id, 'id', true);
+
+            // only 1 section ?
+            if(isset($this->_params->id3)) {
+                if($result!=NULL) {
+                    foreach ($result as $k=>$r) {
+                        if($r->sectionId!=$this->_params->id3) {
+                            unset($result[$k]);
+                        }
+                    }
+                }
+            }
+
+            // add gateway
+            if($result!=NULL) {
+                foreach ($result as $k=>$r) {
+                    $gateway = $this->read_subnet_gateway ($r->id);
+                    if ( $gateway!== false) {
+                        $result[$k]->gatewayId = $gateway->id;
+                    }
+                }
+            }
+
+            // check result
+            if($result==NULL)						{ $this->Response->throw_exception(404, "No subnets found"); }
+            else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+        }
+        // custom fields
+        elseif (@$this->_params->id=="custom_fields") {
+            // check result
+            if(sizeof($this->custom_fields)==0)		{ $this->Response->throw_exception(404, 'No custom fields defined'); }
+            else									{ return array("code"=>200, "data"=>$this->custom_fields); }
+        }
+        // search
+        elseif (@$this->_params->id=="search") {
+            $result = $this->Tools->fetch_multiple_objects ("vlans", "number", $this->_params->id2, "vlanId");
+            // check result
+            if($result==NULL)						{ $this->Response->throw_exception(404, "Vlans not found"); }
+            else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+        }
+        // read vlan details
+        else {
+            $result = $this->Tools->fetch_object ("vlans", "vlanId", $this->_params->id);
+            // check result
+            if($result==NULL)						{ $this->Response->throw_exception(404, "Vlan not found"); }
+            else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+        }
+    }
+
+
+
+
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
+
+
+
+
+
+    /**
+     * Creates new vlan
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        # check for valid keys
+        $values = $this->validate_keys ();
+
+        # verify or set domain
+        $this->validate_domain ($this->_params->domainId);
+
+        # validate input
+        $this->validate_vlan_edit ();
+
+        # execute update
+        if(!$this->Admin->object_modify ("vlans", "add", "vlanId", $values))
+                                                    { $this->Response->throw_exception(500, "Vlan creation failed"); }
+        else {
+            //set result
+            return array("code"=>201, "data"=>"Vlan created", "location"=>"/api/".$this->_params->app_id."/vlans/".$this->Admin->lastId."/");
+        }
+    }
+
+
+
+
+
+    /**
+     * Updates existing vlan/domain
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        # verify
+        $this->validate_vlan_edit ();
+        # check that it exists
+        $this->validate_vlan ();
+
+        # rewrite id
+        $this->_params->vlanId = $this->_params->id;
+        unset($this->_params->id);
+
+        # validate and prepare keys
+        $values = $this->validate_keys ();
+
+        # execute update
+        if(!$this->Admin->object_modify ("vlans", "edit", "vlanId", $values))
+                                                    { $this->Response->throw_exception(500, "Vlan edit failed"); }
+        else {
+            //set result
+            return array("code"=>200, "data"=>"Vlan updated");
+        }
+    }
+
+
+
+
+
+
+
+    /**
+     * Deletes existing vlan
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        # verify
+        $this->validate_vlan ();
+
+        # set variables for update
+        $values = array();
+        $values["vlanId"] = $this->_params->id;
+
+        # execute delete
+        if(!$this->Admin->object_modify ("vlans", "delete", "vlanId", $values))
+                                                    { $this->Response->throw_exception(500, "Vlan delete failed"); }
+        else {
+            // delete all references
+            $this->Admin->remove_object_references ("subnets", "vlanId", $this->_params->id);
+
+            // set result
+            return array("code"=>200, "data"=>"Vlan deleted");
+        }
+    }
+
+
+
+
+
+
+
+
+
+    /* @validations ---------- */
+
+
+    /**
+     * Validates Vlan - checks if it exists
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_vlan () {
+        // validate id
+        if(!isset($this->_params->id))														{ $this->Response->throw_exception(400, "Vlan Id is required");  }
+        // validate number
+        if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Vlan Id must be numeric"); }
+        // check that it exists
+        if($this->Tools->fetch_object ("vlans", "vlanId", $this->_params->id) === false )	{ $this->Response->throw_exception(400, "Invalid Vlan id"); }
+    }
+
+
+    /**
+     * Validates VLAN on add and edit
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_vlan_edit () {
+        # get settings
+        $this->settings = $this->Admin->fetch_object ("settings", "id", 1);
+
+        //if it already exist die
+        if($this->settings->vlanDuplicate==0 && $_SERVER['REQUEST_METHOD']=="POST") {
+            $check_vlan = $this->Admin->fetch_multiple_objects ("vlans", "domainId", $this->_params->domainId, "vlanId");
+            if($check_vlan!==false) {
+                foreach($check_vlan as $v) {
+                    if($v->number == $this->_params->number) {
+                                                                                            { $this->Response->throw_exception(400, "Vlan already exists"); }
+                    }
+                }
+            }
+        }
+
+        //if number too high
+        if($this->_params->number>$this->settings->vlanMax && $_SERVER['REQUEST_METHOD']!="DELETE")
+                                                                                            { $this->Response->throw_exception(400, 'Highest possible VLAN number is '.$this->settings->vlanMax.'!'); }
+        if($_SERVER['REQUEST_METHOD']=="POST") {
+            if($this->_params->number<0)													{ $this->Response->throw_exception(400, "Vlan number cannot be negative"); }
+            elseif(!is_numeric($this->_params->number))										{ $this->Response->throw_exception(400, "Vlan number must be number"); }
+        }
+        if(strlen($this->_params->name)==0)													{ $this->Response->throw_exception(400, "Vlan name is required"); }
+    }
+
+    /**
+     * Validates domains
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_domain () {
+        // validate id
+        if(!isset($this->_params->domainId))												{ $this->_params->domainId = 1; }
+        // validate number
+        if(!is_numeric($this->_params->domainId))											{ $this->Response->throw_exception(400, "Domain id must be numeric"); }
+        // check that it exists
+        if($this->Tools->fetch_object ("vlanDomains", "id", $this->_params->domainId) === false )
+                                                                                            { $this->Response->throw_exception(400, "Invalid domain id"); }
+    }
+
+    /**
+     * Returns id of subnet gateay
+     *
+     * @access private
+     * @params mixed $subnetId
+     * @return void
+     */
+    private function read_subnet_gateway ($subnetId) {
+        return $this->Subnets->find_gateway ($subnetId);
+    }
 }
 
 ?>
\ No newline at end of file