ci-bonfire / Sprint

system/libraries/Ftp.php

Braces +1 added lines, -2 removed lines

@@ -588,8 +588,7 @@
 				if (is_dir($locpath.$file) && $file[0] !== '.')
 				{
 					$this->mirror($locpath.$file.'/', $rempath.$file.'/');
-				}
-				elseif ($file[0] !== '.')
+				} elseif ($file[0] !== '.')
 				{
 					// Get the file extension so we can se the upload type
 					$ext = $this->_getext($file);

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

Braces +52 added lines, -75 removed lines

@@ -472,8 +472,7 @@ 
 							$val = (strlen($matches[1]) === 6)
 								? '#'.$matches[1]
 								: '#'.$matches[1][0].$matches[1][0].$matches[1][1].$matches[1][1].$matches[1][2].$matches[1][2];
-						}
-						else
+						} else
 						{
 							continue;
 						}
@@ -514,8 +513,7 @@ 
 		if (($full_source_path = realpath($this->source_image)) !== FALSE)
 		{
 			$full_source_path = str_replace('\\', '/', $full_source_path);
-		}
-		else
+		} else
 		{
 			$full_source_path = $this->source_image;
 		}
@@ -542,19 +540,16 @@ 
 		{
 			$this->dest_image = $this->source_image;
 			$this->dest_folder = $this->source_folder;
-		}
-		elseif (strpos($this->new_image, '/') === FALSE)
+		} elseif (strpos($this->new_image, '/') === FALSE)
 		{
 			$this->dest_folder = $this->source_folder;
 			$this->dest_image = $this->new_image;
-		}
-		else
+		} else
 		{
 			if (strpos($this->new_image, '/') === FALSE && strpos($this->new_image, '\\') === FALSE)
 			{
 				$full_dest_path = str_replace('\\', '/', realpath($this->new_image));
-			}
-			else
+			} else
 			{
 				$full_dest_path = $this->new_image;
 			}
@@ -564,8 +559,7 @@ 
 			{
 				$this->dest_folder = $full_dest_path.'/';
 				$this->dest_image = $this->source_image;
-			}
-			else
+			} else
 			{
 				$x = explode('/', $full_dest_path);
 				$this->dest_image = end($x);
@@ -641,8 +635,7 @@ 
 		if ($this->wm_shadow_color !== '')
 		{
 			$this->wm_use_drop_shadow = TRUE;
-		}
-		elseif ($this->wm_use_drop_shadow === TRUE && $this->wm_shadow_color === '')
+		} elseif ($this->wm_use_drop_shadow === TRUE && $this->wm_shadow_color === '')
 		{
 			$this->wm_use_drop_shadow = FALSE;
 		}
@@ -713,8 +706,7 @@ 
 		{
 			$this->width	= $this->orig_height;
 			$this->height	= $this->orig_width;
-		}
-		else
+		} else
 		{
 			$this->width	= $this->orig_width;
 			$this->height	= $this->orig_height;
@@ -771,8 +763,7 @@ 
 				$gd_version = str_replace('0', '', $this->gd_version());
 				$v2_override = ($gd_version == 2);
 			}
-		}
-		else
+		} else
 		{
 			// If resizing the x/y axis must be zero
 			$this->x_axis = 0;
@@ -797,8 +788,7 @@ 
 		{
 			$create	= 'imagecreatetruecolor';
 			$copy	= 'imagecopyresampled';
-		}
-		else
+		} else
 		{
 			$create	= 'imagecreate';
 			$copy	= 'imagecopyresized';
@@ -806,9 +796,11 @@ 
 
 		$dst_img = $create($this->width, $this->height);
 
-		if ($this->image_type === 3) // png we can actually preserve transparency
+		if ($this->image_type === 3) {
+			// png we can actually preserve transparency
 		{
 			imagealphablending($dst_img, FALSE);
+		}
 			imagesavealpha($dst_img, TRUE);
 		}
 
@@ -818,11 +810,12 @@ 
 		if ($this->dynamic_output === TRUE)
 		{
 			$this->image_display_gd($dst_img);
-		}
-		elseif ( ! $this->image_save_gd($dst_img)) // Or save it
+		} elseif ( ! $this->image_save_gd($dst_img)) {
+			// Or save it
 		{
 			return FALSE;
 		}
+		}
 
 		// Kill the file handles
 		imagedestroy($dst_img);
