ci-bonfire / Sprint

system/libraries/Parser.php

Doc Comments +1 added lines

@@ -185,6 +185,7 @@
 	 * @param	string
 	 * @param	string
 	 * @param	string
+	 * @param string $val
 	 * @return	string
 	 */
 	protected function _parse_single($key, $val, $string)

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

Doc Comments +1 added lines, -1 removed lines

@@ -434,8 +434,8 @@
 	/**
 	 * Set table data from a database result object
 	 *
-	 * @param	CI_DB_result	$db_result	Database result object
 	 * @return	void
+	 * @param CI_DB_result $object
 	 */
 	protected function _set_from_db_result($object)
 	{

Spacing +8 added lines, -8 removed lines

@@ -55,56 +55,56 @@
 	 *
 	 * @var array
 	 */
-	public $rows		= array();
+	public $rows = array();
 
 	/**
 	 * Data for table heading
 	 *
 	 * @var array
 	 */
-	public $heading		= array();
+	public $heading = array();
 
 	/**
 	 * Whether or not to automatically create the table header
 	 *
 	 * @var bool
 	 */
-	public $auto_heading	= TRUE;
+	public $auto_heading = TRUE;
 
 	/**
 	 * Table caption
 	 *
 	 * @var string
 	 */
-	public $caption		= NULL;
+	public $caption = NULL;
 
 	/**
 	 * Table layout template
 	 *
 	 * @var array
 	 */
-	public $template	= NULL;
+	public $template = NULL;
 
 	/**
 	 * Newline setting
 	 *
 	 * @var string
 	 */
-	public $newline		= "\n";
+	public $newline = "\n";
 
 	/**
 	 * Contents of empty cells
 	 *
 	 * @var string
 	 */
-	public $empty_cells	= '';
+	public $empty_cells = '';
 
 	/**
 	 * Callback for custom table layout
 	 *
 	 * @var function
 	 */
-	public $function	= NULL;
+	public $function = NULL;
 
 	/**
 	 * Set the template from the table config file if it exists

Braces +3 added lines, -6 removed lines

@@ -296,8 +296,7 @@ 
 			if ($table_data instanceof CI_DB_result)
 			{
 				$this->_set_from_db_result($table_data);
-			}
-			elseif (is_array($table_data))
+			} elseif (is_array($table_data))
 			{
 				$this->_set_from_array($table_data);
 			}
@@ -387,12 +386,10 @@ 
 					if ($cell === '' OR $cell === NULL)
 					{
 						$out .= $this->empty_cells;
-					}
-					elseif (isset($this->function))
+					} elseif (isset($this->function))
 					{
 						$out .= call_user_func($this->function, $cell);
-					}
-					else
+					} else
 					{
 						$out .= $cell;
 					}

system/libraries/Trackback.php

Doc Comments +3 added lines

@@ -280,6 +280,7 @@ 
 	 *
 	 * @param	string
 	 * @param	string
+	 * @param string $data
 	 * @return	bool
 	 */
 	public function process($url, $data)
@@ -423,6 +424,7 @@ 
 	 * Convert Reserved XML characters to Entities
 	 *
 	 * @param	string
+	 * @param string $str
 	 * @return	string
 	 */
 	public function convert_xml($str)
@@ -531,6 +533,7 @@ 
 	 * Set error message
 	 *
 	 * @param	string
+	 * @param string $msg
 	 * @return	void
 	 */
 	public function set_error($msg)

Spacing +8 added lines, -8 removed lines

@@ -391,26 +391,26 @@ 
 		if (strpos($url, '?') !== FALSE)
 		{
 			$tb_array = explode('/', $url);
-			$tb_end   = $tb_array[count($tb_array)-1];
+			$tb_end   = $tb_array[count($tb_array) - 1];
 
 			if ( ! is_numeric($tb_end))
 			{
-				$tb_end  = $tb_array[count($tb_array)-2];
+				$tb_end  = $tb_array[count($tb_array) - 2];
 			}
 
 			$tb_array = explode('=', $tb_end);
-			$tb_id	= $tb_array[count($tb_array)-1];
+			$tb_id = $tb_array[count($tb_array) - 1];
 		}
 		else
 		{
 			$url = rtrim($url, '/');
 
 			$tb_array = explode('/', $url);
-			$tb_id	= $tb_array[count($tb_array)-1];
+			$tb_id = $tb_array[count($tb_array) - 1];
 
 			if ( ! is_numeric($tb_id))
 			{
-				$tb_id = $tb_array[count($tb_array)-2];
+				$tb_id = $tb_array[count($tb_array) - 2];
 			}
 		}
 
@@ -488,9 +488,9 @@ 
 	 */
 	public function convert_ascii($str)
 	{
-		$count	= 1;
-		$out	= '';
-		$temp	= array();
+		$count = 1;
+		$out = '';
+		$temp = array();
 
 		for ($i = 0, $s = strlen($str); $i < $s; $i++)
 		{

Braces +3 added lines, -6 removed lines

@@ -205,8 +205,7 @@ 
 				if (MB_ENABLED === TRUE)
 				{
 					$_POST[$val] = mb_convert_encoding($_POST[$val], $this->charset, $this->data['charset']);
-				}
-				elseif (ICONV_ENABLED === TRUE)
+				} elseif (ICONV_ENABLED === TRUE)
 				{
 					$_POST[$val] = @iconv($this->data['charset'], $this->charset.'//IGNORE', $_POST[$val]);
 				}
@@ -400,8 +399,7 @@ 
 
 			$tb_array = explode('=', $tb_end);
 			$tb_id	= $tb_array[count($tb_array)-1];
-		}
-		else
+		} else
 		{
 			$url = rtrim($url, '/');
 
@@ -499,8 +497,7 @@ 
 			if ($ordinal < 128)
 			{
 				$out .= $str[$i];
-			}
-			else
+			} else
 			{
 				if (count($temp) === 0)
 				{

system/libraries/Upload.php

Doc Comments -1 removed lines

@@ -286,7 +286,6 @@
 	/**
 	 * Constructor
 	 *
-	 * @param	array	$props
 	 * @return	void
 	 */
 	public function __construct($config = array())

Indentation +35 added lines, -35 removed lines

@@ -1,40 +1,40 @@
 <?php
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package	CodeIgniter
- * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
- * @since	Version 1.0.0
- * @filesource
- */
+	 * CodeIgniter
+	 *
+	 * An open source application development framework for PHP
+	 *
+	 * This content is released under the MIT License (MIT)
+	 *
+	 * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package	CodeIgniter
+	 * @author	EllisLab Dev Team
+	 * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
+	 * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+	 * @license	http://opensource.org/licenses/MIT	MIT License
+	 * @link	http://codeigniter.com
+	 * @since	Version 1.0.0
+	 * @filesource
+	 */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**

Spacing +13 added lines, -13 removed lines

@@ -293,8 +293,8 @@ 
 	{
 		empty($config) OR $this->initialize($config, FALSE);
 
-		$this->_mimes =& get_mimes();
-		$this->_CI =& get_instance();
+		$this->_mimes = & get_mimes();
+		$this->_CI = & get_instance();
 
 		log_message('info', 'Upload Class Initialized');
 	}
@@ -480,7 +480,7 @@ 
 			else
 			{
 				// An extension was provided, let's have it!
-				$this->file_ext	= $this->get_extension($this->_file_name_override);
+				$this->file_ext = $this->get_extension($this->_file_name_override);
 			}
 
 			if ( ! $this->is_allowed_filetype(TRUE))
@@ -493,7 +493,7 @@ 
 		// Convert the file size to kilobytes
 		if ($this->file_size > 0)
 		{
-			$this->file_size = round($this->file_size/1024, 2);
+			$this->file_size = round($this->file_size / 1024, 2);
 		}
 
 		// Is the file size within the allowed maximum?
@@ -812,10 +812,10 @@ 
 			{
 				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
 
-				$this->image_width	= $D[0];
-				$this->image_height	= $D[1];
-				$this->image_type	= isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
-				$this->image_size_str	= $D[3]; // string containing height and width
+				$this->image_width = $D[0];
+				$this->image_height = $D[1];
+				$this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
+				$this->image_size_str = $D[3]; // string containing height and width
 			}
 		}
 
@@ -863,7 +863,7 @@ 
 			$this->file_type = 'image/jpeg';
 		}
 
