ci-bonfire / Sprint

system/helpers/url_helper.php

Doc Comments +1 added lines

@@ -275,6 +275,7 @@
 	 * @param	string	the email address
 	 * @param	string	the link title
 	 * @param	mixed	any attributes
+	 * @param string $email
 	 * @return	string
 	 */
 	function safe_mailto($email, $title = '', $attributes = '')

Braces +7 added lines, -14 removed lines

@@ -213,13 +213,11 @@ 
 
 			// Ref: http://www.w3schools.com/jsref/met_win_open.asp
 			$window_name = '_blank';
-		}
-		elseif ( ! empty($attributes['window_name']))
+		} elseif ( ! empty($attributes['window_name']))
 		{
 			$window_name = $attributes['window_name'];
 			unset($attributes['window_name']);
-		}
-		else
+		} else
 		{
 			$window_name = '_blank';
 		}
@@ -308,8 +306,7 @@ 
 					}
 					$x[] = '"';
 				}
-			}
-			else
+			} else
 			{
 				for ($i = 0, $l = strlen($attributes); $i < $l; $i++)
 				{
@@ -328,8 +325,7 @@ 
 			if ($ordinal < 128)
 			{
 				$x[] = '|'.$ordinal;
-			}
-			else
+			} else
 			{
 				if (count($temp) === 0)
 				{
@@ -482,8 +478,7 @@ 
 		if ($separator === 'dash')
 		{
 			$separator = '-';
-		}
-		elseif ($separator === 'underscore')
+		} elseif ($separator === 'underscore')
 		{
 			$separator = '_';
 		}
@@ -540,16 +535,14 @@ 
 		if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== FALSE)
 		{
 			$method = 'refresh';
-		}
-		elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code)))
+		} elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code)))
 		{
 			if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.1')
 			{
 				$code = ($_SERVER['REQUEST_METHOD'] !== 'GET')
 					? 303	// reference: http://en.wikipedia.org/wiki/Post/Redirect/Get
 					: 307;
-			}
-			else
+			} else
 			{
 				$code = 302;
 			}

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

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;
 

system/libraries/Cache/drivers/Cache_apc.php

Doc Comments +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 	 *
 	 * @param	string	$id	Cache ID
 	 * @param	mixed	$data	Data to store
-	 * @param	int	$ttol	Length of time (in seconds) to cache the data
+	 * @param	int	$ttl	Length of time (in seconds) to cache the data
 	 * @param	bool	$raw	Whether to store the raw value
 	 * @return	bool	TRUE on success, FALSE on failure
 	 */
@@ -114,7 +114,7 @@ 
 	 *
 	 * @param	string	$id	Cache ID
 	 * @param	int	$offset	Step/value to add
