ci-bonfire / Sprint

system/core/URI.php

Spacing +3 added lines, -3 removed lines

@@ -98,7 +98,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->config =& load_class('Config', 'core');
+		$this->config = & load_class('Config', 'core');
 
 		// If query strings are enabled, we don't need to parse any segments.
 		// However, they don't make sense under CLI.
@@ -558,11 +558,11 @@ 
 
 		if ($where === 'trailing')
 		{
-			$leading	= '';
+			$leading = '';
 		}
 		elseif ($where === 'leading')
 		{
-			$trailing	= '';
+			$trailing = '';
 		}
 
 		return $leading.$this->$which($n).$trailing;

system/database/DB_cache.php

Spacing +3 added lines, -3 removed lines

@@ -74,8 +74,8 @@ 
 	public function __construct(&$db)
 	{
 		// Assign the main CI object to $this->CI and load the file helper since we use it a lot
-		$this->CI =& get_instance();
-		$this->db =& $db;
+		$this->CI = & get_instance();
+		$this->db = & $db;
 		$this->CI->load->helper('file');
 
 		$this->check_path();
@@ -194,7 +194,7 @@ 
 	{
 		if ($segment_one === '')
 		{
-			$segment_one  = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1);
+			$segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1);
 		}
 
 		if ($segment_two === '')

system/database/DB_driver.php

Spacing +48 added lines, -48 removed lines

@@ -92,7 +92,7 @@ 
 	 *
 	 * @var	string
 	 */
-	public $dbdriver		= 'mysqli';
+	public $dbdriver = 'mysqli';
 
 	/**
 	 * Sub-driver
@@ -107,63 +107,63 @@ 
 	 *
 	 * @var	string
 	 */
-	public $dbprefix		= '';
+	public $dbprefix = '';
 
 	/**
 	 * Character set
 	 *
 	 * @var	string
 	 */
-	public $char_set		= 'utf8';
+	public $char_set = 'utf8';
 
 	/**
 	 * Collation
 	 *
 	 * @var	string
 	 */
-	public $dbcollat		= 'utf8_general_ci';
+	public $dbcollat = 'utf8_general_ci';
 
 	/**
 	 * Encryption flag/data
 	 *
 	 * @var	mixed
 	 */
-	public $encrypt			= FALSE;
+	public $encrypt = FALSE;
 
 	/**
 	 * Swap Prefix
 	 *
 	 * @var	string
 	 */
-	public $swap_pre		= '';
+	public $swap_pre = '';
 
 	/**
 	 * Database port
 	 *
 	 * @var	int
 	 */
-	public $port			= '';
+	public $port = '';
 
 	/**
 	 * Persistent connection flag
 	 *
 	 * @var	bool
 	 */
-	public $pconnect		= FALSE;
+	public $pconnect = FALSE;
 
 	/**
 	 * Connection ID
 	 *
 	 * @var	object|resource
 	 */
-	public $conn_id			= FALSE;
+	public $conn_id = FALSE;
 
 	/**
 	 * Result ID
 	 *
 	 * @var	object|resource
 	 */
-	public $result_id		= FALSE;
+	public $result_id = FALSE;
 
 	/**
 	 * Debug flag
@@ -172,21 +172,21 @@ 
 	 *
 	 * @var	bool
 	 */
-	public $db_debug		= FALSE;
+	public $db_debug = FALSE;
 
 	/**
 	 * Benchmark time
 	 *
 	 * @var	int
 	 */
-	public $benchmark		= 0;
+	public $benchmark = 0;
 
 	/**
 	 * Executed queries count
 	 *
 	 * @var	int
 	 */
-	public $query_count		= 0;
+	public $query_count = 0;
 
 	/**
 	 * Bind marker
@@ -195,7 +195,7 @@ 
 	 *
 	 * @var	string
 	 */
-	public $bind_marker		= '?';
+	public $bind_marker = '?';
 
 	/**
 	 * Save queries flag
@@ -204,7 +204,7 @@ 
 	 *
 	 * @var	bool
 	 */
-	public $save_queries		= TRUE;
+	public $save_queries = TRUE;
 
 	/**
 	 * Queries list
@@ -212,7 +212,7 @@ 
 	 * @see	CI_DB_driver::$save_queries
 	 * @var	string[]
 	 */
