iNextrix / ASTPP

web_interface/astpp/system/libraries/Profiler.php

Doc Comments +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 	 * and "_end" respectively).  It then compiles the execution times for
 	 * all points and returns it as an array
 	 *
-	 * @return	array
+	 * @return	string
 	 */
 	protected function _compile_benchmarks()
 	{

Spacing +8 added lines, -8 removed lines

@@ -53,12 +53,12 @@ 
 
 	public function __construct($config = array())
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		$this->CI->load->language('profiler');
 
 		if (isset($config['query_toggle_count']))
 		{
-			$this->_query_toggle_count = (int) $config['query_toggle_count'];
+			$this->_query_toggle_count = (int)$config['query_toggle_count'];
 			unset($config['query_toggle_count']);
 		}
 
@@ -160,7 +160,7 @@ 
 		// Let's determine which databases are currently connected to
 		foreach (get_object_vars($this->CI) as $CI_object)
 		{
-			if (is_object($CI_object) && is_subclass_of(get_class($CI_object), 'CI_DB') )
+			if (is_object($CI_object) && is_subclass_of(get_class($CI_object), 'CI_DB'))
 			{
 				$dbs[] = $CI_object;
 			}
@@ -174,7 +174,7 @@ 
 			$output .= '<legend style="color:#0000FF;">&nbsp;&nbsp;'.$this->CI->lang->line('profiler_queries').'&nbsp;&nbsp;</legend>';
 			$output .= "\n";
 			$output .= "\n\n<table style='border:none; width:100%;'>\n";
-			$output .="<tr><td style='width:100%;color:#0000FF;font-weight:normal;background-color:#eee;padding:5px'>".$this->CI->lang->line('profiler_no_db')."</td></tr>\n";
+			$output .= "<tr><td style='width:100%;color:#0000FF;font-weight:normal;background-color:#eee;padding:5px'>".$this->CI->lang->line('profiler_no_db')."</td></tr>\n";
 			$output .= "</table>\n";
 			$output .= "</fieldset>";
 
@@ -187,7 +187,7 @@ 
 		// Key words we want bolded
 		$highlight = array('SELECT', 'DISTINCT', 'FROM', 'WHERE', 'AND', 'LEFT&nbsp;JOIN', 'ORDER&nbsp;BY', 'GROUP&nbsp;BY', 'LIMIT', 'INSERT', 'INTO', 'VALUES', 'UPDATE', 'OR&nbsp;', 'HAVING', 'OFFSET', 'NOT&nbsp;IN', 'IN', 'LIKE', 'NOT&nbsp;LIKE', 'COUNT', 'MAX', 'MIN', 'ON', 'AS', 'AVG', 'SUM', '(', ')');
 
-		$output  = "\n\n";
+		$output = "\n\n";
 
 		$count = 0;
 
@@ -273,7 +273,7 @@ 
 				$output .= "<tr><td style='width:50%;color:#000;background-color:#ddd;padding:5px'>&#36;_GET[".$key."]&nbsp;&nbsp; </td><td style='width:50%;padding:5px;color:#cd6e00;font-weight:normal;background-color:#ddd;'>";
 				if (is_array($val))
 				{
-					$output .= "<pre>" . htmlspecialchars(stripslashes(print_r($val, true))) . "</pre>";
+					$output .= "<pre>".htmlspecialchars(stripslashes(print_r($val, true)))."</pre>";
 				}
 				else
 				{
@@ -322,7 +322,7 @@ 
 				$output .= "<tr><td style='width:50%;padding:5px;color:#000;background-color:#ddd;'>&#36;_POST[".$key."]&nbsp;&nbsp; </td><td style='width:50%;padding:5px;color:#009900;font-weight:normal;background-color:#ddd;'>";
 				if (is_array($val))
 				{
-					$output .= "<pre>" . htmlspecialchars(stripslashes(print_r($val, TRUE))) . "</pre>";
+					$output .= "<pre>".htmlspecialchars(stripslashes(print_r($val, TRUE)))."</pre>";
 				}
 				else
 				{
@@ -439,7 +439,7 @@ 
 
 		$output .= "\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') 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') as $header)
 		{
 			$val = (isset($_SERVER[$header])) ? $_SERVER[$header] : '';
 			$output .= "<tr><td style='vertical-align: top;width:50%;padding:5px;color:#900;background-color:#ddd;'>".$header."&nbsp;&nbsp;</td><td style='width:50%;padding:5px;color:#000;background-color:#ddd;'>".$val."</td></tr>\n";

Braces +10 added lines, -15 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -213,8 +215,7 @@ 
 			if (count($db->queries) == 0)
 			{
 				$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)
 				{
@@ -258,8 +259,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";
 
@@ -274,8 +274,7 @@ 
 				if (is_array($val))
 				{
 					$output .= "<pre>" . htmlspecialchars(stripslashes(print_r($val, true))) . "</pre>";
-				}
-				else
+				} else
 				{
 					$output .= htmlspecialchars(stripslashes($val));
 				}
@@ -307,8 +306,7 @@ 
 		if (count($_POST) == 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";
 
@@ -323,8 +321,7 @@ 
 				if (is_array($val))
 				{
 					$output .= "<pre>" . htmlspecialchars(stripslashes(print_r($val, TRUE))) . "</pre>";
-				}
-				else
+				} else
 				{
 					$output .= htmlspecialchars(stripslashes($val));
 				}
@@ -356,8 +353,7 @@ 
 		if ($this->CI->uri->uri_string == '')
 		{
 			$output .= "<div style='color:#000;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->lang->line('profiler_no_uri')."</div>";
-		}
-		else
+		} else
 		{
 			$output .= "<div style='color:#000;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->uri->uri_string."</div>";
 		}
@@ -409,8 +405,7 @@ 
 		if (function_exists('memory_get_usage') && ($usage = memory_get_usage()) != '')
 		{
 			$output .= "<div style='color:#5a0099;font-weight:normal;padding:4px 0 4px 0'>".number_format($usage).' bytes</div>';
-		}
-		else
+		} else
 		{
 			$output .= "<div style='color:#5a0099;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->lang->line('profiler_no_memory')."</div>";
 		}

web_interface/astpp/system/libraries/Session.php

Doc Comments +2 added lines, -1 removed lines

@@ -423,6 +423,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
+	 * @param string $item
 	 * @return	string
 	 */
 	function userdata($item)
@@ -614,7 +615,7 @@ 
 	 * Get the "now" time
 	 *
 	 * @access	private
-	 * @return	string
+	 * @return	integer
 	 */
 	function _get_time()
 	{

Spacing +13 added lines, -13 removed lines

@@ -26,24 +26,24 @@ 
  */
 class CI_Session {
 
-	var $sess_encrypt_cookie		= FALSE;
-	var $sess_use_database			= FALSE;
+	var $sess_encrypt_cookie = FALSE;
+	var $sess_use_database = FALSE;
 	var $sess_table_name			= '';
 	var $sess_expiration			= 7200;
 	var $sess_expire_on_close		= FALSE;
 	var $sess_match_ip				= FALSE;
 	var $sess_match_useragent		= TRUE;
-	var $sess_cookie_name			= 'ci_session';
+	var $sess_cookie_name = 'ci_session';
 	var $cookie_prefix				= '';
-	var $cookie_path				= '';
+	var $cookie_path = '';
 	var $cookie_domain				= '';
 	var $cookie_secure				= FALSE;
-	var $sess_time_to_update		= 300;
+	var $sess_time_to_update = 300;
 	var $encryption_key				= '';
 	var $flashdata_key				= 'flash';
 	var $time_reference				= 'time';
 	var $gc_probability				= 5;
-	var $userdata					= array();
+	var $userdata = array();
 	var $CI;
 	var $now;
 
@@ -58,7 +58,7 @@ 
 		log_message('debug', "Session Class Initialized");
 
 		// Set the super object to a local variable for use throughout the class
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 
 		// Set all the session preferences, which can either be set
 		// manually via the $params array above or via the config file
@@ -95,7 +95,7 @@ 
 		// set to zero we'll set the expiration two years from now.
 		if ($this->sess_expiration == 0)
 		{
-			$this->sess_expiration = (60*60*24*365*2);
+			$this->sess_expiration = (60 * 60 * 24 * 365 * 2);
 		}
 		
 		// Set the cookie name
@@ -152,11 +152,11 @@ 
 		else
 		{
 			// encryption was not used, so we need to check the md5 hash
-			$hash	 = substr($session, strlen($session)-32); // get last 32 chars
-			$session = substr($session, 0, strlen($session)-32);
+			$hash = substr($session, strlen($session) - 32); // get last 32 chars
+			$session = substr($session, 0, strlen($session) - 32);
 
 			// Does the md5 hash match?  This is to prevent manipulation of session data in userspace
-			if ($hash !==  md5($session.$this->encryption_key))
+			if ($hash !== md5($session.$this->encryption_key))
 			{
 				log_message('error', 'The session cookie data did not match what was expected. This could be a possible hacking attempt.');
 				$this->sess_destroy();
@@ -266,7 +266,7 @@ 
 		// Before continuing, we need to determine if there is any custom data to deal with.
 		// Let's determine this by removing the default indexes to see if there's anything left in the array
 		// and set the session data while we're at it
-		foreach (array('session_id','ip_address','user_agent','last_activity') as $val)
+		foreach (array('session_id', 'ip_address', 'user_agent', 'last_activity') as $val)
 		{
 			unset($custom_userdata[$val]);
 			$cookie_userdata[$val] = $this->userdata[$val];
@@ -376,7 +376,7 @@ 
 		{
 			// set cookie explicitly to only have our session data
 			$cookie_data = array();
-			foreach (array('session_id','ip_address','user_agent','last_activity') as $val)
+			foreach (array('session_id', 'ip_address', 'user_agent', 'last_activity') as $val)
 			{
 				$cookie_data[$val] = $this->userdata[$val];
 			}

Braces +9 added lines, -13 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -106,8 +108,7 @@ 
 		if ( ! $this->sess_read())
 		{
 			$this->sess_create();
-		}
-		else
+		} else
 		{
 			$this->sess_update();
 		}
@@ -148,8 +149,7 @@ 
 		if ($this->sess_encrypt_cookie == TRUE)
 		{
 			$session = $this->CI->encrypt->decode($session);
-		}
-		else
+		} else
 		{
 			// encryption was not used, so we need to check the md5 hash
 			$hash	 = substr($session, strlen($session)-32); // get last 32 chars
@@ -277,8 +277,7 @@ 
 		if (count($custom_userdata) === 0)
 		{
 			$custom_userdata = '';
-		}
-		else
+		} else
 		{
 			// Serialize the custom data array so we can store it
 			$custom_userdata = $this->_serialize($custom_userdata);
@@ -622,8 +621,7 @@ 
 		{
 			$now = time();
 			$time = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now));
-		}
-		else
+		} else
 		{
 			$time = time();
 		}
@@ -652,8 +650,7 @@ 
 		if ($this->sess_encrypt_cookie == TRUE)
 		{
 			$cookie_data = $this->CI->encrypt->encode($cookie_data);
-		}
-		else
+		} else
 		{
 			// if encryption is not used, we provide an md5 hash to prevent userside tampering
 			$cookie_data = $cookie_data.md5($cookie_data.$this->encryption_key);
@@ -695,8 +692,7 @@ 
 					$data[$key] = str_replace('\\', '{{slash}}', $val);
 				}
 			}
-		}
-		else
+		} else
 		{
 			if (is_string($data))
 			{

web_interface/astpp/system/libraries/Sha1.php

Doc Comments +4 added lines, -1 removed lines

@@ -146,6 +146,7 @@ 
 	 *
 	 * @access	private
 	 * @return	string
+	 * @param integer $t
 	 */
 	function _ft($t, $b, $c, $d)
 	{
@@ -165,7 +166,8 @@ 
 	 * Determine the additive constant
 	 *
 	 * @access	private
-	 * @return	string
+	 * @return	integer
+	 * @param integer $t
 	 */
 	function _kt($t)
 	{
@@ -210,6 +212,7 @@ 
 	 *
 	 * @access	private
 	 * @return	integer
+	 * @param integer $cnt
 	 */
 	function _rol($num, $cnt)
 	{

Spacing +3 added lines, -3 removed lines

@@ -74,10 +74,10 @@ 
 
 		$x[$n * 16 - 1] = strlen($str) * 8;
 
-		$a =  1732584193;
+		$a = 1732584193;
 		$b = -271733879;
 		$c = -1732584194;
-		$d =  271733878;
+		$d = 271733878;
 		$e = -1009589776;
 
 		for ($i = 0; $i < count($x); $i += 16)
@@ -237,7 +237,7 @@ 
 			$bin = substr($bin, 0, strlen($bin) - $b);
 		}
 
-		for ($i=0; $i < $b; $i++)
+		for ($i = 0; $i < $b; $i++)
 		{
 			$bin = "0".$bin;
 		}

Braces +17 added lines, -17 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -93,8 +95,7 @@ 
 				if ($j < 16)
 				{
 					$w[$j] = $x[$i + $j];
-				}
-				else
+				} else
 				{
 					$w[$j] = $this->_rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
 				}
@@ -149,12 +150,15 @@ 
 	 */
 	function _ft($t, $b, $c, $d)
 	{
-		if ($t < 20)
-			return ($b & $c) | ((~$b) & $d);
-		if ($t < 40)
-			return $b ^ $c ^ $d;
-		if ($t < 60)
-			return ($b & $c) | ($b & $d) | ($c & $d);
+		if ($t < 20) {
+					return ($b & $c) | ((~$b) & $d);
+		}
+		if ($t < 40) {
+					return $b ^ $c ^ $d;
+		}
+		if ($t < 60) {
+					return ($b & $c) | ($b & $d) | ($c & $d);
+		}
 
 		return $b ^ $c ^ $d;
 	}
@@ -172,16 +176,13 @@ 
 		if ($t < 20)
 		{
 			return 1518500249;
-		}
-		else if ($t < 40)
+		} else if ($t < 40)
 		{
 			return 1859775393;
-		}
-		else if ($t < 60)
+		} else if ($t < 60)
 		{
 			return -1894007588;
-		}
-		else
+		} else
 		{
 			return -899497514;
 		}
@@ -231,8 +232,7 @@ 
 		if (strlen($bin) < $b)
 		{
 			$bin = 0;
-		}
-		else
+		} else
 		{
 			$bin = substr($bin, 0, strlen($bin) - $b);
 		}