@@ -863,21 +856,18 @@ 
 		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';
-		}
-		elseif ($action === 'rotate')
+		} elseif ($action === 'rotate')
 		{
 			$angle = ($this->rotation_angle === 'hor' OR $this->rotation_angle === 'vrt')
 					? '-flop' : '-rotate '.$this->rotation_angle;
 
 			$cmd .= ' '.$angle.' "'.$this->full_src_path.'" "'.$this->full_dst_path.'" 2>&1';
-		}
-		else // Resize
+		} else // Resize
 		{
 			if($this->maintain_ratio === TRUE)
 			{
 				$cmd .= ' -resize '.$this->width.'x'.$this->height.' "'.$this->full_src_path.'" "'.$this->full_dst_path.'" 2>&1';
-			}
-			else
+			} else
 			{
 				$cmd .= ' -resize '.$this->width.'x'.$this->height.'\! "'.$this->full_src_path.'" "'.$this->full_dst_path.'" 2>&1';
 			}
@@ -940,8 +930,7 @@ 
 		if ($action === 'crop')
 		{
 			$cmd_inner = 'pnmcut -left '.$this->x_axis.' -top '.$this->y_axis.' -width '.$this->width.' -height '.$this->height;
-		}
-		elseif ($action === 'rotate')
+		} elseif ($action === 'rotate')
 		{
 			switch ($this->rotation_angle)
 			{
@@ -958,8 +947,7 @@ 
 			}
 
 			$cmd_inner = 'pnmflip -'.$angle.' ';
-		}
-		else // Resize
+		} else // Resize
 		{
 			$cmd_inner = 'pnmscale -xysize '.$this->width.' '.$this->height;
 		}
@@ -1019,11 +1007,12 @@ 
 		if ($this->dynamic_output === TRUE)
 		{
 			$this->image_display_gd($dst_img);
-		}
-		elseif ( ! $this->image_save_gd($dst_img)) // ... or save it
+		} elseif ( ! $this->image_save_gd($dst_img)) {
+			// ... or save it
 		{
 			return FALSE;
 		}
+		}
 
 		// Kill the file handles
 		imagedestroy($dst_img);
@@ -1072,8 +1061,7 @@ 
 					$right--;
 				}
 			}
-		}
-		else
+		} else
 		{
 			for ($i = 0; $i < $width; $i++)
 			{
@@ -1098,11 +1086,12 @@ 
 		if ($this->dynamic_output === TRUE)
 		{
 			$this->image_display_gd($src_img);
-		}
-		elseif ( ! $this->image_save_gd($src_img)) // ... or save it
+		} elseif ( ! $this->image_save_gd($src_img)) {
+			// ... or save it
 		{
 			return FALSE;
 		}
+		}
 
 		// Kill the file handles
 		imagedestroy($src_img);
@@ -1165,11 +1154,13 @@ 
 		$this->wm_vrt_alignment = strtoupper($this->wm_vrt_alignment[0]);
 		$this->wm_hor_alignment = strtoupper($this->wm_hor_alignment[0]);
 
-		if ($this->wm_vrt_alignment === 'B')
-			$this->wm_vrt_offset = $this->wm_vrt_offset * -1;
+		if ($this->wm_vrt_alignment === 'B') {
+					$this->wm_vrt_offset = $this->wm_vrt_offset * -1;
+		}
 
-		if ($this->wm_hor_alignment === 'R')
-			$this->wm_hor_offset = $this->wm_hor_offset * -1;
+		if ($this->wm_hor_alignment === 'R') {
+					$this->wm_hor_offset = $this->wm_hor_offset * -1;
+		}
 
 		// Set the base x and y axis values
 		$x_axis = $this->wm_hor_offset + $this->wm_padding;
@@ -1179,8 +1170,7 @@ 
 		if ($this->wm_vrt_alignment === 'M')
 		{
 			$y_axis += ($this->orig_height / 2) - ($wm_height / 2);
-		}
-		elseif ($this->wm_vrt_alignment === 'B')
+		} elseif ($this->wm_vrt_alignment === 'B')
 		{
 			$y_axis += $this->orig_height - $wm_height;
 		}
