ci-bonfire / Sprint

system/database/DB_result.php

Doc Comments +1 added lines, -1 removed lines

@@ -314,7 +314,7 @@
 	 *
 	 * A wrapper method.
 	 *
-	 * @param	mixed	$n
+	 * @param	integer	$n
 	 * @param	string	$type	'object' or 'array'
 	 * @return	mixed
 	 */

Spacing +4 added lines, -4 removed lines

@@ -69,28 +69,28 @@
 	 *
 	 * @var	array[]
 	 */
-	public $result_array			= array();
+	public $result_array = array();
 
 	/**
 	 * Result Object
 	 *
 	 * @var	object[]
 	 */
-	public $result_object			= array();
+	public $result_object = array();
 
 	/**
 	 * Custom Result Object
 	 *
 	 * @var	object[]
 	 */
-	public $custom_result_object		= array();
+	public $custom_result_object = array();
 
 	/**
 	 * Current Row index
 	 *
 	 * @var	int
 	 */
-	public $current_row			= 0;
+	public $current_row = 0;
 
 	/**
 	 * Number of rows

Braces +14 added lines, -17 removed lines

@@ -132,12 +132,10 @@ 
 		if (is_int($this->num_rows))
 		{
 			return $this->num_rows;
-		}
-		elseif (count($this->result_array) > 0)
+		} elseif (count($this->result_array) > 0)
 		{
 			return $this->num_rows = count($this->result_array);
-		}
-		elseif (count($this->result_object) > 0)
+		} elseif (count($this->result_object) > 0)
 		{
 			return $this->num_rows = count($this->result_object);
 		}
@@ -158,12 +156,10 @@ 
 		if ($type === 'array')
 		{
 			return $this->result_array();
-		}
-		elseif ($type === 'object')
+		} elseif ($type === 'object')
 		{
 			return $this->result_object();
-		}
-		else
+		} else
 		{
 			return $this->custom_result_object($type);
 		}
@@ -182,8 +178,7 @@ 
 		if (isset($this->custom_result_object[$class_name]))
 		{
 			return $this->custom_result_object[$class_name];
-		}
-		elseif ( ! $this->result_id OR $this->num_rows === 0)
+		} elseif ( ! $this->result_id OR $this->num_rows === 0)
 		{
 			return array();
 		}
@@ -193,8 +188,7 @@ 
 		if (($c = count($this->result_array)) > 0)
 		{
 			$_data = 'result_array';
-		}
-		elseif (($c = count($this->result_object)) > 0)
+		} elseif (($c = count($this->result_object)) > 0)
 		{
 			$_data = 'result_object';
 		}
@@ -334,9 +328,13 @@ 
 			return $this->row_data[$n];
 		}
 
-		if ($type === 'object') return $this->row_object($n);
-		elseif ($type === 'array') return $this->row_array($n);
-		else return $this->custom_row_object($n, $type);
+		if ($type === 'object') {
+			return $this->row_object($n);
+		} elseif ($type === 'array') {
+			return $this->row_array($n);
+		} else {
+			return $this->custom_row_object($n, $type);
+		}
 	}
 
 	// --------------------------------------------------------------------
@@ -530,8 +528,7 @@ 
 		if ($type === 'array')
 		{
 			return $this->_fetch_assoc();
-		}
-		elseif ($type === 'object')
+		} elseif ($type === 'object')
 		{
 			return $this->_fetch_object();
 		}

system/database/drivers/mssql/mssql_driver.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	 * Non-persistent database connection
 	 *
 	 * @param	bool	$persistent
-	 * @return	resource
+	 * @return	false|string
 	 */
 	public function db_connect($persistent = FALSE)
 	{

Spacing +4 added lines, -4 removed lines

@@ -341,11 +341,11 @@ 
 		$retval = array();
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
+			$retval[$i] = new stdClass();
 			$retval[$i]->name		= $query[$i]->COLUMN_NAME;
 			$retval[$i]->type		= $query[$i]->DATA_TYPE;
-			$retval[$i]->max_length		= ($query[$i]->CHARACTER_MAXIMUM_LENGTH > 0) ? $query[$i]->CHARACTER_MAXIMUM_LENGTH : $query[$i]->NUMERIC_PRECISION;
-			$retval[$i]->default		= $query[$i]->COLUMN_DEFAULT;
+			$retval[$i]->max_length = ($query[$i]->CHARACTER_MAXIMUM_LENGTH > 0) ? $query[$i]->CHARACTER_MAXIMUM_LENGTH : $query[$i]->NUMERIC_PRECISION;
+			$retval[$i]->default = $query[$i]->COLUMN_DEFAULT;
 		}
 
 		return $retval;
