iNextrix / ASTPP

web_interface/astpp/system/database/drivers/mysql/mysql_utility.php

Doc Comments +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 	 * List databases
 	 *
 	 * @access	private
-	 * @return	bool
+	 * @return	string
 	 */
 	function _list_databases()
 	{
@@ -44,7 +44,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _optimize_table($table)
 	{
@@ -60,7 +60,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _repair_table($table)
 	{
@@ -73,7 +73,7 @@ 
 	 *
 	 * @access	private
 	 * @param	array	Preferences
-	 * @return	mixed
+	 * @return	false|string
 	 */
 	function _backup($params = array())
 	{

Spacing +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
 			}
 
 			// Trim off the end comma
-			$field_str = preg_replace( "/, $/" , "" , $field_str);
+			$field_str = preg_replace("/, $/", "", $field_str);
 
 
 			// Build the insert string
@@ -193,7 +193,7 @@ 
 				}
 
 				// Remove the comma at the end of the string
-				$val_str = preg_replace( "/, $/" , "" , $val_str);
+				$val_str = preg_replace("/, $/", "", $val_str);
 
 				// Build the INSERT string
 				$output .= 'INSERT INTO '.$table.' ('.$field_str.') VALUES ('.$val_str.');'.$newline;

Braces +5 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -173,15 +175,13 @@ 
 					if ($v === NULL)
 					{
 						$val_str .= 'NULL';
-					}
-					else
+					} else
 					{
 						// Escape the data if it's not an integer
 						if ($is_int[$i] == FALSE)
 						{
 							$val_str .= $this->db->escape($v);
-						}
-						else
+						} else
 						{
 							$val_str .= $v;
 						}

web_interface/astpp/system/database/drivers/mysqli/mysqli_driver.php

Doc Comments +3 added lines, -3 removed lines

@@ -369,7 +369,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
-	 * @return	string
+	 * @return	integer
 	 */
 	function count_all($table = '')
 	{
@@ -438,7 +438,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _field_data($table)
 	{
@@ -523,7 +523,7 @@ 
 	 *
 	 * @access	public
 	 * @param	type
-	 * @return	type
+	 * @return	string
 	 */
 	function _from_tables($tables)
 	{

Spacing +7 added lines, -7 removed lines

@@ -378,7 +378,7 @@ 
 			return 0;
 		}
 
-		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows') . " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE));
+		$query = $this->query($this->_count_string.$this->_protect_identifiers('numrows')." FROM ".$this->_protect_identifiers($table, TRUE, NULL, FALSE));
 
 		if ($query->num_rows() == 0)
 		{
@@ -387,7 +387,7 @@ 
 
 		$row = $query->row();
 		$this->_reset_select();
-		return (int) $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -493,7 +493,7 @@ 
 		{
 			if (strpos($item, '.'.$id) !== FALSE)
 			{
-				$str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item);
+				$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.', $item);
 
 				// remove duplicates if the user already included the escape
 				return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str);
@@ -614,11 +614,11 @@ 
 
 		$limit = ( ! $limit) ? '' : ' LIMIT '.$limit;
 
-		$orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):'';
+		$orderby = (count($orderby) >= 1) ? ' ORDER BY '.implode(", ", $orderby) : '';
 
 		$sql = "UPDATE ".$table." SET ".implode(', ', $valstr);
 
-		$sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : '';
+		$sql .= ($where != '' AND count($where) >= 1) ? " WHERE ".implode(" ", $where) : '';
 
 		$sql .= $orderby.$limit;
 
@@ -641,7 +641,7 @@ 
 	function _update_batch($table, $values, $index, $where = NULL)
 	{
 		$ids = array();
-		$where = ($where != '' AND count($where) >=1) ? implode(" ", $where).' AND ' : '';
+		$where = ($where != '' AND count($where) >= 1) ? implode(" ", $where).' AND ' : '';
 
 		foreach ($values as $key => $val)
 		{
@@ -651,7 +651,7 @@ 
 			{
 				if ($field != $index)
 				{
-					$final[$field][] =  'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field];
+					$final[$field][] = 'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field];
 				}
 			}
 		}

Braces +8 added lines, -11 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -70,8 +72,7 @@ 
 		if ($this->port != '')
 		{
 			return @mysqli_connect($this->hostname, $this->username, $this->password, $this->database, $this->port);
-		}
-		else
+		} else
 		{
 			return @mysqli_connect($this->hostname, $this->username, $this->password, $this->database);
 		}
@@ -144,8 +145,7 @@ 
 		if ($this->use_set_names === TRUE)
 		{
 			return @mysqli_query($this->conn_id, "SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'");
-		}
-		else
+		} else
 		{
 			return @mysqli_set_charset($this->conn_id, $charset);
 		}
@@ -314,12 +314,10 @@ 
 		if (function_exists('mysqli_real_escape_string') AND is_object($this->conn_id))
 		{
 			$str = mysqli_real_escape_string($this->conn_id, $str);
-		}
-		elseif (function_exists('mysql_escape_string'))
+		} elseif (function_exists('mysql_escape_string'))
 		{
 			$str = mysql_escape_string($str);
-		}
-		else
+		} else
 		{
 			$str = addslashes($str);
 		}