-		$img_mimes = array('image/gif',	'image/jpeg', 'image/png');
+		$img_mimes = array('image/gif', 'image/jpeg', 'image/png');
 
 		return in_array($this->file_type, $img_mimes, TRUE);
 	}
@@ -1005,7 +1005,7 @@ 
 			return FALSE;
 		}
 
-		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/',  $this->upload_path);
+		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path);
 		return TRUE;
 	}
 
@@ -1049,9 +1049,9 @@ 
 		$ext = '';
 		if (strpos($filename, '.') !== FALSE)
 		{
-			$parts		= explode('.', $filename);
-			$ext		= '.'.array_pop($parts);
-			$filename	= implode('.', $parts);
+			$parts = explode('.', $filename);
+			$ext = '.'.array_pop($parts);
+			$filename = implode('.', $parts);
 		}
 
 		return substr($filename, 0, ($length - strlen($ext))).$ext;

Braces +18 added lines, -18 removed lines

@@ -327,19 +327,16 @@ 
 					if ($reflection->hasMethod('set_'.$key))
 					{
 						$this->{'set_'.$key}($config[$key]);
-					}
-					else
+					} else
 					{
 						$this->$key = $config[$key];
 					}
-				}
-				else
+				} else
 				{
 					$this->$key = $defaults[$key];
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach ($config as $key => &$value)
 			{
@@ -348,8 +345,7 @@ 
 					if ($reflection->hasMethod('set_'.$key))
 					{
 						$this->{'set_'.$key}($value);
-					}
-					else
+					} else
 					{
 						$this->$key = $value;
 					}
@@ -476,8 +472,7 @@ 
 			if (strpos($this->_file_name_override, '.') === FALSE)
 			{
 				$this->file_name .= $this->file_ext;
-			}
-			else
+			} else
 			{
 				// An extension was provided, let's have it!
 				$this->file_ext	= $this->get_extension($this->_file_name_override);
@@ -671,8 +666,7 @@ 
 		{
 			$this->set_error('upload_bad_filename', 'debug');
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return $new_filename;
 		}
@@ -857,8 +851,7 @@ 
 		if (in_array($this->file_type, $png_mimes))
 		{
 			$this->file_type = 'image/png';
-		}
-		elseif (in_array($this->file_type, $jpeg_mimes))
+		} elseif (in_array($this->file_type, $jpeg_mimes))
 		{
 			$this->file_type = 'image/jpeg';
 		}
