ci-bonfire / Sprint

system/helpers/html_helper.php

Braces +9 added lines, -18 removed lines

@@ -147,8 +147,7 @@ 
 			if ( ! is_array($val))
 			{
 				$out .= $val;
-			}
-			else
+			} else
 			{
 				$out .= $_last_list_item."\n"._list($type, $val, '', $depth + 4).str_repeat(' ', $depth + 2);
 			}
@@ -197,13 +196,11 @@ 
 				if ($index_page === TRUE)
 				{
 					$img .= ' src="'.get_instance()->config->site_url($v).'"';
-				}
-				else
+				} else
 				{
 					$img .= ' src="'.get_instance()->config->slash_item('base_url').$v.'"';
 				}
-			}
-			else
+			} else
 			{
 				$img .= ' '.$k.'="'.$v.'"';
 			}
@@ -289,29 +286,24 @@ 
 					if ($index_page === TRUE)
 					{
 						$link .= 'href="'.$CI->config->site_url($v).'" ';
-					}
-					else
+					} else
 					{
 						$link .= 'href="'.$CI->config->slash_item('base_url').$v.'" ';
 					}
-				}
-				else
+				} else
 				{
 					$link .= $k.'="'.$v.'" ';
 				}
 			}
-		}
-		else
+		} else
 		{
 			if (preg_match('#^([a-z]+:)?//#i', $href))
 			{
 				$link .= 'href="'.$href.'" ';
-			}
-			elseif ($index_page === TRUE)
+			} elseif ($index_page === TRUE)
 			{
 				$link .= 'href="'.$CI->config->site_url($href).'" ';
-			}
-			else
+			} else
 			{
 				$link .= 'href="'.$CI->config->slash_item('base_url').$href.'" ';
 			}
@@ -353,8 +345,7 @@ 
 		if ( ! is_array($name))
 		{
 			$name = array(array('name' => $name, 'content' => $content, 'type' => $type, 'newline' => $newline));
-		}
-		elseif (isset($name['name']))
+		} elseif (isset($name['name']))
 		{
 			// Turn single array into multidimensional
 			$name = array($name);

system/helpers/number_helper.php

Braces +4 added lines, -8 removed lines

@@ -67,23 +67,19 @@
 		{
 			$num = round($num / 1099511627776, $precision);
 			$unit = $CI->lang->line('terabyte_abbr');
-		}
-		elseif ($num >= 1000000000)
+		} elseif ($num >= 1000000000)
 		{
 			$num = round($num / 1073741824, $precision);
 			$unit = $CI->lang->line('gigabyte_abbr');
-		}
-		elseif ($num >= 1000000)
+		} elseif ($num >= 1000000)
 		{
 			$num = round($num / 1048576, $precision);
 			$unit = $CI->lang->line('megabyte_abbr');
-		}
-		elseif ($num >= 1000)
+		} elseif ($num >= 1000)
 		{
 			$num = round($num / 1024, $precision);
 			$unit = $CI->lang->line('kilobyte_abbr');
-		}
-		else
+		} else
 		{
 			$unit = $CI->lang->line('bytes');
 			return number_format($num).' '.$unit;

system/helpers/path_helper.php

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 		if (realpath($path) !== FALSE)
 		{
 			$path = realpath($path);
-		}
-		elseif ($check_existance && ! is_dir($path) && ! is_file($path))
+		} elseif ($check_existance && ! is_dir($path) && ! is_file($path))
 		{
 			show_error('Not a valid path: '.$path);
 		}

system/helpers/smiley_helper.php

Braces +2 added lines, -4 removed lines

@@ -117,8 +117,7 @@ 
 				}
 			}
 EOF;
-		}
-		elseif (is_array($alias))
+		} elseif (is_array($alias))
 		{
 			foreach ($alias as $name => $id)
 			{
@@ -152,8 +151,7 @@ 
 		if (is_array($alias))
 		{
 			$smileys = $alias;
-		}
-		elseif (FALSE === ($smileys = _get_smiley_array()))
+		} elseif (FALSE === ($smileys = _get_smiley_array()))
 		{
 			return FALSE;
 		}

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/url_helper.php

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

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

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

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