ci-bonfire / Sprint

themes/foundation5/fragments/topbar.php

Spacing +3 added lines, -3 removed lines

@@ -11,10 +11,10 @@
         <!-- Right Nav Section -->
         <ul class="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

@@ -13,9 +13,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>
 

themes/foundation5/notice.php

Braces +5 added lines, -2 removed lines

@@ -4,8 +4,11 @@
         <a href="#" class="close">&times;</a>
     </div>
 
-<?php else: ?>
+<?php else {
+	: ?>
 
     <div id="notice"></div>
 
-<?php endif; ?>
\ No newline at end of file
+<?php endif;
+}
+?>
\ No newline at end of file

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

Doc Comments +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @param	mixed	alias name or array of alias->field_id pairs
 	 * @param	string	field_id if alias name was passed in
 	 * @param	bool
-	 * @return	array
+	 * @return	string
 	 */
 	function smiley_js($alias = '', $field_id = '', $inline = TRUE)
 	{

Braces +4 added lines, -8 removed lines

@@ -115,8 +115,7 @@ 
 				if (isset($this->DSN))
 				{
 					$this->dsn .= 'DSN='.$this->DSN;
-				}
-				elseif ( ! empty($this->database))
+				} elseif ( ! empty($this->database))
 				{
 					$this->dsn .= 'DSN='.$this->database;
 				}
@@ -130,8 +129,7 @@ 
 			if (isset($this->DATABASE))
 			{
 				$this->dsn .= 'DATABASE='.$this->DATABASE.';';
-			}
-			elseif ( ! empty($this->database))
+			} elseif ( ! empty($this->database))
 			{
 				$this->dsn .= 'DATABASE='.$this->database.';';
 			}
@@ -139,8 +137,7 @@ 
 			if (isset($this->HOSTNAME))
 			{
 				$this->dsn .= 'HOSTNAME='.$this->HOSTNAME.';';
-			}
-			else
+			} else
 			{
 				$this->dsn .= 'HOSTNAME='.(empty($this->hostname) ? '127.0.0.1;' : $this->hostname.';');
 			}
@@ -148,8 +145,7 @@ 
 			if (isset($this->PORT))
 			{
 				$this->dsn .= 'PORT='.$this->port.';';
-			}
-			elseif ( ! empty($this->port))
+			} elseif ( ! empty($this->port))
 			{
 				$this->dsn .= ';PORT='.$this->port.';';
 			}

themes/bootstrap3/notice.php

Braces +5 added lines, -2 removed lines

@@ -4,8 +4,11 @@
         <a href="#" class="close">&times;</a>
     </div>
 
-<?php else: ?>
+<?php else {
+	: ?>
 
     <div id="notice"></div>
 
-<?php endif; ?>
\ No newline at end of file
+<?php endif;
+}
+?>
\ No newline at end of file

system/core/compat/mbstring.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');
 
 /**

system/database/drivers/mssql/mssql_utility.php

Spacing +2 added lines, -2 removed lines

@@ -51,14 +51,14 @@
 	 *
 	 * @var	string
 	 */
-	protected $_list_databases	= 'EXEC sp_helpdb'; // Can also be: EXEC sp_databases
+	protected $_list_databases = 'EXEC sp_helpdb'; // Can also be: EXEC sp_databases
 
 	/**
 	 * OPTIMIZE TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_optimize_table	= 'ALTER INDEX all ON %s REORGANIZE';
+	protected $_optimize_table = 'ALTER INDEX all ON %s REORGANIZE';
 
 	// --------------------------------------------------------------------
 

system/database/drivers/mssql/mssql_forge.php

Spacing +3 added lines, -3 removed lines

@@ -51,21 +51,21 @@
 	 *
 	 * @var	string
 	 */
-	protected $_create_table_if	= "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE";
+	protected $_create_table_if = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE";
 
 	/**
 	 * DROP TABLE IF statement
 	 *
 	 * @var	string
 	 */
-	protected $_drop_table_if	= "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE";
+	protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE";
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'TINYINT'	=> 'SMALLINT',
 		'SMALLINT'	=> 'INT',
 		'INT'		=> 'BIGINT',

system/database/drivers/mysql/mysql_forge.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_create_database	= 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
+	protected $_create_database = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
 
 	/**
 	 * CREATE TABLE keys flag
@@ -63,14 +63,14 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_create_table_keys	= TRUE;
+	protected $_create_table_keys = TRUE;
 
 	/**
 	 * UNSIGNED support
 	 *
 	 * @var	array
 	 */
-	protected $_unsigned		= array(
+	protected $_unsigned = array(
 		'TINYINT',
 		'SMALLINT',
 		'MEDIUMINT',

Braces +3 added lines, -6 removed lines

@@ -162,14 +162,12 @@ 
 				$field[$i] = ($alter_type === 'ADD')
 						? "\n\tADD ".$field[$i]['_literal']
 						: "\n\tMODIFY ".$field[$i]['_literal'];
-			}
-			else
+			} else
 			{
 				if ($alter_type === 'ADD')
 				{
 					$field[$i]['_literal'] = "\n\tADD ";
-				}
-				else
+				} else
 				{
 					$field[$i]['_literal'] = empty($field[$i]['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
 				}
@@ -235,8 +233,7 @@ 
 						continue;
 					}
 				}
-			}
-			elseif ( ! isset($this->fields[$this->keys[$i]]))
+			} elseif ( ! isset($this->fields[$this->keys[$i]]))
 			{
 				unset($this->keys[$i]);
 				continue;

system/database/drivers/mysql/mysql_utility.php

Spacing +6 added lines, -6 removed lines

@@ -53,21 +53,21 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $_list_databases	= 'SHOW DATABASES';
+	protected $_list_databases = 'SHOW DATABASES';
 
 	/**
 	 * OPTIMIZE TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_optimize_table	= 'OPTIMIZE TABLE %s';
+	protected $_optimize_table = 'OPTIMIZE TABLE %s';
 
 	/**
 	 * REPAIR TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_repair_table	= 'REPAIR TABLE %s';
+	protected $_repair_table = 'REPAIR TABLE %s';
 
 	// --------------------------------------------------------------------
 
@@ -96,7 +96,7 @@ 
 			$output .= 'SET foreign_key_checks = 0;'.$newline;
 		}
 
-		foreach ( (array) $tables as $table)
+		foreach ((array) $tables as $table)
 		{
 			// Is the table in the "ignore" list?
 			if (in_array($table, (array) $ignore, TRUE))
@@ -165,7 +165,7 @@ 
 			}
 
 			// Trim off the end comma
-			$field_str = preg_replace('/, $/' , '', $field_str);
+			$field_str = preg_replace('/, $/', '', $field_str);
 
 			// Build the insert string
 			foreach ($query->result_array() as $row)
@@ -192,7 +192,7 @@ 
 				}
 
 				// Remove the comma at the end of the string
-				$val_str = preg_replace('/, $/' , '', $val_str);
+				$val_str = preg_replace('/, $/', '', $val_str);
 
 				// Build the INSERT string
 				$output .= 'INSERT INTO '.$this->db->protect_identifiers($table).' ('.$field_str.') VALUES ('.$val_str.');'.$newline;

Braces +1 added lines, -2 removed lines

@@ -179,8 +179,7 @@
 					if ($v === NULL)
 					{
 						$val_str .= 'NULL';
-					}
-					else
+					} else
 					{
 						// Escape the data if it's not an integer
 						$val_str .= ($is_int[$i] === FALSE) ? $this->db->escape($v) : $v;