@@ -1099,9 +1092,12 @@ 
 
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
 		{
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
+			if (($file = @fopen($file, 'rb')) === FALSE) {
+				// "b" to force binary
 			{
-				return FALSE; // Couldn't open the file, return FALSE
+				return FALSE;
+			}
+			// Couldn't open the file, return FALSE
 			}
 
 			$opening_bytes = fread($file, 256);
@@ -1209,9 +1205,11 @@ 
 		if (function_exists('finfo_file'))
 		{
 			$finfo = @finfo_open(FILEINFO_MIME);
-			if (is_resource($finfo)) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
+			if (is_resource($finfo)) {
+				// It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
 			{
 				$mime = @finfo_file($finfo, $file['tmp_name']);
+			}
 				finfo_close($finfo);
 
 				/* According to the comments section of the PHP manual page,
@@ -1296,10 +1294,12 @@ 
 		if (function_exists('mime_content_type'))
 		{
 			$this->file_type = @mime_content_type($file['tmp_name']);
-			if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string
+			if (strlen($this->file_type) > 0) {
+				// It's possible that mime_content_type() returns FALSE or an empty string
 			{
 				return;
 			}
+			}
 		}
 
 		$this->file_type = $file['type'];

system/libraries/User_agent.php

Doc Comments +2 added lines, -2 removed lines

@@ -249,7 +249,7 @@ 
 	/**
 	 * Compile the User Agent Data
 	 *
-	 * @return	bool
+	 * @return	boolean|null
 	 */
 	protected function _compile_data()
 	{
@@ -585,7 +585,7 @@ 
 	/**
 	 * Get the referrer
 	 *
-	 * @return	bool
+	 * @return	string
 	 */
 	public function referrer()
 	{

Braces +1 added lines, -2 removed lines

@@ -496,8 +496,7 @@
 			if (empty($_SERVER['HTTP_REFERER']))
 			{
 				$this->referer = FALSE;
-			}
-			else
+			} else
 			{
 				$referer_host = @parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
 				$own_host = parse_url(config_item('base_url'), PHP_URL_HOST);

system/libraries/Xmlrpc.php

Doc Comments +7 added lines, -5 removed lines

@@ -446,7 +446,7 @@ 
 	 * Values Parsing
 	 *
 	 * @param	mixed	$value
-	 * @return	object
+	 * @return	XML_RPC_Values
 	 */
 	public function values_parsing($value)
 	{
@@ -530,7 +530,7 @@ 
 	 *
 	 * @param	int	$number
 	 * @param	string	$message
-	 * @return	object
+	 * @return	XML_RPC_Response
 	 */
 	public function send_error_message($number, $message)
 	{
@@ -543,7 +543,7 @@ 
 	 * Send Response for Server Request
 	 *
 	 * @param	array	$response
-	 * @return	object
+	 * @return	XML_RPC_Response
 	 */
 	public function send_response($response)
 	{
@@ -1116,7 +1116,7 @@ 
 	 * Parse External XML-RPC Server's Response
 	 *
 	 * @param	resource
-	 * @return	object
+	 * @return	XML_RPC_Response
 	 */
 	public function parseResponse($fp)
 	{
@@ -1672,7 +1672,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param	mixed	$val
+	 * @param	integer	$val
 	 * @param	string	$type
 	 * @return	void
 	 */
@@ -1706,6 +1706,7 @@ 
 	 *
 	 * @param	scalar
 	 * @param	string
+	 * @param integer $val
 	 * @return	int
 	 */
 	public function addScalar($val, $type = 'string')
@@ -1773,6 +1774,7 @@ 
 	 * Add struct value
 	 *
 	 * @param	object
+	 * @param integer $vals
 	 * @return	int
 	 */
 	public function addStruct($vals)

Indentation +1 added lines, -1 removed lines

@@ -1914,7 +1914,7 @@
 	 * @param	int	unix timestamp
 	 * @param	bool
 	 * @return	string
-	*/
+	 */
 	public function iso8601_encode($time, $utc = FALSE)
 	{
 		return ($utc) ? strftime('%Y%m%dT%H:%i:%s', $time) : gmstrftime('%Y%m%dT%H:%i:%s', $time);

Spacing +55 added lines, -55 removed lines

@@ -60,140 +60,140 @@ 
 	 *
 	 * @var	bool
 	 */
-	public $debug		= FALSE;
+	public $debug = FALSE;
 
 	/**
 	 * I4 data type
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcI4	= 'i4';
+	public $xmlrpcI4 = 'i4';
 
 	/**
 	 * Integer data type
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcInt	= 'int';
+	public $xmlrpcInt = 'int';
 
 	/**
 	 * Boolean data type
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcBoolean	= 'boolean';
+	public $xmlrpcBoolean = 'boolean';
 
 	/**
 	 * Double data type
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcDouble	= 'double';
+	public $xmlrpcDouble = 'double';
 
 	/**
 	 * String data type
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcString	= 'string';
+	public $xmlrpcString = 'string';
 
 	/**
 	 * DateTime format
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcDateTime	= 'dateTime.iso8601';
+	public $xmlrpcDateTime = 'dateTime.iso8601';
 
 	/**
 	 * Base64 data type
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcBase64	= 'base64';
+	public $xmlrpcBase64 = 'base64';
 
 	/**
 	 * Array data type
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcArray	= 'array';
+	public $xmlrpcArray = 'array';
 
 	/**
 	 * Struct data type
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcStruct	= 'struct';
+	public $xmlrpcStruct = 'struct';
 
 	/**
 	 * Data types list
 	 *
 	 * @var	array
 	 */
-	public $xmlrpcTypes	= array();
+	public $xmlrpcTypes = array();
 
 	/**
 	 * Valid parents list
 	 *
 	 * @var	array
 	 */
-	public $valid_parents	= array();
+	public $valid_parents = array();
 
 	/**
 	 * Response error numbers list
 	 *
 	 * @var	array
 	 */
-	public $xmlrpcerr		= array();
+	public $xmlrpcerr = array();
 
 	/**
 	 * Response error messages list
 	 *
 	 * @var	string[]
 	 */
-	public $xmlrpcstr		= array();
+	public $xmlrpcstr = array();
 
 	/**
 	 * Encoding charset
 	 *
 	 * @var	string
 	 */
-	public $xmlrpc_defencoding	= 'UTF-8';
+	public $xmlrpc_defencoding = 'UTF-8';
 
 	/**
 	 * XML-RPC client name
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcName		= 'XML-RPC for CodeIgniter';
+	public $xmlrpcName = 'XML-RPC for CodeIgniter';
 
 	/**
 	 * XML-RPC version
 	 *
 	 * @var	string
 	 */
-	public $xmlrpcVersion		= '1.1';
+	public $xmlrpcVersion = '1.1';
 
 	/**
 	 * Start of user errors
 	 *
 	 * @var	int
 	 */
-	public $xmlrpcerruser		= 800;
+	public $xmlrpcerruser = 800;
 
 	/**
 	 * Start of XML parse errors
 	 *
 	 * @var	int
 	 */
-	public $xmlrpcerrxml		= 100;
+	public $xmlrpcerrxml = 100;
 
 	/**
 	 * Backslash replacement value
 	 *
 	 * @var	string
 	 */
-	public $xmlrpc_backslash	= '';
+	public $xmlrpc_backslash = '';
 
 	/**
 	 * XML-RPC Client object
@@ -221,14 +221,14 @@ 
 	 *
 	 * @var	string
 	 */
-	public $message			= '';
+	public $message = '';
 
 	/**
 	 * Request error message
 	 *
 	 * @var	string
 	 */
-	public $error			= '';
+	public $error = '';
 
 	/**
 	 * XML-RPC result object
@@ -242,14 +242,14 @@ 
 	 *
 	 * @var	array
 	 */
-	public $response		= array(); // Response from remote server
+	public $response = array(); // Response from remote server
 
 	/**
 	 * XSS Filter flag
 	 *
 	 * @var	bool
 	 */
-	public $xss_clean		= TRUE;
+	public $xss_clean = TRUE;
 
 	// --------------------------------------------------------------------
 
@@ -568,21 +568,21 @@ 
 	 *
 	 * @var	string
 	 */
-	public $path			= '';
+	public $path = '';
 
 	/**
 	 * Server hostname
 	 *
 	 * @var	string
 	 */
-	public $server			= '';
+	public $server = '';
 
 	/**
 	 * Server port
 	 *
 	 * @var	int
 	 */
-	public $port			= 80;
+	public $port = 80;
 
 	/**
 	 *
@@ -604,42 +604,42 @@ 
 	 *
 	 * @var	string
 	 */
-	public $proxy			= FALSE;
+	public $proxy = FALSE;
 
 	/**
 	 * Proxy port
 	 *
 	 * @var	int
 	 */
-	public $proxy_port		= 8080;
+	public $proxy_port = 8080;
 
 	/**
 	 * Error number
 	 *
 	 * @var	string
 	 */
-	public $errno			= '';
+	public $errno = '';
 
 	/**
 	 * Error message
 	 *
 	 * @var	string
 	 */
-	public $errstring		= '';
+	public $errstring = '';
 
 	/**
 	 * Timeout in seconds
 	 *
 	 * @var	int
 	 */
-	public $timeout		= 5;
+	public $timeout = 5;
 
 	/**
 	 * No Multicall flag
 	 *
 	 * @var	bool
 	 */
-	public $no_multicall	= FALSE;
+	public $no_multicall = FALSE;
 
 	// --------------------------------------------------------------------
 
@@ -791,35 +791,35 @@ 
 	 *
 	 * @var	mixed
 	 */
-	public $val		= 0;
+	public $val = 0;
 
 	/**
 	 * Error number
 	 *
 	 * @var	int
 	 */
-	public $errno		= 0;
+	public $errno = 0;
 
 	/**
 	 * Error message
 	 *
 	 * @var	string
 	 */
-	public $errstr		= '';
+	public $errstr = '';
 
 	/**
 	 * Headers list
 	 *
 	 * @var	array
 	 */
-	public $headers		= array();
+	public $headers = array();
 
 	/**
 	 * XSS Filter flag
 	 *
 	 * @var	bool
 	 */
-	public $xss_clean	= TRUE;
+	public $xss_clean = TRUE;
 
 	// --------------------------------------------------------------------
 
@@ -928,7 +928,7 @@ 
 	 */
 	public function decode($array = NULL)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		if (is_array($array))
 		{
@@ -994,7 +994,7 @@ 
 			reset($xmlrpc_val->me['struct']);
 			$arr = array();
 
-			while (list($key,$value) = each($xmlrpc_val->me['struct']))
+			while (list($key, $value) = each($xmlrpc_val->me['struct']))
 			{
 				$arr[$key] = $this->xmlrpc_decoder($value);
 			}
@@ -1054,14 +1054,14 @@ 
 	 *
 	 * @var	array
 	 */
-	public $params		= array();
+	public $params = array();
 
 	/**
 	 * XH?
 	 *
 	 * @var	array
 	 */
-	public $xh		= array();
+	public $xh = array();
 
 	// --------------------------------------------------------------------
 
@@ -1143,7 +1143,7 @@ 
 		// Check for HTTP 200 Response
 		if (strpos($data, 'HTTP') === 0 && ! preg_match('/^HTTP\/[0-9\.]+ 200 /', $data))
 		{
-			$errstr = substr($data, 0, strpos($data, "\n")-1);
+			$errstr = substr($data, 0, strpos($data, "\n") - 1);
 			return new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error'].' ('.$errstr.')');
 		}
 
@@ -1398,7 +1398,7 @@ 
 			case 'ARRAY':
 				$cur_val = array_shift($this->xh[$the_parser]['valuestack']);
 				$this->xh[$the_parser]['value'] = isset($cur_val['values']) ? $cur_val['values'] : array();
-				$this->xh[$the_parser]['vt']	= strtolower($name);
+				$this->xh[$the_parser]['vt'] = strtolower($name);
 				break;
 			case 'NAME':
 				$this->xh[$the_parser]['valuestack'][0]['name'] = $this->xh[$the_parser]['ac'];
@@ -1418,7 +1418,7 @@ 
 				}
 				elseif ($name === 'DATETIME.ISO8601')
 				{
-					$this->xh[$the_parser]['vt']	= $this->xmlrpcDateTime;
+					$this->xh[$the_parser]['vt'] = $this->xmlrpcDateTime;
 					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
 				}
 				elseif ($name === 'BASE64')
@@ -1430,7 +1430,7 @@ 
 					// Translated BOOLEAN values to TRUE AND FALSE
 					$this->xh[$the_parser]['value'] = (bool) $this->xh[$the_parser]['ac'];
 				}
-				elseif ($name=='DOUBLE')
+				elseif ($name == 'DOUBLE')
 				{
 					// we have a DOUBLE
 					// we must check that only 0123456789-.<space> are characters here
@@ -1453,8 +1453,8 @@ 
 				// This if() detects if no scalar was inside <VALUE></VALUE>
 				if ($this->xh[$the_parser]['vt'] == 'value')
 				{
-					$this->xh[$the_parser]['value']	= $this->xh[$the_parser]['ac'];
-					$this->xh[$the_parser]['vt']	= $this->xmlrpcString;
+					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
+					$this->xh[$the_parser]['vt'] = $this->xmlrpcString;
 				}
 
 				// build the XML-RPC value out of the data received, and substitute it
@@ -1559,7 +1559,7 @@ 
 	 */
 	public function output_parameters(array $array = array())
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		if ( ! empty($array))
 		{
@@ -1633,7 +1633,7 @@ 
 			reset($param->me['struct']);
 			$arr = array();
 
-			while (list($key,$value) = each($param->me['struct']))
+			while (list($key, $value) = each($param->me['struct']))
 			{
 				$arr[$key] = $this->decode_message($value);
 			}
@@ -1658,14 +1658,14 @@ 
 	 *
 	 * @var	array
 	 */
-	public $me	= array();
+	public $me = array();
 
 	/**
 	 * Value type
 	 *
 	 * @var	int
 	 */
-	public $mytype	= 0;
+	public $mytype = 0;
 
 	// --------------------------------------------------------------------
 
@@ -1844,13 +1844,13 @@ 
 				switch ($typ)
 				{
 					case $this->xmlrpcBase64:
-						$rs .= '<'.$typ.'>'.base64_encode( (string) $val).'</'.$typ.">\n";
+						$rs .= '<'.$typ.'>'.base64_encode((string) $val).'</'.$typ.">\n";
 						break;
 					case $this->xmlrpcBoolean:
-						$rs .= '<'.$typ.'>'.( (bool) $val ? '1' : '0').'</'.$typ.">\n";
+						$rs .= '<'.$typ.'>'.((bool) $val ? '1' : '0').'</'.$typ.">\n";
 						break;
 					case $this->xmlrpcString:
-						$rs .= '<'.$typ.'>'.htmlspecialchars( (string) $val).'</'.$typ.">\n";
+						$rs .= '<'.$typ.'>'.htmlspecialchars((string) $val).'</'.$typ.">\n";
 						break;
 					default:
 						$rs .= '<'.$typ.'>'.$val.'</'.$typ.">\n";

Braces +36 added lines, -55 removed lines

@@ -455,8 +455,7 @@ 
 			if ( ! isset($value[1], $this->xmlrpcTypes[$value[1]]))
 			{
 				$temp = new XML_RPC_Values($value[0], (is_array($value[0]) ? 'array' : 'string'));
-			}
-			else
+			} else
 			{
 				if (is_array($value[0]) && ($value[1] === 'struct' OR $value[1] === 'array'))
 				{
@@ -468,8 +467,7 @@ 
 
 				$temp = new XML_RPC_Values($value[0], $value[1]);
 			}
-		}
-		else
+		} else
 		{
 			$temp = new XML_RPC_Values($value, 'string');
 		}
@@ -705,8 +703,7 @@ 
 		{
 			$server = $this->server;
 			$port = $this->port;
-		}
-		else
+		} else
 		{
 			$server = $this->proxy;
 			$port = $this->proxy_port;
@@ -747,8 +744,7 @@ 
 				if ($timestamp === 0)
 				{
 					$timestamp = time();
-				}
-				elseif ($timestamp < (time() - $this->timeout))
+				} elseif ($timestamp < (time() - $this->timeout))
 				{
 					$result = FALSE;
 					break;
@@ -756,8 +752,7 @@ 
 
 				usleep(250000);
 				continue;
-			}
-			else
+			} else
 			{
 				$timestamp = 0;
 			}
@@ -840,14 +835,12 @@ 
 			$this->errstr = htmlspecialchars($fstr,
 							(is_php('5.4') ? ENT_XML1 | ENT_NOQUOTES : ENT_NOQUOTES),
 							'UTF-8');
-		}
-		elseif ( ! is_object($val))
+		} elseif ( ! is_object($val))
 		{
 			// programmer error, not an object
 			error_log("Invalid type '".gettype($val)."' (value: ".$val.') passed to XML_RPC_Response. Defaulting to empty value.');
 			$this->val = new XML_RPC_Values();
-		}
-		else
+		} else
 		{
 			$this->val = $val;
 		}
@@ -937,8 +930,7 @@ 
 				if (is_array($array[$key]))
 				{
 					$array[$key] = $this->decode($array[$key]);
-				}
-				elseif ($this->xss_clean)
+				} elseif ($this->xss_clean)
 				{
 					$array[$key] = $CI->security->xss_clean($array[$key]);
 				}
@@ -952,8 +944,7 @@ 
 		if (is_array($result))
 		{
 			$result = $this->decode($result);
-		}
-		elseif ($this->xss_clean)
+		} elseif ($this->xss_clean)
 		{
 			$result = $CI->security->xss_clean($result);
 		}
@@ -976,8 +967,7 @@ 
 		if ($kind === 'scalar')
 		{
 			return $xmlrpc_val->scalarval();
-		}
-		elseif ($kind === 'array')
+		} elseif ($kind === 'array')
 		{
 			reset($xmlrpc_val->me);
 			$b = current($xmlrpc_val->me);
@@ -988,8 +978,7 @@ 
 				$arr[] = $this->xmlrpc_decoder($xmlrpc_val->me['array'][$i]);
 			}
 			return $arr;
-		}
-		elseif ($kind === 'struct')
+		} elseif ($kind === 'struct')
 		{
 			reset($xmlrpc_val->me['struct']);
 			$arr = array();
@@ -1202,8 +1191,7 @@ 
 			}
 
 			return new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'], $this->xmlrpcstr['invalid_return'].' '.$this->xh[$pname]['isf_reason']);