@@ -501,7 +501,7 @@ 
 				."\nWHERE ".$this->escape_identifiers('CI_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit;
 		}
 
-		return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$limit.' ', $sql);
+		return preg_replace('/(^\SELECT (DISTINCT)?)/i', '\\1 TOP '.$limit.' ', $sql);
 	}
 
 	// --------------------------------------------------------------------

Braces +1 added lines, -2 removed lines

@@ -496,8 +496,7 @@
 			if (empty($_SERVER['HTTP_REFERER']))
 			{
 				$this->referer = FALSE;
-			}
-			else
+			} else
 			{
 				$referer_host = @parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
 				$own_host = parse_url(config_item('base_url'), PHP_URL_HOST);

system/database/drivers/mysql/mysql_driver.php

Doc Comments +1 added lines, -1 removed lines

@@ -238,7 +238,7 @@
 	 * Execute the query
 	 *
 	 * @param	string	$sql	an SQL query
-	 * @return	mixed
+	 * @return	resource
 	 */
 	protected function _execute($sql)
 	{

Spacing +4 added lines, -4 removed lines

@@ -153,16 +153,16 @@
 		$retval = array();
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
-			$retval[$i]->name		= $query[$i]->Field;
+			$retval[$i] = new stdClass();
+			$retval[$i]->name = $query[$i]->Field;
 
 			sscanf($query[$i]->Type, '%[a-z](%d)',
 				$retval[$i]->type,
 				$retval[$i]->max_length
 			);
 
-			$retval[$i]->default		= $query[$i]->Default;
-			$retval[$i]->primary_key	= (int) ($query[$i]->Key === 'PRI');
+			$retval[$i]->default = $query[$i]->Default;
+			$retval[$i]->primary_key = (int) ($query[$i]->Key === 'PRI');
 		}
 
 		return $retval;

system/database/drivers/oci8/oci8_driver.php

Doc Comments +2 added lines, -2 removed lines

@@ -266,7 +266,7 @@ 
 	 * Execute the query
 	 *
 	 * @param	string	$sql	an SQL query
-	 * @return	resource
+	 * @return	boolean
 	 */
 	protected function _execute($sql)
 	{
@@ -430,7 +430,7 @@ 
 	/**
 	 * Insert ID
 	 *
-	 * @return	int
+	 * @return	string|null
 	 */
 	public function insert_id()
 	{

Spacing +3 added lines, -3 removed lines

@@ -520,7 +520,7 @@ 
 		$retval = array();
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
+			$retval[$i] = new stdClass();
 			$retval[$i]->name		= $query[$i]->COLUMN_NAME;
 			$retval[$i]->type		= $query[$i]->DATA_TYPE;
 
@@ -530,7 +530,7 @@ 
 			{
 				$length = $query[$i]->DATA_LENGTH;
 			}
-			$retval[$i]->max_length		= $length;
+			$retval[$i]->max_length = $length;
 
 			$default = $query[$i]->DATA_DEFAULT;
 			if ($default === NULL && $query[$i]->NULLABLE === 'N')
@@ -631,7 +631,7 @@ 
 	{
 		if ($this->qb_limit)
 		{
-			$this->where('rownum <= ',$this->qb_limit, FALSE);
+			$this->where('rownum <= ', $this->qb_limit, FALSE);
 			$this->qb_limit = FALSE;
 		}
 

Braces +6 added lines, -12 removed lines

@@ -176,8 +176,7 @@ 
 		{
 			$this->dsn = $this->hostname;
 			return;
-		}
-		elseif ($this->hostname !== '' && strpos($this->hostname, '/') === FALSE && strpos($this->hostname, ':') === FALSE
+		} elseif ($this->hostname !== '' && strpos($this->hostname, '/') === FALSE && strpos($this->hostname, ':') === FALSE
 			&& (( ! empty($this->port) && ctype_digit($this->port)) OR $this->database !== ''))
 		{
 			/* If the hostname field isn't empty, doesn't contain
@@ -255,8 +254,7 @@ 
 		if ( ! $this->conn_id OR ($version_string = oci_server_version($this->conn_id)) === FALSE)
 		{
 			return FALSE;
-		}
-		elseif (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match))
+		} elseif (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match))
 		{
 			return $this->data_cache['version'] = $match[1];
 		}
@@ -480,8 +478,7 @@ 
 		if (strpos($table, '.') !== FALSE)
 		{
 			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
+		} else
 		{
 			$owner = $this->username;
 		}
@@ -504,8 +501,7 @@ 
 		if (strpos($table, '.') !== FALSE)
 		{
 			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
+		} else
 		{
 			$owner = $this->username;
 		}
@@ -565,12 +561,10 @@ 
 		if (is_resource($this->curs_id))
 		{
 			return oci_error($this->curs_id);
-		}
-		elseif (is_resource($this->stmt_id))
+		} elseif (is_resource($this->stmt_id))
 		{
 			return oci_error($this->stmt_id);
-		}
-		elseif (is_resource($this->conn_id))
+		} elseif (is_resource($this->conn_id))
 		{
 			return oci_error($this->conn_id);
 		}

system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	 * Create database
 	 *
 	 * @param	string	$db_name
-	 * @return	string
+	 * @return	boolean
 	 */
 	public function create_database($db_name)
 	{

Spacing +3 added lines, -3 removed lines

@@ -51,14 +51,14 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_rename_table	= FALSE;
+	protected $_rename_table = FALSE;
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'SMALLINT'	=> 'INTEGER',
 		'INTEGER'	=> 'INT64',
 		'FLOAT'		=> 'DOUBLE PRECISION'
@@ -69,7 +69,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_null		= 'NULL';
+	protected $_null = 'NULL';
 
 	// --------------------------------------------------------------------
 

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
 		if ( ! file_exists($this->db->database) OR ! @unlink($this->db->database))
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unable_to_drop') : FALSE;
-		}
-		elseif ( ! empty($this->db->data_cache['db_names']))
+		} elseif ( ! empty($this->db->data_cache['db_names']))
 		{
 			$key = array_search(strtolower($this->db->database), array_map('strtolower', $this->db->data_cache['db_names']), TRUE);
 			if ($key !== FALSE)

system/database/drivers/postgre/postgre_driver.php

Doc Comments +1 added lines, -1 removed lines

@@ -483,7 +483,7 @@
 	 * @param	string	$orderby
 	 * @param	string	$direction	ASC, DESC or RANDOM
 	 * @param	bool	$escape
-	 * @return	object
+	 * @return	CI_DB_query_builder
 	 */
 	public function order_by($orderby, $direction = '', $escape = NULL)
 	{

Spacing +5 added lines, -5 removed lines

@@ -352,8 +352,8 @@ 
 		$v = pg_version($this->conn_id);
 		$v = isset($v['server']) ? $v['server'] : 0; // 'server' key is only available since PosgreSQL 7.4
 
-		$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')
 		{
@@ -450,11 +450,11 @@ 
 		$retval = array();
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retval[$i]			= new stdClass();
+			$retval[$i] = new stdClass();
 			$retval[$i]->name		= $query[$i]->column_name;
 			$retval[$i]->type		= $query[$i]->data_type;
-			$retval[$i]->max_length		= ($query[$i]->character_maximum_length > 0) ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision;
-			$retval[$i]->default		= $query[$i]->column_default;
+			$retval[$i]->max_length = ($query[$i]->character_maximum_length > 0) ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision;
+			$retval[$i]->default = $query[$i]->column_default;
 		}
 
 		return $retval;

Braces +4 added lines, -8 removed lines

@@ -319,8 +319,7 @@ 
 		if (is_php('5.4.4') && (is_string($str) OR (is_object($str) && method_exists($str, '__toString'))))
 		{
 			return pg_escape_literal($this->conn_id, $str);
-		}
-		elseif (is_bool($str))
+		} elseif (is_bool($str))
 		{
 			return ($str) ? 'TRUE' : 'FALSE';
 		}
@@ -358,8 +357,7 @@ 
 		if ($table === NULL && $v >= '8.1')
 		{
 			$sql = 'SELECT LASTVAL() AS ins_id';
-		}
-		elseif ($table !== NULL)
+		} elseif ($table !== NULL)
 		{
 			if ($column !== NULL && $v >= '8.0')
 			{
@@ -367,16 +365,14 @@ 
 				$query = $this->query($sql);
 				$query = $query->row();
 				$seq = $query->seq;
-			}
-			else
+			} else
 			{
 				// seq_name passed in table parameter
 				$seq = $table;
 			}
 
 			$sql = 'SELECT CURRVAL(\''.$seq."') AS ins_id";
-		}
-		else
+		} else
 		{
 			return pg_last_oid($this->result_id);
 		}

Indentation +35 added lines, -35 removed lines

@@ -1,40 +1,40 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
- * @since	Version 1.3.0
- * @filesource
- */
+	 * CodeIgniter
+	 *
+	 * An open source application development framework for PHP
+	 *
+	 * This content is released under the MIT License (MIT)
+	 *
+	 * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package	CodeIgniter
+	 * @author	EllisLab Dev Team
+	 * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
+	 * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+	 * @license	http://opensource.org/licenses/MIT	MIT License
+	 * @link	http://codeigniter.com
+	 * @since	Version 1.3.0
+	 * @filesource
+	 */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**

system/helpers/date_helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 	 *
 	 * @param	string
 	 * @param	int
-	 * @return	int
+	 * @return	string
 	 */
 	function mdate($datestr = '', $time = '')
 	{

Spacing +4 added lines, -4 removed lines

@@ -177,7 +177,7 @@ 
 	 */
 	function timespan($seconds = 1, $time = '', $units = 7)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->lang->load('date');
 
 		is_numeric($seconds) OR $seconds = 1;
@@ -307,7 +307,7 @@ 
 			}
 		}
 
-		$days_in_month	= array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+		$days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 		return $days_in_month[$month - 1];
 	}
 }