@@ -503,8 +501,7 @@ 
 		if (strpos($item, '.') !== FALSE)
 		{
 			$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char;
-		}
-		else
+		} else
 		{
 			$str = $this->_escape_char.$item.$this->_escape_char;
 		}

web_interface/astpp/system/database/drivers/mysqli/mysqli_forge.php

Doc Comments +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the database name
-	 * @return	bool
+	 * @return	string
 	 */
 	function _create_database($name)
 	{
@@ -43,7 +43,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the database name
-	 * @return	bool
+	 * @return	string
 	 */
 	function _drop_database($name)
 	{
@@ -140,7 +140,7 @@ 
 	 * @param	mixed	primary key(s)
 	 * @param	mixed	key(s)
 	 * @param	boolean	should 'IF NOT EXISTS' be added to the SQL
-	 * @return	bool
+	 * @return	string
 	 */
 	function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists)
 	{
@@ -212,7 +212,7 @@ 
 	 * @param	string	the column name
 	 * @param	array	fields
 	 * @param	string	the field after which we should add the new field
-	 * @return	object
+	 * @return	string
 	 */
 	function _alter_table($alter_type, $table, $fields, $after_field = '')
 	{

Spacing +4 added lines, -4 removed lines

@@ -86,7 +86,7 @@ 
 
 				if (array_key_exists('TYPE', $attributes))
 				{
-					$sql .=  ' '.$attributes['TYPE'];
+					$sql .= ' '.$attributes['TYPE'];
 				}
 
 				if (array_key_exists('CONSTRAINT', $attributes))
@@ -159,7 +159,7 @@ 
 		{
 			$key_name = $this->db->_protect_identifiers(implode('_', $primary_keys));
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);
-			$sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")";
+			$sql .= ",\n\tPRIMARY KEY ".$key_name." (".implode(', ', $primary_keys).")";
 		}
 
 		if (is_array($keys) && count($keys) > 0)
@@ -177,7 +177,7 @@ 
 					$key = array($key_name);
 				}
 
-				$sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")";
+				$sql .= ",\n\tKEY {$key_name} (".implode(', ', $key).")";
 			}
 		}
 
@@ -228,7 +228,7 @@ 
 
 		if ($after_field != '')
 		{
-			$sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);
+			$sql .= ' AFTER '.$this->db->_protect_identifiers($after_field);
 		}
 
 		return $sql;

Braces +6 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -72,8 +74,7 @@ 
 			if (is_numeric($field))
 			{
 				$sql .= "\n\t$attributes";
-			}
-			else
+			} else
 			{
 				$attributes = array_change_key_case($attributes, CASE_UPPER);
 
@@ -107,8 +108,7 @@ 
 				if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE)
 				{
 					$sql .= ' NULL';
-				}
-				else
+				} else
 				{
 					$sql .= ' NOT NULL';
 				}
