iNextrix / ASTPP

web_interface/astpp/system/core/Model.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	function __get($key)
 	{
 // 		echo $key;
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$key;
 	}
 }

web_interface/astpp/system/core/URI.php

Spacing +15 added lines, -15 removed lines

@@ -34,7 +34,7 @@ 
 	 * @var array
 	 * @access public
 	 */
-	var	$keyval			= array();
+	var	$keyval = array();
 	/**
 	 * Current uri string
 	 *
@@ -48,7 +48,7 @@ 
 	 * @var array
 	 * @access public
 	 */
-	var $segments		= array();
+	var $segments = array();
 	/**
 	 * Re-indexed list of uri segments
 	 * Starts at 1 instead of 0
@@ -56,7 +56,7 @@ 
 	 * @var array
 	 * @access public
 	 */
-	var $rsegments		= array();
+	var $rsegments = array();
 
 	/**
 	 * Constructor
@@ -69,7 +69,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->config =& load_class('Config', 'core');
+		$this->config = & load_class('Config', 'core');
 		log_message('debug', "URI Class Initialized");
 	}
 
@@ -110,7 +110,7 @@ 
 			}
 
 			// No PATH_INFO?... What about QUERY_STRING?
-			$path =  (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
+			$path = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
 			if (trim($path, '/') != '')
 			{
 				$this->_set_uri_string($path);
@@ -161,9 +161,9 @@ 
 		$str = remove_invisible_characters($str, FALSE);
 //================ITPL=======================
   $pos = strpos($str, "_json");
- if($pos > 0 && !isset($_SERVER['HTTP_X_REQUESTED_WITH'])){
+ if ($pos > 0 && ! isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
        $this->uri_string = str_replace('_json', '', trim($str, '/'));
- }else{
+ } else {
 		// If the URI contains only a slash we'll kill it
 		$this->uri_string = ($str == '/') ? '' : $str;
 }
@@ -242,7 +242,7 @@ 
 	{
 		$args = array_slice($_SERVER['argv'], 1);
 
-		return $args ? '/' . implode('/', $args) : '';
+		return $args ? '/'.implode('/', $args) : '';
 	}
 
 	// --------------------------------------------------------------------
@@ -267,8 +267,8 @@ 
 		}
 
 		// Convert programatic characters to entities
-		$bad	= array('$',		'(',		')',		'%28',		'%29');
-		$good	= array('$',	'(',	')',	'(',	')');
+		$bad = array('$', '(', ')', '%28', '%29');
+		$good = array('$', '(', ')', '(', ')');
 
 		return str_replace($bad, $good, $str);
 	}
@@ -283,7 +283,7 @@ 
 	 */
 	function _remove_url_suffix()
 	{
-		if  ($this->config->item('url_suffix') != "")
+		if ($this->config->item('url_suffix') != "")
 		{
 			$this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string);
 		}
@@ -559,16 +559,16 @@ 
 	 */
 	function _slash_segment($n, $where = 'trailing', $which = 'segment')
 	{
-		$leading	= '/';
-		$trailing	= '/';
+		$leading = '/';
+		$trailing = '/';
 
 		if ($where == 'trailing')
 		{
-			$leading	= '';
+			$leading = '';
 		}
 		elseif ($where == 'leading')
 		{
-			$trailing	= '';
+			$trailing = '';
 		}
 
 		return $leading.$this->$which($n).$trailing;

web_interface/astpp/system/core/Loader.php

Spacing +39 added lines, -39 removed lines

@@ -42,28 +42,28 @@ 
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_view_paths		= array();
+	protected $_ci_view_paths = array();
 	/**
 	 * List of paths to load libraries from
 	 *
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_library_paths	= array();
+	protected $_ci_library_paths = array();
 	/**
 	 * List of paths to load models from
 	 *
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_model_paths		= array();
+	protected $_ci_model_paths = array();
 	/**
 	 * List of paths to load helpers from
 	 *
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_helper_paths		= array();
+	protected $_ci_helper_paths = array();
 	/**
 	 * List of loaded base classes
 	 * Set by the controller class
@@ -71,49 +71,49 @@ 
 	 * @var array
 	 * @access protected
 	 */
-	protected $_base_classes		= array(); // Set by the controller class
+	protected $_base_classes = array(); // Set by the controller class
 	/**
 	 * List of cached variables
 	 *
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_cached_vars		= array();
+	protected $_ci_cached_vars = array();
 	/**
 	 * List of loaded classes
 	 *
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_classes			= array();
+	protected $_ci_classes = array();
 	/**
 	 * List of loaded files
 	 *
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_loaded_files		= array();
+	protected $_ci_loaded_files = array();
 	/**
 	 * List of loaded models
 	 *
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_models			= array();
+	protected $_ci_models = array();
 	/**
 	 * List of loaded helpers
 	 *
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_helpers			= array();
+	protected $_ci_helpers = array();
 	/**
 	 * List of class name mappings
 	 *
 	 * @var array
 	 * @access protected
 	 */
-	protected $_ci_varmap			= array('unit_test' => 'unit',
+	protected $_ci_varmap = array('unit_test' => 'unit',
 											'user_agent' => 'agent');
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_ci_ob_level  = ob_get_level();
+		$this->_ci_ob_level = ob_get_level();
 		$this->_ci_library_paths = array(APPPATH, BASEPATH);
 		$this->_ci_helper_paths = array(APPPATH, BASEPATH);
 		$this->_ci_model_paths = array(APPPATH);
@@ -147,7 +147,7 @@ 
 		$this->_ci_classes = array();
 		$this->_ci_loaded_files = array();
 		$this->_ci_models = array();
-		$this->_base_classes =& is_loaded();
+		$this->_base_classes = & is_loaded();
 
 		$this->_ci_autoloader();
 
@@ -266,7 +266,7 @@ 
 			return;
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$name))
 		{
 			show_error('The model name you are loading is the name of a resource that is already being used: '.$name);
@@ -323,7 +323,7 @@ 
 	public function database($params = '', $return = FALSE, $active_record = NULL)
 	{
 		// Grab the super object
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		// Do we even need to load the database class?
 		if (class_exists('CI_DB') AND $return == FALSE AND $active_record == NULL AND isset($CI->db) AND is_object($CI->db))
@@ -343,7 +343,7 @@ 
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $active_record);
+		$CI->db = & DB($params, $active_record);
 	}
 
 	// --------------------------------------------------------------------