@@ -570,7 +570,7 @@ 
 	 */
 	function timezone_menu($default = 'UTC', $class = '', $name = 'timezones', $attributes = '')
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->lang->load('date');
 
 		$default = ($default === 'GMT') ? 'UTC' : $default;
@@ -693,7 +693,7 @@ 
 		$is_unix = ! ( ! $is_unix OR $is_unix === 'days');
 
 		// Validate input and try strtotime() on invalid timestamps/intervals, just in case
-		if ( ( ! ctype_digit((string) $unix_start) && ($unix_start = @strtotime($unix_start)) === FALSE)
+		if (( ! ctype_digit((string) $unix_start) && ($unix_start = @strtotime($unix_start)) === FALSE)
 			OR ( ! ctype_digit((string) $mixed) && ($is_unix === FALSE OR ($mixed = @strtotime($mixed)) === FALSE))
 			OR ($is_unix === TRUE && $mixed < $unix_start))
 		{

Braces +12 added lines, -19 removed lines

@@ -104,8 +104,7 @@ 
 		if ($datestr === '')
 		{
 			return '';
-		}
-		elseif (empty($time))
+		} elseif (empty($time))
 		{
 			$time = now();
 		}
@@ -283,8 +282,7 @@ 
 		if ($month < 1 OR $month > 12)
 		{
 			return 0;
-		}
-		elseif ( ! is_numeric($year) OR strlen($year) !== 4)
+		} elseif ( ! is_numeric($year) OR strlen($year) !== 4)
 		{
 			$year = date('Y');
 		}