-	 * @return	mixed	New value on success or FALSE on failure
+	 * @return	integer	New value on success or FALSE on failure
 	 */
 	public function increment($id, $offset = 1)
 	{
@@ -128,7 +128,7 @@ 
 	 *
 	 * @param	string	$id	Cache ID
 	 * @param	int	$offset	Step/value to reduce by
-	 * @return	mixed	New value on success or FALSE on failure
+	 * @return	integer	New value on success or FALSE on failure
 	 */
 	public function decrement($id, $offset = 1)
 	{

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

system/libraries/Cache/drivers/Cache_dummy.php

Doc Comments +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	 *
 	 * @param	string	$id	Cache ID
 	 * @param	int	$offset	Step/value to add
-	 * @return	mixed	New value on success or FALSE on failure
+	 * @return	boolean	New value on success or FALSE on failure
 	 */
 	public function increment($id, $offset = 1)
 	{
@@ -111,7 +111,7 @@ 
 	 *
 	 * @param	string	$id	Cache ID
 	 * @param	int	$offset	Step/value to reduce by
-	 * @return	mixed	New value on success or FALSE on failure
+	 * @return	boolean	New value on success or FALSE on failure
 	 */
 	public function decrement($id, $offset = 1)
 	{

system/libraries/Cart.php

Doc Comments +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
 	 * Insert items into the cart and save it to the session table
 	 *
 	 * @param	array
-	 * @return	bool
+	 * @return	string|boolean
 	 */
 	public function insert($items = array())
 	{
@@ -178,7 +178,7 @@ 
 	 * Insert
 	 *
 	 * @param	array
-	 * @return	bool
+	 * @return	false|string
 	 */
 	protected function _insert($items = array())
 	{

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
 	public function __construct($params = array())
 	{
 		// Set the super object to a local variable for use later
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 
 		// Are any config settings being passed manually?  If so, set them
 		$config = is_array($params) ? $params : array();
@@ -546,7 +546,7 @@ 
 	 */
 	public function format_number($n = '')
 	{
-		return ($n === '') ? '' : number_format( (float) $n, 2, '.', ',');
+		return ($n === '') ? '' : number_format((float) $n, 2, '.', ',');
 	}
 
 	// --------------------------------------------------------------------

Braces +3 added lines, -6 removed lines

@@ -147,8 +147,7 @@ 
 			{
 				$save_cart = TRUE;
 			}
-		}
-		else
+		} else
 		{
 			foreach ($items as $val)
 			{
@@ -248,8 +247,7 @@ 
 		if (isset($items['options']) && count($items['options']) > 0)
 		{
 			$rowid = md5($items['id'].serialize($items['options']));
-		}
-		else
+		} else
 		{
 			// No options were submitted so we simply MD5 the product ID.
 			// Technically, we don't need to MD5 the ID in this case, but it makes
@@ -303,8 +301,7 @@ 
 			{
 				$save_cart = TRUE;
 			}
-		}
-		else
+		} else
 		{
 			foreach ($items as $val)
 			{

system/libraries/Email.php

Doc Comments +13 added lines, -6 removed lines

@@ -560,6 +560,7 @@ 
 	 *
 	 * @param	string
 	 * @param	string
+	 * @param string $replyto
 	 * @return	CI_Email
 	 */
 	public function reply_to($replyto, $name = '')
@@ -804,6 +805,8 @@ 
 	 *
 	 * @param	string
 	 * @param	string
+	 * @param string $header
+	 * @param string $value
 	 * @return	CI_Email
 	 */
 	public function set_header($header, $value)
@@ -962,7 +965,7 @@ 
 	 * Get Mail Protocol
 	 *
 	 * @param	bool
-	 * @return	mixed
+	 * @return	string|null
 	 */
 	protected function _get_protocol($return = TRUE)
 	{
@@ -1168,6 +1171,8 @@ 
 	 *
 	 * @param	string
 	 * @param	int	line-length limit
+	 * @param string $str
+	 * @param integer $charlim
 	 * @return	string
 	 */
 	public function word_wrap($str, $charlim = NULL)
@@ -1311,7 +1316,7 @@ 
 	/**
 	 * Build Final Body and attachments
 	 *
-	 * @return	bool
+	 * @return	null|boolean
 	 */
 	protected function _build_message()
 	{
@@ -1465,6 +1470,7 @@ 
 	 * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
 	 *
 	 * @param	string
+	 * @param string $str
 	 * @return	string
 	 */
 	protected function _prep_quoted_printable($str)
@@ -1655,7 +1661,7 @@ 
 	 * Send Email
 	 *
 	 * @param	bool	$auto_clear = TRUE
-	 * @return	bool
+	 * @return	null|boolean
 	 */
 	public function send($auto_clear = TRUE)
 	{
@@ -1712,7 +1718,7 @@ 
 	/**
 	 * Batch Bcc Send. Sends groups of BCCs in batches
 	 *
-	 * @return	void
+	 * @return	false|null
 	 */
 	public function batch_bcc_send()
 	{
@@ -1969,7 +1975,7 @@ 
 	/**
 	 * SMTP Connect
 	 *
-	 * @return	string
+	 * @return	boolean
 	 */
 	protected function _smtp_connect()
 	{
@@ -2019,7 +2025,8 @@ 
 	 *
 	 * @param	string
 	 * @param	string
-	 * @return	string
+	 * @param string $cmd
+	 * @return	boolean
 	 */
 	protected function _send_command($cmd, $data = '')
 	{

Spacing +56 added lines, -56 removed lines

@@ -55,77 +55,77 @@ 
 	 *
 	 * @var	string
 	 */
-	public $useragent	= 'CodeIgniter';
+	public $useragent = 'CodeIgniter';
 
 	/**
 	 * Path to the Sendmail binary.
 	 *
 	 * @var	string
 	 */
-	public $mailpath	= '/usr/sbin/sendmail';	// Sendmail path
+	public $mailpath = '/usr/sbin/sendmail'; // Sendmail path
 
 	/**
 	 * Which method to use for sending e-mails.
 	 *
 	 * @var	string	'mail', 'sendmail' or 'smtp'
 	 */
-	public $protocol	= 'mail';		// mail/sendmail/smtp
+	public $protocol = 'mail'; // mail/sendmail/smtp
 
 	/**
 	 * STMP Server host
 	 *
 	 * @var	string
 	 */
-	public $smtp_host	= '';
+	public $smtp_host = '';
 
 	/**
 	 * SMTP Username
 	 *
 	 * @var	string
 	 */
-	public $smtp_user	= '';
+	public $smtp_user = '';
 
 	/**
 	 * SMTP Password
 	 *
 	 * @var	string
 	 */
-	public $smtp_pass	= '';
+	public $smtp_pass = '';
 
 	/**
 	 * SMTP Server port
 	 *
 	 * @var	int
 	 */
-	public $smtp_port	= 25;
+	public $smtp_port = 25;
 
 	/**
 	 * SMTP connection timeout in seconds
 	 *
 	 * @var	int
 	 */
-	public $smtp_timeout	= 5;
+	public $smtp_timeout = 5;
 
 	/**
 	 * SMTP persistent connection
 	 *
 	 * @var	bool
 	 */
-	public $smtp_keepalive	= FALSE;
+	public $smtp_keepalive = FALSE;
 
 	/**
 	 * SMTP Encryption
 	 *
 	 * @var	string	empty, 'tls' or 'ssl'
 	 */
-	public $smtp_crypto	= '';
+	public $smtp_crypto = '';
 
 	/**
 	 * Whether to apply word-wrapping to the message body.
 	 *
 	 * @var	bool
 	 */
-	public $wordwrap	= TRUE;
+	public $wordwrap = TRUE;
 
 	/**
 	 * Number of characters to wrap at.
@@ -133,49 +133,49 @@ 
 	 * @see	CI_Email::$wordwrap
 	 * @var	int
 	 */
-	public $wrapchars	= 76;
+	public $wrapchars = 76;
 
 	/**
 	 * Message format.
 	 *
 	 * @var	string	'text' or 'html'
 	 */
-	public $mailtype	= 'text';
+	public $mailtype = 'text';
 
 	/**
 	 * Character set (default: utf-8)
 	 *
 	 * @var	string
 	 */
-	public $charset		= 'utf-8';
+	public $charset = 'utf-8';
 
 	/**
 	 * Multipart message
 	 *
 	 * @var	string	'mixed' (in the body) or 'related' (separate)
 	 */
-	public $multipart	= 'mixed';		// "mixed" (in the body) or "related" (separate)
+	public $multipart = 'mixed'; // "mixed" (in the body) or "related" (separate)
 
 	/**
 	 * Alternative message (for HTML messages only)
 	 *
 	 * @var	string
 	 */
-	public $alt_message	= '';
+	public $alt_message = '';
 
 	/**
 	 * Whether to validate e-mail addresses.
 	 *
 	 * @var	bool
 	 */
-	public $validate	= FALSE;
+	public $validate = FALSE;
 
 	/**
 	 * X-Priority header value.
 	 *
 	 * @var	int	1-5
 	 */
-	public $priority	= 3;			// Default priority (1 - 5)
+	public $priority = 3; // Default priority (1 - 5)
 
 	/**
 	 * Newline character sequence.
@@ -184,7 +184,7 @@ 
 	 * @link	http://www.ietf.org/rfc/rfc822.txt
 	 * @var	string	"\r\n" or "\n"
 	 */
-	public $newline		= "\n";			// Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
+	public $newline = "\n"; // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
 
 	/**
 	 * CRLF character sequence
@@ -198,14 +198,14 @@ 
 	 * @link	http://www.ietf.org/rfc/rfc822.txt
 	 * @var	string
 	 */
-	public $crlf		= "\n";
+	public $crlf = "\n";
 
 	/**
 	 * Whether to use Delivery Status Notification.
 	 *
 	 * @var	bool
 	 */
-	public $dsn		= FALSE;
+	public $dsn = FALSE;
 
 	/**
 	 * Whether to send multipart alternatives.
@@ -213,14 +213,14 @@ 
 	 *
 	 * @var	bool
 	 */
-	public $send_multipart	= TRUE;
+	public $send_multipart = TRUE;
 
 	/**
 	 * Whether to send messages to BCC recipients in batches.
 	 *
 	 * @var	bool
 	 */
-	public $bcc_batch_mode	= FALSE;
+	public $bcc_batch_mode = FALSE;
 
 	/**
 	 * BCC Batch max number size.
@@ -228,7 +228,7 @@ 
 	 * @see	CI_Email::$bcc_batch_mode
 	 * @var	int
 	 */
-	public $bcc_batch_size	= 200;
+	public $bcc_batch_size = 200;
 
 	// --------------------------------------------------------------------
 
@@ -237,77 +237,77 @@ 
 	 *
 	 * @var	bool
 	 */
-	protected $_safe_mode		= FALSE;
+	protected $_safe_mode = FALSE;
 
 	/**
 	 * Subject header
 	 *
 	 * @var	string
 	 */
-	protected $_subject		= '';
+	protected $_subject = '';
 
 	/**
 	 * Message body
 	 *
 	 * @var	string
 	 */
-	protected $_body		= '';
+	protected $_body = '';
 
 	/**
 	 * Final message body to be sent.
 	 *
 	 * @var	string
 	 */
-	protected $_finalbody		= '';
+	protected $_finalbody = '';
 
 	/**
 	 * multipart/alternative boundary
 	 *
 	 * @var	string
 	 */
-	protected $_alt_boundary	= '';
+	protected $_alt_boundary = '';
 
 	/**
 	 * Attachment boundary
 	 *
 	 * @var	string
 	 */
-	protected $_atc_boundary	= '';
+	protected $_atc_boundary = '';
 
 	/**
 	 * Final headers to send
 	 *
 	 * @var	string
 	 */
-	protected $_header_str		= '';
+	protected $_header_str = '';
 
 	/**
 	 * SMTP Connection socket placeholder
 	 *
 	 * @var	resource
 	 */
-	protected $_smtp_connect	= '';
+	protected $_smtp_connect = '';
 
 	/**
 	 * Mail encoding
 	 *
 	 * @var	string	'8bit' or '7bit'
 	 */
-	protected $_encoding		= '8bit';
+	protected $_encoding = '8bit';
 
 	/**
 	 * Whether to perform SMTP authentication
 	 *
 	 * @var	bool
 	 */
-	protected $_smtp_auth		= FALSE;
+	protected $_smtp_auth = FALSE;
 
 	/**
 	 * Whether to send a Reply-To header
 	 *
 	 * @var	bool
 	 */
-	protected $_replyto_flag	= FALSE;
+	protected $_replyto_flag = FALSE;
 
 	/**
 	 * Debug messages
@@ -315,42 +315,42 @@ 
 	 * @see	CI_Email::print_debugger()
 	 * @var	string
 	 */
-	protected $_debug_msg		= array();
+	protected $_debug_msg = array();
 
 	/**
 	 * Recipients
 	 *
 	 * @var	string[]
 	 */
-	protected $_recipients		= array();
+	protected $_recipients = array();
 
 	/**
 	 * CC Recipients
 	 *
 	 * @var	string[]
 	 */
-	protected $_cc_array		= array();
+	protected $_cc_array = array();
 
 	/**
 	 * BCC Recipients
 	 *
 	 * @var	string[]
 	 */
-	protected $_bcc_array		= array();
+	protected $_bcc_array = array();
 
 	/**
 	 * Message headers
 	 *
 	 * @var	string[]
 	 */
-	protected $_headers		= array();
+	protected $_headers = array();
 
 	/**
 	 * Attachment data
 	 *
 	 * @var	array
 	 */
-	protected $_attachments		= array();
+	protected $_attachments = array();
 
 	/**
 	 * Valid $protocol values
@@ -358,7 +358,7 @@ 
 	 * @see	CI_Email::$protocol
 	 * @var	string[]
 	 */
-	protected $_protocols		= array('mail', 'sendmail', 'smtp');
+	protected $_protocols = array('mail', 'sendmail', 'smtp');
 
 	/**
 	 * Base charsets
@@ -368,7 +368,7 @@ 
 	 *
 	 * @var	string[]
 	 */
-	protected $_base_charsets	= array('us-ascii', 'iso-2022-');
+	protected $_base_charsets = array('us-ascii', 'iso-2022-');
 
 	/**
 	 * Bit depths
@@ -378,7 +378,7 @@ 
 	 * @see	CI_Email::$_encoding
 	 * @var	string[]
 	 */
-	protected $_bit_depths		= array('7bit', '8bit');
+	protected $_bit_depths = array('7bit', '8bit');
 
 	/**
 	 * $priority translations
@@ -482,11 +482,11 @@ 
 	 */
 	public function clear($clear_attachments = FALSE)
 	{
-		$this->_subject		= '';
-		$this->_body		= '';
-		$this->_finalbody	= '';
+		$this->_subject = '';
+		$this->_body = '';
+		$this->_finalbody = '';
 		$this->_header_str	= '';
-		$this->_replyto_flag	= FALSE;
+		$this->_replyto_flag = FALSE;
 		$this->_recipients	= array();
 		$this->_cc_array	= array();
 		$this->_bcc_array	= array();
@@ -755,12 +755,12 @@ 
 		}
 		else
 		{
-			$file_content =& $file; // buffered file
+			$file_content = & $file; // buffered file
 		}
 
 		$this->_attachments[] = array(
 			'name'		=> array($file, $newname),
-			'disposition'	=> empty($disposition) ? 'attachment' : $disposition,  // Can also be 'inline'  Not sure if it matters
+			'disposition'	=> empty($disposition) ? 'attachment' : $disposition, // Can also be 'inline'  Not sure if it matters
 			'type'		=> $mime,
 			'content'	=> chunk_split(base64_encode($file_content))
 		);
@@ -1014,7 +1014,7 @@ 
 		{
 			return (count($this->_attachments) === 0) ? 'html' : 'html-attach';
 		}
-		elseif	($this->mailtype === 'text' && count($this->_attachments) > 0)
+		elseif ($this->mailtype === 'text' && count($this->_attachments) > 0)
 		{
 			return 'plain-attach';
 		}
@@ -1036,7 +1036,7 @@ 
 		$timezone = date('Z');
 		$operator = ($timezone[0] === '-') ? '-' : '+';
 		$timezone = abs($timezone);
-		$timezone = floor($timezone/3600) * 100 + ($timezone % 3600) / 60;
+		$timezone = floor($timezone / 3600) * 100 + ($timezone % 3600) / 60;
 
 		return sprintf('%s %s%04d', date('D, j M Y H:i:s'), $operator, $timezone);
 	}
@@ -1543,7 +1543,7 @@ 
 				// as they are the encoding delimiter!
 				elseif ($ascii === 61)
 				{
-					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
+					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii))); // =3D
 				}
 				elseif ( ! in_array($ascii, $ascii_safe_chars, TRUE))
 				{
@@ -1734,7 +1734,7 @@ 
 				$set = '';
 			}
 
-			if ($i === $c-1)
+			if ($i === $c - 1)
 			{
 				$chunk[] = substr($set, 1);
 			}
@@ -2302,7 +2302,7 @@ 
 	 */
 	protected function _set_error_message($msg, $val = '')
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->lang->load('email');
 
 		if (sscanf($msg, 'lang:%s', $line) !== 1 OR FALSE === ($line = $CI->lang->line($line)))
@@ -2327,7 +2327,7 @@ 
 	{
 		$ext = strtolower($ext);
 
-		$mimes =& get_mimes();
+		$mimes = & get_mimes();
 
 		if (isset($mimes[$ext]))
 		{

Braces +28 added lines, -47 removed lines

@@ -412,8 +412,7 @@ 
 		if (count($config) > 0)
 		{
 			$this->initialize($config);
-		}
-		else
+		} else
 		{
 			$this->_smtp_auth = ! ($this->smtp_user === '' && $this->smtp_pass === '');
 		}
@@ -458,8 +457,7 @@ 
 				if (method_exists($this, $method))
 				{
 					$this->$method($val);
-				}
-				else
+				} else
 				{
 					$this->$key = $val;
 				}
@@ -538,8 +536,7 @@ 
 			{
 				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
 				$name = '"'.addcslashes($name, "\0..\37\177'\"\\").'"';
-			}
-			else
+			} else
 			{
 				$name = $this->_prep_q_encoding($name);
 			}
@@ -672,8 +669,7 @@ 
 		if ($this->_get_protocol() === 'smtp' OR ($this->bcc_batch_mode && count($bcc) > $this->bcc_batch_size))
 		{
 			$this->_bcc_array = $bcc;
-		}
-		else
+		} else
 		{
 			$this->set_header('Bcc', implode(', ', $bcc));
 		}
@@ -752,8 +748,7 @@ 
 			$file_content = stream_get_contents($fp);
 			$mime = $this->_mime_types(pathinfo($file, PATHINFO_EXTENSION));
 			fclose($fp);
-		}
-		else
+		} else
 		{
 			$file_content =& $file; // buffered file
 		}
@@ -1013,12 +1008,10 @@ 
 		if ($this->mailtype === 'html')
 		{
 			return (count($this->_attachments) === 0) ? 'html' : 'html-attach';
-		}
-		elseif	($this->mailtype === 'text' && count($this->_attachments) > 0)
+		} elseif	($this->mailtype === 'text' && count($this->_attachments) > 0)
 		{
 			return 'plain-attach';
-		}
-		else
+		} else
 		{
 			return 'plain';
 		}
@@ -1337,8 +1330,7 @@ 
 				{
 					$this->_header_str .= $hdr;
 					$this->_finalbody = $this->_body;
-				}
-				else
+				} else
 				{
 					$this->_finalbody = $hdr.$this->newline.$this->newline.$this->_body;
 				}
@@ -1351,8 +1343,7 @@ 
 				{
 					$hdr .= 'Content-Type: text/html; charset='.$this->charset.$this->newline
 						.'Content-Transfer-Encoding: quoted-printable';
-				}
-				else
+				} else
 				{
 					$hdr .= 'Content-Type: multipart/alternative; boundary="'.$this->_alt_boundary.'"';
 
@@ -1372,8 +1363,7 @@ 
 				if ($this->_get_protocol() === 'mail')
 				{
 					$this->_header_str .= $hdr;
-				}
-				else
+				} else
 				{
 					$this->_finalbody = $hdr.$this->newline.$this->newline.$this->_finalbody;
 				}
@@ -1496,8 +1486,7 @@ 
 			if (is_php('5.3'))
 			{
 				return quoted_printable_encode($str);
-			}
-			elseif (function_exists('imap_8bit'))
+			} elseif (function_exists('imap_8bit'))
 			{
 				return imap_8bit($str);
 			}