-		}
-		elseif ( ! is_object($this->xh[$pname]['value']))
+		} elseif ( ! is_object($this->xh[$pname]['value']))
 		{
 			return new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'], $this->xmlrpcstr['invalid_return'].' '.$this->xh[$pname]['isf_reason']);
 		}
@@ -1243,8 +1231,7 @@ 
 			}
 
 			$r = new XML_RPC_Response($v, $errno, $errstr_v->scalarval());
-		}
-		else
+		} else
 		{
 			$r = new XML_RPC_Response($v);
 		}
@@ -1283,7 +1270,9 @@ 
 		$the_parser = (string) $the_parser;
 
 		// If invalid nesting, then return
-		if ($this->xh[$the_parser]['isf'] > 1) return;
+		if ($this->xh[$the_parser]['isf'] > 1) {
+			return;
+		}
 
 		// Evaluate and check for correct nesting of XML elements
 		if (count($this->xh[$the_parser]['stack']) === 0)
@@ -1383,7 +1372,9 @@ 
 	{
 		$the_parser = (string) $the_parser;
 
-		if ($this->xh[$the_parser]['isf'] > 1) return;
+		if ($this->xh[$the_parser]['isf'] > 1) {
+			return;
+		}
 
 		// Remove current element from stack and set variable
 		// NOTE: If the XML validates, then we do not have to worry about
@@ -1415,30 +1406,25 @@ 
 				if ($name === 'STRING')
 				{
 					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
-				}
-				elseif ($name === 'DATETIME.ISO8601')
+				} elseif ($name === 'DATETIME.ISO8601')
 				{
 					$this->xh[$the_parser]['vt']	= $this->xmlrpcDateTime;
 					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
-				}
-				elseif ($name === 'BASE64')
+				} elseif ($name === 'BASE64')
 				{
 					$this->xh[$the_parser]['value'] = base64_decode($this->xh[$the_parser]['ac']);
-				}
-				elseif ($name === 'BOOLEAN')
+				} elseif ($name === 'BOOLEAN')
 				{
 					// Translated BOOLEAN values to TRUE AND FALSE
 					$this->xh[$the_parser]['value'] = (bool) $this->xh[$the_parser]['ac'];
-				}
-				elseif ($name=='DOUBLE')
+				} elseif ($name=='DOUBLE')
 				{
 					// we have a DOUBLE
 					// we must check that only 0123456789-.<space> are characters here
 					$this->xh[$the_parser]['value'] = preg_match('/^[+-]?[eE0-9\t \.]+$/', $this->xh[$the_parser]['ac'])
 										? (float) $this->xh[$the_parser]['ac']
 										: 'ERROR_NON_NUMERIC_FOUND';
-				}
-				else
+				} else
 				{
 					// we have an I4/INT
 					// we must check that only 0123456789-<space> are characters here
@@ -1464,8 +1450,7 @@ 
 				{
 					// Array
 					$this->xh[$the_parser]['valuestack'][0]['values'][] = $temp;
-				}
-				else
+				} else
 				{
 					// Struct
 					$this->xh[$the_parser]['value'] = $temp;
@@ -1517,7 +1502,10 @@ 
 	{
 		$the_parser = (string) $the_parser;
 
-		if ($this->xh[$the_parser]['isf'] > 1) return; // XML Fault found already
+		if ($this->xh[$the_parser]['isf'] > 1) {
+			return;
+		}
+		// XML Fault found already
 
 		// If a value has not been found
 		if ($this->xh[$the_parser]['lv'] !== 3)
@@ -1568,8 +1556,7 @@ 
 				if (is_array($array[$key]))
 				{
 					$array[$key] = $this->output_parameters($array[$key]);
-				}
-				elseif ($key !== 'bits' && $this->xss_clean)
+				} elseif ($key !== 'bits' && $this->xss_clean)
 				{
 					// 'bits' is for the MetaWeblog API image bits
 					// @todo - this needs to be made more general purpose
@@ -1589,8 +1576,7 @@ 
 			if (is_array($a_param))
 			{
 				$parameters[] = $this->output_parameters($a_param);
-			}
-			else
+			} else
 			{
 				$parameters[] = ($this->xss_clean) ? $CI->security->xss_clean($a_param) : $a_param;
 			}
@@ -1614,8 +1600,7 @@ 
 		if ($kind === 'scalar')
 		{
 			return $param->scalarval();
-		}
-		elseif ($kind === 'array')
+		} elseif ($kind === 'array')
 		{
 			reset($param->me);
 			$b = current($param->me);
@@ -1627,8 +1612,7 @@ 
 			}
 
 			return $arr;
