ci-bonfire / Sprint

system/libraries/Session/Session.php

Spacing +1 added lines, -1 removed lines

@@ -354,7 +354,7 @@
 			}
 		}
 
-		$this->userdata =& $_SESSION;
+		$this->userdata = & $_SESSION;
 	}
 
 	// ------------------------------------------------------------------------

Braces +13 added lines, -26 removed lines

@@ -73,18 +73,15 @@ 
 		{
 			log_message('debug', 'Session: Initialization under CLI aborted.');
 			return;
-		}
-		elseif ((bool) ini_get('session.auto_start'))
+		} elseif ((bool) ini_get('session.auto_start'))
 		{
 			log_message('error', 'Session: session.auto_start is enabled in php.ini. Aborting.');
 			return;
-		}
-		elseif ( ! empty($params['driver']))
+		} elseif ( ! empty($params['driver']))
 		{
 			$this->_driver = $params['driver'];
 			unset($params['driver']);
-		}
-		elseif ($driver = config_item('sess_driver'))
+		} elseif ($driver = config_item('sess_driver'))
 		{
 			$this->_driver = $driver;
 		}
@@ -105,8 +102,7 @@ 
 			if (is_php('5.4'))
 			{
 				session_set_save_handler($class, TRUE);
-			}
-			else
+			} else
 			{
 				session_set_save_handler(
 					array($class, 'open'),
@@ -119,8 +115,7 @@ 
 
 				register_shutdown_function('session_write_close');
 			}
-		}
-		else
+		} else
 		{
 			log_message('error', "Session: Driver '".$this->_driver."' doesn't implement SessionHandlerInterface. Aborting.");
 			return;
@@ -147,8 +142,7 @@ 
 			if ( ! isset($_SESSION['__ci_last_regenerate']))
 			{
 				$_SESSION['__ci_last_regenerate'] = time();
-			}
-			elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerate_time))
+			} elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerate_time))
 			{
 				$this->sess_regenerate((bool) config_item('sess_regenerate_destroy'));
 			}
@@ -237,8 +231,7 @@ 
 			if (class_exists($prefix.$class, FALSE))
 			{
 				return $prefix.$class;
-			}
-			else
+			} else
 			{
 				log_message('debug', 'Session: '.$prefix.$class.".php found but it doesn't declare class ".$prefix.$class.'.');
 			}
@@ -264,8 +257,7 @@ 
 		if (isset($params['cookie_lifetime']))
 		{
 			$params['cookie_lifetime'] = (int) $params['cookie_lifetime'];
-		}
-		else
+		} else
 		{
 			$params['cookie_lifetime'] = ( ! isset($expiration) && config_item('sess_expire_on_close'))
 				? 0 : (int) $expiration;
@@ -275,8 +267,7 @@ 
 		if (empty($params['cookie_name']))
 		{
 			$params['cookie_name'] = ini_get('session.name');
-		}
-		else
+		} else
 		{
 			ini_set('session.name', $params['cookie_name']);
 		}
@@ -296,8 +287,7 @@ 
 		if (empty($expiration))
 		{
 			$params['expiration'] = (int) ini_get('session.gc_maxlifetime');
-		}
-		else
+		} else
 		{
 			$params['expiration'] = (int) $expiration;
 			ini_set('session.gc_maxlifetime', $expiration);
@@ -473,8 +463,7 @@ 
 				{
 					$k = $v;
 					$v = $ttl;
-				}
-				else
+				} else
 				{
 					$v += time();
 				}
@@ -572,8 +561,7 @@ 
 		if (isset($_SESSION[$key]))
 		{
 			return $_SESSION[$key];
-		}
-		elseif ($key === 'session_id')
+		} elseif ($key === 'session_id')
 		{
 			return session_id();
 		}
@@ -654,8 +642,7 @@ 
 		if (isset($key))
 		{
 			return isset($_SESSION[$key]) ? $_SESSION[$key] : NULL;
-		}
-		elseif (empty($_SESSION))
+		} elseif (empty($_SESSION))
 		{
 			return array();
 		}

Doc Comments -2 removed lines

@@ -711,7 +711,6 @@ 
 	 *
 	 * Legacy CI_Session compatibility method
 	 *
-	 * @param	mixed	$data	Session data key(s)
 	 * @return	void
 	 */
 	public function unset_userdata($key)
@@ -879,7 +878,6 @@ 
 	 *
 	 * Legacy CI_Session compatibility method
 	 *
