ci-bonfire / Sprint

system/database/drivers/sqlsrv/sqlsrv_result.php

Spacing +2 added lines, -2 removed lines

@@ -136,10 +136,10 @@
 		$retval = array();
 		foreach (sqlsrv_field_metadata($this->result_id) as $i => $field)
 		{
-			$retval[$i]		= new stdClass();
+			$retval[$i] = new stdClass();
 			$retval[$i]->name	= $field['Name'];
 			$retval[$i]->type	= $field['Type'];
-			$retval[$i]->max_length	= $field['Size'];
+			$retval[$i]->max_length = $field['Size'];
 		}
 
 		return $retval;

system/database/drivers/sqlsrv/sqlsrv_utility.php

Spacing +2 added lines, -2 removed lines

@@ -51,14 +51,14 @@
 	 *
 	 * @var	string
 	 */
-	protected $_list_databases	= 'EXEC sp_helpdb'; // Can also be: EXEC sp_databases
+	protected $_list_databases = 'EXEC sp_helpdb'; // Can also be: EXEC sp_databases
 
 	/**
 	 * OPTIMIZE TABLE statement
 	 *
 	 * @var	string
 	 */
-	protected $_optimize_table	= 'ALTER INDEX all ON %s REORGANIZE';
+	protected $_optimize_table = 'ALTER INDEX all ON %s REORGANIZE';
 
 	// --------------------------------------------------------------------
 

system/helpers/captcha_helper.php

Spacing +9 added lines, -9 removed lines

@@ -75,10 +75,10 @@ 
 			'img_id'	=> '',
 			'pool'		=> '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
 			'colors'	=> array(
-				'background'	=> array(255,255,255),
-				'border'	=> array(153,102,102),
-				'text'		=> array(204,153,153),
-				'grid'		=> array(255,182,182)
+				'background'	=> array(255, 255, 255),
+				'border'	=> array(153, 102, 102),
+				'text'		=> array(204, 153, 153),
+				'grid'		=> array(255, 182, 182)
 			)
 		);
 
@@ -225,8 +225,8 @@ 
 		// Determine angle and position
 		// -----------------------------------
 		$length	= strlen($word);
-		$angle	= ($length >= 6) ? mt_rand(-($length-6), ($length-6)) : 0;
-		$x_axis	= mt_rand(6, (360/$length)-16);
+		$angle = ($length >= 6) ? mt_rand(-($length - 6), ($length - 6)) : 0;
+		$x_axis	= mt_rand(6, (360 / $length) - 16);
 		$y_axis = ($angle >= 0) ? mt_rand($img_height, $img_width) : mt_rand(6, $img_height);
 
 		// Create image
@@ -254,7 +254,7 @@ 
 		// -----------------------------------
 		//  Create the spiral pattern
 		// -----------------------------------
-		$theta		= 1;
+		$theta = 1;
 		$thetac		= 7;
 		$radius		= 16;
 		$circles	= 20;
@@ -296,7 +296,7 @@ 
 		{
 			if ($use_font === FALSE)
 			{
-				$y = mt_rand(0 , $img_height / 2);
+				$y = mt_rand(0, $img_height / 2);
 				imagestring($im, $font_size, $x, $y, $word[$i], $colors['text']);
 				$x += ($font_size * 2);
 			}
@@ -331,7 +331,7 @@ 
 			return FALSE;
 		}
 
-		$img = '<img '.($img_id === '' ? '' : 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';
+		$img = '<img '.($img_id === '' ? '' : 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height.'; border: 0;" alt=" " />';
 		ImageDestroy($im);
 
 		return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename);

Braces +7 added lines, -14 removed lines

@@ -87,8 +87,7 @@ 
 			if ( ! is_array($data) && empty($$key))
 			{
 				$$key = $val;
-			}
-			else
+			} else
 			{
 				$$key = isset($data[$key]) ? $data[$key] : $val;
 			}
