ci-bonfire / Sprint

system/libraries/Javascript.php

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;
 		}

system/libraries/Javascript/Jquery.php

Braces +3 added lines, -6 removed lines

@@ -735,8 +735,7 @@ 
 		if ($this->CI->config->item('javascript_ajax_img') === '')
 		{
 			$loading_notifier = 'Loading...';
-		}
-		else
+		} else
 		{
 			$loading_notifier = '<img src="'.$this->CI->config->slash_item('base_url').$this->CI->config->item('javascript_ajax_img').'" alt="Loading" />';
 		}
@@ -892,8 +891,7 @@ 
 				$sort_options[] = "\n\t\t".$k.': '.$v;
 			}
 			$sort_options = implode(',', $sort_options);
-		}
-		else
+		} else
 		{
 			$sort_options = '';
 		}
@@ -1064,8 +1062,7 @@ 
 		if (in_array($speed, array('slow', 'normal', 'fast')))
 		{
 			return '"'.$speed.'"';
-		}
-		elseif (preg_match('/[^0-9]/', $speed))
+		} elseif (preg_match('/[^0-9]/', $speed))
 		{
 			return '';
 		}

system/libraries/Migration.php

Braces +2 added lines, -4 removed lines

@@ -201,8 +201,7 @@ 
 		if ($this->_migration_type === 'sequential')
 		{
 			$target_version = sprintf('%03d', $target_version);
-		}
-		else
+		} else
 		{
 			$target_version = (string) $target_version;
 		}
@@ -219,8 +218,7 @@ 
 		{
 			// Moving Up
 			$method = 'up';
-		}
-		else
+		} else
 		{
 			// Moving Down, apply in reverse order
 			$method = 'down';

system/libraries/Pagination.php

Braces +8 added lines, -16 removed lines

@@ -430,8 +430,7 @@ 
 
 			// Unset the controll, method, old-school routing options
 			unset($get['c'], $get['m'], $get[$this->query_string_segment]);
-		}
-		else
+		} else
 		{
 			$get = array();
 		}
@@ -463,8 +462,7 @@ 
 			// Add the page segment to the end of the query string, where the
 			// page number will be appended.
 			$base_url .= $query_string_sep.http_build_query(array_merge($get, array($this->query_string_segment => '')));
-		}
-		else
+		} else
 		{
 			// Standard segment mode.
 			// Generate our saved query string to append later after the page number.
@@ -496,8 +494,7 @@ 
 		if ($this->page_query_string === TRUE)
 		{
 			$this->cur_page = $this->CI->input->get($this->query_string_segment);
-		}
-		else
+		} else
 		{
 			// Default to the last segment number if one hasn't been defined.
 			if ($this->uri_segment === 0)
@@ -518,8 +515,7 @@ 
 		if ( ! ctype_digit($this->cur_page) OR ($this->use_page_numbers && (int) $this->cur_page === 0))
 		{
 			$this->cur_page = $base_page;
-		}
-		else
+		} else
 		{
 			// Make sure we're using integers for comparisons later.
 			$this->cur_page = (int) $this->cur_page;
@@ -533,8 +529,7 @@ 
 			{
 				$this->cur_page = $num_pages;
 			}
-		}
-		elseif ($this->cur_page > $this->total_rows)
+		} elseif ($this->cur_page > $this->total_rows)
 		{
 			$this->cur_page = ($num_pages - 1) * $this->per_page;
 		}
@@ -578,8 +573,7 @@ 
 				// First page
 				$output .= $this->prev_tag_open.'<a href="'.$first_url.'"'.$attributes.$this->_attr_rel('prev').'>'
 					.$this->prev_link.'</a>'.$this->prev_tag_close;
-			}
-			else
+			} else
 			{
 				$append = $this->prefix.$i.$this->suffix;
 				$output .= $this->prev_tag_open.'<a href="'.$base_url.$append.'"'.$attributes.$this->_attr_rel('prev').'>'
@@ -604,14 +598,12 @@ 
 					{
 						// Current page
 						$output .= $this->cur_tag_open.$loop.$this->cur_tag_close;
-					}
-					elseif ($i === $base_page)
+					} elseif ($i === $base_page)
 					{
 						// First page
 						$output .= $this->num_tag_open.'<a href="'.$first_url.'"'.$attributes.$this->_attr_rel('start').'>'
 							.$loop.'</a>'.$this->num_tag_close;
-					}
-					else
+					} else
 					{
 						$append = $this->prefix.$i.$this->suffix;
 						$output .= $this->num_tag_open.'<a href="'.$base_url.$append.'"'.$attributes.'>'

system/libraries/Profiler.php

Braces +5 added lines, -10 removed lines

@@ -206,8 +206,7 @@ 
 				if ($cobject instanceof CI_DB)
 				{
 					$dbs[get_class($this->CI).':$'.$name] = $cobject;
-				}
-				elseif ($cobject instanceof CI_Model)
+				} elseif ($cobject instanceof CI_Model)
 				{
 					foreach (get_object_vars($cobject) as $mname => $mobject)
 					{
@@ -264,8 +263,7 @@ 
 			{
 				$output .= '<tr><td style="width:100%;color:#0000FF;font-weight:normal;background-color:#eee;padding:5px;">'
 						.$this->CI->lang->line('profiler_no_queries')."</td></tr>\n";
-			}
-			else
+			} else
 			{
 				foreach ($db->queries as $key => $val)
 				{
@@ -307,8 +305,7 @@ 
 		if (count($_GET) === 0)
 		{
 			$output .= '<div style="color:#cd6e00;font-weight:normal;padding:4px 0 4px 0;">'.$this->CI->lang->line('profiler_no_get').'</div>';
-		}
-		else
+		} else
 		{
 			$output .= "\n\n<table style=\"width:100%;border:none;\">\n";
 
@@ -345,8 +342,7 @@ 
 		if (count($_POST) === 0 && count($_FILES) === 0)
 		{
 			$output .= '<div style="color:#009900;font-weight:normal;padding:4px 0 4px 0;">'.$this->CI->lang->line('profiler_no_post').'</div>';
-		}
-		else
+		} else
 		{
 			$output .= "\n\n<table style=\"width:100%;\">\n";
 
@@ -360,8 +356,7 @@ 
 				if (is_array($val) OR is_object($val))
 				{
 					$output .= '<pre>'.htmlspecialchars(stripslashes(print_r($val, TRUE))).'</pre>';
-				}
-				else
+				} else
 				{
 					$output .= htmlspecialchars(stripslashes($val));
 				}

system/libraries/Session/Session.php

Braces +13 added lines, -26 removed lines

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

system/libraries/Session/drivers/Session_database_driver.php

Braces +6 added lines, -12 removed lines

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

system/libraries/Session/drivers/Session_files_driver.php

Braces +6 added lines, -12 removed lines

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

system/libraries/Session/drivers/Session_redis_driver.php

Braces +7 added lines, -14 removed lines

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