ci-bonfire / Sprint

system/core/Security.php

Braces +6 added lines, -7 removed lines

@@ -225,10 +225,12 @@ 
 
 		// Do the tokens exist in both the _POST and _COOKIE arrays?
 		if ( ! isset($_POST[$this->_csrf_token_name], $_COOKIE[$this->_csrf_cookie_name])
-			OR $_POST[$this->_csrf_token_name] !== $_COOKIE[$this->_csrf_cookie_name]) // Do the tokens match?
+			OR $_POST[$this->_csrf_token_name] !== $_COOKIE[$this->_csrf_cookie_name]) {
+			// Do the tokens match?
 		{
 			$this->csrf_show_error();
 		}
+		}
 
 		// We kill this since we're done and we don't want to polute the _POST array
 		unset($_POST[$this->_csrf_token_name]);
@@ -421,8 +423,7 @@ 
 			// closing tags every so often so we skip those and only
 			// do the long opening tags.
 			$str = preg_replace('/<\?(php)/i', '&lt;?\\1', $str);
-		}
-		else
+		} else
 		{
 			$str = str_replace(array('<?', '?'.'>'), array('&lt;?', '?&gt;'), $str);
 		}
@@ -599,8 +600,7 @@ 
 			{
 				// The cast is required to avoid TypeError
 				return random_bytes((int) $length);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				// If random_bytes() can't do the job, we can't either ...
 				// There's no point in using fallbacks.
@@ -854,8 +854,7 @@ 
 				)
 				{
 					$attributes[] = 'xss=removed';
-				}
-				else
+				} else
 				{
 					$attributes[] = $attribute[0][0];
 				}

system/core/URI.php

Braces +6 added lines, -12 removed lines

@@ -110,8 +110,7 @@ 
 			if (is_cli())
 			{
 				$uri = $this->_parse_argv();
-			}
-			else
+			} else
 			{
 				$protocol = $this->config->item('uri_protocol');
 				empty($protocol) && $protocol = 'REQUEST_URI';
@@ -212,8 +211,7 @@ 
 			if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0)
 			{
 				$uri = (string) substr($uri, strlen($_SERVER['SCRIPT_NAME']));
-			}
-			elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
+			} elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
 			{
 				$uri = (string) substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
 			}
@@ -226,8 +224,7 @@ 
 			$query = explode('?', $query, 2);
 			$uri = $query[0];
 			$_SERVER['QUERY_STRING'] = isset($query[1]) ? $query[1] : '';
-		}
-		else
+		} else
 		{
 			$_SERVER['QUERY_STRING'] = $query;
 		}
@@ -259,8 +256,7 @@ 
 		if (trim($uri, '/') === '')
 		{
 			return '';
-		}
-		elseif (strncmp($uri, '/', 1) === 0)
+		} elseif (strncmp($uri, '/', 1) === 0)
 		{
 			$uri = explode('?', $uri, 2);
 			$_SERVER['QUERY_STRING'] = isset($uri[1]) ? $uri[1] : '';
@@ -456,8 +452,7 @@ 
 			if ($i % 2)
 			{
 				$retval[$lastval] = $seg;
-			}
-			else
+			} else
 			{
 				$retval[$seg] = NULL;
 				$lastval = $seg;
@@ -559,8 +554,7 @@ 
 		if ($where === 'trailing')
 		{
 			$leading	= '';
-		}
-		elseif ($where === 'leading')
+		} elseif ($where === 'leading')
 		{
 			$trailing	= '';
 		}

system/core/Utf8.php

Braces +3 added lines, -6 removed lines

@@ -67,8 +67,7 @@ 
 		{
 			define('UTF8_ENABLED', TRUE);
 			log_message('debug', 'UTF-8 Support Enabled');
-		}
-		else
+		} else
 		{
 			define('UTF8_ENABLED', FALSE);
 			log_message('debug', 'UTF-8 Support Disabled');
@@ -94,8 +93,7 @@ 
 			if (MB_ENABLED)
 			{
 				$str = mb_convert_encoding($str, 'UTF-8', 'UTF-8');
-			}
-			elseif (ICONV_ENABLED)
+			} elseif (ICONV_ENABLED)
 			{
 				$str = @iconv('UTF-8', 'UTF-8//IGNORE', $str);
 			}
@@ -137,8 +135,7 @@ 
 		if (MB_ENABLED)
 		{
 			return mb_convert_encoding($str, 'UTF-8', $encoding);
-		}
-		elseif (ICONV_ENABLED)
+		} elseif (ICONV_ENABLED)
 		{
 			return @iconv($encoding, 'UTF-8', $str);
 		}