-	public $queries			= array();
+	public $queries = array();
 
 	/**
 	 * Query times
@@ -221,7 +221,7 @@ 
 	 *
 	 * @var	array
 	 */
-	public $query_times		= array();
+	public $query_times = array();
 
 	/**
 	 * Data cache
@@ -230,28 +230,28 @@ 
 	 *
 	 * @var	array
 	 */
-	public $data_cache		= array();
+	public $data_cache = array();
 
 	/**
 	 * Transaction enabled flag
 	 *
 	 * @var	bool
 	 */
-	public $trans_enabled		= TRUE;
+	public $trans_enabled = TRUE;
 
 	/**
 	 * Strict transaction mode flag
 	 *
 	 * @var	bool
 	 */
-	public $trans_strict		= TRUE;
+	public $trans_strict = TRUE;
 
 	/**
 	 * Transaction depth level
 	 *
 	 * @var	int
 	 */
-	protected $_trans_depth		= 0;
+	protected $_trans_depth = 0;
 
 	/**
 	 * Transaction status flag
@@ -260,7 +260,7 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_trans_status	= TRUE;
+	protected $_trans_status = TRUE;
 
 	/**
 	 * Transaction failure flag
@@ -269,28 +269,28 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_trans_failure	= FALSE;
+	protected $_trans_failure = FALSE;
 
 	/**
 	 * Cache On flag
 	 *
 	 * @var	bool
 	 */
-	public $cache_on		= FALSE;
+	public $cache_on = FALSE;
 
 	/**
 	 * Cache directory path
 	 *
 	 * @var	bool
 	 */
-	public $cachedir		= '';
+	public $cachedir = '';
 
 	/**
 	 * Cache auto-delete flag
 	 *
 	 * @var	bool
 	 */
-	public $cache_autodel		= FALSE;
+	public $cache_autodel = FALSE;
 
 	/**
 	 * DB Cache object
@@ -305,7 +305,7 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_protect_identifiers		= TRUE;
+	protected $_protect_identifiers = TRUE;
 
 	/**
 	 * List of reserved identifiers
@@ -314,7 +314,7 @@ 
 	 *
 	 * @var	string[]
 	 */
-	protected $_reserved_identifiers	= array('*');
+	protected $_reserved_identifiers = array('*');
 
 	/**
 	 * Identifier escape character
@@ -711,8 +711,8 @@ 
 		}
 
 		// Load and instantiate the result driver
-		$driver		= $this->load_rdriver();
-		$RES		= new $driver($this);
+		$driver = $this->load_rdriver();
+		$RES = new $driver($this);
 
 		// Is query caching enabled? If so, we'll serialize the
 		// result object and save it to a cache file.
@@ -725,13 +725,13 @@ 
 			// result object, so we'll have to compile the data
 			// and save it)
 			$CR = new CI_DB_result($this);
-			$CR->result_object	= $RES->result_object();
-			$CR->result_array	= $RES->result_array();
-			$CR->num_rows		= $RES->num_rows();
+			$CR->result_object = $RES->result_object();
+			$CR->result_array = $RES->result_array();
+			$CR->num_rows = $RES->num_rows();
 
 			// Reset these since cached objects can not utilize resource IDs.
-			$CR->conn_id		= NULL;
-			$CR->result_id		= NULL;
+			$CR->conn_id = NULL;
+			$CR->result_id = NULL;
 
 			$this->CACHE->write($sql, $CR);
 		}
@@ -1553,17 +1553,17 @@ 
 				? '\s+'.preg_quote(trim(sprintf($this->_like_escape_str, $this->_like_escape_chr)), '/')
 				: '';
 			$_operators = array(
-				'\s*(?:<|>|!)?=\s*',             // =, <=, >=, !=
-				'\s*<>?\s*',                     // <, <>
-				'\s*>\s*',                       // >
-				'\s+IS NULL',                    // IS NULL
-				'\s+IS NOT NULL',                // IS NOT NULL
-				'\s+EXISTS\s*\([^\)]+\)',        // EXISTS(sql)
-				'\s+NOT EXISTS\s*\([^\)]+\)',    // NOT EXISTS(sql)
-				'\s+BETWEEN\s+',                 // BETWEEN value AND value
-				'\s+IN\s*\([^\)]+\)',            // IN(list)
-				'\s+NOT IN\s*\([^\)]+\)',        // NOT IN (list)
-				'\s+LIKE\s+\S.*('.$_les.')?',    // LIKE 'expr'[ ESCAPE '%s']
+				'\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
+				'\s*<>?\s*', // <, <>
+				'\s*>\s*', // >
+				'\s+IS NULL', // IS NULL
+				'\s+IS NOT NULL', // IS NOT NULL
+				'\s+EXISTS\s*\([^\)]+\)', // EXISTS(sql)
+				'\s+NOT EXISTS\s*\([^\)]+\)', // NOT EXISTS(sql)
+				'\s+BETWEEN\s+', // BETWEEN value AND value
+				'\s+IN\s*\([^\)]+\)', // IN(list)
+				'\s+NOT IN\s*\([^\)]+\)', // NOT IN (list)
+				'\s+LIKE\s+\S.*('.$_les.')?', // LIKE 'expr'[ ESCAPE '%s']
 				'\s+NOT LIKE\s+\S.*('.$_les.')?' // NOT LIKE 'expr'[ ESCAPE '%s']
 			);
 
@@ -1731,7 +1731,7 @@ 
 	 */
 	public function display_error($error = '', $swap = '', $native = FALSE)
 	{
-		$LANG =& load_class('Lang', 'core');
+		$LANG = & load_class('Lang', 'core');
 		$LANG->load('db');
 
 		$heading = $LANG->line('db_error_heading');
@@ -1769,7 +1769,7 @@ 
 			}
 		}
 