@@ -170,8 +170,7 @@ 
 				{
 					$key_name = $this->db->_protect_identifiers(implode('_', $key));
 					$key = $this->db->_protect_identifiers($key);
-				}
-				else
+				} else
 				{
 					$key_name = $this->db->_protect_identifiers($key);
 					$key = array($key_name);

web_interface/astpp/system/database/drivers/mysqli/mysqli_utility.php

Doc Comments +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 	 * List databases
 	 *
 	 * @access	private
-	 * @return	bool
+	 * @return	string
 	 */
 	function _list_databases()
 	{
@@ -44,7 +44,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _optimize_table($table)
 	{
@@ -60,7 +60,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _repair_table($table)
 	{

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER

web_interface/astpp/system/database/drivers/oci8/oci8_driver.php

Doc Comments +6 added lines, -6 removed lines

@@ -116,7 +116,7 @@ 
 	 * Select the database
 	 *
 	 * @access  private called by the base class
-	 * @return  resource
+	 * @return  boolean
 	 */
 	public function db_select()
 	{
@@ -132,7 +132,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	string
-	 * @return	resource
+	 * @return	boolean
 	 */
 	public function db_set_charset($charset, $collation)
 	{
@@ -209,7 +209,7 @@ 
 	 * getCursor.  Returns a cursor from the datbase
 	 *
 	 * @access  public
-	 * @return  cursor id
+	 * @return  resource id
 	 */
 	public function get_cursor()
 	{
@@ -453,7 +453,7 @@ 
 	 *
 	 * @access  public
 	 * @param   string
-	 * @return  string
+	 * @return  integer
 	 */
 	public function count_all($table = '')
 	{
@@ -522,7 +522,7 @@ 
 	 *
 	 * @access  public
 	 * @param   string  the table name
-	 * @return  object
+	 * @return  string
 	 */
 	protected function _field_data($table)
 	{
@@ -611,7 +611,7 @@ 
 	 *
 	 * @access	protected
 	 * @param	type
-	 * @return	type
+	 * @return	string
 	 */
 	protected function _from_tables($tables)
 	{

Spacing +9 added lines, -9 removed lines

@@ -255,14 +255,14 @@ 
 		$have_cursor = FALSE;
 		foreach ($params as $param)
 		{
-			$sql .= $param['name'] . ",";
+			$sql .= $param['name'].",";
 
 			if (array_key_exists('type', $param) && ($param['type'] === OCI_B_CURSOR))
 			{
 				$have_cursor = TRUE;
 			}
 		}
-		$sql = trim($sql, ",") . "); end;";
+		$sql = trim($sql, ",")."); end;";
 
 		$this->stmt_id = FALSE;
 		$this->_set_stmt_id($sql);
@@ -408,7 +408,7 @@ 
 		// escape LIKE condition wildcards
 		if ($like === TRUE)
 		{
-			$str = str_replace(	array('%', '_', $this->_like_escape_chr),
+			$str = str_replace(array('%', '_', $this->_like_escape_chr),
 								array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr),
 								$str);
 		}
@@ -462,7 +462,7 @@ 
 			return 0;
 		}
 
-		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows') . " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE));
+		$query = $this->query($this->_count_string.$this->_protect_identifiers('numrows')." FROM ".$this->_protect_identifiers($table, TRUE, NULL, FALSE));
 
 		if ($query == FALSE)
 		{
@@ -471,7 +471,7 @@ 
 
 		$row = $query->row();
 		$this->_reset_select();
-		return (int) $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -581,7 +581,7 @@ 
 		{
 			if (strpos($item, '.'.$id) !== FALSE)
 			{
-				$str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item);
+				$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.', $item);
 
 				// remove duplicates if the user already included the escape
 				return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str);
@@ -661,7 +661,7 @@ 
 
 		for ($i = 0, $c = count($values); $i < $c; $i++)
 		{
-			$sql .= '	INTO ' . $table . ' (' . $keys . ') VALUES ' . $values[$i] . "\n";
+			$sql .= '	INTO '.$table.' ('.$keys.') VALUES '.$values[$i]."\n";
 		}
 
 		$sql .= 'SELECT * FROM dual';
@@ -693,11 +693,11 @@ 
 
 		$limit = ( ! $limit) ? '' : ' LIMIT '.$limit;
 
-		$orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):'';
+		$orderby = (count($orderby) >= 1) ? ' ORDER BY '.implode(", ", $orderby) : '';
 
 		$sql = "UPDATE ".$table." SET ".implode(', ', $valstr);
 
-		$sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : '';
+		$sql .= ($where != '' AND count($where) >= 1) ? " WHERE ".implode(" ", $where) : '';
 
 		$sql .= $orderby.$limit;
 

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 // ------------------------------------------------------------------------
 
@@ -59,8 +61,7 @@ 
 		if ($download == "")
 		{
 			return $str;	
-		}
-		else
+		} else
 		{	
 			echo $str;
 		}		

web_interface/astpp/system/database/drivers/odbc/odbc_result.php

Doc Comments +4 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 	 * result set starts at zero
 	 *
 	 * @access	private
-	 * @return	array
+	 * @return	boolean
 	 */
 	function _data_seek($n = 0)
 	{
@@ -184,7 +184,8 @@ 
 	 * not available (odbc_fetch_object requires unixODBC)
 	 *
 	 * @access	private
-	 * @return	object
+	 * @return	boolean
+	 * @param null|false $odbc_result
 	 */
 	function _odbc_fetch_object(& $odbc_result) {
 		$rs = array();
@@ -207,6 +208,7 @@ 
 	 *
 	 * @access	private
 	 * @return	array
+	 * @param null|false $odbc_result
 	 */
 	function _odbc_fetch_array(& $odbc_result) {
 		$rs = array();

Spacing +7 added lines, -7 removed lines

@@ -65,7 +65,7 @@ 
 		$field_names = array();
 		for ($i = 0; $i < $this->num_fields(); $i++)
 		{
-			$field_names[]	= odbc_field_name($this->result_id, $i);
+			$field_names[] = odbc_field_name($this->result_id, $i);
 		}
 
 		return $field_names;
@@ -86,12 +86,12 @@ 
 		$retval = array();
 		for ($i = 0; $i < $this->num_fields(); $i++)
 		{
-			$F				= new stdClass();
+			$F = new stdClass();
 			$F->name		= odbc_field_name($this->result_id, $i);
 			$F->type		= odbc_field_type($this->result_id, $i);
-			$F->max_length	= odbc_field_len($this->result_id, $i);
+			$F->max_length = odbc_field_len($this->result_id, $i);
 			$F->primary_key = 0;
-			$F->default		= '';
+			$F->default = '';
 
 			$retval[] = $F;
 		}
@@ -191,7 +191,7 @@ 
 		$rs_obj = FALSE;
 		if (odbc_fetch_into($odbc_result, $rs)) {
 			foreach ($rs as $k=>$v) {
-				$field_name= odbc_field_name($odbc_result, $k+1);
+				$field_name = odbc_field_name($odbc_result, $k + 1);
 				$rs_obj->$field_name = $v;
 			}
 		}
@@ -212,9 +212,9 @@ 
 		$rs = array();
 		$rs_assoc = FALSE;
 		if (odbc_fetch_into($odbc_result, $rs)) {
-			$rs_assoc=array();
+			$rs_assoc = array();
 			foreach ($rs as $k=>$v) {
-				$field_name= odbc_field_name($odbc_result, $k+1);
+				$field_name = odbc_field_name($odbc_result, $k + 1);
 				$rs_assoc[$field_name] = $v;
 			}
 		}

Braces +5 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -471,8 +473,7 @@ 
 		if (strpos($item, '.') !== FALSE)
 		{
 			$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char;
-		}
-		else
+		} else
 		{
 			$str = $this->_escape_char.$item.$this->_escape_char;
 		}
@@ -627,8 +628,7 @@ 
 		if ($offset == 0)
 		{
 			$offset = '';
-		}
-		else
+		} else
 		{
 			$offset .= ", ";
 		}

web_interface/astpp/system/database/drivers/pdo/pdo_driver.php

Doc Comments +6 added lines, -6 removed lines

@@ -89,7 +89,7 @@ 
 	 * Non-persistent database connection
 	 *
 	 * @access	private called by the base class
-	 * @return	resource
+	 * @return	PDO
 	 */
 	function db_connect()
 	{
@@ -104,7 +104,7 @@ 
 	 * Persistent database connection
 	 *
 	 * @access	private called by the base class
-	 * @return	resource
+	 * @return	PDO
 	 */
 	function db_pconnect()
 	{
@@ -140,7 +140,7 @@ 
 	 * Select the database
 	 *
 	 * @access	private called by the base class
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_select()
 	{
@@ -156,7 +156,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	string
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_set_charset($charset, $collation)
 	{
@@ -394,7 +394,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
-	 * @return	string
+	 * @return	integer
 	 */
 	function count_all($table = '')
 	{
@@ -464,7 +464,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _field_data($table)
 	{

Spacing +13 added lines, -13 removed lines

@@ -59,7 +59,7 @@ 
 			$this->_like_escape_chr = '';
 			
 			//Prior to this version, the charset can't be set in the dsn
-			if(is_php('5.3.6'))
+			if (is_php('5.3.6'))
 			{
 				$this->hostname .= ";charset={$this->char_set}";
 			}
@@ -243,7 +243,7 @@ 
 		// Reset the transaction failure flag.
 		// If the $test_mode flag is set to TRUE transactions will be rolled back
 		// even if the queries produce a successful result.
-		$this->_trans_failure = (bool) ($test_mode === TRUE);
+		$this->_trans_failure = (bool)($test_mode === TRUE);
 
 		return $this->conn_id->beginTransaction();
 	}
@@ -332,7 +332,7 @@ 
 		// escape LIKE condition wildcards
 		if ($like === TRUE)
 		{
-			$str = str_replace(	array('%', '_', $this->_like_escape_chr),
+			$str = str_replace(array('%', '_', $this->_like_escape_chr),
 								array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr),
 								$str);
 		}
@@ -361,18 +361,18 @@ 
 	 * @access	public
 	 * @return	integer
 	 */
-	function insert_id($name=NULL)
+	function insert_id($name = NULL)
 	{
 		//Convenience method for postgres insertid
 		if (strpos($this->hostname, 'pgsql') !== FALSE)
 		{
 			$v = $this->_version();
 
-			$table	= func_num_args() > 0 ? func_get_arg(0) : NULL;
+			$table = func_num_args() > 0 ? func_get_arg(0) : NULL;
 
 			if ($table == NULL && $v >= '8.1')
 			{
-				$sql='SELECT LASTVAL() as ins_id';
+				$sql = 'SELECT LASTVAL() as ins_id';
 			}
 			$query = $this->query($sql);
 			$row = $query->row();
@@ -403,7 +403,7 @@ 
 			return 0;
 		}
 
-		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows') . " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE));
+		$query = $this->query($this->_count_string.$this->_protect_identifiers('numrows')." FROM ".$this->_protect_identifiers($table, TRUE, NULL, FALSE));
 
 		if ($query->num_rows() == 0)
 		{
@@ -412,7 +412,7 @@ 
 
 		$row = $query->row();
 		$this->_reset_select();
-		return (int) $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -520,7 +520,7 @@ 
 		{
 			if (strpos($item, '.'.$id) !== FALSE)
 			{
-				$str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item);
+				$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.', $item);
 
 				// remove duplicates if the user already included the escape
 				return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str);
@@ -623,11 +623,11 @@ 
 
 		$limit = ( ! $limit) ? '' : ' LIMIT '.$limit;
 
-		$orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):'';
+		$orderby = (count($orderby) >= 1) ? ' ORDER BY '.implode(", ", $orderby) : '';
 
 		$sql = "UPDATE ".$table." SET ".implode(', ', $valstr);
 
-		$sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : '';
+		$sql .= ($where != '' AND count($where) >= 1) ? " WHERE ".implode(" ", $where) : '';
 
 		$sql .= $orderby.$limit;
 
@@ -650,7 +650,7 @@ 
 	function _update_batch($table, $values, $index, $where = NULL)
 	{
 		$ids = array();
-		$where = ($where != '' AND count($where) >=1) ? implode(" ", $where).' AND ' : '';
+		$where = ($where != '' AND count($where) >= 1) ? implode(" ", $where).' AND ' : '';
 
 		foreach ($values as $key => $val)
 		{
@@ -660,7 +660,7 @@ 
 			{
 				if ($field != $index)
 				{
-					$final[$field][] =  'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field];
+					$final[$field][] = 'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field];
 				}
 			}
 		}

Braces +10 added lines, -15 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -66,13 +68,11 @@ 
 			
 			//Set the charset with the connection options
 			$this->options['PDO::MYSQL_ATTR_INIT_COMMAND'] = "SET NAMES {$this->char_set}";
-		}
-		else if (strpos($this->hostname, 'odbc') !== FALSE)
+		} else if (strpos($this->hostname, 'odbc') !== FALSE)
 		{
 			$this->_like_escape_str = " {escape '%s'} ";
 			$this->_like_escape_chr = '!';
-		}
-		else
+		} else
 		{
 			$this->_like_escape_str = " ESCAPE '%s' ";
 			$this->_like_escape_chr = '!';
@@ -194,8 +194,7 @@ 
 		if (is_object($result_id))
 		{
 			$this->affect_rows = $result_id->rowCount();
-		}
-		else
+		} else
 		{
 			$this->affect_rows = 0;
 		}
@@ -377,8 +376,7 @@ 
 			$query = $this->query($sql);
 			$row = $query->row();
 			return $row->ins_id;
-		}
-		else
+		} else
 		{
 			return $this->conn_id->lastInsertId($name);
 		}
@@ -531,8 +529,7 @@ 
 		{
 			$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char;
 			
-		}
-		else
+		} else
 		{
 			$str = $this->_escape_char.$item.$this->_escape_char;
 		}
@@ -759,15 +756,13 @@ 
 			if ($offset == 0)
 			{
 				$offset = '';
-			}
-			else
+			} else
 			{
 				$offset .= ", ";
 			}
 
 			return $sql."LIMIT ".$offset.$limit;
-		}
-		else
+		} else
 		{
 			$sql .= "LIMIT ".$limit;
 

web_interface/astpp/system/database/drivers/pdo/pdo_forge.php

Doc Comments +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 	 * @param	mixed	primary key(s)
 	 * @param	mixed	key(s)
 	 * @param	boolean	should 'IF NOT EXISTS' be added to the SQL
-	 * @return	bool
+	 * @return	string
 	 */
 	function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists)
 	{
@@ -203,7 +203,7 @@ 
 	 * @param	string	the default value
 	 * @param	boolean	should 'NOT NULL' be added
 	 * @param	string	the field after which we should add the new field
-	 * @return	object
+	 * @return	string
 	 */
 	function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '')
 	{

Spacing +4 added lines, -4 removed lines

@@ -103,7 +103,7 @@ 
 
 				$sql .= "\n\t".$this->db->_protect_identifiers($field);
 
-				$sql .=  ' '.$attributes['TYPE'];
+				$sql .= ' '.$attributes['TYPE'];
 
 				if (array_key_exists('CONSTRAINT', $attributes))
 				{
@@ -145,7 +145,7 @@ 
 		if (count($primary_keys) > 0)
 		{
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);
-			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";
+			$sql .= ",\n\tPRIMARY KEY (".implode(', ', $primary_keys).")";
 		}
 
 		if (is_array($keys) && count($keys) > 0)
@@ -161,7 +161,7 @@ 
 					$key = array($this->db->_protect_identifiers($key));
 				}
 
-				$sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")";
+				$sql .= ",\n\tFOREIGN KEY (".implode(', ', $key).")";
 			}
 		}
 
@@ -216,7 +216,7 @@ 
 
 		if ($after_field != '')
 		{
-			$sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);
+			$sql .= ' AFTER '.$this->db->_protect_identifiers($after_field);
 		}
 
 		return $sql;

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -96,8 +98,7 @@ 
 			if (is_numeric($field))
 			{
 				$sql .= "\n\t$attributes";
-			}
-			else
+			} else
 			{
 				$attributes = array_change_key_case($attributes, CASE_UPPER);
 
@@ -123,8 +124,7 @@ 
 				if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE)
 				{
 					$sql .= ' NULL';
-				}
-				else
+				} else
 				{
 					$sql .= ' NOT NULL';
 				}
@@ -155,8 +155,7 @@ 
 				if (is_array($key))
 				{
 					$key = $this->db->_protect_identifiers($key);
-				}
-				else
+				} else
 				{
 					$key = array($this->db->_protect_identifiers($key));
 				}
@@ -208,8 +207,7 @@ 
 		if ($null === NULL)
 		{
 			$sql .= ' NULL';
-		}
-		else
+		} else
 		{
 			$sql .= ' NOT NULL';
 		}