-		}
-		elseif ($kind === 'struct')
+		} elseif ($kind === 'struct')
 		{
 			reset($param->me['struct']);
 			$arr = array();
@@ -1687,12 +1671,10 @@ 
 			if ($this->xmlrpcTypes[$type] == 1)
 			{
 				$this->addScalar($val, $type);
-			}
-			elseif ($this->xmlrpcTypes[$type] == 2)
+			} elseif ($this->xmlrpcTypes[$type] == 2)
 			{
 				$this->addArray($val);
-			}
-			elseif ($this->xmlrpcTypes[$type] == 3)
+			} elseif ($this->xmlrpcTypes[$type] == 3)
 			{
 				$this->addStruct($val);
 			}
@@ -1735,8 +1717,7 @@ 
 			$ar = $this->me['array'];
 			$ar[] = new XML_RPC_Values($val, $type);
 			$this->me['array'] = $ar;
-		}
-		else
+		} else
 		{
 			// a scalar, so set the value and remember we're scalar
 			$this->me[$type] = $val;

system/libraries/Xmlrpcs.php

Doc Comments +6 added lines, -5 removed lines

@@ -311,6 +311,7 @@ 
 	 * Executes the Method
 	 *
 	 * @param	object
+	 * @param XML_RPC_Message $m
 	 * @return	mixed
 	 */
 	protected function _execute($m)
@@ -419,7 +420,7 @@ 
 	 * Server Function: List Methods
 	 *
 	 * @param	mixed
-	 * @return	object
+	 * @return	XML_RPC_Response
 	 */
 	public function listMethods($m)
 	{
@@ -446,7 +447,7 @@ 
 	 * Server Function: Return Signature for Method
 	 *
 	 * @param	mixed
-	 * @return	object
+	 * @return	XML_RPC_Response
 	 */
 	public function methodSignature($m)
 	{
@@ -486,7 +487,7 @@ 
 	 * Server Function: Doc String for Method
 	 *
 	 * @param	mixed
-	 * @return	object
+	 * @return	XML_RPC_Response
 	 */
 	public function methodHelp($m)
 	{
@@ -552,7 +553,7 @@ 
 	 * Multi-call Function: Error Handling
 	 *
 	 * @param	mixed
-	 * @return	object
+	 * @return	XML_RPC_Values
 	 */
 	public function multicall_error($err)
 	{
@@ -571,7 +572,7 @@ 
 	 * Multi-call Function: Processes method
 	 *
 	 * @param	mixed
-	 * @return	object
+	 * @return	XML_RPC_Values
 	 */
 	public function do_multicall($call)
 	{

Spacing +9 added lines, -9 removed lines

@@ -79,7 +79,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $system_methods	= array();
+	public $system_methods = array();
 
 	/**
 	 * Configuration object
@@ -220,7 +220,7 @@ 
 
 		if ($data === '')
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if ($CI->input->method() === 'post')
 			{
 				$data = $CI->input->raw_input_stream;
@@ -343,7 +343,7 @@ 
 
 		if ($system_call === TRUE)
 		{
-			if ( ! is_callable(array($this,$method_parts[1])))
+			if ( ! is_callable(array($this, $method_parts[1])))
 			{
 				return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']);
 			}
@@ -366,21 +366,21 @@ 
 			{
 				$current_sig = $sig[$i];
 
-				if (count($current_sig) === count($m->params)+1)
+				if (count($current_sig) === count($m->params) + 1)
 				{
 					for ($n = 0, $mc = count($m->params); $n < $mc; $n++)
 					{
 						$p = $m->params[$n];
 						$pt = ($p->kindOf() === 'scalar') ? $p->scalarval() : $p->kindOf();
 
-						if ($pt !== $current_sig[$n+1])
+						if ($pt !== $current_sig[$n + 1])
 						{
-							$pno = $n+1;
-							$wanted = $current_sig[$n+1];
+							$pno = $n + 1;
+							$wanted = $current_sig[$n + 1];
 
 							return new XML_RPC_Response(0,
 								$this->xmlrpcerr['incorrect_params'],
-								$this->xmlrpcstr['incorrect_params'] .
+								$this->xmlrpcstr['incorrect_params'].
 								': Wanted '.$wanted.', got '.$pt.' at param '.$pno.')');
 						}
 					}
@@ -466,7 +466,7 @@ 
 					$inSig = $signature[$i];
 					for ($j = 0, $jc = count($inSig); $j < $jc; $j++)
 					{
-						$cursig[]= new XML_RPC_Values($inSig[$j], 'string');
+						$cursig[] = new XML_RPC_Values($inSig[$j], 'string');
 					}
 					$sigs[] = new XML_RPC_Values($cursig, 'array');
 				}

Braces +11 added lines, -22 removed lines

@@ -263,12 +263,10 @@ 
 				xml_error_string(xml_get_error_code($parser)),
 				xml_get_current_line_number($parser)));
 			xml_parser_free($parser);
-		}
-		elseif ($parser_object->xh[$pname]['isf'])
+		} elseif ($parser_object->xh[$pname]['isf'])
 		{
 			return new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'], $this->xmlrpcstr['invalid_return']);
-		}
-		else
+		} else
 		{
 			xml_parser_free($parser);
 
@@ -347,8 +345,7 @@ 
 			{
 				return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']);
 			}
-		}
-		elseif (($objectCall && ! is_callable(array($method_parts[0], $method_parts[1])))
+		} elseif (($objectCall && ! is_callable(array($method_parts[0], $method_parts[1])))
 			OR ( ! $objectCall && ! is_callable($this->methods[$methName]['function']))
 		)
 		{
@@ -397,17 +394,14 @@ 
 			if ($method_parts[0] === 'this' && $system_call === TRUE)
 			{
 				return call_user_func(array($this, $method_parts[1]), $m);
-			}
-			elseif ($this->object === FALSE)
+			} elseif ($this->object === FALSE)
 			{
 				return get_instance()->$method_parts[1]($m);
-			}
-			else
+			} else
 			{
 				return $this->object->$method_parts[1]($m);
 			}
-		}
-		else
+		} else
 		{
 			return call_user_func($this->methods[$methName]['function'], $m);
 		}
@@ -498,8 +492,7 @@ 
 			$docstring = isset($this->methods[$method_name]['docstring']) ? $this->methods[$method_name]['docstring'] : '';
 
 			return new XML_RPC_Response(new XML_RPC_Values($docstring, 'string'));
-		}
-		else
+		} else
 		{
 			return new XML_RPC_Response(0, $this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
 		}
@@ -578,8 +571,7 @@ 
 		if ($call->kindOf() !== 'struct')
 		{
 			return $this->multicall_error('notstruct');
-		}
-		elseif ( ! $methName = $call->me['struct']['methodName'])
+		} elseif ( ! $methName = $call->me['struct']['methodName'])
 		{
 			return $this->multicall_error('nomethod');
 		}
@@ -590,16 +582,13 @@ 
 		if ($methName->kindOf() !== 'scalar' OR $scalar_type !== 'string')
 		{
 			return $this->multicall_error('notstring');
-		}
-		elseif ($scalar_value === 'system.multicall')
+		} elseif ($scalar_value === 'system.multicall')
 		{
 			return $this->multicall_error('recursion');
-		}
-		elseif ( ! $params = $call->me['struct']['params'])
+		} elseif ( ! $params = $call->me['struct']['params'])
 		{
 			return $this->multicall_error('noparams');
-		}
-		elseif ($params->kindOf() !== 'array')
+		} elseif ($params->kindOf() !== 'array')
 		{
 			return $this->multicall_error('notarray');
 		}

system/libraries/Zip.php

Doc Comments +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
 	 * If this is a newly created file/dir, we will set the time to 'now'
 	 *
 	 * @param	string	$dir	path to file
-	 * @return	array	filemtime/filemdate
+	 * @return	string	filemtime/filemdate
 	 */
 	protected function _get_mod_time($dir)
 	{
@@ -219,7 +219,7 @@ 
 	 * in the filename it will be placed within a directory. Make
 	 * sure you use add_dir() first to create the folder.
 	 *
-	 * @param	mixed	$filepath	A single filepath or an array of file => data pairs
+	 * @param	string	$filepath	A single filepath or an array of file => data pairs
 	 * @param	string	$data		Single file contents
 	 * @return	void
 	 */

Spacing +4 added lines, -4 removed lines

@@ -194,9 +194,9 @@ 
 			"\x50\x4b\x01\x02\x00\x00\x0a\x00\x00\x00\x00\x00"
 			.pack('v', $file_mtime)
 			.pack('v', $file_mdate)
-			.pack('V',0) // crc32
-			.pack('V',0) // compressed filesize
-			.pack('V',0) // uncompressed filesize
+			.pack('V', 0) // crc32
+			.pack('V', 0) // compressed filesize
+			.pack('V', 0) // uncompressed filesize
 			.pack('v', strlen($dir)) // length of pathname
 			.pack('v', 0) // extra field length
 			.pack('v', 0) // file comment length
@@ -456,7 +456,7 @@ 
 
 		get_instance()->load->helper('download');
 		$get_zip = $this->get_zip();
-		$zip_content =& $get_zip;
+		$zip_content = & $get_zip;
 
 		force_download($filename, $zip_content);
 	}

Braces +3 added lines, -6 removed lines

@@ -232,8 +232,7 @@ 
 				$file_data = $this->_get_mod_time($path);
 				$this->_add_data($path, $data, $file_data['file_mtime'], $file_data['file_mdate']);
 			}
-		}
-		else
+		} else
 		{
 			$file_data = $this->_get_mod_time($filepath);
 			$this->_add_data($filepath, $data, $file_data['file_mtime'], $file_data['file_mdate']);
@@ -309,8 +308,7 @@ 
 			if (is_string($archive_filepath))
 			{
 				$name = str_replace('\\', '/', $archive_filepath);
-			}
-			else
+			} else
 			{
 				$name = str_replace('\\', '/', $path);
 
@@ -365,8 +363,7 @@ 
 			if (is_dir($path.$file))
 			{
 				$this->read_dir($path.$file.DIRECTORY_SEPARATOR, $preserve_filepath, $root_path);
-			}
-			elseif (FALSE !== ($data = file_get_contents($path.$file)))
+			} elseif (FALSE !== ($data = file_get_contents($path.$file)))
 			{
 				$name = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $path);
 				if ($preserve_filepath === FALSE)

application/config/api.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
  * @link        http://sprintphp.com
  * @since       Version 1.0
  */
-if (!defined('BASEPATH')) exit('No direct script access allowed');
+if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
 //--------------------------------------------------------------------
 // Authentication Type
@@ -40,7 +40,7 @@ 
 //
 // Allowed values: 'basic', 'digest'
 //
-	$config['api.auth_type']    = 'basic';
+	$config['api.auth_type'] = 'basic';
 
 //--------------------------------------------------------------------
 // Realm
@@ -58,7 +58,7 @@ 
 // the username of the client. This will typically be either
 // 'username' or 'email'.
 //
-	$config['api.auth_field']   = 'email';
+	$config['api.auth_field'] = 'email';
 
 //--------------------------------------------------------------------
 // IP Blacklists

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
  * @link        http://sprintphp.com
  * @since       Version 1.0
  */
-if (!defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 //--------------------------------------------------------------------
 // Allowed Environments