system/core/compat/hash.php

Braces +4 added lines, -8 removed lines

@@ -73,13 +73,11 @@ 
 		{
 			trigger_error('hash_equals(): Expected known_string to be a string, '.strtolower(gettype($known_string)).' given', E_USER_WARNING);
 			return FALSE;
-		}
-		elseif ( ! is_string($user_string))
+		} elseif ( ! is_string($user_string))
 		{
 			trigger_error('hash_equals(): Expected user_string to be a string, '.strtolower(gettype($user_string)).' given', E_USER_WARNING);
 			return FALSE;
-		}
-		elseif (($length = strlen($known_string)) !== strlen($user_string))
+		} elseif (($length = strlen($known_string)) !== strlen($user_string))
 		{
 			return FALSE;
 		}
@@ -135,8 +133,7 @@ 
 			if (is_string($iterations) && is_numeric($iterations))
 			{
 				$iterations = (int) $iterations;
-			}
-			else
+			} else
 			{
 				trigger_error('hash_pbkdf2() expects parameter 4 to be long, '.$type.' given', E_USER_WARNING);
 				return NULL;
@@ -159,8 +156,7 @@ 
 			if (is_string($length) && is_numeric($length))
 			{
 				$length = (int) $length;
-			}
-			else
+			} else
 			{
 				trigger_error('hash_pbkdf2() expects parameter 5 to be long, '.$type.' given', E_USER_WARNING);
 				return NULL;

system/core/compat/password.php

Braces +6 added lines, -12 removed lines

@@ -113,18 +113,15 @@ 
 		{
 			trigger_error('password_hash(): Provided salt is too short: '.$saltlen.' expecting 22', E_USER_WARNING);
 			return NULL;
-		}
-		elseif ( ! isset($options['salt']))
+		} elseif ( ! isset($options['salt']))
 		{
 			if (defined('MCRYPT_DEV_URANDOM'))
 			{
 				$options['salt'] = mcrypt_create_iv(16, MCRYPT_DEV_URANDOM);
-			}
-			elseif (function_exists('openssl_random_pseudo_bytes'))
+			} elseif (function_exists('openssl_random_pseudo_bytes'))
 			{
 				$options['salt'] = openssl_random_pseudo_bytes(16);
-			}
-			elseif (DIRECTORY_SEPARATOR === '/' && (is_readable($dev = '/dev/arandom') OR is_readable($dev = '/dev/urandom')))
+			} elseif (DIRECTORY_SEPARATOR === '/' && (is_readable($dev = '/dev/arandom') OR is_readable($dev = '/dev/urandom')))
 			{
 				if (($fp = fopen($dev, 'rb')) === FALSE)
 				{
@@ -147,16 +144,14 @@ 
 				}
 
 				fclose($fp);
-			}
-			else
+			} else
 			{
 				log_message('error', 'compat/password: No CSPRNG available.');
 				return FALSE;
 			}
 
 			$options['salt'] = str_replace('+', '.', rtrim(base64_encode($options['salt']), '='));
-		}
-		elseif ( ! preg_match('#^[a-zA-Z0-9./]+$#D', $options['salt']))
+		} elseif ( ! preg_match('#^[a-zA-Z0-9./]+$#D', $options['salt']))
 		{
 			$options['salt'] = str_replace('+', '.', rtrim(base64_encode($options['salt']), '='));
 		}
@@ -189,8 +184,7 @@ 
 		if ($algo !== $info['algo'])
 		{
 			return TRUE;
-		}
-		elseif ($algo === 1)
+		} elseif ($algo === 1)
 		{
 			$options['cost'] = isset($options['cost']) ? (int) $options['cost'] : 10;
 			return ($info['options']['cost'] !== $options['cost']);

system/core/compat/standard.php

Braces +15 added lines, -30 removed lines

@@ -74,12 +74,10 @@ 
 			if ($type === 'double')
 			{
 				$column_key = (int) $column_key;
-			}
-			elseif ($type === 'object' && method_exists($column_key, '__toString'))
+			} elseif ($type === 'object' && method_exists($column_key, '__toString'))
 			{
 				$column_key = (string) $column_key;
-			}
-			else
+			} else
 			{
 				trigger_error('array_column(): The column key should be either a string or an integer', E_USER_WARNING);
 				return FALSE;
@@ -91,12 +89,10 @@ 
 			if ($type === 'double')
 			{
 				$index_key = (int) $index_key;
-			}
-			elseif ($type === 'object' && method_exists($index_key, '__toString'))
+			} elseif ($type === 'object' && method_exists($index_key, '__toString'))
 			{
 				$index_key = (string) $index_key;
-			}
-			else
+			} else
 			{
 				trigger_error('array_column(): The index key should be either a string or an integer', E_USER_WARNING);
 				return FALSE;
@@ -109,12 +105,10 @@ 
 			if ($column_key === NULL)
 			{
 				$value = $a;
-			}
-			elseif (is_array($a) && array_key_exists($column_key, $a))
+			} elseif (is_array($a) && array_key_exists($column_key, $a))
 			{
 				$value = $a[$column_key];
-			}
-			else
+			} else
 			{
 				continue;
 			}