@@ -1189,8 +1179,7 @@ 
 		if ($this->wm_hor_alignment === 'C')
 		{
 			$x_axis += ($this->orig_width / 2) - ($wm_width / 2);
-		}
-		elseif ($this->wm_hor_alignment === 'R')
+		} elseif ($this->wm_hor_alignment === 'R')
 		{
 			$x_axis += $this->orig_width - $wm_width;
 		}
@@ -1210,8 +1199,7 @@ 
 		{
 			// copy the image directly, the image's alpha transparency being the sole determinant of blending
 			imagecopy($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height);
-		}
-		else
+		} else
 		{
 			// set our RGB value from above to be transparent and merge the images with the specified opacity
 			imagecolortransparent($wm_img, imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp));
@@ -1229,11 +1217,12 @@ 
 		if ($this->dynamic_output === TRUE)
 		{
 			$this->image_display_gd($src_img);
-		}
-		elseif ( ! $this->image_save_gd($src_img)) // ... or save it
+		} elseif ( ! $this->image_save_gd($src_img)) {
+			// ... or save it
 		{
 			return FALSE;
 		}
+		}
 
 		imagedestroy($src_img);
 		imagedestroy($wm_img);
@@ -1297,16 +1286,14 @@ 
 				$temp = $temp[2] - $temp[0];
 
 				$fontwidth = $temp / strlen($this->wm_text);
-			}
-			else
+			} else
 			{
 				$fontwidth = $this->wm_font_size - ($this->wm_font_size / 4);
 			}
 
 			$fontheight = $this->wm_font_size;
 			$this->wm_vrt_offset += $this->wm_font_size;
-		}
-		else
+		} else
 		{
 			$fontwidth  = imagefontwidth($this->wm_font_size);
 			$fontheight = imagefontheight($this->wm_font_size);
@@ -1328,8 +1315,7 @@ 
 		if ($this->wm_vrt_alignment === 'M')
 		{
 			$y_axis += ($this->orig_height / 2) + ($fontheight / 2);
-		}
-		elseif ($this->wm_vrt_alignment === 'B')
+		} elseif ($this->wm_vrt_alignment === 'B')
 		{
 			$y_axis += $this->orig_height - $fontheight - $this->wm_shadow_distance - ($fontheight / 2);
 		}
@@ -1338,8 +1324,7 @@ 
 		if ($this->wm_hor_alignment === 'R')
 		{
 			$x_axis += $this->orig_width - ($fontwidth * strlen($this->wm_text)) - $this->wm_shadow_distance;
-		}
-		elseif ($this->wm_hor_alignment === 'C')
+		} elseif ($this->wm_hor_alignment === 'C')
 		{
 			$x_axis += floor(($this->orig_width - ($fontwidth * strlen($this->wm_text))) / 2);
 		}
@@ -1363,8 +1348,7 @@ 
 			if ($this->wm_use_truetype)
 			{
 				imagettftext($src_img, $this->wm_font_size, 0, $x_shad, $y_shad, $drp_color, $this->wm_font_path, $this->wm_text);
-			}
-			else
+			} else
 			{
 				imagestring($src_img, $this->wm_font_size, $x_shad, $y_shad, $this->wm_text, $drp_color);
 			}
@@ -1383,8 +1367,7 @@ 
 		if ($this->wm_use_truetype)
 		{
 			imagettftext($src_img, $this->wm_font_size, 0, $x_axis, $y_axis, $txt_color, $this->wm_font_path, $this->wm_text);
-		}
-		else
+		} else
 		{
 			imagestring($src_img, $this->wm_font_size, $x_axis, $y_axis, $this->wm_text, $txt_color);
 		}
@@ -1400,8 +1383,7 @@ 
 		if ($this->dynamic_output === TRUE)
 		{
 			$this->image_display_gd($src_img);
-		}
-		else
+		} else
 		{
 			$this->image_save_gd($src_img);
 		}