@@ -1544,8 +1533,7 @@ 
 				elseif ($ascii === 61)
 				{
 					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
-				}
-				elseif ( ! in_array($ascii, $ascii_safe_chars, TRUE))
+				} elseif ( ! in_array($ascii, $ascii_safe_chars, TRUE))
 				{
 					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii)));
 				}
@@ -1613,8 +1601,7 @@ 
 				}
 
 				$chars = iconv_strlen($str, 'UTF-8');
-			}
-			elseif (MB_ENABLED === TRUE)
+			} elseif (MB_ENABLED === TRUE)
 			{
 				$chars = mb_strlen($str, 'UTF-8');
 			}
@@ -1637,8 +1624,7 @@ 
 				$output .= '?='.$this->crlf // EOL
 					.' =?'.$this->charset.'?Q?'.$chr; // New line
 				$length = 6 + strlen($this->charset) + $l; // Reset the length for the new line
-			}
-			else
+			} else
 			{
 				$output .= $chr;
 				$length += $l;
@@ -1749,8 +1735,7 @@ 
 			if ($this->protocol !== 'smtp')
 			{
 				$this->set_header('Bcc', implode(', ', $bcc));
-			}
-			else
+			} else
 			{
 				$this->_bcc_array = $bcc;
 			}
@@ -1833,8 +1818,7 @@ 
 		if ($this->_safe_mode === TRUE)
 		{
 			return mail($this->_recipients, $this->_subject, $this->_finalbody, $this->_header_str);
-		}
-		else
+		} else
 		{
 			// most documentation of sendmail using the "-f" flag lacks a space after it, however
 			// we've encountered servers that seem to require it to be in place.
@@ -1857,10 +1841,12 @@ 
 						$this->mailpath.' -oi -f '.$this->clean_email($this->_headers['From'])
 							.' -t -r '.$this->clean_email($this->_headers['Return-Path'])
 						, 'w'))
