ci-bonfire / Sprint

system/core/CodeIgniter.php

Spacing +10 added lines, -10 removed lines

@@ -185,7 +185,7 @@ 
  *  Start the timer... tick tock tick tock...
  * ------------------------------------------------------
  */
-	$BM =& load_class('Benchmark', 'core');
+	$BM = & load_class('Benchmark', 'core');
 	$BM->mark('total_execution_time_start');
 	$BM->mark('loading_time:_base_classes_start');
 
@@ -194,7 +194,7 @@ 
  *  Instantiate the hooks class
  * ------------------------------------------------------
  */
-	$EXT =& load_class('Hooks', 'core');
+	$EXT = & load_class('Hooks', 'core');
 
 /*
  * ------------------------------------------------------
@@ -213,7 +213,7 @@ 
  * depending on another class that uses it.
  *
  */
-	$CFG =& load_class('Config', 'core');
+	$CFG = & load_class('Config', 'core');
 
 	// Do we have any manually set config items in the index.php file?
 	if (isset($assign_to_config) && is_array($assign_to_config))
@@ -291,28 +291,28 @@ 
  *  Instantiate the UTF-8 class
  * ------------------------------------------------------
  */
-	$UNI =& load_class('Utf8', 'core');
+	$UNI = & load_class('Utf8', 'core');
 
 /*
  * ------------------------------------------------------
  *  Instantiate the URI class
  * ------------------------------------------------------
  */
-	$URI =& load_class('URI', 'core');
+	$URI = & load_class('URI', 'core');
 
 /*
  * ------------------------------------------------------
  *  Instantiate the routing class and set the routing
  * ------------------------------------------------------
  */
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
 
 /*
  * ------------------------------------------------------
  *  Instantiate the output class
  * ------------------------------------------------------
  */
-	$OUT =& load_class('Output', 'core');
+	$OUT = & load_class('Output', 'core');
 
 /*
  * ------------------------------------------------------
@@ -329,21 +329,21 @@ 
  * Load the security class for xss and csrf support
  * -----------------------------------------------------
  */
-	$SEC =& load_class('Security', 'core');
+	$SEC = & load_class('Security', 'core');
 
 /*
  * ------------------------------------------------------
  *  Load the Input class and sanitize globals
  * ------------------------------------------------------
  */
-	$IN	=& load_class('Input', 'core');
+	$IN = & load_class('Input', 'core');
 
 /*
  * ------------------------------------------------------
  *  Load the Language class
  * ------------------------------------------------------
  */
-	$LANG =& load_class('Lang', 'core');
+	$LANG = & load_class('Lang', 'core');
 
 /*
  * ------------------------------------------------------

Braces +8 added lines, -16 removed lines

@@ -169,12 +169,10 @@ 
 			file_exists(APPPATH.'vendor/autoload.php')
 				? require_once(APPPATH.'vendor/autoload.php')
 				: log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
-		}
-		elseif (file_exists($composer_autoload))
+		} elseif (file_exists($composer_autoload))
 		{
 			require_once($composer_autoload);
-		}
-		else
+		} else
 		{
 			log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
 		}
@@ -250,8 +248,7 @@ 
 		// This is required for mb_convert_encoding() to strip invalid characters.
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
 		mb_substitute_character('none');
-	}
-	else
+	} else
 	{
 		define('MB_ENABLED', FALSE);
 	}
@@ -264,8 +261,7 @@ 
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
 		// and it's usage triggers E_DEPRECATED messages.
 		@ini_set('iconv.internal_encoding', $charset);
-	}
-	else
+	} else
 	{
 		define('ICONV_ENABLED', FALSE);
 	}
@@ -402,16 +398,14 @@ 
 	if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
 	{
 		$e404 = TRUE;
-	}
-	else
+	} else
 	{
 		require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
 
 		if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
 		{
 			$e404 = TRUE;
-		}
-		elseif (method_exists($class, '_remap'))
+		} elseif (method_exists($class, '_remap'))
 		{
 			$params = array($method, array_slice($URI->rsegments, 2));
 			$method = '_remap';
@@ -453,8 +447,7 @@ 
 						$RTR->directory = '';
 					}
 				}
-			}
-			else
+			} else
 			{
 				$e404 = FALSE;
 			}
@@ -470,8 +463,7 @@ 
 				1 => $class,
 				2 => $method
 			);
-		}
-		else
+		} else
 		{
 			show_404($RTR->directory.$class.'/'.$method);
 		}

system/core/Controller.php

Spacing +3 added lines, -3 removed lines

@@ -65,17 +65,17 @@
 	 */
 	public function __construct()
 	{
-		self::$instance =& $this;
+		self::$instance = & $this;
 
 		// Assign all the class objects that were instantiated by the
 		// bootstrap file (CodeIgniter.php) to local class variables
 		// so that CI can run as one big super object.
 		foreach (is_loaded() as $var => $class)
 		{
-			$this->$var =& load_class($class);
+			$this->$var = & load_class($class);
 		}
 
-		$this->load =& load_class('Loader', 'core');
+		$this->load = & load_class('Loader', 'core');
 		$this->load->initialize();
 		log_message('info', 'Controller Class Initialized');
 	}