-	 * @param	mixed	$data	Session data key(s)
 	 * @return	void
 	 */
 	public function unset_tempdata($key)

system/libraries/Session/Session_driver.php

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');
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 */
 	public function __construct(&$params)
 	{
-		$this->_config =& $params;
+		$this->_config = & $params;
 	}
 
 	// ------------------------------------------------------------------------

system/libraries/Session/drivers/Session_database_driver.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 	{
 		parent::__construct($params);
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		isset($CI->db) OR $CI->load->database();
 		$this->_db = $CI->db;
 

Braces +6 added lines, -12 removed lines

@@ -88,12 +88,10 @@ 
 		if ( ! $this->_db instanceof CI_DB_query_builder)
 		{
 			throw new Exception('Query Builder not enabled for the configured database. Aborting.');
-		}
-		elseif ($this->_db->pconnect)
+		} elseif ($this->_db->pconnect)
 		{
 			throw new Exception('Configured database connection is persistent. Aborting.');
-		}
-		elseif ($this->_db->cache_on)
+		} elseif ($this->_db->cache_on)
 		{
 			throw new Exception('Configured database connection has cache enabled. Aborting.');
 		}
@@ -102,8 +100,7 @@ 
 		if (strpos($db_driver, 'mysql') !== FALSE)
 		{
 			$this->_platform = 'mysql';
-		}
-		elseif (in_array($db_driver, array('postgre', 'pdo_pgsql'), TRUE))
+		} elseif (in_array($db_driver, array('postgre', 'pdo_pgsql'), TRUE))
 		{
 			$this->_platform = 'postgre';
 		}
@@ -206,8 +203,7 @@ 
 
 			$this->_row_exists = FALSE;
 			$this->_session_id = $session_id;
-		}
-		elseif ($this->_lock === FALSE)
+		} elseif ($this->_lock === FALSE)
 		{
 			return FALSE;
 		}
@@ -334,8 +330,7 @@ 
 			}
 
 			return FALSE;
-		}
-		elseif ($this->_platform === 'postgre')
+		} elseif ($this->_platform === 'postgre')
 		{
 			$arg = "hashtext('".$session_id."')".($this->_config['match_ip'] ? ", hashtext('".$_SERVER['REMOTE_ADDR']."')" : '');
 			if ($this->_db->simple_query('SELECT pg_advisory_lock('.$arg.')'))
@@ -375,8 +370,7 @@ 
 			}
 
 			return FALSE;
-		}
-		elseif ($this->_platform === 'postgre')
+		} elseif ($this->_platform === 'postgre')
 		{
 			if ($this->_db->simple_query('SELECT pg_advisory_unlock('.$this->_lock.')'))
 			{

system/libraries/Session/drivers/Session_files_driver.php

Braces +6 added lines, -12 removed lines

@@ -92,8 +92,7 @@ 
 		{
 			$this->_config['save_path'] = rtrim($this->_config['save_path'], '/\\');
 			ini_set('session.save_path', $this->_config['save_path']);
-		}
-		else
+		} else
 		{
 			$this->_config['save_path'] = rtrim(ini_get('session.save_path'), '/\\');
 		}
@@ -118,8 +117,7 @@ 
 			{
 				throw new Exception("Session: Configured save path '".$this->_config['save_path']."' is not a directory, doesn't exist or cannot be created.");
 			}
-		}
-		elseif ( ! is_writable($save_path))
+		} elseif ( ! is_writable($save_path))
 		{
 			throw new Exception("Session: Configured save path '".$this->_config['save_path']."' is not writable by the PHP process.");
 		}
@@ -158,8 +156,7 @@ 
 					log_message('error', "Session: File '".$this->_file_path.$session_id."' doesn't exist and cannot be created.");
 					return FALSE;
 				}
-			}
-			elseif (($this->_file_handle = fopen($this->_file_path.$session_id, 'r+b')) === FALSE)
+			} elseif (($this->_file_handle = fopen($this->_file_path.$session_id, 'r+b')) === FALSE)
 			{
 				log_message('error', "Session: Unable to open file '".$this->_file_path.$session_id."'.");
 				return FALSE;
@@ -188,8 +185,7 @@ 
 		elseif ($this->_file_handler === FALSE)
 		{
 			return FALSE;
-		}
-		else
+		} else
 		{
 			rewind($this->_file_handle);
 		}