web_interface/astpp/system/libraries/Table.php

Doc Comments +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 	 *
 	 * @access	public
 	 * @param	array
-	 * @return	void
+	 * @return	false|null
 	 */
 	function set_template($template)
 	{
@@ -395,7 +395,7 @@ 
 	 *
 	 * @access	public
 	 * @param	object
-	 * @return	void
+	 * @return	false|null
 	 */
 	function _set_from_object($query)
 	{
@@ -433,7 +433,7 @@ 
 	 *
 	 * @access	public
 	 * @param	array
-	 * @return	void
+	 * @return	false|null
 	 */
 	function _set_from_array($data, $set_heading = TRUE)
 	{

Spacing +8 added lines, -8 removed lines

@@ -28,13 +28,13 @@ 
  */
 class CI_Table {
 
-	var $rows				= array();
+	var $rows = array();
 	var $heading			= array();
-	var $auto_heading		= TRUE;
+	var $auto_heading = TRUE;
 	var $caption			= NULL;
 	var $template			= NULL;
 	var $newline			= "\n";
-	var $empty_cells		= "";
+	var $empty_cells = "";
 	var	$function			= FALSE;
 
 	public function __construct()
@@ -268,7 +268,7 @@ 
 		if ($this->caption)
 		{
 			$out .= $this->newline;
-			$out .= '<caption>' . $this->caption . '</caption>';
+			$out .= '<caption>'.$this->caption.'</caption>';
 			$out .= $this->newline;
 		}
 
@@ -383,9 +383,9 @@ 
 	 */
 	function clear()
 	{
-		$this->rows				= array();
-		$this->heading			= array();
-		$this->auto_heading		= TRUE;
+		$this->rows = array();
+		$this->heading = array();
+		$this->auto_heading = TRUE;
 	}
 
 	// --------------------------------------------------------------------
@@ -495,7 +495,7 @@ 
 	 */
 	function _default_template()
 	{
-		return  array (
+		return  array(
 						'table_open'			=> '<table border="0" cellpadding="4" cellspacing="0">',
 
 						'thead_open'			=> '<thead>',

Braces +9 added lines, -13 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -185,15 +187,13 @@ 
 					if (is_array($val) && isset($val['data']))
 					{
 						$args[$key] = $val;
-					}
-					else
+					} else
 					{
 						$args[$key] = array('data' => $val);
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach ($args as $key => $val)
 			{
@@ -239,8 +239,7 @@ 
 			if (is_object($table_data))
 			{
 				$this->_set_from_object($table_data);
-			}
-			elseif (is_array($table_data))
+			} elseif (is_array($table_data))
 			{
 				$set_heading = (count($this->heading) == 0 AND $this->auto_heading == FALSE) ? FALSE : TRUE;
 				$this->_set_from_array($table_data, $set_heading);
@@ -341,14 +340,12 @@ 
 					if ($cell === "" OR $cell === NULL)
 					{
 						$out .= $this->empty_cells;
-					}
-					else
+					} else
 					{
 						if ($function !== FALSE && is_callable($function))
 						{
 							$out .= call_user_func($function, $cell);
-						}
-						else
+						} else
 						{
 							$out .= $cell;
 						}
@@ -449,8 +446,7 @@ 
 			if ($i == 0 AND count($data) > 1 AND count($this->heading) == 0 AND $set_heading == TRUE)
 			{
 				$this->heading = $this->_prep_args($row);
-			}
-			else
+			} else
 			{
 				$this->rows[] = $this->_prep_args($row);
 			}

web_interface/astpp/system/libraries/Trackback.php

Doc Comments +3 added lines

@@ -226,6 +226,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	string
+	 * @param string $data
 	 * @return	bool
 	 */
 	function process($url, $data)
@@ -399,6 +400,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
+	 * @param string $str
 	 * @return	string
 	 */
 	function convert_xml($str)
@@ -512,6 +514,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
+	 * @param string $msg
 	 * @return	void
 	 */
 	function set_error($msg)

Spacing +25 added lines, -25 removed lines

@@ -28,12 +28,12 @@ 
  */
 class CI_Trackback {
 
-	var $time_format	= 'local';
-	var $charset		= 'UTF-8';
-	var $data			= array('url' => '', 'title' => '', 'excerpt' => '', 'blog_name' => '', 'charset' => '');
-	var $convert_ascii	= TRUE;
-	var $response		= '';
-	var $error_msg		= array();
+	var $time_format = 'local';
+	var $charset = 'UTF-8';
+	var $data = array('url' => '', 'title' => '', 'excerpt' => '', 'blog_name' => '', 'charset' => '');
+	var $convert_ascii = TRUE;
+	var $response = '';
+	var $error_msg = array();
 
 	/**
 	 * Constructor
@@ -251,12 +251,12 @@ 
 		}
 
 		// Transfer the data
-		fputs ($fp, "POST " . $path . " HTTP/1.0\r\n" );
-		fputs ($fp, "Host: " . $target['host'] . "\r\n" );
-		fputs ($fp, "Content-type: application/x-www-form-urlencoded\r\n" );
-		fputs ($fp, "Content-length: " . strlen($data) . "\r\n" );
-		fputs ($fp, "Connection: close\r\n\r\n" );
-		fputs ($fp, $data);
+		fputs($fp, "POST ".$path." HTTP/1.0\r\n");
+		fputs($fp, "Host: ".$target['host']."\r\n");
+		fputs($fp, "Content-type: application/x-www-form-urlencoded\r\n");
+		fputs($fp, "Content-length: ".strlen($data)."\r\n");
+		fputs($fp, "Connection: close\r\n\r\n");
+		fputs($fp, $data);
 
 		// Was it successful?
 		$this->response = "";
@@ -359,30 +359,30 @@ 
 		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];
 			}
 		}
 
-		if ( ! preg_match ("/^([0-9]+)$/", $tb_id))
+		if ( ! preg_match("/^([0-9]+)$/", $tb_id))
 		{
 			return FALSE;
 		}
@@ -406,14 +406,14 @@ 
 		$temp = '__TEMP_AMPERSANDS__';
 
 		$str = preg_replace("/&#(\d+);/", "$temp\\1;", $str);
-		$str = preg_replace("/&(\w+);/",  "$temp\\1;", $str);
+		$str = preg_replace("/&(\w+);/", "$temp\\1;", $str);
 
-		$str = str_replace(array("&","<",">","\"", "'", "-"),
+		$str = str_replace(array("&", "<", ">", "\"", "'", "-"),
 							array("&amp;", "&lt;", "&gt;", "&quot;", "&#39;", "&#45;"),
 							$str);
 
-		$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
-		$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
+		$str = preg_replace("/$temp(\d+);/", "&#\\1;", $str);
+		$str = preg_replace("/$temp(\w+);/", "&\\1;", $str);
 
 		return $str;
 	}
@@ -470,9 +470,9 @@ 
 	 */
 	function convert_ascii($str)
 	{
-		$count	= 1;
-		$out	= '';
-		$temp	= array();
+		$count = 1;
+		$out = '';
+		$temp = array();
 
 		for ($i = 0, $s = strlen($str); $i < $s; $i++)
 		{

Braces +8 added lines, -11 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -89,12 +91,10 @@ 
 				if ($item == 'excerpt')
 				{
 					$$item = $this->convert_ascii($$item);
-				}
-				elseif ($item == 'title')
+				} elseif ($item == 'title')
 				{
 					$$item = $this->convert_ascii($$item);
-				}
-				elseif ($item == 'blog_name')
+				} elseif ($item == 'blog_name')
 				{
 					$$item = $this->convert_ascii($$item);
 				}
@@ -368,8 +368,7 @@ 
 
 			$tb_array = explode('=', $tb_end);
 			$tb_id	= $tb_array[count($tb_array)-1];
-		}
-		else
+		} else
 		{
 			$url = rtrim($url, '/');
 
@@ -385,8 +384,7 @@ 
 		if ( ! preg_match ("/^([0-9]+)$/", $tb_id))
 		{
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return $tb_id;
 		}
@@ -481,8 +479,7 @@ 
 			if ($ordinal < 128)
 			{
 				$out .= $str[$i];
-			}
-			else
+			} else
 			{
 				if (count($temp) == 0)
 				{

web_interface/astpp/system/libraries/Typography.php

Doc Comments +1 added lines

@@ -251,6 +251,7 @@
 	 *
 	 * @access	public
 	 * @param	string
+	 * @param string $str
 	 * @return	string
 	 */
 	function format_characters($str)

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
 	var $block_elements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul';
 
 	// Elements that should not have <p> and <br /> tags within them.
-	var $skip_elements	= 'p|pre|ol|ul|dl|object|table|h\d';
+	var $skip_elements = 'p|pre|ol|ul|dl|object|table|h\d';
 
 	// Tags we want the parser to completely ignore when splitting the string.
 	var $inline_elements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var';
@@ -124,7 +124,7 @@ 
 		//		[2] = <closing tag>
 		//		Etc...
 		//	}
-		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		// Build our finalized string.  We cycle through the array, skipping tags, and processing the contained text
 		$str = '';
@@ -143,7 +143,7 @@ 
 			{
 				if (preg_match("#".$this->skip_elements."#", $match[2]))
 				{
-					$process =  ($match[1] == '/') ? TRUE : FALSE;
+					$process = ($match[1] == '/') ? TRUE : FALSE;
 				}
 
 				if ($match[1] == '')
@@ -324,7 +324,7 @@ 
 			return $str;
 		}
 
-		if (strpos($str, "\n") === FALSE  && ! in_array($this->last_block_element, $this->inner_block_required))
+		if (strpos($str, "\n") === FALSE && ! in_array($this->last_block_element, $this->inner_block_required))
 		{
 			return $str;
 		}
@@ -341,7 +341,7 @@ 
 			// We trim off the right-side new line so that the closing </p> tag
 			// will be positioned immediately following the string, matching
 			// the behavior of the opening <p> tag
-			$str =  '<p>'.rtrim($str).'</p>';
+			$str = '<p>'.rtrim($str).'</p>';
 		}
 
 		// Remove empty paragraphs if they are on the first line, as this
@@ -367,7 +367,7 @@ 
 	 */
 	function _protect_characters($match)
 	{
-		return str_replace(array("'",'"','--','  '), array('{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'), $match[0]);
+		return str_replace(array("'", '"', '--', '  '), array('{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'), $match[0]);
 	}
 
 	// --------------------------------------------------------------------
@@ -381,7 +381,7 @@ 
 	 */
 	function nl2br_except_pre($str)
 	{
-		$ex = explode("pre>",$str);
+		$ex = explode("pre>", $str);
 		$ct = count($ex);
 
 		$newstr = "";

Braces +8 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -228,8 +230,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
@@ -390,14 +391,14 @@ 
 			if (($i % 2) == 0)
 			{
 				$newstr .= nl2br($ex[$i]);
-			}
-			else
+			} else
 			{
 				$newstr .= $ex[$i];
 			}
 
-			if ($ct - 1 != $i)
-				$newstr .= "pre>";
+			if ($ct - 1 != $i) {
+							$newstr .= "pre>";
+			}
 		}
 
 		return $newstr;

web_interface/astpp/system/libraries/Upload.php

Doc Comments +8 added lines

@@ -385,6 +385,8 @@ 
 	 *
 	 * @param	string
 	 * @param	string
+	 * @param string $path
+	 * @param string $filename
 	 * @return	string
 	 */
 	public function set_filename($path, $filename)
@@ -732,6 +734,7 @@ 
 	 * Extract the file extension
 	 *
 	 * @param	string
+	 * @param string $filename
 	 * @return	string
 	 */
 	public function get_extension($filename)
@@ -746,6 +749,7 @@ 
 	 * Clean the file name for security
 	 *
 	 * @param	string
+	 * @param string $filename
 	 * @return	string
 	 */
 	public function clean_file_name($filename)
@@ -790,6 +794,8 @@ 
 	 * Limit the File Name Length
 	 *
 	 * @param	string
+	 * @param string $filename
+	 * @param integer $length
 	 * @return	string
 	 */
 	public function limit_filename_length($filename, $length)
@@ -885,6 +891,7 @@ 
 	 * Set an error message
 	 *
 	 * @param	string
+	 * @param string $msg
 	 * @return	void
 	 */
 	public function set_error($msg)
@@ -938,6 +945,7 @@ 
 	 * the "allowed types" set by the developer
 	 *
 	 * @param	string
+	 * @param string $mime
 	 * @return	string
 	 */
 	public function mimes_types($mime)

Spacing +47 added lines, -47 removed lines

@@ -26,33 +26,33 @@ 
  */
 class CI_Upload {
 
-	public $max_size				= 0;
-	public $max_width				= 0;
-	public $max_height				= 0;
-	public $max_filename			= 0;
-	public $allowed_types			= "";
+	public $max_size = 0;
+	public $max_width = 0;
+	public $max_height = 0;
+	public $max_filename = 0;
+	public $allowed_types = "";
 	public $file_temp				= "";
 	public $file_name				= "";
 	public $orig_name				= "";
 	public $file_type				= "";
 	public $file_size				= "";
-	public $file_ext				= "";
+	public $file_ext = "";
 	public $upload_path				= "";
 	public $overwrite				= FALSE;
 	public $encrypt_name			= FALSE;
-	public $is_image				= FALSE;
+	public $is_image = FALSE;
 	public $image_width				= '';
 	public $image_height			= '';
-	public $image_type				= '';
-	public $image_size_str			= '';
+	public $image_type = '';
+	public $image_size_str = '';
 	public $error_msg				= array();
-	public $mimes					= array();
-	public $remove_spaces			= TRUE;
+	public $mimes = array();
+	public $remove_spaces = TRUE;
 	public $xss_clean				= FALSE;
 	public $temp_prefix				= "temp_file_";
 	public $client_name				= '';
 
-	protected $_file_name_override	= '';
+	protected $_file_name_override = '';
 
 	/**
 	 * Constructor
@@ -162,7 +162,7 @@ 
 		{
 			$error = ( ! isset($_FILES[$field]['error'])) ? 4 : $_FILES[$field]['error'];
 
-			switch($error)
+			switch ($error)
 			{
 				case 1:	// UPLOAD_ERR_INI_SIZE
 					$this->set_error('upload_file_exceeds_limit');
@@ -224,7 +224,7 @@ 
 			// An extension was provided, lets have it!
 			else
 			{
-				$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))
@@ -237,7 +237,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?
@@ -342,7 +342,7 @@ 
 	 */
 	public function data()
 	{
-		return array (
+		return array(
 						'file_name'			=> $this->file_name,
 						'file_type'			=> $this->file_type,
 						'file_path'			=> $this->upload_path,
@@ -433,7 +433,7 @@ 
 	 */
 	public function set_max_filesize($n)
 	{
-		$this->max_size = ((int) $n < 0) ? 0: (int) $n;
+		$this->max_size = ((int)$n < 0) ? 0 : (int)$n;
 	}
 
 	// --------------------------------------------------------------------
@@ -446,7 +446,7 @@ 
 	 */
 	public function set_max_filename($n)
 	{
-		$this->max_filename = ((int) $n < 0) ? 0: (int) $n;
+		$this->max_filename = ((int)$n < 0) ? 0 : (int)$n;
 	}
 
 	// --------------------------------------------------------------------
@@ -459,7 +459,7 @@ 
 	 */
 	public function set_max_width($n)
 	{
-		$this->max_width = ((int) $n < 0) ? 0: (int) $n;
+		$this->max_width = ((int)$n < 0) ? 0 : (int)$n;
 	}
 
 	// --------------------------------------------------------------------
@@ -472,7 +472,7 @@ 
 	 */
 	public function set_max_height($n)
 	{
-		$this->max_height = ((int) $n < 0) ? 0: (int) $n;
+		$this->max_height = ((int)$n < 0) ? 0 : (int)$n;
 	}
 
 	// --------------------------------------------------------------------
@@ -516,10 +516,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']])) ? 'unknown' : $types[$D['2']];
-				$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']])) ? 'unknown' : $types[$D['2']];
+				$this->image_size_str = $D['3']; // string containing height and width
 			}
 		}
 	}
@@ -643,7 +643,7 @@ 
 	 */
 	public function is_allowed_filesize()
 	{
-		if ($this->max_size != 0  AND  $this->file_size > $this->max_size)
+		if ($this->max_size != 0 AND $this->file_size > $this->max_size)
 		{
 			return FALSE;
 		}
@@ -722,7 +722,7 @@ 
 			return FALSE;
 		}
 
-		$this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/",  $this->upload_path);
+		$this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/", $this->upload_path);
 		return TRUE;
 	}
 
@@ -765,17 +765,17 @@ 
 						'/',
 						"%20",
 						"%22",
-						"%3c",		// <
-						"%253c",	// <
-						"%3e",		// >
-						"%0e",		// >
-						"%28",		// (
-						"%29",		// )
-						"%2528",	// (
-						"%26",		// &
-						"%24",		// $
-						"%3f",		// ?
-						"%3b",		// ;
+						"%3c", // <
+						"%253c", // <
+						"%3e", // >
+						"%0e", // >
+						"%28", // (
+						"%29", // )
+						"%2528", // (
+						"%26", // &
+						"%24", // $
+						"%3f", // ?
+						"%3b", // ;
 						"%3d"		// =
 					);
 
@@ -802,9 +802,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;
@@ -875,7 +875,7 @@ 
 			return FALSE;
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->security->xss_clean($data, TRUE);
 	}
 
@@ -889,7 +889,7 @@ 
 	 */
 	public function set_error($msg)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->lang->load('upload');
 
 		if (is_array($msg))
@@ -984,9 +984,9 @@ 
 			return $filename;
 		}
 
-		$parts		= explode('.', $filename);
-		$ext		= array_pop($parts);
-		$filename	= array_shift($parts);
+		$parts = explode('.', $filename);
+		$ext = array_pop($parts);
+		$filename = array_shift($parts);
 
 		foreach ($parts as $part)
 		{
@@ -1019,7 +1019,7 @@ 
 	protected function _file_mime_type($file)
 	{
 		// Use if the Fileinfo extension, if available (only versions above 5.3 support the FILEINFO_MIME_TYPE flag)
-		if ( (float) substr(phpversion(), 0, 3) >= 5.3 && function_exists('finfo_file'))
+		if ((float)substr(phpversion(), 0, 3) >= 5.3 && function_exists('finfo_file'))
 		{
 			$finfo = new finfo(FILEINFO_MIME_TYPE);
 			if ($finfo !== FALSE) // This is possible, if there is no magic MIME database file found on the system
@@ -1055,7 +1055,7 @@ 
 		if (DIRECTORY_SEPARATOR !== '\\' && function_exists('exec'))
 		{
 			$output = array();
-			@exec('file --brief --mime-type ' . escapeshellarg($file['tmp_path']), $output, $return_code);
+			@exec('file --brief --mime-type '.escapeshellarg($file['tmp_path']), $output, $return_code);
 			if ($return_code === 0 && strlen($output[0]) > 0) // A return status code != 0 would mean failed execution
 			{
 				$this->file_type = rtrim($output[0]);

Braces +23 added lines, -23 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -116,13 +118,11 @@ 
 				if (method_exists($this, $method))
 				{
 					$this->$method($config[$key]);
-				}
-				else
+				} else
 				{
 					$this->$key = $config[$key];
 				}
-			}
-			else
+			} else
 			{
 				$this->$key = $val;
 			}
@@ -416,8 +416,7 @@ 
 		{
 			$this->set_error('upload_bad_filename');
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return $new_filename;
 		}
@@ -625,8 +624,7 @@ 
 			{
 				return TRUE;
 			}
-		}
-		elseif ($mime == $this->file_type)
+		} elseif ($mime == $this->file_type)
 		{
 				return TRUE;
 		}
@@ -646,8 +644,7 @@ 
 		if ($this->max_size != 0  AND  $this->file_size > $this->max_size)
 		{
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return TRUE;
 		}
@@ -852,9 +849,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);
@@ -900,8 +900,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;
@@ -949,12 +948,10 @@ 
 			if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 			{
 				include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
-			}
-			elseif (is_file(APPPATH.'config/mimes.php'))
+			} elseif (is_file(APPPATH.'config/mimes.php'))
 			{
 				include(APPPATH.'config//mimes.php');
-			}
-			else
+			} else
 			{
 				return FALSE;
 			}