system/core/Lang.php

Spacing +3 added lines, -3 removed lines

@@ -53,14 +53,14 @@ 
 	 *
 	 * @var	array
 	 */
-	public $language =	array();
+	public $language = array();
 
 	/**
 	 * List of loaded language files
 	 *
 	 * @var	array
 	 */
-	public $is_loaded =	array();
+	public $is_loaded = array();
 
 	/**
 	 * Class constructor
@@ -108,7 +108,7 @@ 
 
 		if (empty($idiom) OR ! preg_match('/^[a-z_-]+$/i', $idiom))
 		{
-			$config =& get_config();
+			$config = & get_config();
 			$idiom = empty($config['language']) ? 'english' : $config['language'];
 		}
 

Braces +1 added lines, -2 removed lines

@@ -266,8 +266,7 @@
 		if ($reduce_linebreaks === TRUE)
 		{
 			$table['#<p>\n*</p>#'] = '';
-		}
-		else
+		} else
 		{
 			// If we have empty paragraph tags we add a non-breaking space
 			// otherwise most browsers won't treat them as true paragraphs

system/core/Log.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 	 */
 	public function __construct()
 	{
-		$config =& get_config();
+		$config = & get_config();
 
 		$this->_log_path = ($config['log_path'] !== '') ? $config['log_path'] : APPPATH.'logs/';
 		$this->_file_ext = (isset($config['log_file_extension']) && $config['log_file_extension'] !== '')

Braces +2 added lines, -4 removed lines

@@ -129,8 +129,7 @@ 
 		if (is_numeric($config['log_threshold']))
 		{
 			$this->_threshold = (int) $config['log_threshold'];
-		}
-		elseif (is_array($config['log_threshold']))
+		} elseif (is_array($config['log_threshold']))
 		{
 			$this->_threshold = 0;
 			$this->_threshold_array = array_flip($config['log_threshold']);
@@ -198,8 +197,7 @@ 
 			$microtime_short = sprintf("%06d", ($microtime_full - floor($microtime_full)) * 1000000);
 			$date = new DateTime(date('Y-m-d H:i:s.'.$microtime_short, $microtime_full));
 			$date = $date->format($this->_date_fmt);
-		}
-		else
+		} else
 		{
 			$date = date($this->_date_fmt);
 		}

system/core/Router.php

Spacing +6 added lines, -6 removed lines

@@ -62,21 +62,21 @@ 
 	 *
 	 * @var	array
 	 */
-	public $routes =	array();
+	public $routes = array();
 
 	/**
 	 * Current class name
 	 *
 	 * @var	string
 	 */
-	public $class =		'';
+	public $class = '';
 
 	/**
 	 * Current method name
 	 *
 	 * @var	string
 	 */
-	public $method =	'index';
+	public $method = 'index';
 
 	/**
 	 * Sub-directory that contains the requested controller class
@@ -123,8 +123,8 @@ 
 	 */
 	public function __construct($routing = NULL)
 	{
-		$this->config =& load_class('Config', 'core');
-		$this->uri =& load_class('URI', 'core');
+		$this->config = & load_class('Config', 'core');
+		$this->uri = & load_class('URI', 'core');
 
 		$this->enable_query_strings = ( ! is_cli() && $this->config->item('enable_query_strings') === TRUE);
 
@@ -136,7 +136,7 @@ 
 		if (is_array($routing))
 		{
 			empty($routing['controller']) OR $this->set_class($routing['controller']);
-			empty($routing['function'])   OR $this->set_method($routing['function']);
+			empty($routing['function']) OR $this->set_method($routing['function']);
 		}
 
 		log_message('info', 'Router Class Initialized');

Braces +5 added lines, -10 removed lines

@@ -211,8 +211,7 @@ 
 					1 => $this->class,
 					2 => $this->method
 				);
-			}
-			else
+			} else
 			{
 				$this->_set_default_controller();
 			}
@@ -226,8 +225,7 @@ 
 		if ($this->uri->uri_string !== '')
 		{
 			$this->_parse_routes();
-		}
-		else
+		} else
 		{
 			$this->_set_default_controller();
 		}