-		$error =& load_class('Exceptions', 'core');
+		$error = & load_class('Exceptions', 'core');
 		echo $error->show_error($heading, $message, 'error_db');
 		exit(8); // EXIT_DATABASE
 	}

system/database/DB_forge.php

Spacing +15 added lines, -15 removed lines

@@ -58,28 +58,28 @@ 
 	 *
 	 * @var	array
 	 */
-	public $fields		= array();
+	public $fields = array();
 
 	/**
 	 * Keys data
 	 *
 	 * @var	array
 	 */
-	public $keys		= array();
+	public $keys = array();
 
 	/**
 	 * Primary Keys data
 	 *
 	 * @var	array
 	 */
-	public $primary_keys	= array();
+	public $primary_keys = array();
 
 	/**
 	 * Database character set
 	 *
 	 * @var	string
 	 */
-	public $db_char_set	= '';
+	public $db_char_set = '';
 
 	// --------------------------------------------------------------------
 
@@ -88,28 +88,28 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= 'CREATE DATABASE %s';
+	protected $_create_database = 'CREATE DATABASE %s';
 
 	/**
 	 * DROP DATABASE statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_database	= 'DROP DATABASE %s';
+	protected $_drop_database = 'DROP DATABASE %s';
 
 	/**
 	 * CREATE TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_create_table	= "%s %s (%s\n)";
+	protected $_create_table = "%s %s (%s\n)";
 
 	/**
 	 * CREATE TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= 'CREATE TABLE IF NOT EXISTS';
+	protected $_create_table_if = 'CREATE TABLE IF NOT EXISTS';
 
 	/**
 	 * CREATE TABLE keys flag
@@ -119,42 +119,42 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_create_table_keys	= FALSE;
+	protected $_create_table_keys = FALSE;
 
 	/**
 	 * DROP TABLE IF EXISTS statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= 'DROP TABLE IF EXISTS';
+	protected $_drop_table_if = 'DROP TABLE IF EXISTS';
 
 	/**
 	 * RENAME TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_rename_table	= 'ALTER TABLE %s RENAME TO %s;';
+	protected $_rename_table = 'ALTER TABLE %s RENAME TO %s;';
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	bool|array
 	 */
-	protected $_unsigned		= TRUE;
+	protected $_unsigned = TRUE;
 
 	/**
 	 * NULL value representation in CREATE/ALTER TABLE statements
 	 *
 	 * @var	string
 	 */