-		) // server probably has popen disabled, so nothing we can do to get a verbose error.
+		) {
+			// server probably has popen disabled, so nothing we can do to get a verbose error.
 		{
 			return FALSE;
 		}
+		}
 
 		fputs($fp, $this->_header_str);
 		fputs($fp, $this->_finalbody);
@@ -1955,8 +1941,7 @@ 
 		if ($this->smtp_keepalive)
 		{
 			$this->_send_command('reset');
-		}
-		else
+		} else
 		{
 			$this->_send_command('quit');
 		}
@@ -2030,8 +2015,7 @@ 
 						if ($this->_smtp_auth OR $this->_get_encoding() === '8bit')
 						{
 							$this->_send_data('EHLO '.$this->_get_hostname());
-						}
-						else
+						} else
 						{
 							$this->_send_data('HELO '.$this->_get_hostname());
 						}
@@ -2053,8 +2037,7 @@ 
 						if ($this->dsn)
 						{
 							$this->_send_data('RCPT TO:<'.$data.'> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;'.$data);
-						}
-						else
+						} else
 						{
 							$this->_send_data('RCPT TO:<'.$data.'>');
 						}
@@ -2120,11 +2103,12 @@ 
 
 		$reply = $this->_get_smtp_data();
 
-		if (strpos($reply, '503') === 0)	// Already authenticated
+		if (strpos($reply, '503') === 0) {
+			// Already authenticated
 		{
 			return TRUE;
 		}
-		elseif (strpos($reply, '334') !== 0)
+		} elseif (strpos($reply, '334') !== 0)
 		{
 			$this->_set_error_message('lang:email_failed_smtp_login', $reply);
 			return FALSE;
@@ -2176,8 +2160,7 @@ 
 				if ($timestamp === 0)
 				{
 					$timestamp = time();
-				}
-				elseif ($timestamp < (time() - $this->smtp_timeout))
+				} elseif ($timestamp < (time() - $this->smtp_timeout))
 				{
 					$result = FALSE;
 					break;
@@ -2185,8 +2168,7 @@ 
 
 				usleep(250000);
 				continue;
-			}
-			else
+			} else
 			{
 				$timestamp = 0;
 			}
