ci-bonfire / Sprint

system/helpers/string_helper.php

Spacing +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
 	 */
 	function quotes_to_entities($str)
 	{
-		return str_replace(array("\'","\"","'",'"'), array("'",""","'","""), $str);
+		return str_replace(array("\'", "\"", "'", '"'), array("'", """, "'", """), $str);
 	}
 }
 

system/helpers/typography_helper.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	function nl2br_except_pre($str)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->library('typography');
 		return $CI->typography->nl2br_except_pre($str);
 	}
@@ -78,7 +78,7 @@ 
 	 */
 	function auto_typography($str, $reduce_linebreaks = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->library('typography');
 		return $CI->typography->auto_typography($str, $reduce_linebreaks);
 	}

system/language/english/date_lang.php

Spacing +3 added lines, -3 removed lines

@@ -76,12 +76,12 @@ 
 $lang['UP45']	= '(UTC +4:30) Afghanistan';
 $lang['UP5']	= '(UTC +5:00) Pakistan Standard Time, Yekaterinburg Time';
 $lang['UP55']	= '(UTC +5:30) Indian Standard Time, Sri Lanka Time';
-$lang['UP575']	= '(UTC +5:45) Nepal Time';
+$lang['UP575'] = '(UTC +5:45) Nepal Time';
 $lang['UP6']	= '(UTC +6:00) Bangladesh Standard Time, Bhutan Time, Omsk Time';
 $lang['UP65']	= '(UTC +6:30) Cocos Islands, Myanmar';
 $lang['UP7']	= '(UTC +7:00) Krasnoyarsk Time, Cambodia, Laos, Thailand, Vietnam';
 $lang['UP8']	= '(UTC +8:00) Australian Western Standard Time, Beijing Time, Irkutsk Time';
-$lang['UP875']	= '(UTC +8:45) Australian Central Western Standard Time';
+$lang['UP875'] = '(UTC +8:45) Australian Central Western Standard Time';
 $lang['UP9']	= '(UTC +9:00) Japan Standard Time, Korea Standard Time, Yakutsk Time';
 $lang['UP95']	= '(UTC +9:30) Australian Central Standard Time';
 $lang['UP10']	= '(UTC +10:00) Australian Eastern Standard Time, Vladivostok Time';
@@ -89,6 +89,6 @@ 
 $lang['UP11']	= '(UTC +11:00) Srednekolymsk Time, Solomon Islands, Vanuatu';
 $lang['UP115']	= '(UTC +11:30) Norfolk Island';
 $lang['UP12']	= '(UTC +12:00) Fiji, Gilbert Islands, Kamchatka Time, New Zealand Standard Time';
-$lang['UP1275']	= '(UTC +12:45) Chatham Islands Standard Time';
+$lang['UP1275'] = '(UTC +12:45) Chatham Islands Standard Time';
 $lang['UP13']	= '(UTC +13:00) Samoa Time Zone, Phoenix Islands Time, Tonga';
 $lang['UP14']	= '(UTC +14:00) Line Islands';

system/language/english/form_validation_lang.php

Spacing +15 added lines, -15 removed lines

@@ -37,32 +37,32 @@
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['form_validation_required']		= 'The {field} field is required.';
-$lang['form_validation_isset']			= 'The {field} field must have a value.';
-$lang['form_validation_valid_email']		= 'The {field} field must contain a valid email address.';
-$lang['form_validation_valid_emails']		= 'The {field} field must contain all valid email addresses.';
-$lang['form_validation_valid_url']		= 'The {field} field must contain a valid URL.';
-$lang['form_validation_valid_ip']		= 'The {field} field must contain a valid IP.';
+$lang['form_validation_required'] = 'The {field} field is required.';
+$lang['form_validation_isset'] = 'The {field} field must have a value.';
+$lang['form_validation_valid_email'] = 'The {field} field must contain a valid email address.';
+$lang['form_validation_valid_emails'] = 'The {field} field must contain all valid email addresses.';
+$lang['form_validation_valid_url'] = 'The {field} field must contain a valid URL.';
+$lang['form_validation_valid_ip'] = 'The {field} field must contain a valid IP.';
 $lang['form_validation_min_length']		= 'The {field} field must be at least {param} characters in length.';
 $lang['form_validation_max_length']		= 'The {field} field cannot exceed {param} characters in length.';
-$lang['form_validation_exact_length']		= 'The {field} field must be exactly {param} characters in length.';
-$lang['form_validation_alpha']			= 'The {field} field may only contain alphabetical characters.';
-$lang['form_validation_alpha_numeric']		= 'The {field} field may only contain alpha-numeric characters.';
-$lang['form_validation_alpha_numeric_spaces']	= 'The {field} field may only contain alpha-numeric characters and spaces.';
+$lang['form_validation_exact_length'] = 'The {field} field must be exactly {param} characters in length.';
+$lang['form_validation_alpha'] = 'The {field} field may only contain alphabetical characters.';
+$lang['form_validation_alpha_numeric'] = 'The {field} field may only contain alpha-numeric characters.';
+$lang['form_validation_alpha_numeric_spaces'] = 'The {field} field may only contain alpha-numeric characters and spaces.';
 $lang['form_validation_alpha_dash']		= 'The {field} field may only contain alpha-numeric characters, underscores, and dashes.';
 $lang['form_validation_numeric']		= 'The {field} field must contain only numbers.';
 $lang['form_validation_is_numeric']		= 'The {field} field must contain only numeric characters.';
 $lang['form_validation_integer']		= 'The {field} field must contain an integer.';