-	protected $_null		= '';
+	protected $_null = '';
 
 	/**
 	 * DEFAULT value representation in CREATE/ALTER TABLE statements
 	 *
 	 * @var	string
 	 */
-	protected $_default		= ' DEFAULT ';
+	protected $_default = ' DEFAULT ';
 
 	// --------------------------------------------------------------------
 
@@ -166,7 +166,7 @@ 
 	 */
 	public function __construct(&$db)
 	{
-		$this->db =& $db;
+		$this->db = & $db;
 		log_message('info', 'Database Forge Class Initialized');
 	}
 

system/database/DB_query_builder.php

Spacing +32 added lines, -32 removed lines

@@ -56,119 +56,119 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $return_delete_sql		= FALSE;
+	protected $return_delete_sql = FALSE;
 
 	/**
 	 * Reset DELETE data flag
 	 *
 	 * @var	bool
 	 */
-	protected $reset_delete_data		= FALSE;
+	protected $reset_delete_data = FALSE;
 
 	/**
 	 * QB SELECT data
 	 *
 	 * @var	array
 	 */
-	protected $qb_select			= array();
+	protected $qb_select = array();
 
 	/**
 	 * QB DISTINCT flag
 	 *
 	 * @var	bool
 	 */
-	protected $qb_distinct			= FALSE;
+	protected $qb_distinct = FALSE;
 
 	/**
 	 * QB FROM data
 	 *
 	 * @var	array
 	 */
-	protected $qb_from			= array();
+	protected $qb_from = array();
 
 	/**
 	 * QB JOIN data
 	 *
 	 * @var	array
 	 */
-	protected $qb_join			= array();
+	protected $qb_join = array();
 
 	/**
 	 * QB WHERE data
 	 *
 	 * @var	array
 	 */
-	protected $qb_where			= array();
+	protected $qb_where = array();
 
 	/**
 	 * QB GROUP BY data
 	 *
 	 * @var	array
 	 */
-	protected $qb_groupby			= array();
+	protected $qb_groupby = array();
 
 	/**
 	 * QB HAVING data
 	 *
 	 * @var	array
 	 */
-	protected $qb_having			= array();
+	protected $qb_having = array();
 
 	/**
 	 * QB keys
 	 *
 	 * @var	array
 	 */
-	protected $qb_keys			= array();
+	protected $qb_keys = array();
 
 	/**
 	 * QB LIMIT data
 	 *
 	 * @var	int
 	 */
-	protected $qb_limit			= FALSE;
+	protected $qb_limit = FALSE;
 
 	/**
 	 * QB OFFSET data
 	 *
 	 * @var	int
 	 */
-	protected $qb_offset			= FALSE;
+	protected $qb_offset = FALSE;
 
 	/**
 	 * QB ORDER BY data
 	 *
 	 * @var	array
 	 */
-	protected $qb_orderby			= array();
+	protected $qb_orderby = array();
 
 	/**
 	 * QB data sets
 	 *
 	 * @var	array
 	 */
-	protected $qb_set			= array();
+	protected $qb_set = array();
 
 	/**
 	 * QB aliased tables list
 	 *
 	 * @var	array
 	 */
-	protected $qb_aliased_tables		= array();
+	protected $qb_aliased_tables = array();
 
 	/**
 	 * QB WHERE group started flag
 	 *
 	 * @var	bool
 	 */
-	protected $qb_where_group_started	= FALSE;
+	protected $qb_where_group_started = FALSE;
 
 	/**
 	 * QB WHERE group count
 	 *
 	 * @var	int
 	 */
-	protected $qb_where_group_count		= 0;
+	protected $qb_where_group_count = 0;
 
 	// Query Builder Caching variables
 