@@ -2308,8 +2290,7 @@ 
 		if (sscanf($msg, 'lang:%s', $line) !== 1 OR FALSE === ($line = $CI->lang->line($line)))
 		{
 			$this->_debug_msg[] = str_replace('%s', $val, $msg).'<br />';
-		}
-		else
+		} else
 		{
 			$this->_debug_msg[] = str_replace('%s', $val, $line).'<br />';
 		}

system/libraries/Encrypt.php

Doc Comments +7 added lines, -1 removed lines

@@ -245,6 +245,8 @@ 
 	 *
 	 * @param	string
 	 * @param	string
+	 * @param string $string
+	 * @param string $key
 	 * @return	string
 	 */
 	protected function _xor_decode($string, $key)
@@ -290,6 +292,7 @@ 
 	 *
 	 * @param	string
 	 * @param	string
+	 * @param string $key
 	 * @return	string
 	 */
 	public function mcrypt_encode($data, $key)
@@ -306,6 +309,8 @@ 
 	 *
 	 * @param	string
 	 * @param	string
+	 * @param string $data
+	 * @param string $key
 	 * @return	string
 	 */
 	public function mcrypt_decode($data, $key)
@@ -332,6 +337,7 @@ 
 	 *
 	 * @param	string
 	 * @param	string
+	 * @param string $data
 	 * @return	string
 	 */
 	protected function _add_cipher_noise($data, $key)
@@ -422,7 +428,7 @@ 
 	/**
 	 * Get Mcrypt cipher Value
 	 *
-	 * @return	int
+	 * @return	string
 	 */
 	protected function _get_cipher()
 	{

Spacing +3 added lines, -3 removed lines

@@ -55,21 +55,21 @@
 	 *
 	 * @var string
 	 */
-	public $encryption_key		= '';
+	public $encryption_key = '';
 
 	/**
 	 * Type of hash operation
 	 *
 	 * @var string
 	 */
-	protected $_hash_type		= 'sha1';
+	protected $_hash_type = 'sha1';
 
 	/**
 	 * Flag for the existence of mcrypt
 	 *
 	 * @var bool
 	 */
-	protected $_mcrypt_exists	= FALSE;
+	protected $_mcrypt_exists = FALSE;
 
 	/**
 	 * Current cipher to be used with mcrypt

system/libraries/Encryption.php

Doc Comments +3 added lines, -3 removed lines

@@ -640,7 +640,7 @@ 
 	 * Get params
 	 *
 	 * @param	array	$params	Input parameters
-	 * @return	array
+	 * @return	string
 	 */
 	protected function _get_params($params)
 	{
@@ -830,10 +830,10 @@ 
 	 * HKDF
 	 *
 	 * @link	https://tools.ietf.org/rfc/rfc5869.txt
-	 * @param	$key	Input key
+	 * @param	string $key	Input key
 	 * @param	$digest	A SHA-2 hashing algorithm
 	 * @param	$salt	Optional salt
-	 * @param	$length	Output length (defaults to the selected digest size)
+	 * @param	integer $length	Output length (defaults to the selected digest size)
 	 * @param	$info	Optional context/application-specific info
 	 * @return	string	A pseudo-random key
 	 */

Spacing +1 added lines, -1 removed lines

@@ -590,7 +590,7 @@
 		// Remove PKCS#7 padding, if necessary
 		if (in_array(strtolower(mcrypt_enc_get_modes_name($params['handle'])), array('cbc', 'ecb'), TRUE))
 		{
-			$data = self::substr($data, 0, -ord($data[self::strlen($data)-1]));
+			$data = self::substr($data, 0, -ord($data[self::strlen($data) - 1]));
 		}
 
 		mcrypt_generic_deinit($params['handle']);

Braces +17 added lines, -34 removed lines

@@ -191,13 +191,11 @@ 
 				if ($this->_drivers[$params['driver']])
 				{
 					$this->_driver = $params['driver'];
-				}
-				else
+				} else
 				{
 					log_message('error', "Encryption: Driver '".$params['driver']."' is not available.");
 				}
-			}
-			else
+			} else
 			{
 				log_message('error', "Encryption: Unknown driver '".$params['driver']."' cannot be configured.");
 			}
