ci-bonfire / Sprint

system/helpers/text_helper.php

Braces +6 added lines, -12 removed lines

@@ -155,8 +155,7 @@ 
 				}
 
 				$out .= $str[$i];
-			}
-			else
+			} else
 			{
 				if (count($temp) === 0)
 				{
@@ -213,12 +212,10 @@ 
 				{
 					$out .= chr($digits);
 
-				}
-				elseif ($digits < 2048)
+				} elseif ($digits < 2048)
 				{
 					$out .= chr(192 + (($digits - ($digits % 64)) / 64)).chr(128 + ($digits % 64));
-				}
-				else
+				} else
 				{
 					$out .= chr(224 + (($digits - ($digits % 4096)) / 4096))
 						.chr(128 + ((($digits % 4096) - ($digits % 64)) / 64))
@@ -278,8 +275,7 @@ 
 			if ($replacement !== '')
 			{
 				$str = preg_replace("/({$delim})(".str_replace('\*', '\w*?', preg_quote($badword, '/')).")({$delim})/i", "\\1{$replacement}\\3", $str);
-			}
-			else
+			} else
 			{
 				$str = preg_replace("/({$delim})(".str_replace('\*', '\w*?', preg_quote($badword, '/')).")({$delim})/ie", "'\\1'.str_repeat('#', strlen('\\2')).'\\3'", $str);
 			}
@@ -486,8 +482,7 @@ 
 			if ($temp !== '')
 			{
 				$output .= $temp."\n".$line."\n";
-			}
-			else
+			} else
 			{
 				$output .= $line."\n";
 			}
@@ -538,8 +533,7 @@ 
 		if ($position === 1)
 		{
 			$end = mb_substr($str, 0, -($max_length - mb_strlen($beg)));
-		}
-		else
+		} else
 		{
 			$end = mb_substr($str, -($max_length - mb_strlen($beg)));
 		}

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/Cache/drivers/Cache_file.php

Braces +2 added lines, -4 removed lines

@@ -139,8 +139,7 @@ 
 		if ($data === FALSE)
 		{
 			$data = array('data' => 0, 'ttl' => 60);
-		}
-		elseif ( ! is_int($data['data']))
+		} elseif ( ! is_int($data['data']))
 		{
 			return FALSE;
 		}
@@ -167,8 +166,7 @@ 
 		if ($data === FALSE)
 		{
 			$data = array('data' => 0, 'ttl' => 60);
-		}
-		elseif ( ! is_int($data['data']))
+		} elseif ( ! is_int($data['data']))
 		{
 			return FALSE;
 		}

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_memcached.php

Braces +4 added lines, -8 removed lines

@@ -99,12 +99,10 @@ 
 		if (class_exists('Memcached', FALSE))
 		{
 			$this->_memcached = new Memcached();
-		}
-		elseif (class_exists('Memcache', FALSE))
+		} elseif (class_exists('Memcache', FALSE))
 		{
 			$this->_memcached = new Memcache();
-		}
-		else
+		} else
 		{
 			log_message('error', 'Cache: Failed to create Memcache(d) object; extension not loaded?');
 		}
@@ -124,8 +122,7 @@ 
 					TRUE,
 					$cache_server['weight']
 				);
-			}
-			else
+			} else
 			{
 				$this->_memcached->addServer(
 					$cache_server['hostname'],
@@ -172,8 +169,7 @@ 
 		if (get_class($this->_memcached) === 'Memcached')
 		{
 			return $this->_memcached->set($id, $data, $ttl);
-		}
-		elseif (get_class($this->_memcached) === 'Memcache')
+		} elseif (get_class($this->_memcached) === 'Memcache')
 		{
 			return $this->_memcached->set($id, $data, 0, $ttl);
 		}

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_redis.php

Braces +3 added lines, -6 removed lines

@@ -107,8 +107,7 @@ 
 			if ($config['socket_type'] === 'unix')
 			{
 				$success = $this->_redis->connect($config['socket']);
-			}
-			else // tcp socket
+			} else // tcp socket
 			{
 				$success = $this->_redis->connect($config['host'], $config['port'], $config['timeout']);
 			}
@@ -122,8 +121,7 @@ 
 			{
 				log_message('error', 'Cache: Redis authentication failed.');
 			}
-		}
-		catch (RedisException $e)
+		} catch (RedisException $e)
 		{
 			log_message('error', 'Cache: Redis connection refused ('.$e->getMessage().')');
 		}
@@ -175,8 +173,7 @@ 
 
 			isset($this->_serialized[$id]) OR $this->_serialized[$id] = TRUE;
 			$data = serialize($data);