@@ -1591,13 +1573,11 @@ 
 			{
 				$this->master_dim = ((($this->orig_height/$this->orig_width) - ($this->height/$this->width)) < 0)
 							? 'width' : 'height';
-			}
-			else
+			} else
 			{
 				$this->master_dim = ($this->height === 0) ? 'width' : 'height';
 			}
-		}
-		elseif (($this->master_dim === 'width' && $this->width === 0)
+		} elseif (($this->master_dim === 'width' && $this->width === 0)
 			OR ($this->master_dim === 'height' && $this->height === 0))
 		{
 			return;
@@ -1606,8 +1586,7 @@ 
 		if ($this->master_dim === 'width')
 		{
 			$this->height = (int) ceil($this->width*$this->orig_height/$this->orig_width);
-		}
-		else
+		} else
 		{
 			$this->width = (int) ceil($this->orig_width*$this->height/$this->orig_height);
 		}
@@ -1708,8 +1687,7 @@ 
 		if ($vals['new_width'] === 0)
 		{
 			$vals['new_width'] = ceil($vals['width']*$vals['new_height']/$vals['height']);
-		}
-		elseif ($vals['new_height'] === 0)
+		} elseif ($vals['new_height'] === 0)
 		{
 			$vals['new_height'] = ceil($vals['new_width']*$vals['height']/$vals['width']);
 		}
@@ -1799,8 +1777,7 @@ 
 				$this->error_msg[] = $msg;
 				log_message('error', $msg);
 			}
-		}
-		else
+		} else
 		{
 			$msg = ($CI->lang->line($msg) === FALSE) ? $msg : $CI->lang->line($msg);
 			$this->error_msg[] = $msg;

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

Braces +2 added lines, -4 removed lines

@@ -201,8 +201,7 @@ 
 		if ($this->_migration_type === 'sequential')
 		{
 			$target_version = sprintf('%03d', $target_version);
-		}
-		else
+		} else
 		{
 			$target_version = (string) $target_version;
 		}
@@ -219,8 +218,7 @@ 
 		{
 			// Moving Up
 			$method = 'up';
-		}
-		else
+		} else
 		{
 			// Moving Down, apply in reverse order
 			$method = 'down';

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 = '';

Braces +8 added lines, -16 removed lines

@@ -430,8 +430,7 @@ 
 
 			// Unset the controll, method, old-school routing options
 			unset($get['c'], $get['m'], $get[$this->query_string_segment]);
-		}
-		else
+		} else
 		{
 			$get = array();
 		}
@@ -463,8 +462,7 @@ 
 			// Add the page segment to the end of the query string, where the
 			// page number will be appended.
 			$base_url .= $query_string_sep.http_build_query(array_merge($get, array($this->query_string_segment => '')));
-		}
-		else
+		} else
 		{
 			// Standard segment mode.
 			// Generate our saved query string to append later after the page number.
@@ -496,8 +494,7 @@ 
 		if ($this->page_query_string === TRUE)
 		{
 			$this->cur_page = $this->CI->input->get($this->query_string_segment);
-		}
-		else
+		} else
 		{
 			// Default to the last segment number if one hasn't been defined.
 			if ($this->uri_segment === 0)
@@ -518,8 +515,7 @@ 
 		if ( ! ctype_digit($this->cur_page) OR ($this->use_page_numbers && (int) $this->cur_page === 0))
 		{
 			$this->cur_page = $base_page;
-		}
-		else
+		} else
 		{
 			// Make sure we're using integers for comparisons later.
 			$this->cur_page = (int) $this->cur_page;
@@ -533,8 +529,7 @@ 
 			{
 				$this->cur_page = $num_pages;
 			}
-		}
-		elseif ($this->cur_page > $this->total_rows)
+		} elseif ($this->cur_page > $this->total_rows)
 		{
 			$this->cur_page = ($num_pages - 1) * $this->per_page;
 		}