@@ -236,8 +234,7 @@ 
 			if ( ! in_array($params['cipher'], mcrypt_list_algorithms(), TRUE))
 			{
 				log_message('error', 'Encryption: MCrypt cipher '.strtoupper($params['cipher']).' is not available.');
-			}
-			else
+			} else
 			{
 				$this->_cipher = $params['cipher'];
 			}
@@ -249,8 +246,7 @@ 
 			if ( ! isset($this->_modes['mcrypt'][$params['mode']]))
 			{
 				log_message('error', 'Encryption: MCrypt mode '.strtoupper($params['mode']).' is not available.');
-			}
-			else
+			} else
 			{
 				$this->_mode = $this->_modes['mcrypt'][$params['mode']];
 			}
@@ -269,8 +265,7 @@ 
 			if ($this->_handle = mcrypt_module_open($this->_cipher, '', $this->_mode, ''))
 			{
 				log_message('info', 'Encryption: MCrypt cipher '.strtoupper($this->_cipher).' initialized in '.strtoupper($this->_mode).' mode.');
-			}
-			else
+			} else
 			{
 				log_message('error', 'Encryption: Unable to initialize MCrypt with cipher '.strtoupper($this->_cipher).' in '.strtoupper($this->_mode).' mode.');
 			}
@@ -300,8 +295,7 @@ 
 			if ( ! isset($this->_modes['openssl'][$params['mode']]))
 			{
 				log_message('error', 'Encryption: OpenSSL mode '.strtoupper($params['mode']).' is not available.');
-			}
-			else
+			} else
 			{
 				$this->_mode = $this->_modes['openssl'][$params['mode']];
 			}
@@ -318,8 +312,7 @@ 
 			{
 				$this->_handle = NULL;
 				log_message('error', 'Encryption: Unable to initialize OpenSSL with method '.strtoupper($handle).'.');
-			}
-			else
+			} else
 			{
 				$this->_handle = $handle;
 				log_message('info', 'Encryption: OpenSSL initialized with method '.strtoupper($handle).'.');
@@ -564,14 +557,12 @@ 
 			{
 				$iv = self::substr($data, 0, $iv_size);
 				$data = self::substr($data, $iv_size);
-			}
-			else
+			} else
 			{
 				// MCrypt is dumb and this is ignored, only size matters
 				$iv = str_repeat("\x0", $iv_size);
 			}
-		}
-		else
+		} else
 		{
 			$iv = NULL;
 		}
@@ -617,8 +608,7 @@ 
 		{
 			$iv = self::substr($data, 0, $iv_size);
 			$data = self::substr($data, $iv_size);
-		}
-		else
+		} else
 		{
 			$iv = NULL;
 		}
@@ -657,8 +647,7 @@ 
 					'hmac_key' => NULL
 				)
 				: FALSE;
-		}
-		elseif ( ! isset($params['cipher'], $params['mode'], $params['key']))
+		} elseif ( ! isset($params['cipher'], $params['mode'], $params['key']))
 		{
 			return FALSE;
 		}
@@ -669,8 +658,7 @@ 
 			if ( ! isset($this->_modes[$this->_driver][$params['mode']]))
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				$params['mode'] = $this->_modes[$this->_driver][$params['mode']];
 			}
@@ -679,22 +667,19 @@ 
 		if (isset($params['hmac']) && $params['hmac'] === FALSE)
 		{
 			$params['hmac_digest'] = $params['hmac_key'] = NULL;
-		}
-		else
+		} else
 		{
 			if ( ! isset($params['hmac_key']))
 			{
 				return FALSE;
-			}
-			elseif (isset($params['hmac_digest']))
+			} elseif (isset($params['hmac_digest']))
 			{
 				$params['hmac_digest'] = strtolower($params['hmac_digest']);
 				if ( ! isset($this->_digests[$params['hmac_digest']]))
 				{
 					return FALSE;
 				}
-			}
-			else
+			} else
 			{
 				$params['hmac_digest'] = 'sha512';
 			}
@@ -847,8 +832,7 @@ 
 		if (empty($length) OR ! is_int($length))
 		{
 			$length = $this->_digests[$digest];
-		}
-		elseif ($length > (255 * $this->_digests[$digest]))
+		} elseif ($length > (255 * $this->_digests[$digest]))
 		{
 			return FALSE;
 		}
@@ -880,8 +864,7 @@ 
 		if ($key === 'mode')
 		{
 			return array_search($this->_mode, $this->_modes[$this->_driver], TRUE);
-		}
-		elseif (in_array($key, array('cipher', 'driver', 'drivers', 'digests'), TRUE))
+		} elseif (in_array($key, array('cipher', 'driver', 'drivers', 'digests'), TRUE))
 		{
 			return $this->{'_'.$key};
 		}

system/libraries/Form_validation.php

Doc Comments +1 added lines

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

Spacing +14 added lines, -14 removed lines

@@ -60,63 +60,63 @@ 
 	 *
 	 * @var array
 	 */
-	protected $_field_data		= array();
+	protected $_field_data = array();
 
 	/**
 	 * Validation rules for the current form
 	 *
 	 * @var array
 	 */
-	protected $_config_rules	= array();
+	protected $_config_rules = array();
 
 	/**
 	 * Array of validation errors
 	 *
 	 * @var array
 	 */
-	protected $_error_array		= array();
+	protected $_error_array = array();
 
 	/**
 	 * Array of custom error messages
 	 *
 	 * @var array
 	 */
-	protected $_error_messages	= array();
+	protected $_error_messages = array();
 
 	/**
 	 * Start tag for error wrapping
 	 *
 	 * @var string
 	 */
-	protected $_error_prefix	= '<p>';
+	protected $_error_prefix = '<p>';
 
 	/**
 	 * End tag for error wrapping
 	 *
 	 * @var string
 	 */
-	protected $_error_suffix	= '</p>';
+	protected $_error_suffix = '</p>';
 
 	/**
 	 * Custom error message
 	 *
 	 * @var string
 	 */
-	protected $error_string		= '';
+	protected $error_string = '';
 
 	/**
 	 * Whether the form data has been validated as safe
 	 *
 	 * @var bool
 	 */
