ci-bonfire / Sprint

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;

system/core/compat/password.php

Braces +6 added lines, -12 removed lines

@@ -113,18 +113,15 @@ 
 		{
 			trigger_error('password_hash(): Provided salt is too short: '.$saltlen.' expecting 22', E_USER_WARNING);
 			return NULL;
-		}
-		elseif ( ! isset($options['salt']))
+		} elseif ( ! isset($options['salt']))
 		{
 			if (defined('MCRYPT_DEV_URANDOM'))
 			{
 				$options['salt'] = mcrypt_create_iv(16, MCRYPT_DEV_URANDOM);
-			}
-			elseif (function_exists('openssl_random_pseudo_bytes'))
+			} elseif (function_exists('openssl_random_pseudo_bytes'))
 			{
 				$options['salt'] = openssl_random_pseudo_bytes(16);
-			}
-			elseif (DIRECTORY_SEPARATOR === '/' && (is_readable($dev = '/dev/arandom') OR is_readable($dev = '/dev/urandom')))
+			} elseif (DIRECTORY_SEPARATOR === '/' && (is_readable($dev = '/dev/arandom') OR is_readable($dev = '/dev/urandom')))
 			{
 				if (($fp = fopen($dev, 'rb')) === FALSE)
 				{
@@ -147,16 +144,14 @@ 
 				}
 
 				fclose($fp);
-			}
-			else
+			} else
 			{
 				log_message('error', 'compat/password: No CSPRNG available.');
 				return FALSE;
 			}
 
 			$options['salt'] = str_replace('+', '.', rtrim(base64_encode($options['salt']), '='));
-		}
-		elseif ( ! preg_match('#^[a-zA-Z0-9./]+$#D', $options['salt']))
+		} elseif ( ! preg_match('#^[a-zA-Z0-9./]+$#D', $options['salt']))
 		{
 			$options['salt'] = str_replace('+', '.', rtrim(base64_encode($options['salt']), '='));
 		}
@@ -189,8 +184,7 @@ 
 		if ($algo !== $info['algo'])
 		{
 			return TRUE;
-		}
-		elseif ($algo === 1)
+		} elseif ($algo === 1)
 		{
 			$options['cost'] = isset($options['cost']) ? (int) $options['cost'] : 10;
 			return ($info['options']['cost'] !== $options['cost']);

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 3.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 3.0.0
+	 * @filesource
+	 */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**

system/core/compat/standard.php

Braces +15 added lines, -30 removed lines

@@ -74,12 +74,10 @@ 
 			if ($type === 'double')
 			{
 				$column_key = (int) $column_key;
-			}
-			elseif ($type === 'object' && method_exists($column_key, '__toString'))
+			} elseif ($type === 'object' && method_exists($column_key, '__toString'))
 			{
 				$column_key = (string) $column_key;
-			}
-			else
+			} else
 			{
 				trigger_error('array_column(): The column key should be either a string or an integer', E_USER_WARNING);
 				return FALSE;
@@ -91,12 +89,10 @@ 
 			if ($type === 'double')
 			{
 				$index_key = (int) $index_key;
-			}
-			elseif ($type === 'object' && method_exists($index_key, '__toString'))
+			} elseif ($type === 'object' && method_exists($index_key, '__toString'))
 			{
 				$index_key = (string) $index_key;
-			}
-			else
+			} else
 			{
 				trigger_error('array_column(): The index key should be either a string or an integer', E_USER_WARNING);
 				return FALSE;
@@ -109,12 +105,10 @@ 
 			if ($column_key === NULL)
 			{
 				$value = $a;
-			}
-			elseif (is_array($a) && array_key_exists($column_key, $a))
+			} elseif (is_array($a) && array_key_exists($column_key, $a))
 			{
 				$value = $a[$column_key];
-			}
-			else
+			} else
 			{
 				continue;
 			}
@@ -122,8 +116,7 @@ 
 			if ($index_key === NULL OR ! array_key_exists($index_key, $a))
 			{
 				$result[] = $value;
-			}
-			else
+			} else
 			{
 				$result[$a[$index_key]] = $value;
 			}