@@ -269,8 +267,7 @@ 
 		if (isset($segments[1]))
 		{
 			$this->set_method($segments[1]);
-		}
-		else
+		} else
 		{
 			$segments[1] = 'index';
 		}
@@ -385,8 +382,7 @@ 
 				if (isset($val[$http_verb]))
 				{
 					$val = $val[$http_verb];
-				}
-				else
+				} else
 				{
 					continue;
 				}
@@ -489,8 +485,7 @@ 
 		if ($append !== TRUE OR empty($this->directory))
 		{
 			$this->directory = str_replace('.', '', trim($dir, '/')).'/';
-		}
-		else
+		} else
 		{
 			$this->directory .= str_replace('.', '', trim($dir, '/')).'/';
 		}

system/core/Security.php

Spacing +17 added lines, -17 removed lines

@@ -53,22 +53,22 @@ 
 	 *
 	 * @var	array
 	 */
-	public $filename_bad_chars =	array(
+	public $filename_bad_chars = array(
 		'../', '<!--', '-->', '<', '>',
 		"'", '"', '&', '$', '#',
 		'{', '}', '[', ']', '=',
 		';', '?', '%20', '%22',
-		'%3c',		// <
-		'%253c',	// <
-		'%3e',		// >
-		'%0e',		// >
-		'%28',		// (
-		'%29',		// )
-		'%2528',	// (
-		'%26',		// &
-		'%24',		// $
-		'%3f',		// ?
-		'%3b',		// ;
+		'%3c', // <
+		'%253c', // <
+		'%3e', // >
+		'%0e', // >
+		'%28', // (
+		'%29', // )
+		'%2528', // (
+		'%26', // &
+		'%24', // $
+		'%3f', // ?
+		'%3b', // ;
 		'%3d'		// =
 	);
 
@@ -107,7 +107,7 @@ 
 	 *
 	 * @var	int
 	 */
-	protected $_csrf_expire =	7200;
+	protected $_csrf_expire = 7200;
 
 	/**
 	 * CSRF Token name
@@ -116,7 +116,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_csrf_token_name =	'ci_csrf_token';
+	protected $_csrf_token_name = 'ci_csrf_token';
 
 	/**
 	 * CSRF Cookie name
@@ -125,14 +125,14 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_csrf_cookie_name =	'ci_csrf_token';
+	protected $_csrf_cookie_name = 'ci_csrf_token';
 
 	/**
 	 * List of never allowed strings
 	 *
 	 * @var	array
 	 */
-	protected $_never_allowed_str =	array(
+	protected $_never_allowed_str = array(
 		'document.cookie'	=> '[removed]',
 		'document.write'	=> '[removed]',
 		'.parentNode'		=> '[removed]',
@@ -795,7 +795,7 @@ 
 	 */
 	protected function _sanitize_naughty_html($matches)
 	{
-		static $naughty_tags    = array(
+		static $naughty_tags = array(
 			'alert', 'prompt', 'confirm', 'applet', 'audio', 'basefont', 'base', 'behavior', 'bgsound',
 			'blink', 'body', 'embed', 'expression', 'form', 'frameset', 'frame', 'head', 'html', 'ilayer',
 			'iframe', 'input', 'button', 'select', 'isindex', 'layer', 'link', 'meta', 'keygen', 'object',

Braces +6 added lines, -7 removed lines

@@ -225,10 +225,12 @@ 
 
 		// Do the tokens exist in both the _POST and _COOKIE arrays?
 		if ( ! isset($_POST[$this->_csrf_token_name], $_COOKIE[$this->_csrf_cookie_name])
-			OR $_POST[$this->_csrf_token_name] !== $_COOKIE[$this->_csrf_cookie_name]) // Do the tokens match?
+			OR $_POST[$this->_csrf_token_name] !== $_COOKIE[$this->_csrf_cookie_name]) {
+			// Do the tokens match?
 		{
 			$this->csrf_show_error();
 		}
+		}
 
 		// We kill this since we're done and we don't want to polute the _POST array
 		unset($_POST[$this->_csrf_token_name]);
@@ -421,8 +423,7 @@ 
 			// closing tags every so often so we skip those and only
 			// do the long opening tags.
 			$str = preg_replace('/<\?(php)/i', '&lt;?\\1', $str);
-		}
-		else
+		} else
 		{
 			$str = str_replace(array('<?', '?'.'>'), array('&lt;?', '?&gt;'), $str);
 		}
@@ -599,8 +600,7 @@ 
 			{
 				// The cast is required to avoid TypeError
 				return random_bytes((int) $length);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				// If random_bytes() can't do the job, we can't either ...
 				// There's no point in using fallbacks.
@@ -854,8 +854,7 @@ 
 				)
 				{
 					$attributes[] = 'xss=removed';
-				}
-				else
+				} else
 				{
 					$attributes[] = $attribute[0][0];
 				}

Doc Comments +1 added lines

@@ -1237,6 +1237,7 @@
 	 * Valid Email
 	 *
 	 * @param	string
+	 * @param string $str
 	 * @return	bool
 	 */
 	public function valid_email($str)

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;

Braces +6 added lines, -12 removed lines

@@ -110,8 +110,7 @@ 
 			if (is_cli())
 			{
 				$uri = $this->_parse_argv();
-			}
-			else
+			} else
 			{
 				$protocol = $this->config->item('uri_protocol');
 				empty($protocol) && $protocol = 'REQUEST_URI';
@@ -212,8 +211,7 @@ 
 			if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0)
 			{
 				$uri = (string) substr($uri, strlen($_SERVER['SCRIPT_NAME']));
-			}
-			elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
+			} elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
 			{
 				$uri = (string) substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
 			}