-	protected $_safe_form_data	= FALSE;
+	protected $_safe_form_data = FALSE;
 
 	/**
 	 * Custom data to validate
 	 *
 	 * @var array
 	 */
-	public $validation_data	= array();
+	public $validation_data = array();
 
 	/**
 	 * Initialize Form_Validation class
@@ -126,7 +126,7 @@ 
 	 */
 	public function __construct($rules = array())
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 
 		// applies delimiters set in config file.
 		if (isset($rules['error_prefix']))
@@ -508,7 +508,7 @@ 
 	{
 		if (is_array($array) && isset($keys[$i]))
 		{
-			return isset($array[$keys[$i]]) ? $this->_reduce_array($array[$keys[$i]], $keys, ($i+1)) : NULL;
+			return isset($array[$keys[$i]]) ? $this->_reduce_array($array[$keys[$i]], $keys, ($i + 1)) : NULL;
 		}
 
 		// NULL must be returned for empty fields
@@ -538,18 +538,18 @@ 
 				else
 				{
 					// start with a reference
-					$post_ref =& $_POST;
+					$post_ref = & $_POST;
 
 					// before we assign values, make a reference to the right POST key
 					if (count($row['keys']) === 1)
 					{
-						$post_ref =& $post_ref[current($row['keys'])];
+						$post_ref = & $post_ref[current($row['keys'])];
 					}
 					else
 					{
 						foreach ($row['keys'] as $val)
 						{
-							$post_ref =& $post_ref[$val];
+							$post_ref = & $post_ref[$val];
 						}
 					}
 

Braces +26 added lines, -52 removed lines

@@ -202,8 +202,7 @@ 
 		if ( ! is_string($field) OR $field === '' OR empty($rules))
 		{
 			return $this;
-		}
-		elseif ( ! is_array($rules))
+		} elseif ( ! is_array($rules))
 		{
 			// BC: Convert pipe-separated rules string to an array
 			if ( ! is_string($rules))
@@ -460,8 +459,7 @@ 
 			if ($row['is_array'] === TRUE)
 			{
 				$this->_field_data[$field]['postdata'] = $this->_reduce_array($validation_array, $row['keys']);
-			}
-			elseif (isset($validation_array[$field]))
+			} elseif (isset($validation_array[$field]))
 			{
 				$this->_field_data[$field]['postdata'] = $validation_array[$field];
 			}
@@ -534,8 +532,7 @@ 
 					{
 						$_POST[$row['field']] = $row['postdata'];
 					}
-				}
-				else
+				} else
 				{
 					// start with a reference
 					$post_ref =& $_POST;
@@ -544,8 +541,7 @@ 
 					if (count($row['keys']) === 1)
 					{
 						$post_ref =& $post_ref[current($row['keys'])];
-					}
-					else
+					} else
 					{
 						foreach ($row['keys'] as $val)
 						{
@@ -562,8 +558,7 @@ 
 						}
 
 						$post_ref = $array;
-					}
-					else
+					} else
 					{
 						$post_ref = $row['postdata'];
 					}
@@ -611,14 +606,12 @@ 
 						$rules = array(1 => $rule);
 						break;
 					}
-				}
-				elseif (is_callable($rule))
+				} elseif (is_callable($rule))
 				{
 					$callback = TRUE;
 					$rules = array(1 => $rule);
 					break;
-				}
-				elseif (is_array($rule) && isset($rule[0], $rule[1]) && is_callable($rule[1]))
+				} elseif (is_array($rule) && isset($rule[0], $rule[1]) && is_callable($rule[1]))
 				{
 					$callback = TRUE;
 					$rules = array(array($rule[0], $rule[1]));
@@ -644,12 +637,10 @@ 
 				if (isset($this->_field_data[$row['field']]['errors'][$type]))
 				{
 					$line = $this->_field_data[$row['field']]['errors'][$type];
-				}
-				elseif (isset($this->_error_messages[$type]))
+				} elseif (isset($this->_error_messages[$type]))
 				{
 					$line = $this->_error_messages[$type];
-				}
-				elseif (FALSE === ($line = $this->CI->lang->line('form_validation_'.$type))
+				} elseif (FALSE === ($line = $this->CI->lang->line('form_validation_'.$type))
 					// DEPRECATED support for non-prefixed keys
 					&& FALSE === ($line = $this->CI->lang->line($type, FALSE)))
 				{
@@ -691,8 +682,7 @@ 
 
 				$postdata = $this->_field_data[$row['field']]['postdata'][$cycles];
 				$_in_array = TRUE;
-			}
-			else
+			} else
 			{
 				// If we get an array field, but it's not expected - then it is most likely
 				// somebody messing with the form on the client side, so we'll just consider
@@ -711,12 +701,10 @@ 
 					$rule = substr($rule, 9);
 					$callback = TRUE;
 				}
-			}
-			elseif (is_callable($rule))
+			} elseif (is_callable($rule))
 			{
 				$callable = TRUE;
-			}
-			elseif (is_array($rule) && isset($rule[0], $rule[1]) && is_callable($rule[1]))
+			} elseif (is_array($rule) && isset($rule[0], $rule[1]) && is_callable($rule[1]))
 			{
 				// We have a "named" callable, so save the name
 				$callable = $rule[0];
@@ -741,14 +729,12 @@ 
 					{
 						log_message('debug', 'Unable to find callback validation rule: '.$rule);
 						$result = FALSE;
-					}
-					else
+					} else
 					{
 						// Run the function and grab the result
 						$result = $this->CI->$rule($postdata, $param);
 					}
-				}
-				else
+				} else
 				{
 					$result = is_array($rule)
 						? $rule[0]->{$rule[1]}($postdata)
@@ -765,8 +751,7 @@ 
 				if ($_in_array === TRUE)
 				{
 					$this->_field_data[$row['field']]['postdata'][$cycles] = is_bool($result) ? $postdata : $result;
-				}
-				else
+				} else
 				{
 					$this->_field_data[$row['field']]['postdata'] = is_bool($result) ? $postdata : $result;
 				}
@@ -776,8 +761,7 @@ 
 				{
 					continue;
 				}