@@ -360,7 +360,7 @@ 
 			$this->database();
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		// for backwards compatibility, load dbforge so we can extend dbutils off it
 		// this use is deprecated and strongly discouraged
@@ -387,7 +387,7 @@ 
 			$this->database();
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		require_once(BASEPATH.'database/DB_forge.php');
 		require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_forge.php');
@@ -567,7 +567,7 @@ 
 	 */
 	public function language($file = array(), $lang = '')
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		if ( ! is_array($file))
 		{
@@ -592,7 +592,7 @@ 
 	 */
 	public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->config->load($file, $use_sections, $fail_gracefully);
 	}
 
@@ -642,7 +642,7 @@ 
 	 * @param 	boolean
 	 * @return	void
 	 */
-	public function add_package_path($path, $view_cascade=TRUE)
+	public function add_package_path($path, $view_cascade = TRUE)
 	{
 		$path = rtrim($path, '/').'/';
 
@@ -653,7 +653,7 @@ 
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
 
 		// Add config file path
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 		array_unshift($config->_config_paths, $path);
 	}
 
@@ -686,7 +686,7 @@ 
 	 */
 	public function remove_package_path($path = '', $remove_config_path = TRUE)
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path == '')
 		{
@@ -783,12 +783,12 @@ 
 		// This allows anything loaded using $this->load (views, files, etc.)
 		// to become accessible from within the Controller and Model functions.
 
-		$_ci_CI =& get_instance();
+		$_ci_CI = & get_instance();
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
 		{
 			if ( ! isset($this->$_ci_key))
 			{
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
 			}
 		}
 
@@ -824,7 +824,7 @@ 
 		// do a little string replacement, changing the short tags
 		// to standard PHP echo statements.
 
-		if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE)
+		if ((bool)@ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE)
 		{
 			echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
 		}