@@ -122,8 +116,7 @@ 
 			if ($index_key === NULL OR ! array_key_exists($index_key, $a))
 			{
 				$result[] = $value;
-			}
-			else
+			} else
 			{
 				$result[$a[$index_key]] = $value;
 			}
@@ -158,8 +151,7 @@ 
 			if ($type === 'object' && method_exists($data, '__toString'))
 			{
 				$data = (string) $data;
-			}
-			else
+			} else
 			{
 				trigger_error('hex2bin() expects parameter 1 to be string, '.$type.' given', E_USER_WARNING);
 				return NULL;
@@ -170,8 +162,7 @@ 
 		{
 			trigger_error('Hexadecimal input string must have an even length', E_USER_WARNING);
 			return FALSE;
-		}
-		elseif ( ! preg_match('/^[0-9a-f]*$/i', $data))
+		} elseif ( ! preg_match('/^[0-9a-f]*$/i', $data))
 		{
 			trigger_error('Input string must be hexadecimal string', E_USER_WARNING);
 			return FALSE;
@@ -206,8 +197,7 @@ 
 		{
 			trigger_error('array_replace() expects at least 1 parameter, 0 given', E_USER_WARNING);
 			return NULL;
-		}
-		elseif ($c === 1)
+		} elseif ($c === 1)
 		{
 			if ( ! is_array($arrays[0]))
 			{
@@ -227,8 +217,7 @@ 
 			{
 				trigger_error('array_replace(): Argument #'.($i + 2).' is not an array', E_USER_WARNING);
 				return NULL;
-			}
-			elseif (empty($arrays[$i]))
+			} elseif (empty($arrays[$i]))
 			{
 				continue;
 			}
@@ -261,8 +250,7 @@ 
 		{
 			trigger_error('array_replace_recursive() expects at least 1 parameter, 0 given', E_USER_WARNING);
 			return NULL;
-		}
-		elseif ($c === 1)
+		} elseif ($c === 1)
 		{
 			if ( ! is_array($arrays[0]))
 			{
@@ -282,8 +270,7 @@ 
 			{
 				trigger_error('array_replace_recursive(): Argument #'.($i + 2).' is not an array', E_USER_WARNING);
 				return NULL;
-			}
-			elseif (empty($arrays[$i]))
+			} elseif (empty($arrays[$i]))
 			{
 				continue;
 			}
@@ -316,14 +303,12 @@ 
 		if (strlen($str) === 0)
 		{
 			return '';
-		}
-		elseif (in_array($type = gettype($str), array('array', 'object'), TRUE))
+		} elseif (in_array($type = gettype($str), array('array', 'object'), TRUE))
 		{
 			if ($type === 'object' && method_exists($str, '__toString'))
 			{
 				$str = (string) $str;
-			}
-			else
+			} else
 			{
 				trigger_error('quoted_printable_encode() expects parameter 1 to be string, '.$type.' given', E_USER_WARNING);
 				return NULL;

system/database/DB.php

Braces +4 added lines, -8 removed lines

@@ -73,8 +73,7 @@ 
 					if (file_exists($file_path = $path.'config/'.ENVIRONMENT.'/database.php'))
 					{
 						include($file_path);
-					}
-					elseif (file_exists($file_path = $path.'config/database.php'))
+					} elseif (file_exists($file_path = $path.'config/database.php'))
 					{
 						include($file_path);
 					}
@@ -95,15 +94,13 @@ 
 		if ( ! isset($active_group))
 		{
 			show_error('You have not specified a database connection group via $active_group in your config/database.php file.');
-		}
-		elseif ( ! isset($db[$active_group]))
+		} elseif ( ! isset($db[$active_group]))
 		{
 			show_error('You have specified an invalid database connection group ('.$active_group.') in your config/database.php file.');
 		}
 
 		$params = $db[$active_group];
