iNextrix / ASTPP

web_interface/astpp/index.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
  * as this file.
  *
  */
-       $assets_path='assets';
+       $assets_path = 'assets';
 /*
  *---------------------------------------------------------------
  * APPLICATION FOLDER NAME
@@ -187,7 +187,7 @@ 
 	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 	
 	//Name of the "assets folder'
-	define('ASSETSDIR',realpath($assets_path).'/');
+	define('ASSETSDIR', realpath($assets_path).'/');
 	
 	// The path to the "application" folder
 	if (is_dir($application_folder))

web_interface/astpp/system/core/Security.php

Spacing +24 added lines, -24 removed lines

@@ -32,14 +32,14 @@ 
 	 * @var string
 	 * @access protected
 	 */
-	protected $_xss_hash			= '';
+	protected $_xss_hash = '';
 	/**
 	 * Random Hash for Cross Site Request Forgery Protection Cookie
 	 *
 	 * @var string
 	 * @access protected
 	 */
-	protected $_csrf_hash			= '';
+	protected $_csrf_hash = '';
 	/**
 	 * Expiration time for Cross Site Request Forgery Protection Cookie
 	 * Defaults to two hours (in seconds)
@@ -47,21 +47,21 @@ 
 	 * @var int
 	 * @access protected
 	 */
-	protected $_csrf_expire			= 7200;
+	protected $_csrf_expire = 7200;
 	/**
 	 * Token name for Cross Site Request Forgery Protection Cookie
 	 *
 	 * @var string
 	 * @access protected
 	 */
-	protected $_csrf_token_name		= 'ci_csrf_token';
+	protected $_csrf_token_name = 'ci_csrf_token';
 	/**
 	 * Cookie name for Cross Site Request Forgery Protection Cookie
 	 *
 	 * @var string
 	 * @access protected
 	 */
-	protected $_csrf_cookie_name	= 'ci_csrf_token';
+	protected $_csrf_cookie_name = 'ci_csrf_token';
 	/**
 	 * List of never allowed strings
 	 *
@@ -101,7 +101,7 @@ 
 	public function __construct()
 	{
 		// CSRF config
-		foreach(array('csrf_expire', 'csrf_token_name', 'csrf_cookie_name') as $key)
+		foreach (array('csrf_expire', 'csrf_token_name', 'csrf_cookie_name') as $key)
 		{
 			if (FALSE !== ($val = config_item($key)))
 			{
@@ -354,7 +354,7 @@ 
 		}
 		else
 		{
-			$str = str_replace(array('<?', '?'.'>'),  array('&lt;?', '?&gt;'), $str);
+			$str = str_replace(array('<?', '?'.'>'), array('&lt;?', '?&gt;'), $str);
 		}
 
 		/*
@@ -407,7 +407,7 @@ 
 				$str = preg_replace("#<(/*)(script|xss)(.*?)\>#si", '[removed]', $str);
 			}
 		}
-		while($original != $str);
+		while ($original != $str);
 
 		unset($original);
 
@@ -458,7 +458,7 @@ 
 
 		if ($is_image === TRUE)
 		{
-			return ($str == $converted_string) ? TRUE: FALSE;
+			return ($str == $converted_string) ? TRUE : FALSE;
 		}
 
 		log_message('debug', "XSS Filtering completed");
@@ -500,7 +500,7 @@ 
 	 * @param	string
 	 * @return	string
 	 */