@@ -158,8 +151,7 @@ 
 			if ($type === 'object' && method_exists($data, '__toString'))
 			{
 				$data = (string) $data;
-			}
-			else
+			} else
 			{
 				trigger_error('hex2bin() expects parameter 1 to be string, '.$type.' given', E_USER_WARNING);
 				return NULL;
@@ -170,8 +162,7 @@ 
 		{
 			trigger_error('Hexadecimal input string must have an even length', E_USER_WARNING);
 			return FALSE;
-		}
-		elseif ( ! preg_match('/^[0-9a-f]*$/i', $data))
+		} elseif ( ! preg_match('/^[0-9a-f]*$/i', $data))
 		{
 			trigger_error('Input string must be hexadecimal string', E_USER_WARNING);
 			return FALSE;
@@ -206,8 +197,7 @@ 
 		{
 			trigger_error('array_replace() expects at least 1 parameter, 0 given', E_USER_WARNING);
 			return NULL;
-		}
-		elseif ($c === 1)
+		} elseif ($c === 1)
 		{
 			if ( ! is_array($arrays[0]))
 			{
@@ -227,8 +217,7 @@ 
 			{
 				trigger_error('array_replace(): Argument #'.($i + 2).' is not an array', E_USER_WARNING);
 				return NULL;
-			}
-			elseif (empty($arrays[$i]))
+			} elseif (empty($arrays[$i]))
 			{
 				continue;
 			}
@@ -261,8 +250,7 @@ 
 		{
 			trigger_error('array_replace_recursive() expects at least 1 parameter, 0 given', E_USER_WARNING);
 			return NULL;
-		}
-		elseif ($c === 1)
+		} elseif ($c === 1)
 		{
 			if ( ! is_array($arrays[0]))
 			{
@@ -282,8 +270,7 @@ 
 			{
 				trigger_error('array_replace_recursive(): Argument #'.($i + 2).' is not an array', E_USER_WARNING);
 				return NULL;
-			}
-			elseif (empty($arrays[$i]))
+			} elseif (empty($arrays[$i]))
 			{
 				continue;
 			}
@@ -316,14 +303,12 @@ 
 		if (strlen($str) === 0)
 		{
 			return '';
-		}
-		elseif (in_array($type = gettype($str), array('array', 'object'), TRUE))
+		} elseif (in_array($type = gettype($str), array('array', 'object'), TRUE))
 		{
 			if ($type === 'object' && method_exists($str, '__toString'))
 			{
 				$str = (string) $str;
-			}
-			else
+			} else
 			{
 				trigger_error('quoted_printable_encode() expects parameter 1 to be string, '.$type.' given', E_USER_WARNING);
 				return NULL;

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 3.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 3.0.0
+	 * @filesource
+	 */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**

system/database/DB.php

Indentation +36 added lines, -36 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');
 
 /**
@@ -185,7 +185,7 @@ 
 	elseif ( ! class_exists('CI_DB', FALSE))
 	{
 		/**
-	 	 * @ignore
+		 * @ignore
 		 */
 		class CI_DB extends CI_DB_driver { }
 	}

Braces +4 added lines, -8 removed lines

@@ -73,8 +73,7 @@ 
 					if (file_exists($file_path = $path.'config/'.ENVIRONMENT.'/database.php'))
 					{
 						include($file_path);
-					}
-					elseif (file_exists($file_path = $path.'config/database.php'))
+					} elseif (file_exists($file_path = $path.'config/database.php'))
 					{
 						include($file_path);
 					}
@@ -95,15 +94,13 @@ 
 		if ( ! isset($active_group))
 		{
 			show_error('You have not specified a database connection group via $active_group in your config/database.php file.');
-		}
-		elseif ( ! isset($db[$active_group]))
+		} elseif ( ! isset($db[$active_group]))
 		{
 			show_error('You have specified an invalid database connection group ('.$active_group.') in your config/database.php file.');
 		}
 
 		$params = $db[$active_group];
-	}
-	elseif (is_string($params))
+	} elseif (is_string($params))
 	{
 		/**
 		 * Parse the URL from the DSN string
@@ -181,8 +178,7 @@ 
 			 */
 			class CI_DB extends CI_DB_query_builder { }
 		}
-	}
-	elseif ( ! class_exists('CI_DB', FALSE))
+	} elseif ( ! class_exists('CI_DB', FALSE))
 	{
 		/**
 	 	 * @ignore

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();

Braces +7 added lines, -7 removed lines

@@ -103,8 +103,7 @@ 
 		if (isset($this->db->data_cache['db_names']))
 		{
 			return $this->db->data_cache['db_names'];
-		}
-		elseif ($this->_list_databases === FALSE)
+		} elseif ($this->_list_databases === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
 		}
@@ -387,8 +386,7 @@ 
 			{
 				$prefs['filename'] = (count($prefs['tables']) === 1 ? $prefs['tables'] : $this->db->database)
 							.date('Y-m-d_H-i', time()).'.sql';
-			}
-			else
+			} else
 			{
 				// If they included the .zip file extension we'll remove it
 				if (preg_match('|.+?\.zip$|', $prefs['filename']))
@@ -408,15 +406,17 @@ 
 			$CI->load->library('zip');
 			$CI->zip->add_data($prefs['filename'], $this->_backup($prefs));
 			return $CI->zip->get_zip();
-		}
-		elseif ($prefs['format'] === 'txt') // Was a text file requested?
+		} elseif ($prefs['format'] === 'txt') {
+			// Was a text file requested?
 		{
 			return $this->_backup($prefs);
 		}
-		elseif ($prefs['format'] === 'gzip') // Was a Gzip file requested?
+		} elseif ($prefs['format'] === 'gzip') {
+			// Was a Gzip file requested?
 		{
 			return gzencode($this->_backup($prefs));
 		}
+		}
 
 		return;
 	}

system/database/drivers/cubrid/cubrid_driver.php

Braces +2 added lines, -4 removed lines

@@ -100,8 +100,7 @@ 
 			{
 				$this->auto_commit = FALSE;
 			}
-		}
-		else
+		} else
 		{
 			// If no port is defined by the user, use the default value
 			empty($this->port) OR $this->port = 33000;
@@ -194,8 +193,7 @@ 
 		if (($autocommit = cubrid_get_autocommit($this->conn_id)) === NULL)
 		{
 			return FALSE;
-		}
-		elseif ($autocommit === TRUE)
+		} elseif ($autocommit === TRUE)
 		{
 			return cubrid_set_autocommit($this->conn_id, CUBRID_AUTOCOMMIT_FALSE);
 		}

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;