@@ -226,8 +224,7 @@ 
 			$query = explode('?', $query, 2);
 			$uri = $query[0];
 			$_SERVER['QUERY_STRING'] = isset($query[1]) ? $query[1] : '';
-		}
-		else
+		} else
 		{
 			$_SERVER['QUERY_STRING'] = $query;
 		}
@@ -259,8 +256,7 @@ 
 		if (trim($uri, '/') === '')
 		{
 			return '';
-		}
-		elseif (strncmp($uri, '/', 1) === 0)
+		} elseif (strncmp($uri, '/', 1) === 0)
 		{
 			$uri = explode('?', $uri, 2);
 			$_SERVER['QUERY_STRING'] = isset($uri[1]) ? $uri[1] : '';
@@ -456,8 +452,7 @@ 
 			if ($i % 2)
 			{
 				$retval[$lastval] = $seg;
-			}
-			else
+			} else
 			{
 				$retval[$seg] = NULL;
 				$lastval = $seg;
@@ -559,8 +554,7 @@ 
 		if ($where === 'trailing')
 		{
 			$leading	= '';
-		}
-		elseif ($where === 'leading')
+		} elseif ($where === 'leading')
 		{
 			$trailing	= '';
 		}

system/core/Utf8.php

Braces +3 added lines, -6 removed lines

@@ -67,8 +67,7 @@ 
 		{
 			define('UTF8_ENABLED', TRUE);
 			log_message('debug', 'UTF-8 Support Enabled');
-		}
-		else
+		} else
 		{
 			define('UTF8_ENABLED', FALSE);
 			log_message('debug', 'UTF-8 Support Disabled');
@@ -94,8 +93,7 @@ 
 			if (MB_ENABLED)
 			{
 				$str = mb_convert_encoding($str, 'UTF-8', 'UTF-8');
-			}
-			elseif (ICONV_ENABLED)
+			} elseif (ICONV_ENABLED)
 			{
 				$str = @iconv('UTF-8', 'UTF-8//IGNORE', $str);
 			}
@@ -137,8 +135,7 @@ 
 		if (MB_ENABLED)
 		{
 			return mb_convert_encoding($str, 'UTF-8', $encoding);
-		}
-		elseif (ICONV_ENABLED)
+		} elseif (ICONV_ENABLED)
 		{
 			return @iconv($encoding, 'UTF-8', $str);
 		}

system/core/compat/hash.php

Braces +4 added lines, -8 removed lines

@@ -73,13 +73,11 @@ 
 		{
 			trigger_error('hash_equals(): Expected known_string to be a string, '.strtolower(gettype($known_string)).' given', E_USER_WARNING);
 			return FALSE;
-		}
-		elseif ( ! is_string($user_string))
+		} elseif ( ! is_string($user_string))
 		{
 			trigger_error('hash_equals(): Expected user_string to be a string, '.strtolower(gettype($user_string)).' given', E_USER_WARNING);
 			return FALSE;
-		}
-		elseif (($length = strlen($known_string)) !== strlen($user_string))
+		} elseif (($length = strlen($known_string)) !== strlen($user_string))
 		{
 			return FALSE;
 		}
@@ -135,8 +133,7 @@ 
 			if (is_string($iterations) && is_numeric($iterations))
 			{
 				$iterations = (int) $iterations;
-			}
-			else
+			} else
 			{
 				trigger_error('hash_pbkdf2() expects parameter 4 to be long, '.$type.' given', E_USER_WARNING);
 				return NULL;
@@ -159,8 +156,7 @@ 
 			if (is_string($length) && is_numeric($length))
 			{
 				$length = (int) $length;
-			}
-			else
+			} else
 			{
 				trigger_error('hash_pbkdf2() expects parameter 5 to be long, '.$type.' given', E_USER_WARNING);
 				return NULL;