@@ -137,8 +136,7 @@ 
 					{
 						$word .= $pool[random_int(0, $rand_max)];
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					// This means fallback to the next possible
 					// alternative to random_int()
@@ -215,8 +213,7 @@ 
 			{
 				$word .= $pool[mt_rand(0, $rand_max)];
 			}
-		}
-		elseif ( ! is_string($word))
+		} elseif ( ! is_string($word))
 		{
 			$word = (string) $word;
 		}
@@ -284,8 +281,7 @@ 
 			($font_size > 5) && $font_size = 5;
 			$x = mt_rand(0, $img_width / ($length / 3));
 			$y = 0;
-		}
-		else
+		} else
 		{
 			($font_size > 30) && $font_size = 30;
 			$x = mt_rand(0, $img_width / ($length / 1.5));
@@ -299,8 +295,7 @@ 
 				$y = mt_rand(0 , $img_height / 2);
 				imagestring($im, $font_size, $x, $y, $word[$i], $colors['text']);
 				$x += ($font_size * 2);
-			}
-			else
+			} else
 			{
 				$y = mt_rand($img_height / 2, $img_height - 3);
 				imagettftext($im, $font_size, $angle, $x, $y, $colors['text'], $font_path, $word[$i]);
@@ -320,13 +315,11 @@ 
 		{
 			$img_filename = $now.'.jpg';
 			imagejpeg($im, $img_path.$img_filename);
-		}
-		elseif (function_exists('imagepng'))
+		} elseif (function_exists('imagepng'))
 		{
 			$img_filename = $now.'.png';
 			imagepng($im, $img_path.$img_filename);
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

system/helpers/directory_helper.php

Spacing +3 added lines, -3 removed lines

@@ -68,9 +68,9 @@
 	{
 		if ($fp = @opendir($source_dir))
 		{
-			$filedata	= array();
-			$new_depth	= $directory_depth - 1;
-			$source_dir	= rtrim($source_dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
+			$filedata = array();
+			$new_depth = $directory_depth - 1;
+			$source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
 			while (FALSE !== ($file = readdir($fp)))
 			{

Braces +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 				if (($directory_depth < 1 OR $new_depth > 0) && is_dir($source_dir.$file))
 				{
 					$filedata[$file] = directory_map($source_dir.$file, $new_depth, $hidden);
-				}
-				else
+				} else
 				{
 					$filedata[] = $file;
 				}

system/helpers/download_helper.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 			}
 
 			// Load the mime types
-			$mimes =& get_mimes();
+			$mimes = & get_mimes();
 
 			// Only change the default MIME if we can find one
 			if (isset($mimes[$extension]))

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

Spacing +6 added lines, -6 removed lines

@@ -177,7 +177,7 @@ 
 	 */
 	function img($src = '', $index_page = FALSE, $attributes = '')
 	{
-		if ( ! is_array($src) )
+		if ( ! is_array($src))
 		{
 			$src = array('src' => $src);
 		}
@@ -277,7 +277,7 @@ 
 	 */
 	function link_tag($href = '', $rel = 'stylesheet', $type = 'text/css', $title = '', $media = '', $index_page = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$link = '<link ';
 
 		if (is_array($href))
@@ -363,10 +363,10 @@ 
 		$str = '';
 		foreach ($name as $meta)
 		{
-			$type		= (isset($meta['type']) && $meta['type'] !== 'name')	? 'http-equiv' : 'name';
-			$name		= isset($meta['name'])					? $meta['name'] : '';
-			$content	= isset($meta['content'])				? $meta['content'] : '';
-			$newline	= isset($meta['newline'])				? $meta['newline'] : "\n";
+			$type		= (isset($meta['type']) && $meta['type'] !== 'name') ? 'http-equiv' : 'name';
+			$name		= isset($meta['name']) ? $meta['name'] : '';
+			$content	= isset($meta['content']) ? $meta['content'] : '';
+			$newline	= isset($meta['newline']) ? $meta['newline'] : "\n";
 
 			$str .= '<meta '.$type.'="'.$name.'" content="'.$content.'" />'.$newline;
 		}

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

Spacing +19 added lines, -19 removed lines

@@ -133,25 +133,25 @@
 		}
 
 		$plural_rules = array(
-			'/(quiz)$/'                => '\1zes',      // quizzes
-			'/^(ox)$/'                 => '\1\2en',     // ox
-			'/([m|l])ouse$/'           => '\1ice',      // mouse, louse
-			'/(matr|vert|ind)ix|ex$/'  => '\1ices',     // matrix, vertex, index
-			'/(x|ch|ss|sh)$/'          => '\1es',       // search, switch, fix, box, process, address
-			'/([^aeiouy]|qu)y$/'       => '\1ies',      // query, ability, agency
-			'/(hive)$/'                => '\1s',        // archive, hive
-			'/(?:([^f])fe|([lr])f)$/'  => '\1\2ves',    // half, safe, wife
-			'/sis$/'                   => 'ses',        // basis, diagnosis
-			'/([ti])um$/'              => '\1a',        // datum, medium
-			'/(p)erson$/'              => '\1eople',    // person, salesperson
-			'/(m)an$/'                 => '\1en',       // man, woman, spokesman
-			'/(c)hild$/'               => '\1hildren',  // child
-			'/(buffal|tomat)o$/'       => '\1\2oes',    // buffalo, tomato
-			'/(bu|campu)s$/'           => '\1\2ses',    // bus, campus
-			'/(alias|status|virus)$/'  => '\1es',       // alias
-			'/(octop)us$/'             => '\1i',        // octopus
-			'/(ax|cris|test)is$/'      => '\1es',       // axis, crisis
-			'/s$/'                     => 's',          // no change (compatibility)
+			'/(quiz)$/'                => '\1zes', // quizzes
+			'/^(ox)$/'                 => '\1\2en', // ox
+			'/([m|l])ouse$/'           => '\1ice', // mouse, louse
+			'/(matr|vert|ind)ix|ex$/'  => '\1ices', // matrix, vertex, index
+			'/(x|ch|ss|sh)$/'          => '\1es', // search, switch, fix, box, process, address
+			'/([^aeiouy]|qu)y$/'       => '\1ies', // query, ability, agency
+			'/(hive)$/'                => '\1s', // archive, hive
+			'/(?:([^f])fe|([lr])f)$/'  => '\1\2ves', // half, safe, wife
+			'/sis$/'                   => 'ses', // basis, diagnosis
+			'/([ti])um$/'              => '\1a', // datum, medium
+			'/(p)erson$/'              => '\1eople', // person, salesperson
+			'/(m)an$/'                 => '\1en', // man, woman, spokesman
+			'/(c)hild$/'               => '\1hildren', // child
+			'/(buffal|tomat)o$/'       => '\1\2oes', // buffalo, tomato
+			'/(bu|campu)s$/'           => '\1\2ses', // bus, campus
+			'/(alias|status|virus)$/'  => '\1es', // alias
+			'/(octop)us$/'             => '\1i', // octopus
+			'/(ax|cris|test)is$/'      => '\1es', // axis, crisis
+			'/s$/'                     => 's', // no change (compatibility)
 			'/$/'                      => 's',
 		);
 

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;

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/helpers/path_helper.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	function set_realpath($path, $check_existance = FALSE)
 	{
 		// Security check to make sure the path is NOT a URL. No remote file inclusion!
-		if (preg_match('#^(http:\/\/|https:\/\/|www\.|ftp)#i', $path) OR filter_var($path, FILTER_VALIDATE_IP) === $path )
+		if (preg_match('#^(http:\/\/|https:\/\/|www\.|ftp)#i', $path) OR filter_var($path, FILTER_VALIDATE_IP) === $path)
 		{
 			show_error('The path you submitted must be a local server path, not a URL');
 		}

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