-	}
-	elseif (is_string($params))
+	} elseif (is_string($params))
 	{
 		/**
 		 * Parse the URL from the DSN string
@@ -181,8 +178,7 @@ 
 			 */
 			class CI_DB extends CI_DB_query_builder { }
 		}
-	}
-	elseif ( ! class_exists('CI_DB', FALSE))
+	} elseif ( ! class_exists('CI_DB', FALSE))
 	{
 		/**
 	 	 * @ignore

system/database/DB_driver.php

Braces +17 added lines, -34 removed lines

@@ -599,8 +599,7 @@ 
 		{
 			log_message('error', 'Invalid query: '.$sql);
 			return ($this->db_debug) ? $this->display_error('db_invalid_query') : FALSE;
-		}
-		elseif ( ! is_bool($return_object))
+		} elseif ( ! is_bool($return_object))
 		{
 			$return_object = ! $this->is_write_type($sql);
 		}
@@ -975,13 +974,11 @@ 
 		if (empty($binds) OR empty($this->bind_marker) OR strpos($sql, $this->bind_marker) === FALSE)
 		{
 			return $sql;
-		}
-		elseif ( ! is_array($binds))
+		} elseif ( ! is_array($binds))
 		{
 			$binds = array($binds);
 			$bind_count = 1;
-		}
-		else
+		} else
 		{
 			// Make sure we're using numeric keys
 			$binds = array_values($binds);
@@ -1005,8 +1002,7 @@ 
 			{
 				return $sql;
 			}
-		}
-		elseif (($c = preg_match_all('/'.preg_quote($this->bind_marker, '/').'/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bind_count)
+		} elseif (($c = preg_match_all('/'.preg_quote($this->bind_marker, '/').'/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bind_count)
 		{
 			return $sql;
 		}
@@ -1093,16 +1089,13 @@ 
 		{
 			$str = array_map(array(&$this, 'escape'), $str);
 			return $str;
-		}
-		elseif (is_string($str) OR (is_object($str) && method_exists($str, '__toString')))
+		} elseif (is_string($str) OR (is_object($str) && method_exists($str, '__toString')))
 		{
 			return "'".$this->escape_str($str)."'";
-		}
-		elseif (is_bool($str))
+		} elseif (is_bool($str))
 		{
 			return ($str === FALSE) ? 0 : 1;
-		}
-		elseif ($str === NULL)
+		} elseif ($str === NULL)
 		{
 			return 'NULL';
 		}
@@ -1253,12 +1246,10 @@ 
 				if (isset($row['table_name']))
 				{
 					$key = 'table_name';
-				}
-				elseif (isset($row['TABLE_NAME']))
+				} elseif (isset($row['TABLE_NAME']))
 				{
 					$key = 'TABLE_NAME';
-				}
-				else
+				} else
 				{
 					/* We have no other choice but to just get the first element's key.
 					 * Due to array_shift() accepting its argument by reference, if
@@ -1321,12 +1312,10 @@ 
 				if (isset($row['column_name']))
 				{
 					$key = 'column_name';
-				}
-				elseif (isset($row['COLUMN_NAME']))
+				} elseif (isset($row['COLUMN_NAME']))
 				{
 					$key = 'COLUMN_NAME';
-				}
-				else
+				} else
 				{
 					// We have no other choice but to just get the first element's key.
 					$key = key($row);
@@ -1382,8 +1371,7 @@ 
 		if ($this->_escape_char === '' OR empty($item) OR in_array($item, $this->_reserved_identifiers))
 		{
 			return $item;
-		}
-		elseif (is_array($item))
+		} elseif (is_array($item))
 		{
 			foreach ($item as $key => $value)
 			{
@@ -1410,8 +1398,7 @@ 
 					$this->_escape_char[0],
 					$this->_escape_char[1]
 				);
-			}
-			else
+			} else
 			{
 				$preg_ec[0] = $preg_ec[1] = preg_quote($this->_escape_char, '/');
 				$preg_ec[2] = $preg_ec[3] = $this->_escape_char;
@@ -1679,8 +1666,7 @@ 
 		if ( ! class_exists('CI_DB_Cache', FALSE))
 		{
 			require_once(BASEPATH.'database/DB_cache.php');
-		}
-		elseif (is_object($this->CACHE))
+		} elseif (is_object($this->CACHE))
 		{
 			return TRUE;
 		}
@@ -1739,8 +1725,7 @@ 
 		if ($native === TRUE)
 		{
 			$message = (array) $error;
-		}
-		else
+		} else
 		{
 			$message = is_array($error) ? $error : array(str_replace('%s', $swap, $LANG->line($error)));
 		}
@@ -1843,15 +1828,13 @@ 
 				? substr($item, $offset, 4).$this->escape_identifiers(substr($item, $offset + 4))
 				: substr($item, $offset);
 			$item = substr($item, 0, $offset);
-		}
-		elseif ($offset = strrpos($item, ' '))
+		} elseif ($offset = strrpos($item, ' '))
 		{
 			$alias = ($protect_identifiers)
 				? ' '.$this->escape_identifiers(substr($item, $offset + 1))
 				: substr($item, $offset);
 			$item = substr($item, 0, $offset);
-		}
-		else
+		} else
 		{
 			$alias = '';
 		}

system/database/DB_forge.php

Braces +14 added lines, -28 removed lines

@@ -183,8 +183,7 @@ 
 		if ($this->_create_database === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
-		}
-		elseif ( ! $this->db->query(sprintf($this->_create_database, $db_name, $this->db->char_set, $this->db->dbcollat)))
+		} elseif ( ! $this->db->query(sprintf($this->_create_database, $db_name, $this->db->char_set, $this->db->dbcollat)))
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unable_to_drop') : FALSE;
 		}
@@ -210,8 +209,7 @@ 
 		if ($this->_drop_database === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
-		}
-		elseif ( ! $this->db->query(sprintf($this->_drop_database, $db_name)))
+		} elseif ( ! $this->db->query(sprintf($this->_drop_database, $db_name)))
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unable_to_drop') : FALSE;
 		}
@@ -258,8 +256,7 @@ 
 		if ($primary === TRUE)
 		{
 			$this->primary_keys[] = $key;
-		}
-		else
+		} else
 		{
 			$this->keys[] = $key;
 		}
@@ -289,8 +286,7 @@ 
 					)
 				));
 				$this->add_key('id', TRUE);
-			}
-			else
+			} else
 			{
 				if (strpos($field, ' ') === FALSE)
 				{
@@ -324,8 +320,7 @@ 
 		if ($table === '')
 		{
 			show_error('A table name is required for that operation.');
-		}
-		else
+		} else
 		{
 			$table = $this->db->dbprefix.$table;
 		}
@@ -381,8 +376,7 @@ 
 			if ($this->db->table_exists($table))
 			{
 				return TRUE;
-			}
-			else
+			} else
 			{
 				$if_not_exists = FALSE;
 			}
@@ -502,8 +496,7 @@ 
 				{
 					return TRUE;
 				}
-			}
-			else
+			} else
 			{
 				$sql = sprintf($this->_drop_table_if, $this->db->escape_identifiers($table));
 			}
@@ -527,8 +520,7 @@ 
 		{
 			show_error('A table name is required for that operation.');
 			return FALSE;
-		}
-		elseif ($this->_rename_table === FALSE)
+		} elseif ($this->_rename_table === FALSE)
 		{
 			return ($this->db->db_debug) ? $this->db->display_error('db_unsupported_feature') : FALSE;
 		}
@@ -740,8 +732,7 @@ 
 				if (isset($attributes['AFTER']))
 				{
 					$field['after'] = $attributes['AFTER'];
-				}
-				elseif (isset($attributes['FIRST']))
+				} elseif (isset($attributes['FIRST']))
 				{
 					$field['first'] = (bool) $attributes['FIRST'];
 				}
@@ -754,13 +745,11 @@ 
 				if ($attributes['NULL'] === TRUE)
 				{
 					$field['null'] = empty($this->_null) ? '' : ' '.$this->_null;
-				}
-				else
+				} else
 				{
 					$field['null'] = ' NOT NULL';
 				}
-			}
-			elseif ($create_table === TRUE)
+			} elseif ($create_table === TRUE)
 			{
 				$field['null'] = ' NOT NULL';
 			}
@@ -864,8 +853,7 @@ 
 				{
 					$field['unsigned'] = ' UNSIGNED';
 					return;
-				}
-				elseif (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
+				} elseif (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
 				{
 					$field['type'] = $key;
 					return;
@@ -903,8 +891,7 @@ 
 				// Override the NULL attribute if that's our default
 				$attributes['NULL'] = TRUE;
 				$field['null'] = empty($this->_null) ? '' : ' '.$this->_null;
-			}
-			else
+			} else
 			{
 				$field['default'] = $this->_default.$this->db->escape($attributes['DEFAULT']);
 			}
@@ -998,8 +985,7 @@ 
 						continue;
 					}
 				}
-			}
-			elseif ( ! isset($this->fields[$this->keys[$i]]))
+			} elseif ( ! isset($this->fields[$this->keys[$i]]))
 			{
 				unset($this->keys[$i]);
 				continue;