@@ -993,8 +990,7 @@ 
 			if ( ! in_array(strtolower($part), $this->allowed_types) OR $this->mimes_types(strtolower($part)) === FALSE)
 			{
 				$filename .= '.'.$part.'_';
-			}
-			else
+			} else
 			{
 				$filename .= '.'.$part;
 			}
@@ -1022,9 +1018,11 @@ 
 		if ( (float) substr(phpversion(), 0, 3) >= 5.3 && function_exists('finfo_file'))
 		{
 			$finfo = new finfo(FILEINFO_MIME_TYPE);
-			if ($finfo !== FALSE) // This is possible, if there is no magic MIME database file found on the system
+			if ($finfo !== FALSE) {
+				// This is possible, if there is no magic MIME database file found on the system
 			{
 				$file_type = $finfo->file($file['tmp_name']);
+			}
 
 				/* According to the comments section of the PHP manual page,
 				 * it is possible that this function returns an empty string
@@ -1056,9 +1054,11 @@ 
 		{
 			$output = array();
 			@exec('file --brief --mime-type ' . escapeshellarg($file['tmp_path']), $output, $return_code);
-			if ($return_code === 0 && strlen($output[0]) > 0) // A return status code != 0 would mean failed execution
+			if ($return_code === 0 && strlen($output[0]) > 0) {
+				// A return status code != 0 would mean failed execution
 			{
 				$this->file_type = rtrim($output[0]);
+			}
 				return;
 			}
 		}

web_interface/astpp/system/libraries/User_agent.php

Doc Comments +3 added lines, -3 removed lines

@@ -136,7 +136,7 @@ 
 	 * Compile the User Agent Data
 	 *
 	 * @access	private
-	 * @return	bool
+	 * @return	boolean|null
 	 */
 	private function _compile_data()
 	{
@@ -157,7 +157,7 @@ 
 	 * Set the Platform
 	 *
 	 * @access	private
-	 * @return	mixed
+	 * @return	boolean|null
 	 */
 	private function _set_platform()
 	{
@@ -473,7 +473,7 @@ 
 	 * Get the referrer
 	 *
 	 * @access	public
-	 * @return	bool
+	 * @return	string
 	 */
 	public function referrer()
 	{

Spacing +5 added lines, -5 removed lines

@@ -28,10 +28,10 @@ 
  */
 class CI_User_agent {
 
-	var $agent		= NULL;
+	var $agent = NULL;
 
-	var $is_browser	= FALSE;
-	var $is_robot	= FALSE;
+	var $is_browser = FALSE;
+	var $is_robot = FALSE;
 	var $is_mobile	= FALSE;
 
 	var $languages	= array();
@@ -42,11 +42,11 @@ 
 	var $mobiles	= array();
 	var $robots		= array();
 
-	var $platform	= '';
+	var $platform = '';
 	var $browser	= '';
 	var $version	= '';
 	var $mobile		= '';
-	var $robot		= '';
+	var $robot = '';
 
 	/**
 	 * Constructor

Braces +5 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -87,12 +89,10 @@ 
 		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/user_agents.php'))
 		{
 			include(APPPATH.'config/'.ENVIRONMENT.'/user_agents.php');
-		}
-		elseif (is_file(APPPATH.'config/user_agents.php'))
+		} elseif (is_file(APPPATH.'config/user_agents.php'))
 		{
 			include(APPPATH.'config/user_agents.php');
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

web_interface/astpp/system/libraries/Xmlrpc.php

Doc Comments +12 added lines

@@ -369,6 +369,9 @@ 
 		$this->path = $path;
 	}
 
+	/**
+	 * @param XML_RPC_Message $msg
+	 */
 	function send($msg)
 	{
 		if (is_array($msg))
@@ -544,6 +547,9 @@ 
 	//  XML-RPC Object to PHP Types
 	//-------------------------------------
 
+	/**
+	 * @param integer $xmlrpc_val
+	 */
 	function xmlrpc_decoder($xmlrpc_val)
 	{
 		$kind = $xmlrpc_val->kindOf();
@@ -1234,6 +1240,9 @@ 
 		}
 	}
 
+	/**
+	 * @param integer $val
+	 */
 	function addScalar($val, $type='string')
 	{
 		$typeof = $this->xmlrpcTypes[$type];
@@ -1291,6 +1300,9 @@ 
 		return 1;
 	}
 
+	/**
+	 * @param integer $vals
+	 */
 	function addStruct($vals)
 	{
 		if ($this->mytype != 0)

Spacing +97 added lines, -97 removed lines

@@ -32,38 +32,38 @@ 
  */
 class CI_Xmlrpc {
 
-	var $debug			= FALSE;	// Debugging on or off
-	var $xmlrpcI4		= 'i4';
-	var $xmlrpcInt		= 'int';
-	var $xmlrpcBoolean	= 'boolean';
+	var $debug = FALSE; // Debugging on or off
+	var $xmlrpcI4 = 'i4';
+	var $xmlrpcInt = 'int';
+	var $xmlrpcBoolean = 'boolean';
 	var $xmlrpcDouble	= 'double';
 	var $xmlrpcString	= 'string';
-	var $xmlrpcDateTime	= 'dateTime.iso8601';
+	var $xmlrpcDateTime = 'dateTime.iso8601';
 	var $xmlrpcBase64	= 'base64';
 	var $xmlrpcArray	= 'array';
 	var $xmlrpcStruct	= 'struct';
 
 	var $xmlrpcTypes	= array();
-	var $valid_parents	= array();
-	var $xmlrpcerr		= array();	// Response numbers
-	var $xmlrpcstr		= array();  // Response strings
+	var $valid_parents = array();
+	var $xmlrpcerr		= array(); // Response numbers
+	var $xmlrpcstr		= array(); // Response strings
 
 	var $xmlrpc_defencoding = 'UTF-8';
-	var $xmlrpcName			= 'XML-RPC for CodeIgniter';
+	var $xmlrpcName = 'XML-RPC for CodeIgniter';
 	var $xmlrpcVersion		= '1.1';
 	var $xmlrpcerruser		= 800; // Start of user errors
-	var $xmlrpcerrxml		= 100; // Start of XML Parse errors
-	var $xmlrpc_backslash	= ''; // formulate backslashes for escaping regexp
+	var $xmlrpcerrxml = 100; // Start of XML Parse errors
+	var $xmlrpc_backslash = ''; // formulate backslashes for escaping regexp
 
 	var $client;
 	var $method;
 	var $data;
-	var $message			= '';
-	var $error				= '';		// Error string for request
+	var $message = '';
+	var $error = ''; // Error string for request
 	var $result;
-	var $response			= array();  // Response from remote server
+	var $response = array(); // Response from remote server
 
-	var $xss_clean			= TRUE;
+	var $xss_clean = TRUE;
 
 	//-------------------------------------
 	//  VALUES THAT MULTIPLE CLASSES NEED
@@ -71,7 +71,7 @@ 
 
 	public function __construct($config = array())
 	{
-		$this->xmlrpcName		= $this->xmlrpcName;
+		$this->xmlrpcName = $this->xmlrpcName;
 		$this->xmlrpc_backslash = chr(92).chr(92);
 
 		// Types for info sent back and forth
@@ -120,7 +120,7 @@ 
 		$this->xmlrpcerr['http_error'] = '5';
 		$this->xmlrpcstr['http_error'] = "Did not receive a '200 OK' response from remote server.";
 		$this->xmlrpcerr['no_data'] = '6';
-		$this->xmlrpcstr['no_data'] ='No data received from server.';
+		$this->xmlrpcstr['no_data'] = 'No data received from server.';
 
 		$this->initialize($config);
 
@@ -151,7 +151,7 @@ 
 	//  Take URL and parse it
 	//-------------------------------------
 
-	function server($url, $port=80)
+	function server($url, $port = 80)
 	{
 		if (substr($url, 0, 4) != "http")
 		{
@@ -175,7 +175,7 @@ 
 	//  Set Timeout
 	//-------------------------------------
 
-	function timeout($seconds=5)
+	function timeout($seconds = 5)
 	{
 		if ( ! is_null($this->client) && is_int($seconds))
 		{
@@ -273,7 +273,7 @@ 
 
 	function send_request()
 	{
-		$this->message = new XML_RPC_Message($this->method,$this->data);
+		$this->message = new XML_RPC_Message($this->method, $this->data);
 		$this->message->debug = $this->debug;
 
 		if ( ! $this->result = $this->client->send($this->message))
@@ -319,7 +319,7 @@ 
 
 	function send_error_message($number, $message)
 	{
-		return new XML_RPC_Response('0',$number, $message);
+		return new XML_RPC_Response('0', $number, $message);
 	}
 	// END
 
@@ -353,14 +353,14 @@ 
 class XML_RPC_Client extends CI_Xmlrpc
 {
 	var $path			= '';
-	var $server			= '';
+	var $server = '';
 	var $port			= 80;
-	var $errno			= '';
-	var $errstring		= '';
-	var $timeout		= 5;
-	var $no_multicall	= FALSE;
+	var $errno = '';
+	var $errstring = '';
+	var $timeout = 5;
+	var $no_multicall = FALSE;
 
-	public function __construct($path, $server, $port=80)
+	public function __construct($path, $server, $port = 80)
 	{
 		parent::__construct();
 
@@ -374,7 +374,7 @@ 
 		if (is_array($msg))
 		{
 			// Multi-call disabled
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['multicall_recursion'],$this->xmlrpcstr['multicall_recursion']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['multicall_recursion'], $this->xmlrpcstr['multicall_recursion']);
 			return $r;
 		}
 
@@ -383,12 +383,12 @@ 
 
 	function sendPayload($msg)
 	{
-		$fp = @fsockopen($this->server, $this->port,$this->errno, $this->errstr, $this->timeout);
+		$fp = @fsockopen($this->server, $this->port, $this->errno, $this->errstr, $this->timeout);
 
 		if ( ! is_resource($fp))
 		{
 			error_log($this->xmlrpcstr['http_error']);
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'],$this->xmlrpcstr['http_error']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']);
 			return $r;
 		}
 
@@ -403,7 +403,7 @@ 
 		$op .= "Host: {$this->server}$r";
 		$op .= "Content-Type: text/xml$r";
 		$op .= "User-Agent: {$this->xmlrpcName}$r";
-		$op .= "Content-Length: ".strlen($msg->payload). "$r$r";
+		$op .= "Content-Length: ".strlen($msg->payload)."$r$r";
 		$op .= $msg->payload;
 
 
@@ -447,7 +447,7 @@ 
 		else if ( ! 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.");
+			error_log("Invalid type '".gettype($val)."' (value: $val) passed to XML_RPC_Response.  Defaulting to empty value.");
 			$this->val = new XML_RPC_Values();
 		}
 		else
@@ -481,11 +481,11 @@ 
 		<struct>
 			<member>
 				<name>faultCode</name>
-				<value><int>' . $this->errno . '</int></value>
+				<value><int>' . $this->errno.'</int></value>
 			</member>
 			<member>
 				<name>faultString</name>
-				<value><string>' . $this->errstr . '</string></value>
+				<value><string>' . $this->errstr.'</string></value>
 			</member>
 		</struct>
 	</value>
@@ -493,17 +493,17 @@ 
 		}
 		else
 		{
-			$result .= "<params>\n<param>\n" .
-					$this->val->serialize_class() .
+			$result .= "<params>\n<param>\n".
+					$this->val->serialize_class().
 					"</param>\n</params>";
 		}
 		$result .= "\n</methodResponse>";
 		return $result;
 	}
 
-	function decode($array=FALSE)
+	function decode($array = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		
 		if ($array !== FALSE && is_array($array))
 		{
@@ -555,7 +555,7 @@ 
 		elseif ($kind == 'array')
 		{
 			reset($xmlrpc_val->me);
-			list($a,$b) = each($xmlrpc_val->me);
+			list($a, $b) = each($xmlrpc_val->me);
 			$size = count($b);
 
 			$arr = array();
@@ -571,7 +571,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);
 			}
@@ -584,7 +584,7 @@ 
 	//  ISO-8601 time to server or UTC time
 	//-------------------------------------
 
-	function iso8601_decode($time, $utc=0)
+	function iso8601_decode($time, $utc = 0)
 	{
 		// return a timet in the localtime, or UTC
 		$t = 0;
@@ -611,17 +611,17 @@ 
 {
 	var $payload;
 	var $method_name;
-	var $params			= array();
-	var $xh				= array();
+	var $params = array();
+	var $xh = array();
 
-	public function __construct($method, $pars=0)
+	public function __construct($method, $pars = 0)
 	{
 		parent::__construct();
 
 		$this->method_name = $method;
 		if (is_array($pars) && count($pars) > 0)
 		{
-			for ($i=0; $i<count($pars); $i++)
+			for ($i = 0; $i < count($pars); $i++)
 			{
 				// $pars[$i] = XML_RPC_Values
 				$this->params[] = $pars[$i];
@@ -636,10 +636,10 @@ 
 	function createPayload()
 	{
 		$this->payload = "<?xml version=\"1.0\"?".">\r\n<methodCall>\r\n";
-		$this->payload .= '<methodName>' . $this->method_name . "</methodName>\r\n";
+		$this->payload .= '<methodName>'.$this->method_name."</methodName>\r\n";
 		$this->payload .= "<params>\r\n";
 
-		for ($i=0; $i<count($this->params); $i++)
+		for ($i = 0; $i < count($this->params); $i++)
 		{
 			// $p = XML_RPC_Values
 			$p = $this->params[$i];
@@ -669,7 +669,7 @@ 
 		if ($this->debug === TRUE)
 		{
 			echo "<pre>";
-			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
+			echo "---DATA---\n".htmlspecialchars($data)."\n---END DATA---\n\n";
 			echo "</pre>";
 		}
 
@@ -691,8 +691,8 @@ 
 
 		if (strncmp($data, 'HTTP', 4) == 0 && ! preg_match('/^HTTP\/[0-9\.]+ 200 /', $data))
 		{
-			$errstr= substr($data, 0, strpos($data, "\n")-1);
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']. ' (' . $errstr . ')');
+			$errstr = substr($data, 0, strpos($data, "\n") - 1);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error'].' ('.$errstr.')');
 			return $r;
 		}
 
@@ -702,11 +702,11 @@ 
 
 		$parser = xml_parser_create($this->xmlrpc_defencoding);
 
-		$this->xh[$parser]					= array();
-		$this->xh[$parser]['isf']			= 0;
-		$this->xh[$parser]['ac']			= '';
-		$this->xh[$parser]['headers']		= array();
-		$this->xh[$parser]['stack']			= array();
+		$this->xh[$parser] = array();
+		$this->xh[$parser]['isf'] = 0;
+		$this->xh[$parser]['ac'] = '';
+		$this->xh[$parser]['headers'] = array();
+		$this->xh[$parser]['stack'] = array();
 		$this->xh[$parser]['valuestack']	= array();
 		$this->xh[$parser]['isf_reason']	= 0;
 
@@ -762,12 +762,12 @@ 
 				echo "---Invalid Return---\n\n";
 			}
 
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'], $this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
 			return $r;
 		}
 		elseif ( ! is_object($this->xh[$parser]['value']))
 		{
-			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
+			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'], $this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
 			return $r;
 		}
 
@@ -789,9 +789,9 @@ 
 				echo "---END HEADERS---\n\n";
 			}
 
-			echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
+			echo "---DATA---\n".htmlspecialchars($data)."\n---END DATA---\n\n";
 
-			echo "---PARSED---\n" ;
+			echo "---PARSED---\n";
 			var_dump($this->xh[$parser]['value']);
 			echo "\n---END PARSED---</pre>";
 		}
@@ -870,7 +870,7 @@ 
 			}
 		}
 
-		switch($name)
+		switch ($name)
 		{
 			case 'STRUCT':
 			case 'ARRAY':
@@ -956,13 +956,13 @@ 
 
 		$curr_elem = array_shift($this->xh[$the_parser]['stack']);
 
-		switch($name)
+		switch ($name)
 		{
 			case 'STRUCT':
 			case 'ARRAY':
 				$cur_val = array_shift($this->xh[$the_parser]['valuestack']);
 				$this->xh[$the_parser]['value'] = ( ! isset($cur_val['values'])) ? array() : $cur_val['values'];
-				$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'];
@@ -980,16 +980,16 @@ 
 				{
 					$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]['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
 					if ($this->xh[$the_parser]['ac'] == '1')
@@ -1001,7 +1001,7 @@ 
 						$this->xh[$the_parser]['value'] = FALSE;
 					}
 				}
-				elseif ($name=='DOUBLE')
+				elseif ($name == 'DOUBLE')
 				{
 					// we have a DOUBLE
 					// we must check that only 0123456789-.<space> are characters here
@@ -1032,10 +1032,10 @@ 
 			break;
 			case 'VALUE':
 				// This if() detects if no scalar was inside <VALUE></VALUE>
-				if ($this->xh[$the_parser]['vt']=='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
@@ -1053,7 +1053,7 @@ 
 				}
 			break;
 			case 'MEMBER':
-				$this->xh[$the_parser]['ac']='';
+				$this->xh[$the_parser]['ac'] = '';
 
 				// If value add to array in the stack for the last element built
 				if ($this->xh[$the_parser]['value'])
@@ -1062,7 +1062,7 @@ 
 				}
 			break;
 			case 'DATA':
-				$this->xh[$the_parser]['ac']='';
+				$this->xh[$the_parser]['ac'] = '';
 			break;
 			case 'PARAM':
 				if ($this->xh[$the_parser]['value'])
@@ -1111,11 +1111,11 @@ 
 	}
 
 
-	function addParam($par) { $this->params[]=$par; }
+	function addParam($par) { $this->params[] = $par; }
 
-	function output_parameters($array=FALSE)
+	function output_parameters($array = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		
 		if ($array !== FALSE && is_array($array))
 		{
@@ -1169,11 +1169,11 @@ 
 		elseif ($kind == 'array')
 		{
 			reset($param->me);
-			list($a,$b) = each($param->me);
+			list($a, $b) = each($param->me);
 
 			$arr = array();
 
-			for($i = 0; $i < count($b); $i++)
+			for ($i = 0; $i < count($b); $i++)
 			{
 				$arr[] = $this->decode_message($param->me['array'][$i]);
 			}
@@ -1186,7 +1186,7 @@ 
 
 			$arr = array();
 
-			while (list($key,$value) = each($param->me['struct']))
+			while (list($key, $value) = each($param->me['struct']))
 			{
 				$arr[$key] = $this->decode_message($value);
 			}
@@ -1208,10 +1208,10 @@ 
  */
 class XML_RPC_Values extends CI_Xmlrpc
 {
-	var $me		= array();
-	var $mytype	= 0;
+	var $me = array();
+	var $mytype = 0;
 
-	public function __construct($val=-1, $type='')
+	public function __construct($val = -1, $type = '')
 	{
 		parent::__construct();
 
@@ -1221,7 +1221,7 @@ 
 
 			if ($this->xmlrpcTypes[$type] == 1)
 			{
-				$this->addScalar($val,$type);
+				$this->addScalar($val, $type);
 			}
 			elseif ($this->xmlrpcTypes[$type] == 2)
 			{
@@ -1234,11 +1234,11 @@ 
 		}
 	}
 
-	function addScalar($val, $type='string')
+	function addScalar($val, $type = 'string')
 	{
 		$typeof = $this->xmlrpcTypes[$type];
 
-		if ($this->mytype==1)
+		if ($this->mytype == 1)
 		{
 			echo '<strong>XML_RPC_Values</strong>: scalar can have only one value<br />';
 			return 0;
@@ -1252,13 +1252,13 @@ 
 
 		if ($type == $this->xmlrpcBoolean)
 		{
-			if (strcasecmp($val,'true')==0 OR $val==1 OR ($val==true && strcasecmp($val,'false')))
+			if (strcasecmp($val, 'true') == 0 OR $val == 1 OR ($val == true && strcasecmp($val, 'false')))
 			{
 				$val = 1;
 			}
 			else
 			{
-				$val=0;
+				$val = 0;
 			}
 		}
 
@@ -1282,7 +1282,7 @@ 
 	{
 		if ($this->mytype != 0)
 		{
-			echo '<strong>XML_RPC_Values</strong>: already initialized as a [' . $this->kindOf() . ']<br />';
+			echo '<strong>XML_RPC_Values</strong>: already initialized as a ['.$this->kindOf().']<br />';
 			return 0;
 		}
 
@@ -1295,7 +1295,7 @@ 
 	{
 		if ($this->mytype != 0)
 		{
-			echo '<strong>XML_RPC_Values</strong>: already initialized as a [' . $this->kindOf() . ']<br />';
+			echo '<strong>XML_RPC_Values</strong>: already initialized as a ['.$this->kindOf().']<br />';
 			return 0;
 		}
 		$this->mytype = $this->xmlrpcTypes['struct'];
@@ -1305,7 +1305,7 @@ 
 
 	function kindOf()
 	{
-		switch($this->mytype)
+		switch ($this->mytype)
 		{
 			case 3:
 				return 'struct';
@@ -1325,7 +1325,7 @@ 
 	{
 		$rs = '';
 
-		switch($this->xmlrpcTypes[$typ])
+		switch ($this->xmlrpcTypes[$typ])
 		{
 			case 3:
 				// struct
@@ -1342,24 +1342,24 @@ 
 			case 2:
 				// array
 				$rs .= "<array>\n<data>\n";
-				for($i=0; $i < count($val); $i++)
+				for ($i = 0; $i < count($val); $i++)
 				{
 					$rs .= $this->serializeval($val[$i]);
 				}
-				$rs.="</data>\n</array>\n";
+				$rs .= "</data>\n</array>\n";
 				break;
 			case 1:
 				// others
 				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";
@@ -1389,7 +1389,7 @@ 
 	function scalarval()
 	{
 		reset($this->me);
-		list($a,$b) = each($this->me);
+		list($a, $b) = each($this->me);
 		return $b;
 	}
 
@@ -1400,7 +1400,7 @@ 
 
 	// Useful for sending time in XML-RPC
 
-	function iso8601_encode($time, $utc=0)
+	function iso8601_encode($time, $utc = 0)
 	{
 		if ($utc == 1)
 		{

Braces +56 added lines, -79 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -237,13 +239,11 @@ 
 				if (is_array($value[0]))
 				{
 					$temp = new XML_RPC_Values($value['0'], 'array');
-				}
-				else
+				} else
 				{
 					$temp = new XML_RPC_Values($value['0'], 'string');
 				}
-			}
-			elseif (is_array($value['0']) && ($value['1'] == 'struct' OR $value['1'] == 'array'))
+			} elseif (is_array($value['0']) && ($value['1'] == 'struct' OR $value['1'] == 'array'))
 			{
 				while (list($k) = each($value['0']))
 				{
@@ -251,13 +251,11 @@ 
 				}
 
 				$temp = new XML_RPC_Values($value['0'], $value['1']);
-			}
-			else
+			} else
 			{
 				$temp = new XML_RPC_Values($value['0'], $value['1']);
 			}
-		}
-		else
+		} else
 		{
 			$temp = new XML_RPC_Values($value, 'string');
 		}
@@ -280,8 +278,7 @@ 
 		{
 			$this->error = $this->result->errstr;
 			return FALSE;
-		}
-		elseif ( ! is_object($this->result->val))
+		} elseif ( ! is_object($this->result->val))
 		{
 			$this->error = $this->result->errstr;
 			return FALSE;
@@ -443,14 +440,12 @@ 
 			// error
 			$this->errno = $code;
 			$this->errstr = htmlentities($fstr);
-		}
-		else if ( ! is_object($val))
+		} else if ( ! 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;
 		}
@@ -490,8 +485,7 @@ 
 		</struct>
 	</value>
 </fault>';
-		}
-		else
+		} else
 		{
 			$result .= "<params>\n<param>\n" .
 					$this->val->serialize_class() .
@@ -512,24 +506,21 @@ 
 				if (is_array($array[$key]))
 				{
 					$array[$key] = $this->decode($array[$key]);
-				}
-				else
+				} else
 				{
 					$array[$key] = ($this->xss_clean) ? $CI->security->xss_clean($array[$key]) : $array[$key];
 				}
 			}
 
 			$result = $array;
-		}
-		else
+		} else
 		{
 			$result = $this->xmlrpc_decoder($this->val);
 
 			if (is_array($result))
 			{
 				$result = $this->decode($result);
-			}
-			else
+			} else
 			{
 				$result = ($this->xss_clean) ? $CI->security->xss_clean($result) : $result;
 			}
@@ -551,8 +542,7 @@ 
 		if ($kind == 'scalar')
 		{
 			return $xmlrpc_val->scalarval();
-		}
-		elseif ($kind == 'array')
+		} elseif ($kind == 'array')
 		{
 			reset($xmlrpc_val->me);
 			list($a,$b) = each($xmlrpc_val->me);
@@ -565,8 +555,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();
@@ -764,8 +753,7 @@ 
 
 			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
 			return $r;
-		}
-		elseif ( ! is_object($this->xh[$parser]['value']))
+		} elseif ( ! is_object($this->xh[$parser]['value']))
 		{
 			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
 			return $r;
@@ -815,8 +803,7 @@ 
 			}
 
 			$r = new XML_RPC_Response($v, $errno, $errstr_v->scalarval());
-		}
-		else
+		} else
 		{
 			$r = new XML_RPC_Response($v);
 		}
@@ -846,7 +833,9 @@ 
 	function open_tag($the_parser, $name, $attrs)
 	{
 		// 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
 
@@ -858,8 +847,7 @@ 
 				$this->xh[$the_parser]['isf_reason'] = 'Top level XML-RPC element is missing';
 				return;
 			}
-		}
-		else
+		} else
 		{
 			// not top level element: see if parent is OK
 			if ( ! in_array($this->xh[$the_parser]['stack'][0], $this->valid_parents[$name], TRUE))
@@ -936,7 +924,9 @@ 
 		// Add current element name to stack, to allow validation of nesting
 		array_unshift($this->xh[$the_parser]['stack'], $name);
 
-		if ($name != 'VALUE') $this->xh[$the_parser]['lv'] = 0;
+		if ($name != 'VALUE') {
+			$this->xh[$the_parser]['lv'] = 0;
+		}
 	}
 	// END
 
@@ -947,7 +937,9 @@ 
 
 	function closing_tag($the_parser, $name)
 	{
-		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
@@ -979,50 +971,42 @@ 
 				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
 					if ($this->xh[$the_parser]['ac'] == '1')
 					{
 						$this->xh[$the_parser]['value'] = TRUE;
-					}
-					else
+					} else
 					{
 						$this->xh[$the_parser]['value'] = FALSE;
 					}
-				}
-				elseif ($name=='DOUBLE')
+				} elseif ($name=='DOUBLE')
 				{
 					// we have a DOUBLE
 					// we must check that only 0123456789-.<space> are characters here
 					if ( ! preg_match('/^[+-]?[eE0-9\t \.]+$/', $this->xh[$the_parser]['ac']))
 					{
 						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
-					}
-					else
+					} else
 					{
 						$this->xh[$the_parser]['value'] = (double)$this->xh[$the_parser]['ac'];
 					}
-				}
-				else
+				} else
 				{
 					// we have an I4/INT
 					// we must check that only 0123456789-<space> are characters here
 					if ( ! preg_match('/^[+-]?[0-9\t ]+$/', $this->xh[$the_parser]['ac']))
 					{
 						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
-					}
-					else
+					} else
 					{
 						$this->xh[$the_parser]['value'] = (int)$this->xh[$the_parser]['ac'];
 					}
@@ -1045,8 +1029,7 @@ 
 				{
 					// Array
 					$this->xh[$the_parser]['valuestack'][0]['values'][] = $temp;
-				}
-				else
+				} else
 				{
 					// Struct
 					$this->xh[$the_parser]['value'] = $temp;
@@ -1091,7 +1074,10 @@ 
 
 	function character_data($the_parser, $data)
 	{
-		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)
@@ -1124,8 +1110,7 @@ 
 				if (is_array($array[$key]))
 				{
 					$array[$key] = $this->output_parameters($array[$key]);
-				}
-				else
+				} else
 				{
 					// 'bits' is for the MetaWeblog API image bits
 					// @todo - this needs to be made more general purpose
@@ -1134,8 +1119,7 @@ 
 			}
 
 			$parameters = $array;
-		}
-		else
+		} else
 		{
 			$parameters = array();
 
@@ -1146,8 +1130,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;
 				}
@@ -1165,8 +1148,7 @@ 
 		if ($kind == 'scalar')
 		{
 			return $param->scalarval();
-		}
-		elseif ($kind == 'array')
+		} elseif ($kind == 'array')
 		{
 			reset($param->me);
 			list($a,$b) = each($param->me);
@@ -1179,8 +1161,7 @@ 
 			}
 
 			return $arr;
-		}
-		elseif ($kind == 'struct')
+		} elseif ($kind == 'struct')
 		{
 			reset($param->me['struct']);
 
@@ -1222,12 +1203,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);
 			}
@@ -1255,8 +1234,7 @@ 
 			if (strcasecmp($val,'true')==0 OR $val==1 OR ($val==true && strcasecmp($val,'false')))
 			{
 				$val = 1;
-			}
-			else
+			} else
 			{
 				$val=0;
 			}
@@ -1268,8 +1246,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;
@@ -1405,13 +1382,13 @@ 
 		if ($utc == 1)
 		{
 			$t = strftime("%Y%m%dT%H:%i:%s", $time);
-		}
-		else
+		} else
 		{
-			if (function_exists('gmstrftime'))
-				$t = gmstrftime("%Y%m%dT%H:%i:%s", $time);
-			else
-				$t = strftime("%Y%m%dT%H:%i:%s", $time - date('Z'));
+			if (function_exists('gmstrftime')) {
+							$t = gmstrftime("%Y%m%dT%H:%i:%s", $time);
+			} else {
+							$t = strftime("%Y%m%dT%H:%i:%s", $time - date('Z'));
+			}
 		}
 		return $t;
 	}