-	public function entity_decode($str, $charset='UTF-8')
+	public function entity_decode($str, $charset = 'UTF-8')
 	{
 		if (stristr($str, '&') === FALSE)
 		{
@@ -543,17 +543,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"		// =
 					);
 
@@ -619,7 +619,7 @@ 
 			$attribs = array();
 			
 			// find occurrences of illegal attribute strings without quotes
-			preg_match_all("/(".implode('|', $evil_attributes).")\s*=\s*([^\s]*)/is",  $str, $matches, PREG_SET_ORDER);
+			preg_match_all("/(".implode('|', $evil_attributes).")\s*=\s*([^\s]*)/is", $str, $matches, PREG_SET_ORDER);
 			
 			foreach ($matches as $attr)
 			{
@@ -627,7 +627,7 @@ 
 			}
 			
 			// find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes)
-			preg_match_all("/(".implode('|', $evil_attributes).")\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is",  $str, $matches, PREG_SET_ORDER);
+			preg_match_all("/(".implode('|', $evil_attributes).")\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is", $str, $matches, PREG_SET_ORDER);
 
 			foreach ($matches as $attr)
 			{
@@ -797,7 +797,7 @@ 
 		 * Just as above, adds a semicolon if missing.
 		 *
 		 */
-		$str = preg_replace('#(&\#x?)([0-9A-F]+);?#i',"\\1\\2;",$str);
+		$str = preg_replace('#(&\#x?)([0-9A-F]+);?#i', "\\1\\2;", $str);
 
 		/*
 		 * Un-Protect GET variables in URLs

web_interface/astpp/system/core/Output.php

Spacing +14 added lines, -14 removed lines

@@ -41,35 +41,35 @@ 
 	 * @var int
 	 * @access 	protected
 	 */
-	protected $cache_expiration	= 0;
+	protected $cache_expiration = 0;
 	/**
 	 * List of server headers
 	 *
 	 * @var array
 	 * @access 	protected
 	 */
-	protected $headers			= array();
+	protected $headers = array();
 	/**
 	 * List of mime types
 	 *
 	 * @var array
 	 * @access 	protected
 	 */
-	protected $mime_types		= array();
+	protected $mime_types = array();
 	/**
 	 * Determines wether profiler is enabled
 	 *
 	 * @var book
 	 * @access 	protected
 	 */
-	protected $enable_profiler	= FALSE;
+	protected $enable_profiler = FALSE;
 	/**
 	 * Determines if output compression is enabled
 	 *
 	 * @var bool
 	 * @access 	protected
 	 */
-	protected $_zlib_oc			= FALSE;
+	protected $_zlib_oc = FALSE;
 	/**
 	 * List of profiler sections
 	 *
@@ -83,7 +83,7 @@ 
 	 * @var bool
 	 * @access 	protected
 	 */
-	protected $parse_exec_vars	= TRUE;
+	protected $parse_exec_vars = TRUE;
 
 	/**
 	 * Constructor
@@ -217,7 +217,7 @@ 
 			// Is this extension supported?
 			if (isset($this->mime_types[$extension]))
 			{
-				$mime_type =& $this->mime_types[$extension];
+				$mime_type = & $this->mime_types[$extension];
 
 				if (is_array($mime_type))
 				{
@@ -331,7 +331,7 @@ 
 		// Grab the super object if we can.
 		if (class_exists('CI_Controller'))
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 		}
 
 		// --------------------------------------------------------------------
@@ -339,7 +339,7 @@ 
 		// Set the output data
 		if ($output == '')
 		{
-			$output =& $this->final_output;
+			$output = & $this->final_output;
 		}
 
 		// --------------------------------------------------------------------
@@ -361,7 +361,7 @@ 
 
 		if ($this->parse_exec_vars === TRUE)
 		{
-			$memory	 = ( ! function_exists('memory_get_usage')) ? '0' : round(memory_get_usage()/1024/1024, 2).'MB';
+			$memory = ( ! function_exists('memory_get_usage')) ? '0' : round(memory_get_usage() / 1024 / 1024, 2).'MB';
 
 			$output = str_replace('{elapsed_time}', $elapsed, $output);
 			$output = str_replace('{memory_usage}', $memory, $output);
@@ -442,7 +442,7 @@ 
 		}
 		else
 		{
-			echo $output;  // Send it to the browser!
+			echo $output; // Send it to the browser!
 		}
 
 		log_message('debug', "Final output sent to browser");
@@ -460,7 +460,7 @@ 
 	 */
 	function _write_cache($output)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$path = $CI->config->item('cache_path');
 
 		$cache_path = ($path == '') ? APPPATH.'cache/' : $path;
@@ -471,7 +471,7 @@ 
 			return;
 		}
 
-		$uri =	$CI->config->item('base_url').
+		$uri = $CI->config->item('base_url').
 				$CI->config->item('index_page').
 				$CI->uri->uri_string();
 
@@ -516,7 +516,7 @@ 
 		$cache_path = ($CFG->item('cache_path') == '') ? APPPATH.'cache/' : $CFG->item('cache_path');
 
 		// Build the file path.  The file name is an MD5 hash of the full URI
-		$uri =	$CFG->item('base_url').
+		$uri = $CFG->item('base_url').
 				$CFG->item('index_page').
 				$URI->uri_string;
 

web_interface/astpp/system/core/Config.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->config =& get_config();
+		$this->config = & get_config();
 		log_message('debug', "Config Class Initialized");
 
 		// Set the base_url automatically if none was provided
@@ -69,7 +69,7 @@ 
 			if (isset($_SERVER['HTTP_HOST']))
 			{
 				$base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
-				$base_url .= '://'. $_SERVER['HTTP_HOST'];
+				$base_url .= '://'.$_SERVER['HTTP_HOST'];
 				$base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
 			}
 
@@ -231,7 +231,7 @@ 
 		{
 			return FALSE;
 		}
-		if( trim($this->config[$item]) == '')
+		if (trim($this->config[$item]) == '')
 		{
 			return '';
 		}
@@ -279,7 +279,7 @@ 
 	 */
 	function base_url($uri = '')
 	{
-		return $this->slash_item('base_url').ltrim($this->_uri_string($uri),'/');
+		return $this->slash_item('base_url').ltrim($this->_uri_string($uri), '/');
 	}
 
 	// -------------------------------------------------------------

web_interface/astpp/system/core/CodeIgniter.php

Spacing +10 added lines, -10 removed lines

@@ -112,7 +112,7 @@ 
  *  Start the timer... tick tock tick tock...
  * ------------------------------------------------------
  */
-	$BM =& load_class('Benchmark', 'core');
+	$BM = & load_class('Benchmark', 'core');
 	$BM->mark('total_execution_time_start');
 	$BM->mark('loading_time:_base_classes_start');
 
@@ -121,7 +121,7 @@ 
  *  Instantiate the hooks class
  * ------------------------------------------------------
  */
-	$EXT =& load_class('Hooks', 'core');
+	$EXT = & load_class('Hooks', 'core');
 
 /*
  * ------------------------------------------------------
@@ -135,7 +135,7 @@ 
  *  Instantiate the config class
  * ------------------------------------------------------
  */
-	$CFG =& load_class('Config', 'core');
+	$CFG = & load_class('Config', 'core');
 
 	// Do we have any manually set config items in the index.php file?
 	if (isset($assign_to_config))
@@ -155,21 +155,21 @@ 
  *
  */
 
-	$UNI =& load_class('Utf8', 'core');
+	$UNI = & load_class('Utf8', 'core');
 
 /*
  * ------------------------------------------------------
  *  Instantiate the URI class
  * ------------------------------------------------------
  */
-	$URI =& load_class('URI', 'core');
+	$URI = & load_class('URI', 'core');
 
 /*
  * ------------------------------------------------------
  *  Instantiate the routing class and set the routing
  * ------------------------------------------------------
  */
-	$RTR =& load_class('Router', 'core');
+	$RTR = & load_class('Router', 'core');
 	$RTR->_set_routing();
 
 	// Set any routing overrides that may exist in the main index file
@@ -183,7 +183,7 @@ 
  *  Instantiate the output class
  * ------------------------------------------------------
  */
-	$OUT =& load_class('Output', 'core');
+	$OUT = & load_class('Output', 'core');
 
 /*
  * ------------------------------------------------------
@@ -203,21 +203,21 @@ 
  * Load the security class for xss and csrf support
  * -----------------------------------------------------
  */
-	$SEC =& load_class('Security', 'core');
+	$SEC = & load_class('Security', 'core');
 
 /*
  * ------------------------------------------------------
  *  Load the Input class and sanitize globals
  * ------------------------------------------------------
  */
-	$IN	=& load_class('Input', 'core');
+	$IN = & load_class('Input', 'core');
 
 /*
  * ------------------------------------------------------
  *  Load the Language class
  * ------------------------------------------------------
  */
-	$LANG =& load_class('Lang', 'core');
+	$LANG = & load_class('Lang', 'core');
 
 /*
  * ------------------------------------------------------

web_interface/astpp/system/core/Common.php

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
 		// write a file then read it.  Bah...
 		if (is_dir($file))
 		{
-			$file = rtrim($file, '/').'/'.md5(mt_rand(1,100).mt_rand(1,100));
+			$file = rtrim($file, '/').'/'.md5(mt_rand(1, 100).mt_rand(1, 100));
 
 			if (($fp = @fopen($file, FOPEN_WRITE_CREATE)) === FALSE)
 			{
@@ -253,7 +253,7 @@ 
 				}
 			}
 		}
-		$_config[0] =& $config;
+		$_config[0] = & $config;
                 return $_config[0];
 
 	}
@@ -275,7 +275,7 @@ 
 
 		if ( ! isset($_config_item[$item]))
 		{
-			$config =& get_config();
+			$config = & get_config();
 
 			if ( ! isset($config[$item]))
 			{
@@ -306,7 +306,7 @@ 
 {
 	function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
 	{
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 		echo $_error->show_error($heading, $message, 'error_general', $status_code);
 		exit;
 	}
@@ -328,7 +328,7 @@ 
 {
 	function show_404($page = '', $log_error = TRUE)
 	{
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 		$_error->show_404($page, $log_error);
 		exit;
 	}
@@ -356,7 +356,7 @@ 
 			return;
 		}
 
-		$_log =& load_class('Log');
+		$_log = & load_class('Log');
 		$_log->write_log($level, $message, $php_error);
 	}
 }
@@ -479,7 +479,7 @@ 
 			return;
 		}
 
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 
 		// Should we display the error? We'll get the current error_reporting
 		// level and add its bits with the severity bits to find out.
@@ -521,11 +521,11 @@ 
 		
 		if ($url_encoded)
 		{
-			$non_displayables[] = '/%0[0-8bcef]/';	// url encoded 00-08, 11, 12, 14, 15
-			$non_displayables[] = '/%1[0-9a-f]/';	// url encoded 16-31
+			$non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15
+			$non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31
 		}
 		
-		$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';	// 00-08, 11, 12, 14-31, 127
+		$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
 
 		do
 		{

web_interface/astpp/system/core/Input.php

Spacing +13 added lines, -13 removed lines

@@ -33,45 +33,45 @@ 
 	 *
 	 * @var string
 	 */
-	var $ip_address				= FALSE;
+	var $ip_address = FALSE;
 	/**
 	 * user agent (web browser) being used by the current user
 	 *
 	 * @var string
 	 */
-	var $user_agent				= FALSE;
+	var $user_agent = FALSE;
 	/**
 	 * If FALSE, then $_GET will be set to an empty array
 	 *
 	 * @var bool
 	 */
-	var $_allow_get_array		= TRUE;
+	var $_allow_get_array = TRUE;
 	/**
 	 * If TRUE, then newlines are standardized
 	 *
 	 * @var bool
 	 */
-	var $_standardize_newlines	= TRUE;
+	var $_standardize_newlines = TRUE;
 	/**
 	 * Determines whether the XSS filter is always active when GET, POST or COOKIE data is encountered
 	 * Set automatically based on config setting
 	 *
 	 * @var bool
 	 */
-	var $_enable_xss			= FALSE;
+	var $_enable_xss = FALSE;
 	/**
 	 * Enables a CSRF cookie token to be set.
 	 * Set automatically based on config setting
 	 *
 	 * @var bool
 	 */
-	var $_enable_csrf			= FALSE;
+	var $_enable_csrf = FALSE;
 	/**
 	 * List of all HTTP request headers
 	 *
 	 * @var array
 	 */
-	protected $headers			= array();
+	protected $headers = array();
 
 
 	/**
@@ -85,18 +85,18 @@ 
 	{
 		log_message('debug', "Input Class Initialized");
 
-		$this->_allow_get_array	= (config_item('allow_get_array') === TRUE);
-		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
-		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
+		$this->_allow_get_array = (config_item('allow_get_array') === TRUE);
+		$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
+		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
 
 		global $SEC;
-		$this->security =& $SEC;
+		$this->security = & $SEC;
 
 		// Do we need the UTF-8 class?
 		if (UTF8_ENABLED === TRUE)
 		{
 			global $UNI;
-			$this->uni =& $UNI;
+			$this->uni = & $UNI;
 		}
 
 		// Sanitize global arrays
@@ -200,7 +200,7 @@ 
 	*/
 	function get_post($index = '', $xss_clean = FALSE)
 	{
-		if ( ! isset($_POST[$index]) )
+		if ( ! isset($_POST[$index]))
 		{
 			return $this->get($index, $xss_clean);
 		}

web_interface/astpp/system/core/Lang.php

Spacing +3 added lines, -3 removed lines

@@ -31,13 +31,13 @@ 
 	 *
 	 * @var array
 	 */
-	var $language	= array();
+	var $language = array();
 	/**
 	 * List of loaded language files
 	 *
 	 * @var array
 	 */
-	var $is_loaded	= array();
+	var $is_loaded = array();
 
 	/**
 	 * Constructor
@@ -78,7 +78,7 @@ 
 			return;
 		}
 
-		$config =& get_config();
+		$config = & get_config();
 
 		if ($idiom == '')
 		{

web_interface/astpp/system/core/Hooks.php

Spacing +8 added lines, -8 removed lines

@@ -33,19 +33,19 @@ 
 	 *
 	 * @var bool
 	 */
-	var $enabled		= FALSE;
+	var $enabled = FALSE;
 	/**
 	 * List of all hooks set in config/hooks.php
 	 *
 	 * @var array
 	 */
-	var $hooks			= array();
+	var $hooks = array();
 	/**
 	 * Determines wether hook is in progress, used to prevent infinte loops
 	 *
 	 * @var bool
 	 */
-	var $in_progress	= FALSE;
+	var $in_progress = FALSE;
 
 	/**
 	 * Constructor
@@ -67,7 +67,7 @@ 
 	 */
 	function _initialize()
 	{
-		$CFG =& load_class('Config', 'core');
+		$CFG = & load_class('Config', 'core');
 
 		// If hooks are not enabled in the config file
 		// there is nothing else to do
@@ -95,7 +95,7 @@ 
 			return;
 		}
 
-		$this->hooks =& $hook;
+		$this->hooks = & $hook;
 		$this->enabled = TRUE;
 	}
 
@@ -182,9 +182,9 @@ 
 		// Set class/function name
 		// -----------------------------------
 
-		$class		= FALSE;
-		$function	= FALSE;
-		$params		= '';
+		$class = FALSE;
+		$function = FALSE;
+		$params = '';
 
 		if (isset($data['class']) AND $data['class'] != '')
 		{