@@ -578,8 +573,7 @@ 
 				// First page
 				$output .= $this->prev_tag_open.'<a href="'.$first_url.'"'.$attributes.$this->_attr_rel('prev').'>'
 					.$this->prev_link.'</a>'.$this->prev_tag_close;
-			}
-			else
+			} else
 			{
 				$append = $this->prefix.$i.$this->suffix;
 				$output .= $this->prev_tag_open.'<a href="'.$base_url.$append.'"'.$attributes.$this->_attr_rel('prev').'>'
@@ -604,14 +598,12 @@ 
 					{
 						// Current page
 						$output .= $this->cur_tag_open.$loop.$this->cur_tag_close;
-					}
-					elseif ($i === $base_page)
+					} elseif ($i === $base_page)
 					{
 						// First page
 						$output .= $this->num_tag_open.'<a href="'.$first_url.'"'.$attributes.$this->_attr_rel('start').'>'
 							.$loop.'</a>'.$this->num_tag_close;
-					}
-					else
+					} else
 					{
 						$append = $this->prefix.$i.$this->suffix;
 						$output .= $this->num_tag_open.'<a href="'.$base_url.$append.'"'.$attributes.'>'

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;">'

Braces +5 added lines, -10 removed lines

@@ -206,8 +206,7 @@ 
 				if ($cobject instanceof CI_DB)
 				{
 					$dbs[get_class($this->CI).':$'.$name] = $cobject;
-				}
-				elseif ($cobject instanceof CI_Model)
+				} elseif ($cobject instanceof CI_Model)
 				{
 					foreach (get_object_vars($cobject) as $mname => $mobject)
 					{
@@ -264,8 +263,7 @@ 
 			{
 				$output .= '<tr><td style="width:100%;color:#0000FF;font-weight:normal;background-color:#eee;padding:5px;">'
 						.$this->CI->lang->line('profiler_no_queries')."</td></tr>\n";
-			}
-			else
+			} else
 			{
 				foreach ($db->queries as $key => $val)
 				{
@@ -307,8 +305,7 @@ 
 		if (count($_GET) === 0)
 		{
 			$output .= '<div style="color:#cd6e00;font-weight:normal;padding:4px 0 4px 0;">'.$this->CI->lang->line('profiler_no_get').'</div>';
-		}
-		else
+		} else
 		{
 			$output .= "\n\n<table style=\"width:100%;border:none;\">\n";
 
@@ -345,8 +342,7 @@ 
 		if (count($_POST) === 0 && count($_FILES) === 0)
 		{
 			$output .= '<div style="color:#009900;font-weight:normal;padding:4px 0 4px 0;">'.$this->CI->lang->line('profiler_no_post').'</div>';
-		}
-		else
+		} else
 		{
 			$output .= "\n\n<table style=\"width:100%;\">\n";
 
@@ -360,8 +356,7 @@ 
 				if (is_array($val) OR is_object($val))
 				{
 					$output .= '<pre>'.htmlspecialchars(stripslashes(print_r($val, TRUE))).'</pre>';
-				}
-				else
+				} else
 				{
 					$output .= htmlspecialchars(stripslashes($val));
 				}

system/libraries/Session/Session.php

Spacing +1 added lines, -1 removed lines

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

Braces +13 added lines, -26 removed lines

@@ -73,18 +73,15 @@ 
 		{
 			log_message('debug', 'Session: Initialization under CLI aborted.');
 			return;
-		}
-		elseif ((bool) ini_get('session.auto_start'))
+		} elseif ((bool) ini_get('session.auto_start'))
 		{
 			log_message('error', 'Session: session.auto_start is enabled in php.ini. Aborting.');
 			return;
-		}
-		elseif ( ! empty($params['driver']))
+		} elseif ( ! empty($params['driver']))
 		{
 			$this->_driver = $params['driver'];
 			unset($params['driver']);
-		}
-		elseif ($driver = config_item('sess_driver'))
+		} elseif ($driver = config_item('sess_driver'))
 		{
 			$this->_driver = $driver;
 		}