-			}
-			elseif ( ! method_exists($this, $rule))
+			} elseif ( ! method_exists($this, $rule))
 			{
 				// If our own wrapper function doesn't exist we see if a native PHP function does.
 				// Users can use any native PHP function call that has one param.
@@ -789,27 +773,23 @@ 
 					if ($_in_array === TRUE)
 					{
 						$this->_field_data[$row['field']]['postdata'][$cycles] = is_bool($result) ? $postdata : $result;
-					}
-					else
+					} else
 					{
 						$this->_field_data[$row['field']]['postdata'] = is_bool($result) ? $postdata : $result;
 					}
-				}
-				else
+				} else
 				{
 					log_message('debug', 'Unable to find validation rule: '.$rule);
 					$result = FALSE;
 				}
-			}
-			else
+			} else
 			{
 				$result = $this->$rule($postdata, $param);
 
 				if ($_in_array === TRUE)
 				{
 					$this->_field_data[$row['field']]['postdata'][$cycles] = is_bool($result) ? $postdata : $result;
-				}
-				else
+				} else
 				{
 					$this->_field_data[$row['field']]['postdata'] = is_bool($result) ? $postdata : $result;
 				}
@@ -827,8 +807,7 @@ 
 				elseif (isset($this->_field_data[$row['field']]['errors'][$rule]))
 				{
 					$line = $this->_field_data[$row['field']]['errors'][$rule];
-				}
-				elseif ( ! isset($this->_error_messages[$rule]))
+				} elseif ( ! isset($this->_error_messages[$rule]))
 				{
 					if (FALSE === ($line = $this->CI->lang->line('form_validation_'.$rule))
 						// DEPRECATED support for non-prefixed keys
@@ -836,8 +815,7 @@ 
 					{
 						$line = $this->CI->lang->line('form_validation_error_message_not_set').'('.$rule.')';
 					}
-				}
-				else
+				} else
 				{
 					$line = $this->_error_messages[$rule];
 				}
@@ -984,8 +962,7 @@ 
 			}
 
 			return '';
-		}
-		elseif (($field === '' OR $value === '') OR ($field !== $value))
+		} elseif (($field === '' OR $value === '') OR ($field !== $value))
 		{
 			return '';
 		}
@@ -1027,8 +1004,7 @@ 
 			}
 
 			return '';
-		}
-		elseif (($field === '' OR $value === '') OR ($field !== $value))
+		} elseif (($field === '' OR $value === '') OR ($field !== $value))
 		{
 			return '';
 		}
@@ -1202,14 +1178,12 @@ 
 		if (empty($str))
 		{
 			return FALSE;
-		}
-		elseif (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches))
+		} elseif (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches))
 		{
 			if (empty($matches[2]))
 			{
 				return FALSE;
-			}
-			elseif ( ! in_array($matches[1], array('http', 'https'), TRUE))
+			} elseif ( ! in_array($matches[1], array('http', 'https'), TRUE))
 			{
 				return FALSE;
 			}

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

system/libraries/Javascript.php

Doc Comments +1 added lines

@@ -675,6 +675,7 @@
 	 *
 	 * @param	string	The element to attach the event to
 	 * @param	bool	If a CDATA section should be added
+	 * @param string $script
 	 * @return	string
 	 */
 	public function inline($script, $cdata = TRUE)

Spacing +2 added lines, -2 removed lines

@@ -78,12 +78,12 @@
 
 		extract($defaults);
 
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 
 		// load the requested js library
 		$this->CI->load->library('Javascript/'.$js_library_driver, array('autoload' => $autoload));
 		// make js to refer to current library
-		$this->js =& $this->CI->$js_library_driver;
+		$this->js = & $this->CI->$js_library_driver;
 
 		log_message('info', 'Javascript Class Initialized and loaded. Driver used: '.$js_library_driver);
 	}

Braces +11 added lines, -22 removed lines

@@ -644,8 +644,7 @@ 
 		if ($external_file !== '')
 		{
 			$this->_javascript_location = $external_file;
-		}
-		elseif ($this->CI->config->item('javascript_location') !== '')
+		} elseif ($this->CI->config->item('javascript_location') !== '')
 		{
 			$this->_javascript_location = $this->CI->config->item('javascript_location');
 		}
@@ -653,12 +652,10 @@ 
 		if ($relative === TRUE OR strpos($external_file, 'http://') === 0 OR strpos($external_file, 'https://') === 0)
 		{
 			$str = $this->_open_script($external_file);
-		}
-		elseif (strpos($this->_javascript_location, 'http://') !== FALSE)
+		} elseif (strpos($this->_javascript_location, 'http://') !== FALSE)
 		{
 			$str = $this->_open_script($this->_javascript_location.$external_file);
-		}
-		else
+		} else
 		{
 			$str = $this->_open_script($this->CI->config->slash_item('base_url').$this->_javascript_location.$external_file);
 		}
@@ -754,17 +751,14 @@ 
 			if (is_object($result))
 			{
 				$json_result = is_callable(array($result, 'result_array')) ? $result->result_array() : (array) $result;
-			}
-			elseif (is_array($result))
+			} elseif (is_array($result))
 			{
 				$json_result = $result;
-			}
-			else
+			} else
 			{
 				return $this->_prep_args($result);
 			}
-		}
-		else
+		} else
 		{
 			return 'null';
 		}
@@ -775,8 +769,7 @@ 
 		if ( ! is_array($json_result) && empty($json_result))
 		{
 			show_error('Generate JSON Failed - Illegal key, value pair.');
-		}
-		elseif ($match_array_type)
+		} elseif ($match_array_type)
 		{
 			$_is_assoc = $this->_is_associative_array($json_result);
 		}
@@ -786,8 +779,7 @@ 
 			if ($_is_assoc)
 			{
 				$json[] = $this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type);
-			}
-			else
+			} else
 			{
 				$json[] = $this->generate_json($v, $match_array_type);
 			}
@@ -838,16 +830,13 @@ 
 		if ($result === NULL)
 		{
 			return 'null';
-		}
-		elseif (is_bool($result))
+		} elseif (is_bool($result))
 		{
 			return ($result === TRUE) ? 'true' : 'false';
-		}
-		elseif (is_string($result) OR $is_key)
+		} elseif (is_string($result) OR $is_key)
 		{
 			return '"'.str_replace(array('\\', "\t", "\n", "\r", '"', '/'), array('\\\\', '\\t', '\\n', "\\r", '\"', '\/'), $result).'"';
-		}
-		elseif (is_scalar($result))
+		} elseif (is_scalar($result))
 		{
 			return $result;
 		}