@@ -420,8 +418,7 @@ 
 		if ($fmt === 'us')
 		{
 			$r .= date('h', $time).':'.date('i', $time);
-		}
-		else
+		} else
 		{
 			$r .= date('H', $time).':'.date('i', $time);
 		}
@@ -477,8 +474,7 @@ 
 			if ($ampm[0] === 'p' && $hour < 12)
 			{
 				$hour += 12;
-			}
-			elseif ($ampm[0] === 'a' && $hour === 12)
+			} elseif ($ampm[0] === 'a' && $hour === 12)
 			{
 				$hour = 0;
 			}
@@ -505,8 +501,7 @@ 
 		if (empty($bad_date))
 		{
 			return 'Unknown';
-		}
-		elseif (empty($format))
+		} elseif (empty($format))
 		{
 			$format = 'U';
 		}
@@ -518,8 +513,7 @@ 
 			{
 				$year  = substr($bad_date, 0, 4);
 				$month = substr($bad_date, 4, 2);
-			}
-			else
+			} else
 			{
 				$month  = substr($bad_date, 0, 2);
 				$year   = substr($bad_date, 2, 4);
@@ -732,8 +726,7 @@ 
 			{
 				$arg = new DateTime();
 				$arg->setTimestamp($mixed);
-			}
-			else
+			} else
 			{
 				$arg = (int) $mixed;
 			}