web_interface/astpp/system/database/drivers/postgre/postgre_driver.php

Doc Comments +6 added lines, -6 removed lines

@@ -124,7 +124,7 @@ 
 	 * Select the database
 	 *
 	 * @access	private called by the base class
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_select()
 	{
@@ -140,7 +140,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	string
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_set_charset($charset, $collation)
 	{
@@ -368,7 +368,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
-	 * @return	string
+	 * @return	integer
 	 */
 	function count_all($table = '')
 	{
@@ -437,7 +437,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _field_data($table)
 	{
@@ -463,7 +463,7 @@ 
 	 * The error message number
 	 *
 	 * @access	private
-	 * @return	integer
+	 * @return	string
 	 */
 	function _error_number()
 	{
@@ -522,7 +522,7 @@ 
 	 *
 	 * @access	public
 	 * @param	type
-	 * @return	type
+	 * @return	string
 	 */
 	function _from_tables($tables)
 	{

Spacing +9 added lines, -9 removed lines

@@ -296,7 +296,7 @@ 
 		// escape LIKE condition wildcards
 		if ($like === TRUE)
 		{
-			$str = str_replace(	array('%', '_', $this->_like_escape_chr),
+			$str = str_replace(array('%', '_', $this->_like_escape_chr),
 								array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr),
 								$str);
 		}
@@ -330,12 +330,12 @@ 
 		$v = $this->_version();
 		$v = $v['server'];
 
-		$table	= func_num_args() > 0 ? func_get_arg(0) : NULL;
-		$column	= func_num_args() > 1 ? func_get_arg(1) : NULL;
+		$table = func_num_args() > 0 ? func_get_arg(0) : NULL;
+		$column = func_num_args() > 1 ? func_get_arg(1) : NULL;
 
 		if ($table == NULL && $v >= '8.1')
 		{
-			$sql='SELECT LASTVAL() as ins_id';
+			$sql = 'SELECT LASTVAL() as ins_id';
 		}
 		elseif ($table != NULL && $column != NULL && $v >= '8.0')
 		{
@@ -377,7 +377,7 @@ 
 			return 0;
 		}
 
-		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows') . " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE));
+		$query = $this->query($this->_count_string.$this->_protect_identifiers('numrows')." FROM ".$this->_protect_identifiers($table, TRUE, NULL, FALSE));
 
 		if ($query->num_rows() == 0)
 		{
@@ -386,7 +386,7 @@ 
 
 		$row = $query->row();
 		$this->_reset_select();
-		return (int) $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -492,7 +492,7 @@ 
 		{
 			if (strpos($item, '.'.$id) !== FALSE)
 			{
-				$str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item);
+				$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.', $item);
 
 				// remove duplicates if the user already included the escape
 				return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str);
@@ -594,11 +594,11 @@ 
 
 		$limit = ( ! $limit) ? '' : ' LIMIT '.$limit;
 
-		$orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):'';
+		$orderby = (count($orderby) >= 1) ? ' ORDER BY '.implode(", ", $orderby) : '';
 
 		$sql = "UPDATE ".$table." SET ".implode(', ', $valstr);
 
-		$sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : '';
+		$sql .= ($where != '' AND count($where) >= 1) ? " WHERE ".implode(" ", $where) : '';
 
 		$sql .= $orderby.$limit;
 

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -336,20 +338,17 @@ 
 		if ($table == NULL && $v >= '8.1')
 		{
 			$sql='SELECT LASTVAL() as ins_id';
-		}
-		elseif ($table != NULL && $column != NULL && $v >= '8.0')
+		} elseif ($table != NULL && $column != NULL && $v >= '8.0')
 		{
 			$sql = sprintf("SELECT pg_get_serial_sequence('%s','%s') as seq", $table, $column);
 			$query = $this->query($sql);
 			$row = $query->row();
 			$sql = sprintf("SELECT CURRVAL('%s') as ins_id", $row->seq);
-		}
-		elseif ($table != NULL)
+		} elseif ($table != NULL)
 		{
 			// seq_name passed in table parameter
 			$sql = sprintf("SELECT CURRVAL('%s') as ins_id", $table);
-		}
-		else
+		} else
 		{
 			return pg_last_oid($this->result_id);
 		}
@@ -502,8 +501,7 @@ 
 		if (strpos($item, '.') !== FALSE)
 		{
 			$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char;
-		}
-		else
+		} else
 		{
 			$str = $this->_escape_char.$item.$this->_escape_char;
 		}