@@ -232,8 +228,7 @@ 
 		if ( ! is_resource($this->_file_handle))
 		{
 			return FALSE;
-		}
-		elseif ($this->_fingerprint === md5($session_data))
+		} elseif ($this->_fingerprint === md5($session_data))
 		{
 			return ($this->_file_new)
 				? TRUE
@@ -308,8 +303,7 @@ 
 			return file_exists($this->_file_path.$session_id)
 				? (unlink($this->_file_path.$session_id) && $this->_cookie_destroy())
 				: TRUE;
-		}
-		elseif ($this->_file_path !== NULL)
+		} elseif ($this->_file_path !== NULL)
 		{
 			clearstatcache();
 			return file_exists($this->_file_path.$session_id)

system/libraries/Session/drivers/Session_redis_driver.php

Braces +7 added lines, -14 removed lines

@@ -84,8 +84,7 @@ 
 		if (empty($this->_config['save_path']))
 		{
 			log_message('error', 'Session: No Redis save path configured.');
-		}
-		elseif (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->_config['save_path'], $matches))
+		} elseif (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->_config['save_path'], $matches))
 		{
 			isset($matches[3]) OR $matches[3] = ''; // Just to avoid undefined index notices below
 			$this->_config['save_path'] = array(
@@ -97,8 +96,7 @@ 
 			);
 
 			preg_match('#prefix=([^\s&]+)#', $matches[3], $match) && $this->_key_prefix = $match[1];
-		}
-		else
+		} else
 		{
 			log_message('error', 'Session: Invalid Redis save path format: '.$this->_config['save_path']);
 		}
@@ -131,16 +129,13 @@ 
 		if ( ! $redis->connect($this->_config['save_path']['host'], $this->_config['save_path']['port'], $this->_config['save_path']['timeout']))
 		{
 			log_message('error', 'Session: Unable to connect to Redis with the configured settings.');
-		}
-		elseif (isset($this->_config['save_path']['password']) && ! $redis->auth($this->_config['save_path']['password']))
+		} elseif (isset($this->_config['save_path']['password']) && ! $redis->auth($this->_config['save_path']['password']))
 		{
 			log_message('error', 'Session: Unable to authenticate to Redis instance.');
-		}
-		elseif (isset($this->_config['save_path']['database']) && ! $redis->select($this->_config['save_path']['database']))
+		} elseif (isset($this->_config['save_path']['database']) && ! $redis->select($this->_config['save_path']['database']))
 		{
 			log_message('error', 'Session: Unable to select Redis database with index '.$this->_config['save_path']['database']);
-		}
-		else
+		} else
 		{
 			$this->_redis = $redis;
 			return TRUE;
@@ -245,8 +240,7 @@ 
 						return FALSE;
 					}
 				}
-			}
-			catch (RedisException $e)
+			} catch (RedisException $e)
 			{
 				log_message('error', 'Session: Got RedisException on close(): '.$e->getMessage());
 			}
@@ -342,8 +336,7 @@ 
 		{
 			log_message('error', 'Session: Unable to obtain lock for '.$this->_key_prefix.$session_id.' after 30 attempts, aborting.');
 			return FALSE;
-		}
-		elseif ($ttl === -1)
+		} elseif ($ttl === -1)
 		{
 			log_message('debug', 'Session: Lock for '.$this->_key_prefix.$session_id.' had no TTL, overriding.');
 		}

system/libraries/Typography.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 	 *
 	 * @var string
 	 */
-	public $skip_elements	= 'p|pre|ol|ul|dl|object|table|h\d';
+	public $skip_elements = 'p|pre|ol|ul|dl|object|table|h\d';
 
 	/**
 	 * Tags we want the parser to completely ignore when splitting the string.
@@ -167,7 +167,7 @@ 
 		 *		Etc...
 		 *	}
 		 */
-		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		// Build our finalized string.  We cycle through the array, skipping tags, and processing the contained text
 		$str = '';
@@ -372,7 +372,7 @@ 
 			// We trim off the right-side new line so that the closing </p> tag
 			// will be positioned immediately following the string, matching
 			// the behavior of the opening <p> tag
-			$str =  '<p>'.rtrim($str).'</p>';
+			$str = '<p>'.rtrim($str).'</p>';
 		}
 
 		// Remove empty paragraphs if they are on the first line, as this
@@ -395,7 +395,7 @@ 
 	 */
 	protected function _protect_characters($match)
 	{
-		return str_replace(array("'",'"','--','  '), array('{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'), $match[0]);
+		return str_replace(array("'", '"', '--', '  '), array('{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'), $match[0]);
 	}
 
 	// --------------------------------------------------------------------

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/libraries/Unit_test.php