@@ -764,23 +757,23 @@ 
 			$arg = new DateTime();
 			$arg->setDate(date('Y', $mixed), date('n', $mixed), date('j', $mixed));
 			$arg->setTime(date('G', $mixed), date('i', $mixed), date('s', $mixed));
-		}
-		else
+		} else
 		{
 			$arg = (int) $mixed;
 		}
 		$range[] = $from->format($format);
 
-		if (is_int($arg)) // Day intervals
+		if (is_int($arg)) {
+			// Day intervals
 		{
 			do
 			{
 				$from->modify('+1 day');
+		}
 				$range[] = $from->format($format);
 			}
 			while (--$arg > 0);
-		}
-		else // end date UNIX timestamp
+		} else // end date UNIX timestamp
 		{
 			for ($from->modify('+1 day'), $end_check = $arg->format('Ymd'); $from->format('Ymd') < $end_check; $from->modify('+1 day'))
 			{

Indentation +35 added lines, -35 removed lines

@@ -1,40 +1,40 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
- * @since	Version 1.0.0
- * @filesource
- */
+	 * CodeIgniter
+	 *
+	 * An open source application development framework for PHP
+	 *
+	 * This content is released under the MIT License (MIT)
+	 *
+	 * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package	CodeIgniter
+	 * @author	EllisLab Dev Team
+	 * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
+	 * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+	 * @license	http://opensource.org/licenses/MIT	MIT License
+	 * @link	http://codeigniter.com
+	 * @since	Version 1.0.0
+	 * @filesource
+	 */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**

system/helpers/file_helper.php

Doc Comments +2 added lines

@@ -220,6 +220,7 @@ 
 	 * @param	string	path to source
 	 * @param	bool	Look only at the top level directory specified?
 	 * @param	bool	internal variable to determine recursion status - do not use in calls
+	 * @param string $source_dir
 	 * @return	array
 	 */
 	function get_dir_file_info($source_dir, $top_level_only = TRUE, $_recursion = FALSE)
@@ -272,6 +273,7 @@ 
 	 *
 	 * @param	string	path to file
 	 * @param	mixed	array or comma separated string of information returned
+	 * @param string $file
 	 * @return	array
 	 */
 	function get_file_info($file, $returned_values = array('name', 'server_path', 'size', 'date'))

Spacing +3 added lines, -3 removed lines

@@ -415,17 +415,17 @@
 		// Owner
 		$symbolic .= (($perms & 0x0100) ? 'r' : '-')
 			.(($perms & 0x0080) ? 'w' : '-')
-			.(($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x' ) : (($perms & 0x0800) ? 'S' : '-'));
+			.(($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x') : (($perms & 0x0800) ? 'S' : '-'));
 
 		// Group
 		$symbolic .= (($perms & 0x0020) ? 'r' : '-')
 			.(($perms & 0x0010) ? 'w' : '-')
-			.(($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x' ) : (($perms & 0x0400) ? 'S' : '-'));
+			.(($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x') : (($perms & 0x0400) ? 'S' : '-'));
 
 		// World
 		$symbolic .= (($perms & 0x0004) ? 'r' : '-')
 			.(($perms & 0x0002) ? 'w' : '-')
-			.(($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x' ) : (($perms & 0x0200) ? 'T' : '-'));
+			.(($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x') : (($perms & 0x0200) ? 'T' : '-'));
 
 		return $symbolic;
 	}

Braces +10 added lines, -20 removed lines

@@ -141,8 +141,7 @@ 
 				if (is_dir($path.DIRECTORY_SEPARATOR.$filename) && $filename[0] !== '.')
 				{
 					delete_files($path.DIRECTORY_SEPARATOR.$filename, $del_dir, $htdocs, $_level + 1);
-				}
-				elseif ($htdocs !== TRUE OR ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
+				} elseif ($htdocs !== TRUE OR ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
 				{
 					@unlink($path.DIRECTORY_SEPARATOR.$filename);
 				}
@@ -190,8 +189,7 @@ 
 				if (is_dir($source_dir.$file) && $file[0] !== '.')
 				{
 					get_filenames($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE);
-				}
-				elseif ($file[0] !== '.')
+				} elseif ($file[0] !== '.')
 				{
 					$_filedata[] = ($include_path === TRUE) ? $source_dir.$file : $file;
 				}
@@ -242,8 +240,7 @@ 
 				if (is_dir($source_dir.$file) && $file[0] !== '.' && $top_level_only === FALSE)
 				{
 					get_dir_file_info($source_dir.$file.DIRECTORY_SEPARATOR, $top_level_only, TRUE);
-				}
-				elseif ($file[0] !== '.')
+				} elseif ($file[0] !== '.')
 				{
 					$_filedata[$file] = get_file_info($source_dir.$file);
 					$_filedata[$file]['relative_path'] = $relative_path;
@@ -382,32 +379,25 @@ 
 		if (($perms & 0xC000) === 0xC000)
 		{
 			$symbolic = 's'; // Socket
-		}
-		elseif (($perms & 0xA000) === 0xA000)
+		} elseif (($perms & 0xA000) === 0xA000)
 		{
 			$symbolic = 'l'; // Symbolic Link
-		}
-		elseif (($perms & 0x8000) === 0x8000)
+		} elseif (($perms & 0x8000) === 0x8000)
 		{
 			$symbolic = '-'; // Regular
-		}
-		elseif (($perms & 0x6000) === 0x6000)
+		} elseif (($perms & 0x6000) === 0x6000)
 		{
 			$symbolic = 'b'; // Block special
-		}
-		elseif (($perms & 0x4000) === 0x4000)
+		} elseif (($perms & 0x4000) === 0x4000)
 		{
 			$symbolic = 'd'; // Directory
-		}
-		elseif (($perms & 0x2000) === 0x2000)
+		} elseif (($perms & 0x2000) === 0x2000)
 		{
 			$symbolic = 'c'; // Character special
-		}
-		elseif (($perms & 0x1000) === 0x1000)
+		} elseif (($perms & 0x1000) === 0x1000)
 		{
 			$symbolic = 'p'; // FIFO pipe
-		}
-		else
+		} else
 		{
 			$symbolic = 'u'; // Unknown
 		}

Indentation +35 added lines, -35 removed lines

@@ -1,40 +1,40 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
- * @since	Version 1.0.0
- * @filesource
- */
+	 * CodeIgniter
+	 *
+	 * An open source application development framework for PHP
+	 *
+	 * This content is released under the MIT License (MIT)
+	 *
+	 * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package	CodeIgniter
+	 * @author	EllisLab Dev Team
+	 * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
+	 * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+	 * @license	http://opensource.org/licenses/MIT	MIT License
+	 * @link	http://codeigniter.com
+	 * @since	Version 1.0.0
+	 * @filesource
+	 */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**

system/helpers/form_helper.php

Doc Comments +2 added lines, -2 removed lines

@@ -326,10 +326,10 @@
 	/**
 	 * Drop-down Menu
 	 *
-	 * @param	mixed	$data
+	 * @param	string	$data
 	 * @param	mixed	$options
 	 * @param	mixed	$selected
-	 * @param	mixed	$extra
+	 * @param	string|false	$extra
 	 * @return	string
 	 */
 	function form_dropdown($data = '', $options = array(), $selected = array(), $extra = '')

Spacing +8 added lines, -8 removed lines

@@ -63,7 +63,7 @@ 
 	 */
 	function form_open($action = '', $attributes = array(), $hidden = array())
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		// If no action is provided then set to the current url
 		if ( ! $action)
@@ -688,7 +688,7 @@ 
 	 */
 	function set_value($field, $default = '', $html_escape = TRUE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		$value = (isset($CI->form_validation) && is_object($CI->form_validation) && $CI->form_validation->has_rule($field))
 			? $CI->form_validation->set_value($field, $default)
@@ -716,7 +716,7 @@ 
 	 */
 	function set_select($field, $value = '', $default = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		if (isset($CI->form_validation) && is_object($CI->form_validation) && $CI->form_validation->has_rule($field))
 		{
@@ -763,7 +763,7 @@ 
 	 */
 	function set_checkbox($field, $value = '', $default = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		if (isset($CI->form_validation) && is_object($CI->form_validation) && $CI->form_validation->has_rule($field))
 		{
@@ -815,7 +815,7 @@ 
 	 */
 	function set_radio($field, $value = '', $default = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		if (isset($CI->form_validation) && is_object($CI->form_validation) && $CI->form_validation->has_rule($field))
 		{
@@ -867,7 +867,7 @@ 
 	 */
 	function form_error($field = '', $prefix = '', $suffix = '')
 	{
-		if (FALSE === ($OBJ =& _get_validation_object()))
+		if (FALSE === ($OBJ = & _get_validation_object()))
 		{
 			return '';
 		}
@@ -892,7 +892,7 @@ 
 	 */
 	function validation_errors($prefix = '', $suffix = '')
 	{
-		if (FALSE === ($OBJ =& _get_validation_object()))
+		if (FALSE === ($OBJ = & _get_validation_object()))
 		{
 			return '';
 		}
@@ -1012,7 +1012,7 @@ 
 	 */
 	function &_get_validation_object()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		// We set this as a variable since we're returning by reference.
 		$return = FALSE;

Braces +10 added lines, -20 removed lines

@@ -127,8 +127,7 @@ 
 		if (is_string($attributes))
 		{
 			$attributes .= ' enctype="multipart/form-data"';
-		}
-		else
+		} else
 		{
 			$attributes['enctype'] = 'multipart/form-data';
 		}
@@ -174,8 +173,7 @@ 
 		if ( ! is_array($value))
 		{
 			$form .= '<input type="hidden" name="'.$name.'" value="'.html_escape($value)."\" />\n";
-		}
-		else
+		} else
 		{
 			foreach ($value as $k => $v)
 			{
@@ -281,8 +279,7 @@ 
 		if ( ! is_array($data) OR ! isset($data['value']))
 		{
 			$val = $value;
-		}
-		else
+		} else
 		{
 			$val = $data['value'];
 			unset($data['value']); // textareas don't use the value attribute
@@ -349,8 +346,7 @@ 
 				$options = $data['options'];
 				unset($data['options']); // select tags don't use an options attribute
 			}
-		}
-		else
+		} else
 		{
 			$defaults = array('name' => $data);
 		}
@@ -367,8 +363,7 @@ 
 				{
 					$selected = array($_POST[$data['name']]);
 				}
-			}
-			elseif (isset($_POST[$data]))
+			} elseif (isset($_POST[$data]))
 			{
 				$selected = array($_POST[$data]);
 			}
@@ -401,8 +396,7 @@ 
 				}
 
 				$form .= "</optgroup>\n";
-			}
-			else
+			} else
 			{
 				$form .= '<option value="'.html_escape($key).'"'
 					.(in_array($key, $selected) ? ' selected="selected"' : '').'>'
@@ -438,8 +432,7 @@ 
 			if ($checked == FALSE)
 			{
 				unset($data['checked']);
-			}
-			else
+			} else
 			{
 				$data['checked'] = 'checked';
 			}
@@ -448,8 +441,7 @@ 
 		if ($checked == TRUE)
 		{
 			$defaults['checked'] = 'checked';
-		}
-		else
+		} else
 		{
 			unset($defaults['checked']);
 		}
@@ -721,8 +713,7 @@ 
 		if (isset($CI->form_validation) && is_object($CI->form_validation) && $CI->form_validation->has_rule($field))
 		{
 			return $CI->form_validation->set_select($field, $value, $default);
-		}
-		elseif (($input = $CI->input->post($field, FALSE)) === NULL)
+		} elseif (($input = $CI->input->post($field, FALSE)) === NULL)
 		{
 			return ($default === TRUE) ? ' selected="selected"' : '';
 		}
@@ -940,8 +931,7 @@ 
 			if ($key === 'value')
 			{
 				$val = html_escape($val);
-			}
-			elseif ($key === 'name' && ! strlen($default['name']))
+			} elseif ($key === 'name' && ! strlen($default['name']))
 			{
 				continue;
 			}

Indentation +35 added lines, -35 removed lines

@@ -1,40 +1,40 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
- * @since	Version 1.0.0
- * @filesource
- */
+	 * CodeIgniter
+	 *
+	 * An open source application development framework for PHP
+	 *
+	 * This content is released under the MIT License (MIT)
+	 *
+	 * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package	CodeIgniter
+	 * @author	EllisLab Dev Team
+	 * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
+	 * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+	 * @license	http://opensource.org/licenses/MIT	MIT License
+	 * @link	http://codeigniter.com
+	 * @since	Version 1.0.0
+	 * @filesource
+	 */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**