ci-bonfire / Sprint

system/helpers/download_helper.php

Braces +2 added lines, -4 removed lines

@@ -66,8 +66,7 @@ 
 		if ($filename === '' OR $data === '')
 		{
 			return;
-		}
-		elseif ($data === NULL)
+		} elseif ($data === NULL)
 		{
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
 			{
@@ -77,8 +76,7 @@ 
 			$filepath = $filename;
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 			$filename = end($filename);
-		}
-		else
+		} else
 		{
 			$filesize = strlen($data);
 		}

system/helpers/file_helper.php

Braces +10 added lines, -20 removed lines

@@ -141,8 +141,7 @@ 
 				if (is_dir($path.DIRECTORY_SEPARATOR.$filename) && $filename[0] !== '.')
 				{
 					delete_files($path.DIRECTORY_SEPARATOR.$filename, $del_dir, $htdocs, $_level + 1);
-				}
-				elseif ($htdocs !== TRUE OR ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
+				} elseif ($htdocs !== TRUE OR ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
 				{
 					@unlink($path.DIRECTORY_SEPARATOR.$filename);
 				}
@@ -190,8 +189,7 @@ 
 				if (is_dir($source_dir.$file) && $file[0] !== '.')
 				{
 					get_filenames($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE);
-				}
-				elseif ($file[0] !== '.')
+				} elseif ($file[0] !== '.')
 				{
 					$_filedata[] = ($include_path === TRUE) ? $source_dir.$file : $file;
 				}
@@ -242,8 +240,7 @@ 
 				if (is_dir($source_dir.$file) && $file[0] !== '.' && $top_level_only === FALSE)
 				{
 					get_dir_file_info($source_dir.$file.DIRECTORY_SEPARATOR, $top_level_only, TRUE);
-				}
-				elseif ($file[0] !== '.')
+				} elseif ($file[0] !== '.')
 				{
 					$_filedata[$file] = get_file_info($source_dir.$file);
 					$_filedata[$file]['relative_path'] = $relative_path;
@@ -382,32 +379,25 @@ 
 		if (($perms & 0xC000) === 0xC000)
 		{
 			$symbolic = 's'; // Socket
-		}
-		elseif (($perms & 0xA000) === 0xA000)
+		} elseif (($perms & 0xA000) === 0xA000)
 		{
 			$symbolic = 'l'; // Symbolic Link
-		}
-		elseif (($perms & 0x8000) === 0x8000)
+		} elseif (($perms & 0x8000) === 0x8000)
 		{
 			$symbolic = '-'; // Regular
-		}
-		elseif (($perms & 0x6000) === 0x6000)
+		} elseif (($perms & 0x6000) === 0x6000)
 		{
 			$symbolic = 'b'; // Block special
-		}
-		elseif (($perms & 0x4000) === 0x4000)
+		} elseif (($perms & 0x4000) === 0x4000)
 		{
 			$symbolic = 'd'; // Directory
-		}
-		elseif (($perms & 0x2000) === 0x2000)
+		} elseif (($perms & 0x2000) === 0x2000)
 		{
 			$symbolic = 'c'; // Character special
-		}
-		elseif (($perms & 0x1000) === 0x1000)
+		} elseif (($perms & 0x1000) === 0x1000)
 		{
 			$symbolic = 'p'; // FIFO pipe
-		}
-		else
+		} else
 		{
 			$symbolic = 'u'; // Unknown
 		}

system/helpers/form_helper.php

Braces +10 added lines, -20 removed lines

@@ -127,8 +127,7 @@ 
 		if (is_string($attributes))
 		{
 			$attributes .= ' enctype="multipart/form-data"';
-		}
-		else
+		} else
 		{
 			$attributes['enctype'] = 'multipart/form-data';
 		}
@@ -174,8 +173,7 @@ 
 		if ( ! is_array($value))
 		{
 			$form .= '<input type="hidden" name="'.$name.'" value="'.html_escape($value)."\" />\n";
-		}
-		else
+		} else
 		{
 			foreach ($value as $k => $v)
 			{
@@ -281,8 +279,7 @@ 
 		if ( ! is_array($data) OR ! isset($data['value']))
 		{
 			$val = $value;
-		}
-		else
+		} else
 		{
 			$val = $data['value'];
 			unset($data['value']); // textareas don't use the value attribute
@@ -349,8 +346,7 @@ 
 				$options = $data['options'];
 				unset($data['options']); // select tags don't use an options attribute
 			}
-		}
-		else
+		} else
 		{
 			$defaults = array('name' => $data);
 		}
@@ -367,8 +363,7 @@ 
 				{
 					$selected = array($_POST[$data['name']]);
 				}
-			}
-			elseif (isset($_POST[$data]))
+			} elseif (isset($_POST[$data]))
 			{
 				$selected = array($_POST[$data]);
 			}
@@ -401,8 +396,7 @@ 
 				}
 
 				$form .= "</optgroup>\n";
-			}
-			else
+			} else
 			{
 				$form .= '<option value="'.html_escape($key).'"'
 					.(in_array($key, $selected) ? ' selected="selected"' : '').'>'
@@ -438,8 +432,7 @@ 
 			if ($checked == FALSE)
 			{
 				unset($data['checked']);
-			}
-			else
+			} else
 			{
 				$data['checked'] = 'checked';
 			}
@@ -448,8 +441,7 @@ 
 		if ($checked == TRUE)
 		{
 			$defaults['checked'] = 'checked';
-		}
-		else
+		} else
 		{
 			unset($defaults['checked']);
 		}
@@ -721,8 +713,7 @@ 
 		if (isset($CI->form_validation) && is_object($CI->form_validation) && $CI->form_validation->has_rule($field))
 		{
 			return $CI->form_validation->set_select($field, $value, $default);
-		}
-		elseif (($input = $CI->input->post($field, FALSE)) === NULL)
+		} elseif (($input = $CI->input->post($field, FALSE)) === NULL)
 		{
 			return ($default === TRUE) ? ' selected="selected"' : '';
 		}
@@ -940,8 +931,7 @@ 
 			if ($key === 'value')
 			{
 				$val = html_escape($val);
-			}
-			elseif ($key === 'name' && ! strlen($default['name']))
+			} elseif ($key === 'name' && ! strlen($default['name']))
 			{
 				continue;
 			}

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