Spacing +4 added lines, -4 removed lines

@@ -92,7 +92,7 @@ 
 	 *
 	 * @var	array
 	 */
-	protected $_test_items_visible	= array(
+	protected $_test_items_visible = array(
 		'test_name',
 		'test_datatype',
 		'res_datatype',
@@ -166,7 +166,7 @@ 
 
 		$back = $this->_backtrace();
 
-		$report = array (
+		$report = array(
 			'test_name'     => $test_name,
 			'test_datatype' => gettype($test),
 			'res_datatype'  => $extype,
@@ -198,7 +198,7 @@ 
 			$result = $this->result();
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->language('unit_test');
 
 		$this->_parse_template();
@@ -273,7 +273,7 @@ 
 	 */
 	public function result($results = array())
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->language('unit_test');
 
 		if (count($results) === 0)

Braces +3 added lines, -6 removed lines

@@ -157,8 +157,7 @@ 
 			$expected = str_replace('is_double', 'is_float', $expected);
 			$result = $expected($test);
 			$extype = str_replace(array('true', 'false'), 'bool', str_replace('is_', '', $expected));
-		}
-		else
+		} else
 		{
 			$result = ($this->strict === TRUE) ? ($test === $expected) : ($test == $expected);
 			$extype = gettype($expected);
@@ -215,8 +214,7 @@ 
 					if ($val === $CI->lang->line('ut_passed'))
 					{
 						$val = '<span style="color: #0C0;">'.$val.'</span>';
-					}
-					elseif ($val === $CI->lang->line('ut_failed'))
+					} elseif ($val === $CI->lang->line('ut_failed'))
 					{
 						$val = '<span style="color: #C00;">'.$val.'</span>';
 					}
@@ -290,8 +288,7 @@ 
 				if ( ! in_array($key, $this->_test_items_visible))
 				{
 					continue;
-				}
-				elseif (in_array($key, array('test_name', 'test_datatype', 'test_res_datatype', 'result'), TRUE))
+				} elseif (in_array($key, array('test_name', 'test_datatype', 'test_res_datatype', 'result'), TRUE))
 				{
 					if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$val), FALSE)))
 					{

themes/bootstrap3/fragments/topbar.php

Spacing +3 added lines, -3 removed lines

@@ -16,10 +16,10 @@
 
                 <ul class="nav navbar-nav navbar-right">
                     <li>
-                        <?php if (! empty($_SESSION['logged_in']) ) : ?>
-                            <a href="<?= site_url( \Myth\Route::named('logout') ) ?>">Logout</a>
+                        <?php if ( ! empty($_SESSION['logged_in'])) : ?>
+                            <a href="<?= site_url(\Myth\Route::named('logout')) ?>">Logout</a>
                         <?php else : ?>
-                            <a href="<?= site_url( \Myth\Route::named('login') ) ?>">Login</a>
+                            <a href="<?= site_url(\Myth\Route::named('login')) ?>">Login</a>
                         <?php endif; ?>
                     </li>
                 </ul>

Braces +5 added lines, -2 removed lines

@@ -18,9 +18,12 @@
                     <li>
                         <?php if (! empty($_SESSION['logged_in']) ) : ?>
                             <a href="<?= site_url( \Myth\Route::named('logout') ) ?>">Logout</a>
-                        <?php else : ?>
+                        <?php else {
+	: ?>
                             <a href="<?= site_url( \Myth\Route::named('login') ) ?>">Login</a>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                     </li>
                 </ul>
         </div>

themes/bootstrap3/two_right.php

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@
 <?php
-    if (empty($navbar_style)) $themer->set('navbar_style', 'navbar-static');
-    if (empty($containerClass))
-    {
-        $themer->set('containerClass', 'container');
-        $containerClass = 'container';
-    }
+	if (empty($navbar_style)) $themer->set('navbar_style', 'navbar-static');
+	if (empty($containerClass))
+	{
+		$themer->set('containerClass', 'container');
+		$containerClass = 'container';
+	}
 ?>
 
 <?= $themer->display('bootstrap:fragments/head') ?>

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-    if (empty($navbar_style)) $themer->set('navbar_style', 'navbar-static');
+    if (empty($navbar_style)) {
+    	$themer->set('navbar_style', 'navbar-static');
+    }
     if (empty($containerClass))
     {
         $themer->set('containerClass', 'container');