-$lang['form_validation_regex_match']		= 'The {field} field is not in the correct format.';
+$lang['form_validation_regex_match'] = 'The {field} field is not in the correct format.';
 $lang['form_validation_matches']		= 'The {field} field does not match the {param} field.';
 $lang['form_validation_differs']		= 'The {field} field must differ from the {param} field.';
 $lang['form_validation_is_unique'] 		= 'The {field} field must contain a unique value.';
 $lang['form_validation_is_natural']		= 'The {field} field must only contain digits.';
 $lang['form_validation_is_natural_no_zero']	= 'The {field} field must only contain digits and must be greater than zero.';
-$lang['form_validation_decimal']		= 'The {field} field must contain a decimal number.';
-$lang['form_validation_less_than']		= 'The {field} field must contain a number less than {param}.';
+$lang['form_validation_decimal'] = 'The {field} field must contain a decimal number.';
+$lang['form_validation_less_than'] = 'The {field} field must contain a number less than {param}.';
 $lang['form_validation_less_than_equal_to']	= 'The {field} field must contain a number less than or equal to {param}.';
-$lang['form_validation_greater_than']		= 'The {field} field must contain a number greater than {param}.';
+$lang['form_validation_greater_than'] = 'The {field} field must contain a number greater than {param}.';
 $lang['form_validation_greater_than_equal_to']	= 'The {field} field must contain a number greater than or equal to {param}.';
 $lang['form_validation_error_message_not_set']	= 'Unable to access an error message corresponding to your field name {field}.';
-$lang['form_validation_in_list']		= 'The {field} field must be one of: {param}.';
+$lang['form_validation_in_list'] = 'The {field} field must be one of: {param}.';

system/language/english/ftp_lang.php

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['ftp_no_connection']		= 'Unable to locate a valid connection ID. Please make sure you are connected before performing any file routines.';
-$lang['ftp_unable_to_connect']		= 'Unable to connect to your FTP server using the supplied hostname.';
+$lang['ftp_no_connection'] = 'Unable to locate a valid connection ID. Please make sure you are connected before performing any file routines.';
+$lang['ftp_unable_to_connect'] = 'Unable to connect to your FTP server using the supplied hostname.';
 $lang['ftp_unable_to_login']		= 'Unable to login to your FTP server. Please check your username and password.';
 $lang['ftp_unable_to_mkdir']		= 'Unable to create the directory you have specified.';
 $lang['ftp_unable_to_changedir']	= 'Unable to change directories.';

system/libraries/Calendar.php

Spacing +11 added lines, -11 removed lines

@@ -129,7 +129,7 @@ 
 	 */
 	public function __construct($config = array())
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		$this->CI->lang->load('calendar');
 
 		empty($config) OR $this->initialize($config);
@@ -205,15 +205,15 @@ 
 
 		$adjusted_date = $this->adjust_date($month, $year);
 
-		$month	= $adjusted_date['month'];
-		$year	= $adjusted_date['year'];
+		$month = $adjusted_date['month'];
+		$year = $adjusted_date['year'];
 
 		// Determine the total days in the month
 		$total_days = $this->get_total_days($month, $year);
 
 		// Set the starting day of the week
 		$start_days	= array('sunday' => 0, 'monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6);
-		$start_day	= isset($start_days[$this->start_day]) ? $start_days[$this->start_day] : 0;
+		$start_day = isset($start_days[$this->start_day]) ? $start_days[$this->start_day] : 0;
 
 		// Set the starting day number
 		$local_date = mktime(12, 0, 0, $month, 1, $year);
@@ -227,9 +227,9 @@ 
 
 		// Set the current month/year/day
 		// We use this to determine the "today" date
-		$cur_year	= date('Y', $local_time);
-		$cur_month	= date('m', $local_time);
-		$cur_day	= date('j', $local_time);
+		$cur_year = date('Y', $local_time);
+		$cur_month = date('m', $local_time);
+		$cur_day = date('j', $local_time);
 
 		$is_current_month = ($cur_year == $year && $cur_month == $month);
 
@@ -270,9 +270,9 @@ 
 
 		$day_names = $this->get_day_names();
 
-		for ($i = 0; $i < 7; $i ++)
+		for ($i = 0; $i < 7; $i++)
 		{
-			$out .= str_replace('{week_day}', $day_names[($start_day + $i) %7], $this->replacements['week_day_cell']);
+			$out .= str_replace('{week_day}', $day_names[($start_day + $i) % 7], $this->replacements['week_day_cell']);
 		}
 
 		$out .= "\n".$this->replacements['week_row_end']."\n";
@@ -423,8 +423,8 @@ 
 	{
 		$date = array();
 
-		$date['month']	= $month;
-		$date['year']	= $year;
+		$date['month'] = $month;
+		$date['year'] = $year;
 
 		while ($date['month'] > 12)
 		{

system/libraries/Cart.php

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, '.', ',');
 	}
 
 	// --------------------------------------------------------------------

system/libraries/Email.php

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]))
 		{

system/libraries/Encrypt.php

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