@@ -919,7 +919,7 @@ 
 					// return a new instance of the object
 					if ( ! is_null($object_name))
 					{
-						$CI =& get_instance();
+						$CI = & get_instance();
 						if ( ! isset($CI->$object_name))
 						{
 							return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name);
@@ -958,7 +958,7 @@ 
 					// return a new instance of the object
 					if ( ! is_null($object_name))
 					{
-						$CI =& get_instance();
+						$CI = & get_instance();
 						if ( ! isset($CI->$object_name))
 						{
 							return $this->_ci_init_class($class, '', $params, $object_name);
@@ -1021,24 +1021,24 @@ 
 					// We test for both uppercase and lowercase, for servers that
 					// are case-sensitive with regard to file names. Check for environment
 					// first, global next
-					if (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php'))
+					if (defined('ENVIRONMENT') AND file_exists($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php'))
 					{
-						include($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
+						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
 						break;
 					}
-					elseif (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
+					elseif (defined('ENVIRONMENT') AND file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
 					{
-						include($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
+						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
 						break;
 					}
-					elseif (file_exists($path .'config/'.strtolower($class).'.php'))
+					elseif (file_exists($path.'config/'.strtolower($class).'.php'))
 					{
-						include($path .'config/'.strtolower($class).'.php');
+						include($path.'config/'.strtolower($class).'.php');
 						break;
 					}
-					elseif (file_exists($path .'config/'.ucfirst(strtolower($class)).'.php'))
+					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
 					{
-						include($path .'config/'.ucfirst(strtolower($class)).'.php');
+						include($path.'config/'.ucfirst(strtolower($class)).'.php');
 						break;
 					}
 				}
@@ -1089,7 +1089,7 @@ 
 		$this->_ci_classes[$class] = $classvar;
 
 		// Instantiate the class
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if ($config !== NULL)
 		{
 			$CI->$classvar = new $name($config);
@@ -1139,7 +1139,7 @@ 
 		// Load any custom config file
 		if (count($autoload['config']) > 0)
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			foreach ($autoload['config'] as $key => $val)
 			{
 				$CI->config->load($val);
@@ -1211,7 +1211,7 @@ 
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 

web_interface/astpp/system/core/Exceptions.php

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 	{
 		$severity = ( ! isset($this->levels[$severity])) ? $severity : $this->levels[$severity];
 
-		log_message('error', 'Severity: '.$severity.'  --> '.$message. ' '.$filepath.' '.$line, TRUE);
+		log_message('error', 'Severity: '.$severity.'  --> '.$message.' '.$filepath.' '.$line, TRUE);
 	}
 
 	// --------------------------------------------------------------------
@@ -171,7 +171,7 @@ 
 		if (FALSE !== strpos($filepath, '/'))
 		{
 			$x = explode('/', $filepath);
-			$filepath = $x[count($x)-2].'/'.end($x);
+			$filepath = $x[count($x) - 2].'/'.end($x);
 		}
 
 		if (ob_get_level() > $this->ob_level + 1)

web_interface/astpp/system/core/Controller.php

Spacing +3 added lines, -3 removed lines

@@ -36,17 +36,17 @@
 	 */
 	public function __construct()
 	{
-		self::$instance =& $this;
+		self::$instance = & $this;
 		
 		// Assign all the class objects that were instantiated by the
 		// bootstrap file (CodeIgniter.php) to local class variables
 		// so that CI can run as one big super object.
 		foreach (is_loaded() as $var => $class)
 		{
-			$this->$var =& load_class($class);
+			$this->$var = & load_class($class);
 		}
 
-		$this->load =& load_class('Loader', 'core');
+		$this->load = & load_class('Loader', 'core');
 
 		$this->load->initialize();
 		

web_interface/astpp/system/libraries/Xmlrpc.php

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

web_interface/astpp/system/libraries/Parser.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	public function parse($template, $data, $return = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$template = $CI->load->view($template, $data, TRUE);
 
 		return $this->_parse($template, $data, $return);
@@ -104,7 +104,7 @@ 
 
 		if ($return == FALSE)
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->output->append_output($template);
 		}
 
@@ -197,7 +197,7 @@ 
 	 */
 	function _match_pair($string, $variable)
 	{
-		if ( ! preg_match("|" . preg_quote($this->l_delim) . $variable . preg_quote($this->r_delim) . "(.+?)". preg_quote($this->l_delim) . '/' . $variable . preg_quote($this->r_delim) . "|s", $string, $match))
+		if ( ! preg_match("|".preg_quote($this->l_delim).$variable.preg_quote($this->r_delim)."(.+?)".preg_quote($this->l_delim).'/'.$variable.preg_quote($this->r_delim)."|s", $string, $match))
 		{
 			return FALSE;
 		}

web_interface/astpp/system/libraries/Cache/Cache.php

Spacing +3 added lines, -3 removed lines

@@ -26,12 +26,12 @@
  */
 class CI_Cache extends CI_Driver_Library {
 	
-	protected $valid_drivers 	= array(
+	protected $valid_drivers = array(
 		'cache_apc', 'cache_file', 'cache_memcached', 'cache_dummy'
 	);
 
-	protected $_cache_path		= NULL;		// Path of cache files (if file-based cache)
-	protected $_adapter			= 'dummy';
+	protected $_cache_path = NULL; // Path of cache files (if file-based cache)
+	protected $_adapter = 'dummy';
 	protected $_backup_driver;
 	
 	// ------------------------------------------------------------------------

web_interface/astpp/system/libraries/Cache/drivers/Cache_file.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function __construct()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->helper('file');
 		
 		$path = $CI->config->item('cache_path');
@@ -60,7 +60,7 @@ 
 		$data = read_file($this->_cache_path.$id);
 		$data = unserialize($data);
 		
-		if (time() >  $data['time'] + $data['ttl'])
+		if (time() > $data['time'] + $data['ttl'])
 		{
 			unlink($this->_cache_path.$id);
 			return FALSE;