@@ -105,8 +102,7 @@ 
 			if (is_php('5.4'))
 			{
 				session_set_save_handler($class, TRUE);
-			}
-			else
+			} else
 			{
 				session_set_save_handler(
 					array($class, 'open'),
@@ -119,8 +115,7 @@ 
 
 				register_shutdown_function('session_write_close');
 			}
-		}
-		else
+		} else
 		{
 			log_message('error', "Session: Driver '".$this->_driver."' doesn't implement SessionHandlerInterface. Aborting.");
 			return;
@@ -147,8 +142,7 @@ 
 			if ( ! isset($_SESSION['__ci_last_regenerate']))
 			{
 				$_SESSION['__ci_last_regenerate'] = time();
-			}
-			elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerate_time))
+			} elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerate_time))
 			{
 				$this->sess_regenerate((bool) config_item('sess_regenerate_destroy'));
 			}
@@ -237,8 +231,7 @@ 
 			if (class_exists($prefix.$class, FALSE))
 			{
 				return $prefix.$class;
-			}
-			else
+			} else
 			{
 				log_message('debug', 'Session: '.$prefix.$class.".php found but it doesn't declare class ".$prefix.$class.'.');
 			}
@@ -264,8 +257,7 @@ 
 		if (isset($params['cookie_lifetime']))
 		{
 			$params['cookie_lifetime'] = (int) $params['cookie_lifetime'];
-		}
-		else
+		} else
 		{
 			$params['cookie_lifetime'] = ( ! isset($expiration) && config_item('sess_expire_on_close'))
 				? 0 : (int) $expiration;
@@ -275,8 +267,7 @@ 
 		if (empty($params['cookie_name']))
 		{
 			$params['cookie_name'] = ini_get('session.name');
-		}
-		else
+		} else
 		{
 			ini_set('session.name', $params['cookie_name']);
 		}
@@ -296,8 +287,7 @@ 
 		if (empty($expiration))
 		{
 			$params['expiration'] = (int) ini_get('session.gc_maxlifetime');
-		}
-		else
+		} else
 		{
 			$params['expiration'] = (int) $expiration;
 			ini_set('session.gc_maxlifetime', $expiration);
@@ -473,8 +463,7 @@ 
 				{
 					$k = $v;
 					$v = $ttl;
-				}
-				else
+				} else
 				{
 					$v += time();
 				}
@@ -572,8 +561,7 @@ 
 		if (isset($_SESSION[$key]))
 		{
 			return $_SESSION[$key];
-		}
-		elseif ($key === 'session_id')
+		} elseif ($key === 'session_id')
 		{
 			return session_id();
 		}
@@ -654,8 +642,7 @@ 
 		if (isset($key))
 		{
 			return isset($_SESSION[$key]) ? $_SESSION[$key] : NULL;
-		}
-		elseif (empty($_SESSION))
+		} elseif (empty($_SESSION))
 		{
 			return array();
 		}

Doc Comments -2 removed lines

@@ -711,7 +711,6 @@ 
 	 *
 	 * Legacy CI_Session compatibility method
 	 *
-	 * @param	mixed	$data	Session data key(s)
 	 * @return	void
 	 */
 	public function unset_userdata($key)
@@ -879,7 +878,6 @@ 
 	 *
 	 * Legacy CI_Session compatibility method
 	 *
-	 * @param	mixed	$data	Session data key(s)
 	 * @return	void
 	 */
 	public function unset_tempdata($key)

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

Braces +1 added lines, -2 removed lines

@@ -266,8 +266,7 @@
 		if ($reduce_linebreaks === TRUE)
 		{
 			$table['#<p>\n*</p>#'] = '';
-		}
-		else
+		} else
 		{
 			// If we have empty paragraph tags we add a non-breaking space
 			// otherwise most browsers won't treat them as true paragraphs

system/libraries/Session/drivers/Session_database_driver.php

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;
 

Braces +6 added lines, -12 removed lines

@@ -88,12 +88,10 @@ 
 		if ( ! $this->_db instanceof CI_DB_query_builder)
 		{
 			throw new Exception('Query Builder not enabled for the configured database. Aborting.');
-		}
-		elseif ($this->_db->pconnect)
+		} elseif ($this->_db->pconnect)
 		{
 			throw new Exception('Configured database connection is persistent. Aborting.');
-		}
-		elseif ($this->_db->cache_on)
+		} elseif ($this->_db->cache_on)
 		{
 			throw new Exception('Configured database connection has cache enabled. Aborting.');
 		}