-		}
-		elseif (isset($this->_serialized[$id]))
+		} elseif (isset($this->_serialized[$id]))
 		{
 			$this->_serialized[$id] = NULL;
 			$this->_redis->sRemove('_ci_redis_serialized', $id);

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

Braces +12 added lines, -24 removed lines

@@ -184,12 +184,10 @@ 
 		if (empty($year))
 		{
 			$year = date('Y', $local_time);
-		}
-		elseif (strlen($year) === 1)
+		} elseif (strlen($year) === 1)
 		{
 			$year = '200'.$year;
-		}
-		elseif (strlen($year) === 2)
+		} elseif (strlen($year) === 2)
 		{
 			$year = '20'.$year;
 		}
@@ -197,8 +195,7 @@ 
 		if (empty($month))
 		{
 			$month = date('m', $local_time);
-		}
-		elseif (strlen($month) === 1)
+		} elseif (strlen($month) === 1)
 		{
 			$month = '0'.$month;
 		}
@@ -294,8 +291,7 @@ 
 						$temp = ($is_current_month === TRUE && $day == $cur_day) ?
 								$this->replacements['cal_cell_content_today'] : $this->replacements['cal_cell_content'];
 						$out .= str_replace(array('{content}', '{day}'), array($data[$day], $day), $temp);
-					}
-					else
+					} else
 					{
 						// Cells with no content
 						$temp = ($is_current_month === TRUE && $day == $cur_day) ?
@@ -304,8 +300,7 @@ 
 					}
 
 					$out .= ($is_current_month === TRUE && $day == $cur_day) ? $this->replacements['cal_cell_end_today'] : $this->replacements['cal_cell_end'];
-				}
-				elseif ($this->show_other_days === TRUE)
+				} elseif ($this->show_other_days === TRUE)
 				{
 					$out .= $this->replacements['cal_cell_start_other'];
 
@@ -315,16 +310,14 @@ 
 						$prev_month = $this->adjust_date($month - 1, $year);
 						$prev_month_days = $this->get_total_days($prev_month['month'], $prev_month['year']);
 						$out .= str_replace('{day}', $prev_month_days + $day, $this->replacements['cal_cell_other']);
-					}
-					else
+					} else
 					{
 						// Day of next month
 						$out .= str_replace('{day}', $day - $total_days, $this->replacements['cal_cell_other']);
 					}
 
 					$out .= $this->replacements['cal_cell_end_other'];
-				}
-				else
+				} else
 				{
 					// Blank cells
 					$out .= $this->replacements['cal_cell_start'].$this->replacements['cal_cell_blank'].$this->replacements['cal_cell_end'];
@@ -355,8 +348,7 @@ 
 		if ($this->month_type === 'short')
 		{
 			$month_names = array('01' => 'cal_jan', '02' => 'cal_feb', '03' => 'cal_mar', '04' => 'cal_apr', '05' => 'cal_may', '06' => 'cal_jun', '07' => 'cal_jul', '08' => 'cal_aug', '09' => 'cal_sep', '10' => 'cal_oct', '11' => 'cal_nov', '12' => 'cal_dec');
-		}
-		else
+		} else
 		{
 			$month_names = array('01' => 'cal_january', '02' => 'cal_february', '03' => 'cal_march', '04' => 'cal_april', '05' => 'cal_mayl', '06' => 'cal_june', '07' => 'cal_july', '08' => 'cal_august', '09' => 'cal_september', '10' => 'cal_october', '11' => 'cal_november', '12' => 'cal_december');
 		}
@@ -387,12 +379,10 @@ 
 		if ($this->day_type === 'long')
 		{
 			$day_names = array('sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday');
-		}
-		elseif ($this->day_type === 'short')
+		} elseif ($this->day_type === 'short')
 		{
 			$day_names = array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat');
-		}
-		else
+		} else
 		{
 			$day_names = array('su', 'mo', 'tu', 'we', 'th', 'fr', 'sa');
 		}
@@ -528,14 +518,12 @@ 
 				if (preg_match('/\{'.$val.'\}(.*?)\{\/'.$val.'\}/si', $this->template, $match))
 				{
 					$this->replacements[$val] = $match[1];
-				}
-				elseif (in_array($val, $today, TRUE))
+				} elseif (in_array($val, $today, TRUE))
 				{
 					$this->replacements[$val] = $this->replacements[substr($val, 0, -6)];
 				}
 			}
-		}
-		elseif (is_array($this->template))
+		} elseif (is_array($this->template))
 		{
 			$this->replacements = array_merge($this->replacements, $this->template);
 		}