ci-bonfire / Sprint

system/libraries/Form_validation.php

Spacing +14 added lines, -14 removed lines

@@ -60,63 +60,63 @@ 
 	 *
 	 * @var array
 	 */
-	protected $_field_data		= array();
+	protected $_field_data = array();
 
 	/**
 	 * Validation rules for the current form
 	 *
 	 * @var array
 	 */
-	protected $_config_rules	= array();
+	protected $_config_rules = array();
 
 	/**
 	 * Array of validation errors
 	 *
 	 * @var array
 	 */
-	protected $_error_array		= array();
+	protected $_error_array = array();
 
 	/**
 	 * Array of custom error messages
 	 *
 	 * @var array
 	 */
-	protected $_error_messages	= array();
+	protected $_error_messages = array();
 
 	/**
 	 * Start tag for error wrapping
 	 *
 	 * @var string
 	 */
-	protected $_error_prefix	= '<p>';
+	protected $_error_prefix = '<p>';
 
 	/**
 	 * End tag for error wrapping
 	 *
 	 * @var string
 	 */
-	protected $_error_suffix	= '</p>';
+	protected $_error_suffix = '</p>';
 
 	/**
 	 * Custom error message
 	 *
 	 * @var string
 	 */
-	protected $error_string		= '';
+	protected $error_string = '';
 
 	/**
 	 * Whether the form data has been validated as safe
 	 *
 	 * @var bool
 	 */
-	protected $_safe_form_data	= FALSE;
+	protected $_safe_form_data = FALSE;
 
 	/**
 	 * Custom data to validate
 	 *
 	 * @var array
 	 */
-	public $validation_data	= array();
+	public $validation_data = array();
 
 	/**
 	 * Initialize Form_Validation class
@@ -126,7 +126,7 @@ 
 	 */
 	public function __construct($rules = array())
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 
 		// applies delimiters set in config file.
 		if (isset($rules['error_prefix']))