@@ -102,8 +100,7 @@ 
 		if (strpos($db_driver, 'mysql') !== FALSE)
 		{
 			$this->_platform = 'mysql';
-		}
-		elseif (in_array($db_driver, array('postgre', 'pdo_pgsql'), TRUE))
+		} elseif (in_array($db_driver, array('postgre', 'pdo_pgsql'), TRUE))
 		{
 			$this->_platform = 'postgre';
 		}
@@ -206,8 +203,7 @@ 
 
 			$this->_row_exists = FALSE;
 			$this->_session_id = $session_id;
-		}
-		elseif ($this->_lock === FALSE)
+		} elseif ($this->_lock === FALSE)
 		{
 			return FALSE;
 		}
@@ -334,8 +330,7 @@ 
 			}
 
 			return FALSE;
-		}
-		elseif ($this->_platform === 'postgre')
+		} elseif ($this->_platform === 'postgre')
 		{
 			$arg = "hashtext('".$session_id."')".($this->_config['match_ip'] ? ", hashtext('".$_SERVER['REMOTE_ADDR']."')" : '');
 			if ($this->_db->simple_query('SELECT pg_advisory_lock('.$arg.')'))
@@ -375,8 +370,7 @@ 
 			}
 
 			return FALSE;
-		}
-		elseif ($this->_platform === 'postgre')
+		} elseif ($this->_platform === 'postgre')
 		{
 			if ($this->_db->simple_query('SELECT pg_advisory_unlock('.$this->_lock.')'))
 			{

system/libraries/Session/drivers/Session_files_driver.php

Braces +6 added lines, -12 removed lines

@@ -92,8 +92,7 @@ 
 		{
 			$this->_config['save_path'] = rtrim($this->_config['save_path'], '/\\');
 			ini_set('session.save_path', $this->_config['save_path']);
-		}
-		else
+		} else
 		{
 			$this->_config['save_path'] = rtrim(ini_get('session.save_path'), '/\\');
 		}
@@ -118,8 +117,7 @@ 
 			{
 				throw new Exception("Session: Configured save path '".$this->_config['save_path']."' is not a directory, doesn't exist or cannot be created.");
 			}
-		}
-		elseif ( ! is_writable($save_path))
+		} elseif ( ! is_writable($save_path))
 		{
 			throw new Exception("Session: Configured save path '".$this->_config['save_path']."' is not writable by the PHP process.");
 		}
@@ -158,8 +156,7 @@ 
 					log_message('error', "Session: File '".$this->_file_path.$session_id."' doesn't exist and cannot be created.");
 					return FALSE;
 				}
-			}
-			elseif (($this->_file_handle = fopen($this->_file_path.$session_id, 'r+b')) === FALSE)
+			} elseif (($this->_file_handle = fopen($this->_file_path.$session_id, 'r+b')) === FALSE)
 			{
 				log_message('error', "Session: Unable to open file '".$this->_file_path.$session_id."'.");
 				return FALSE;
@@ -188,8 +185,7 @@ 
 		elseif ($this->_file_handler === FALSE)
 		{
 			return FALSE;
-		}
-		else
+		} else
 		{
 			rewind($this->_file_handle);
 		}
@@ -232,8 +228,7 @@ 
 		if ( ! is_resource($this->_file_handle))
 		{
 			return FALSE;
-		}
-		elseif ($this->_fingerprint === md5($session_data))
+		} elseif ($this->_fingerprint === md5($session_data))
 		{
 			return ($this->_file_new)
 				? TRUE
@@ -308,8 +303,7 @@ 
 			return file_exists($this->_file_path.$session_id)
 				? (unlink($this->_file_path.$session_id) && $this->_cookie_destroy())
 				: TRUE;
-		}
-		elseif ($this->_file_path !== NULL)
+		} elseif ($this->_file_path !== NULL)
 		{
 			clearstatcache();
 			return file_exists($this->_file_path.$session_id)