@@ -177,84 +177,84 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $qb_caching				= FALSE;
+	protected $qb_caching = FALSE;
 
 	/**
 	 * QB Cache exists list
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_exists			= array();
+	protected $qb_cache_exists = array();
 
 	/**
 	 * QB Cache SELECT data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_select			= array();
+	protected $qb_cache_select = array();
 
 	/**
 	 * QB Cache FROM data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_from			= array();
+	protected $qb_cache_from = array();
 
 	/**
 	 * QB Cache JOIN data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_join			= array();
+	protected $qb_cache_join = array();
 
 	/**
 	 * QB Cache WHERE data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_where			= array();
+	protected $qb_cache_where = array();
 
 	/**
 	 * QB Cache GROUP BY data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_groupby			= array();
+	protected $qb_cache_groupby = array();
 
 	/**
 	 * QB Cache HAVING data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_having			= array();
+	protected $qb_cache_having = array();
 
 	/**
 	 * QB Cache ORDER BY data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_orderby			= array();
+	protected $qb_cache_orderby = array();
 
 	/**
 	 * QB Cache data sets
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_set				= array();
+	protected $qb_cache_set = array();
 
 	/**
 	 * QB No Escape data
 	 *
 	 * @var	array
 	 */
-	protected $qb_no_escape 			= array();
+	protected $qb_no_escape = array();
 
 	/**
 	 * QB Cache No Escape data
 	 *
 	 * @var	array
 	 */
-	protected $qb_cache_no_escape			= array();
+	protected $qb_cache_no_escape = array();
 
 	// --------------------------------------------------------------------
 
@@ -2605,9 +2605,9 @@ 
 
 		foreach (array_unique($this->qb_cache_exists) as $val) // select, from, etc.
 		{
-			$qb_variable	= 'qb_'.$val;
-			$qb_cache_var	= 'qb_cache_'.$val;
-			$qb_new 	= $this->$qb_cache_var;
+			$qb_variable = 'qb_'.$val;
+			$qb_cache_var = 'qb_cache_'.$val;
+			$qb_new = $this->$qb_cache_var;
 
 			for ($i = 0, $c = count($this->$qb_variable); $i < $c; $i++)
 			{

system/database/DB_result.php

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

system/database/DB_utility.php

Spacing +5 added lines, -5 removed lines

@@ -60,21 +60,21 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_list_databases		= FALSE;
+	protected $_list_databases = FALSE;
 
 	/**
 	 * OPTIMIZE TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_optimize_table	= FALSE;
+	protected $_optimize_table = FALSE;
 
 	/**
 	 * REPAIR TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_repair_table	= FALSE;
+	protected $_repair_table = FALSE;
 
 	// --------------------------------------------------------------------
 
@@ -86,7 +86,7 @@ 
 	 */
 	public function __construct(&$db)
 	{
-		$this->db =& $db;
+		$this->db = & $db;
 		log_message('info', 'Database Utility Class Initialized');
 	}
 
@@ -404,7 +404,7 @@ 
 			}
 
 			// Load the Zip class and output it
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->load->library('zip');
 			$CI->zip->add_data($prefs['filename'], $this->_backup($prefs));
 			return $CI->zip->get_zip();

system/database/drivers/cubrid/cubrid_forge.php

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= FALSE;
+	protected $_create_database = FALSE;
 
 	/**
 	 * CREATE TABLE keys flag
@@ -61,28 +61,28 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_create_table_keys	= TRUE;
+	protected $_create_table_keys = TRUE;
 
 	/**
 	 * DROP DATABASE statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_database	= FALSE;
+	protected $_drop_database = FALSE;
 
 	/**
 	 * CREATE TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= FALSE;
+	protected $_create_table_if = FALSE;
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'SHORT'		=> 'INTEGER',
 		'SMALLINT'	=> 'INTEGER',
 		'INT'		=> 'BIGINT',

system/database/drivers/ibase/ibase_forge.php

Spacing +5 added lines, -5 removed lines

@@ -51,28 +51,28 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= FALSE;
+	protected $_create_table_if = FALSE;
 
 	/**
 	 * RENAME TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_rename_table	= FALSE;
+	protected $_rename_table = FALSE;
 
 	/**
 	 * DROP TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= FALSE;
+	protected $_drop_table_if = FALSE;
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'SMALLINT'	=> 'INTEGER',
 		'INTEGER'	=> 'INT64',
 		'FLOAT'		=> 'DOUBLE PRECISION'
@@ -83,7 +83,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_null		= 'NULL';
+	protected $_null = 'NULL';
 
 	// --------------------------------------------------------------------