@@ -508,7 +508,7 @@ 
 	{
 		if (is_array($array) && isset($keys[$i]))
 		{
-			return isset($array[$keys[$i]]) ? $this->_reduce_array($array[$keys[$i]], $keys, ($i+1)) : NULL;
+			return isset($array[$keys[$i]]) ? $this->_reduce_array($array[$keys[$i]], $keys, ($i + 1)) : NULL;
 		}
 
 		// NULL must be returned for empty fields
@@ -538,18 +538,18 @@ 
 				else
 				{
 					// start with a reference
-					$post_ref =& $_POST;
+					$post_ref = & $_POST;
 
 					// before we assign values, make a reference to the right POST key
 					if (count($row['keys']) === 1)
 					{
-						$post_ref =& $post_ref[current($row['keys'])];
+						$post_ref = & $post_ref[current($row['keys'])];
 					}
 					else
 					{
 						foreach ($row['keys'] as $val)
 						{
-							$post_ref =& $post_ref[$val];
+							$post_ref = & $post_ref[$val];
 						}
 					}
 

system/libraries/Image_lib.php

Spacing +79 added lines, -79 removed lines

@@ -54,105 +54,105 @@ 
 	 *
 	 * @var string
 	 */
-	public $image_library		= 'gd2';
+	public $image_library = 'gd2';
 
 	/**
 	 * Path to the graphic library (if applicable)
 	 *
 	 * @var string
 	 */
-	public $library_path		= '';
+	public $library_path = '';
 
 	/**
 	 * Whether to send to browser or write to disk
 	 *
 	 * @var bool
 	 */
-	public $dynamic_output		= FALSE;
+	public $dynamic_output = FALSE;
 
 	/**
 	 * Path to original image
 	 *
 	 * @var string
 	 */
-	public $source_image		= '';
+	public $source_image = '';
 
 	/**
 	 * Path to the modified image
 	 *
 	 * @var string
 	 */
-	public $new_image		= '';
+	public $new_image = '';
 
 	/**
 	 * Image width
 	 *
 	 * @var int
 	 */
-	public $width			= '';
+	public $width = '';
 
 	/**
 	 * Image height
 	 *
 	 * @var int
 	 */
-	public $height			= '';
+	public $height = '';
 
 	/**
 	 * Quality percentage of new image
 	 *
 	 * @var int
 	 */
-	public $quality			= 90;
+	public $quality = 90;
 
 	/**
 	 * Whether to create a thumbnail
 	 *
 	 * @var bool
 	 */
-	public $create_thumb		= FALSE;
+	public $create_thumb = FALSE;
 
 	/**
 	 * String to add to thumbnail version of image
 	 *
 	 * @var string
 	 */
-	public $thumb_marker		= '_thumb';
+	public $thumb_marker = '_thumb';
 
 	/**
 	 * Whether to maintain aspect ratio when resizing or use hard values
 	 *
 	 * @var bool
 	 */
-	public $maintain_ratio		= TRUE;
+	public $maintain_ratio = TRUE;
 
 	/**
 	 * auto, height, or width.  Determines what to use as the master dimension
 	 *
 	 * @var string
 	 */
-	public $master_dim		= 'auto';
+	public $master_dim = 'auto';
 
 	/**
 	 * Angle at to rotate image
 	 *
 	 * @var string
 	 */
-	public $rotation_angle		= '';
+	public $rotation_angle = '';
 
 	/**
 	 * X Coordinate for manipulation of the current image
 	 *
 	 * @var int
 	 */
-	public $x_axis			= '';
+	public $x_axis = '';
 
 	/**
 	 * Y Coordinate for manipulation of the current image
 	 *
 	 * @var int
 	 */
-	public $y_axis			= '';
+	public $y_axis = '';
 
 	// --------------------------------------------------------------------------
 	// Watermark Vars
@@ -163,112 +163,112 @@ 
 	 *
 	 * @var string
 	 */
-	public $wm_text			= '';
+	public $wm_text = '';
 
 	/**
 	 * Type of watermarking.  Options:  text/overlay
 	 *
 	 * @var string
 	 */
-	public $wm_type			= 'text';
+	public $wm_type = 'text';
 
 	/**
 	 * Default transparency for watermark
 	 *
 	 * @var int
 	 */
-	public $wm_x_transp		= 4;
+	public $wm_x_transp = 4;
 
 	/**
 	 * Default transparency for watermark
 	 *
 	 * @var int
 	 */
-	public $wm_y_transp		= 4;
+	public $wm_y_transp = 4;
 
 	/**
 	 * Watermark image path
 	 *
 	 * @var string
 	 */
-	public $wm_overlay_path		= '';
+	public $wm_overlay_path = '';
 
 	/**
 	 * TT font
 	 *
 	 * @var string
 	 */
-	public $wm_font_path		= '';
+	public $wm_font_path = '';
 
 	/**
 	 * Font size (different versions of GD will either use points or pixels)
 	 *
 	 * @var int
 	 */
-	public $wm_font_size		= 17;
+	public $wm_font_size = 17;
 
 	/**
 	 * Vertical alignment:   T M B
 	 *
 	 * @var string
 	 */
-	public $wm_vrt_alignment	= 'B';
+	public $wm_vrt_alignment = 'B';
 
 	/**
 	 * Horizontal alignment: L R C
 	 *
 	 * @var string
 	 */
-	public $wm_hor_alignment	= 'C';
+	public $wm_hor_alignment = 'C';
 
 	/**
 	 * Padding around text
 	 *
 	 * @var int
 	 */
-	public $wm_padding			= 0;
+	public $wm_padding = 0;
 
 	/**
 	 * Lets you push text to the right
 	 *
 	 * @var int
 	 */
-	public $wm_hor_offset		= 0;
+	public $wm_hor_offset = 0;
 
 	/**
 	 * Lets you push text down
 	 *
 	 * @var int
 	 */
-	public $wm_vrt_offset		= 0;
+	public $wm_vrt_offset = 0;
 
 	/**
 	 * Text color
 	 *
 	 * @var string
 	 */
-	protected $wm_font_color	= '#ffffff';
+	protected $wm_font_color = '#ffffff';
 
 	/**
 	 * Dropshadow color
 	 *
 	 * @var string
 	 */
-	protected $wm_shadow_color	= '';
+	protected $wm_shadow_color = '';
 
 	/**
 	 * Dropshadow distance
 	 *
 	 * @var int
 	 */
-	public $wm_shadow_distance	= 2;
+	public $wm_shadow_distance = 2;
 
 	/**
 	 * Image opacity: 1 - 100  Only works with image
 	 *
 	 * @var int
 	 */
-	public $wm_opacity		= 50;
+	public $wm_opacity = 50;
 
 	// --------------------------------------------------------------------------
 	// Private Vars
@@ -279,63 +279,63 @@ 
 	 *
 	 * @var string
 	 */
-	public $source_folder		= '';
+	public $source_folder = '';
 
 	/**
 	 * Destination image folder
 	 *
 	 * @var string
 	 */
-	public $dest_folder		= '';
+	public $dest_folder = '';
 
 	/**
 	 * Image mime-type
 	 *
 	 * @var string
 	 */
-	public $mime_type		= '';
+	public $mime_type = '';
 
 	/**
 	 * Original image width
 	 *
 	 * @var int
 	 */
-	public $orig_width		= '';
+	public $orig_width = '';
 
 	/**
 	 * Original image height
 	 *
 	 * @var int
 	 */
-	public $orig_height		= '';
+	public $orig_height = '';
 
 	/**
 	 * Image format
 	 *
 	 * @var string
 	 */
-	public $image_type		= '';
+	public $image_type = '';
 
 	/**
 	 * Size of current image
 	 *
 	 * @var string
 	 */
-	public $size_str		= '';
+	public $size_str = '';
 
 	/**
 	 * Full path to source image
 	 *
 	 * @var string
 	 */
-	public $full_src_path		= '';
+	public $full_src_path = '';
 
 	/**
 	 * Full path to destination image
 	 *
 	 * @var string
 	 */
-	public $full_dst_path		= '';
+	public $full_dst_path = '';
 
 	/**
 	 * File permissions
@@ -349,35 +349,35 @@ 
 	 *
 	 * @var string
 	 */
-	public $create_fnc		= 'imagecreatetruecolor';
+	public $create_fnc = 'imagecreatetruecolor';
 
 	/**
 	 * Name of function to copy image
 	 *
 	 * @var string
 	 */
-	public $copy_fnc		= 'imagecopyresampled';
+	public $copy_fnc = 'imagecopyresampled';
 
 	/**
 	 * Error messages
 	 *
 	 * @var array
 	 */
-	public $error_msg		= array();
+	public $error_msg = array();
 
 	/**
 	 * Whether to have a drop shadow on watermark
 	 *
 	 * @var bool
 	 */
-	protected $wm_use_drop_shadow	= FALSE;
+	protected $wm_use_drop_shadow = FALSE;
 
 	/**
 	 * Whether to use truetype fonts
 	 *
 	 * @var bool
 	 */
-	public $wm_use_truetype	= FALSE;
+	public $wm_use_truetype = FALSE;
 
 	/**
 	 * Initialize Image Library
@@ -413,30 +413,30 @@ 
 			$this->$val = '';
 		}
 
-		$this->image_library 		= 'gd2';
-		$this->dynamic_output 		= FALSE;
-		$this->quality 				= 90;
+		$this->image_library = 'gd2';
+		$this->dynamic_output = FALSE;
+		$this->quality = 90;
 		$this->create_thumb 		= FALSE;
 		$this->thumb_marker 		= '_thumb';
-		$this->maintain_ratio 		= TRUE;
-		$this->master_dim 			= 'auto';
-		$this->wm_type 				= 'text';
+		$this->maintain_ratio = TRUE;
+		$this->master_dim = 'auto';
+		$this->wm_type = 'text';
 		$this->wm_x_transp 			= 4;
 		$this->wm_y_transp 			= 4;
 		$this->wm_font_size 		= 17;
 		$this->wm_vrt_alignment 	= 'B';
 		$this->wm_hor_alignment 	= 'C';
-		$this->wm_padding 			= 0;
+		$this->wm_padding = 0;
 		$this->wm_hor_offset 		= 0;
 		$this->wm_vrt_offset 		= 0;
-		$this->wm_font_color		= '#ffffff';
-		$this->wm_shadow_distance 	= 2;
+		$this->wm_font_color = '#ffffff';
+		$this->wm_shadow_distance = 2;
 		$this->wm_opacity 			= 50;
 		$this->create_fnc 			= 'imagecreatetruecolor';
-		$this->copy_fnc 			= 'imagecopyresampled';
-		$this->error_msg 			= array();
-		$this->wm_use_drop_shadow 	= FALSE;
-		$this->wm_use_truetype 		= FALSE;
+		$this->copy_fnc = 'imagecopyresampled';
+		$this->error_msg = array();
+		$this->wm_use_drop_shadow = FALSE;
+		$this->wm_use_truetype = FALSE;
 	}
 
 	// --------------------------------------------------------------------
@@ -711,13 +711,13 @@ 
 		// Reassign the width and height
 		if ($this->rotation_angle === 90 OR $this->rotation_angle === 270)
 		{
-			$this->width	= $this->orig_height;
-			$this->height	= $this->orig_width;
+			$this->width = $this->orig_height;
+			$this->height = $this->orig_width;
 		}
 		else
 		{
-			$this->width	= $this->orig_width;
-			$this->height	= $this->orig_height;
+			$this->width = $this->orig_width;
+			$this->height = $this->orig_height;
 		}
 
 		// Choose resizing function
@@ -795,13 +795,13 @@ 
 		 */
 		if ($this->image_library === 'gd2' && function_exists('imagecreatetruecolor'))
 		{
-			$create	= 'imagecreatetruecolor';
-			$copy	= 'imagecopyresampled';
+			$create = 'imagecreatetruecolor';
+			$copy = 'imagecopyresampled';
 		}
 		else
 		{
-			$create	= 'imagecreate';
-			$copy	= 'imagecopyresized';
+			$create = 'imagecreate';
+			$copy = 'imagecopyresized';
 		}
 
 		$dst_img = $create($this->width, $this->height);
@@ -862,7 +862,7 @@ 
 
 		if ($action === 'crop')
 		{
-			$cmd .= ' -crop '.$this->width.'x'.$this->height.'+'.$this->x_axis.'+'.$this->y_axis.' "'.$this->full_src_path.'" "'.$this->full_dst_path .'" 2>&1';
+			$cmd .= ' -crop '.$this->width.'x'.$this->height.'+'.$this->x_axis.'+'.$this->y_axis.' "'.$this->full_src_path.'" "'.$this->full_dst_path.'" 2>&1';
 		}
 		elseif ($action === 'rotate')
 		{
@@ -873,7 +873,7 @@ 
 		}
 		else // Resize
 		{
-			if($this->maintain_ratio === TRUE)
+			if ($this->maintain_ratio === TRUE)
 			{
 				$cmd .= ' -resize '.$this->width.'x'.$this->height.' "'.$this->full_src_path.'" "'.$this->full_dst_path.'" 2>&1';
 			}
@@ -1146,10 +1146,10 @@ 
 		$this->get_image_properties();
 
 		// Fetch watermark image properties
-		$props		= $this->get_image_properties($this->wm_overlay_path, TRUE);
-		$wm_img_type	= $props['image_type'];
-		$wm_width	= $props['width'];
-		$wm_height	= $props['height'];
+		$props = $this->get_image_properties($this->wm_overlay_path, TRUE);
+		$wm_img_type = $props['image_type'];
+		$wm_width = $props['width'];
+		$wm_height = $props['height'];
 
 		// Create two image resources
 		$wm_img  = $this->image_create_gd($this->wm_overlay_path, $wm_img_type);
@@ -1589,7 +1589,7 @@ 
 		{
 			if ($this->width > 0 && $this->height > 0)
 			{
-				$this->master_dim = ((($this->orig_height/$this->orig_width) - ($this->height/$this->width)) < 0)
+				$this->master_dim = ((($this->orig_height / $this->orig_width) - ($this->height / $this->width)) < 0)
 							? 'width' : 'height';
 			}
 			else
@@ -1605,11 +1605,11 @@ 
 
 		if ($this->master_dim === 'width')
 		{
-			$this->height = (int) ceil($this->width*$this->orig_height/$this->orig_width);
+			$this->height = (int) ceil($this->width * $this->orig_height / $this->orig_width);
 		}
 		else
 		{
-			$this->width = (int) ceil($this->orig_width*$this->height/$this->orig_height);
+			$this->width = (int) ceil($this->orig_width * $this->height / $this->orig_height);
 		}
 	}
 
@@ -1656,7 +1656,7 @@ 
 		}
 
 		$this->orig_width	= $vals[0];
-		$this->orig_height	= $vals[1];
+		$this->orig_height = $vals[1];
 		$this->image_type	= $vals[2];
 		$this->size_str		= $vals[3];
 		$this->mime_type	= $mime;
@@ -1707,11 +1707,11 @@ 
 
 		if ($vals['new_width'] === 0)
 		{
-			$vals['new_width'] = ceil($vals['width']*$vals['new_height']/$vals['height']);
+			$vals['new_width'] = ceil($vals['width'] * $vals['new_height'] / $vals['height']);
 		}
 		elseif ($vals['new_height'] === 0)
 		{
-			$vals['new_height'] = ceil($vals['new_width']*$vals['height']/$vals['width']);
+			$vals['new_height'] = ceil($vals['new_width'] * $vals['height'] / $vals['width']);
 		}
 
 		return $vals;
@@ -1788,7 +1788,7 @@ 
 	 */
 	public function set_error($msg)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->lang->load('imglib');
 
 		if (is_array($msg))

system/libraries/Javascript.php

Spacing +2 added lines, -2 removed lines

@@ -78,12 +78,12 @@
 
 		extract($defaults);
 
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 
 		// load the requested js library
 		$this->CI->load->library('Javascript/'.$js_library_driver, array('autoload' => $autoload));
 		// make js to refer to current library
-		$this->js =& $this->CI->$js_library_driver;
+		$this->js = & $this->CI->$js_library_driver;
 
 		log_message('info', 'Javascript Class Initialized and loaded. Driver used: '.$js_library_driver);
 	}

system/libraries/Migration.php

Spacing +1 added lines, -1 removed lines

@@ -258,7 +258,7 @@
 
 			// Run migrations that are inside the target range
 			if (
-				($method === 'up'   && $number > $current_version && $number <= $target_version) OR
+				($method === 'up' && $number > $current_version && $number <= $target_version) OR
 				($method === 'down' && $number <= $current_version && $number > $target_version)
 			)
 			{

system/libraries/Pagination.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
 	 *
 	 * @var	string
 	 */
-	protected $base_url		= '';
+	protected $base_url = '';
 
 	/**
 	 * Prefix
@@ -329,7 +329,7 @@ 
 	 */
 	public function __construct($params = array())
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		$this->CI->load->language('pagination');
 		foreach (array('first_link', 'next_link', 'prev_link', 'last_link') as $key)
 		{
@@ -545,13 +545,13 @@ 
 		// to a page number, so we can generate the surrounding number links.
 		if ( ! $this->use_page_numbers)
 		{
-			$this->cur_page = (int) floor(($this->cur_page/$this->per_page) + 1);
+			$this->cur_page = (int) floor(($this->cur_page / $this->per_page) + 1);
 		}
 
 		// Calculate the start and end numbers. These determine
 		// which number to start and end the digit links with.
-		$start	= (($this->cur_page - $this->num_links) > 0) ? $this->cur_page - ($this->num_links - 1) : 1;
-		$end	= (($this->cur_page + $this->num_links) < $num_pages) ? $this->cur_page + $this->num_links : $num_pages;
+		$start = (($this->cur_page - $this->num_links) > 0) ? $this->cur_page - ($this->num_links - 1) : 1;
+		$end = (($this->cur_page + $this->num_links) < $num_pages) ? $this->cur_page + $this->num_links : $num_pages;
 
 		// And here we go...
 		$output = '';

system/libraries/Parser.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	 */
 	public function __construct()
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		log_message('info', 'Parser Class Initialized');
 	}
 

system/libraries/Profiler.php

Spacing +3 added lines, -3 removed lines

@@ -97,7 +97,7 @@ 
 	 */
 	public function __construct($config = array())
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		$this->CI->load->language('profiler');
 
 		// default all sections to display
@@ -238,7 +238,7 @@ 
 		// Key words we want bolded
 		$highlight = array('SELECT', 'DISTINCT', 'FROM', 'WHERE', 'AND', 'LEFT JOIN', 'ORDER BY', 'GROUP BY', 'LIMIT', 'INSERT', 'INTO', 'VALUES', 'UPDATE', 'OR ', 'HAVING', 'OFFSET', 'NOT IN', 'IN', 'LIKE', 'NOT LIKE', 'COUNT', 'MAX', 'MIN', 'ON', 'AS', 'AVG', 'SUM', '(', ')');
 
-		$output  = "\n\n";
+		$output = "\n\n";
 		$count = 0;
 
 		foreach ($dbs as $name => $db)
@@ -463,7 +463,7 @@ 
 			.'&nbsp;&nbsp;(<span style="cursor: pointer;" onclick="var s=document.getElementById(\'ci_profiler_httpheaders_table\').style;s.display=s.display==\'none\'?\'\':\'none\';this.innerHTML=this.innerHTML==\''.$this->CI->lang->line('profiler_section_show').'\'?\''.$this->CI->lang->line('profiler_section_hide').'\':\''.$this->CI->lang->line('profiler_section_show').'\';">'.$this->CI->lang->line('profiler_section_show')."</span>)</legend>\n\n\n"
 			.'<table style="width:100%;display:none;" id="ci_profiler_httpheaders_table">'."\n";
 
-		foreach (array('HTTP_ACCEPT', 'HTTP_USER_AGENT', 'HTTP_CONNECTION', 'SERVER_PORT', 'SERVER_NAME', 'REMOTE_ADDR', 'SERVER_SOFTWARE', 'HTTP_ACCEPT_LANGUAGE', 'SCRIPT_NAME', 'REQUEST_METHOD',' HTTP_HOST', 'REMOTE_HOST', 'CONTENT_TYPE', 'SERVER_PROTOCOL', 'QUERY_STRING', 'HTTP_ACCEPT_ENCODING', 'HTTP_X_FORWARDED_FOR', 'HTTP_DNT') as $header)
+		foreach (array('HTTP_ACCEPT', 'HTTP_USER_AGENT', 'HTTP_CONNECTION', 'SERVER_PORT', 'SERVER_NAME', 'REMOTE_ADDR', 'SERVER_SOFTWARE', 'HTTP_ACCEPT_LANGUAGE', 'SCRIPT_NAME', 'REQUEST_METHOD', ' HTTP_HOST', 'REMOTE_HOST', 'CONTENT_TYPE', 'SERVER_PROTOCOL', 'QUERY_STRING', 'HTTP_ACCEPT_ENCODING', 'HTTP_X_FORWARDED_FOR', 'HTTP_DNT') as $header)
 		{
 			$val = isset($_SERVER[$header]) ? $_SERVER[$header] : '';
 			$output .= '<tr><td style="vertical-align:top;width:50%;padding:5px;color:#900;background-color:#ddd;">'

system/libraries/Session/Session.php

Spacing +1 added lines, -1 removed lines

@@ -354,7 +354,7 @@
 			}
 		}
 
-		$this->userdata =& $_SESSION;
+		$this->userdata = & $_SESSION;
 	}
 
 	// ------------------------------------------------------------------------

system/libraries/Session/Session_driver.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 */
 	public function __construct(&$params)
 	{
-		$this->_config =& $params;
+		$this->_config = & $params;
 	}
 
 	// ------------------------------------------------------------------------