iNextrix / ASTPP

web_interface/astpp/system/core/Loader.php

Doc Comments +10 added lines, -6 removed lines

@@ -140,7 +140,7 @@ 
 	 * This method is called once in CI_Controller.
 	 *
 	 * @param 	array
-	 * @return 	object
+	 * @return 	CI_Loader
 	 */
 	public function initialize()
 	{
@@ -189,7 +189,7 @@ 
 	 * @param	string	the name of the class
 	 * @param	mixed	the optional parameters
 	 * @param	string	an optional object name
-	 * @return	void
+	 * @return	null|false
 	 */
 	public function library($library = '', $params = NULL, $object_name = NULL)
 	{
@@ -412,7 +412,7 @@ 
 	 * @param	string
 	 * @param	array
 	 * @param	bool
-	 * @return	void
+	 * @return	string|null
 	 */
 	public function view($view, $vars = array(), $return = FALSE)
 	{
@@ -606,7 +606,7 @@ 
 	 * @param	string	the name of the class
 	 * @param	mixed	the optional parameters
 	 * @param	string	an optional object name
-	 * @return	void
+	 * @return	false|null
 	 */
 	public function driver($library = '', $params = NULL, $object_name = NULL)
 	{
@@ -736,7 +736,7 @@ 
 	 * variables made available to view files
 	 *
 	 * @param	array
-	 * @return	void
+	 * @return	string|null
 	 */
 	protected function _ci_load($_ci_data)
 	{
@@ -874,6 +874,7 @@ 
 	 * @param	string	the item that is being loaded
 	 * @param	mixed	any additional parameters
 	 * @param	string	an optional object name
+	 * @param string $class
 	 * @return	void
 	 */
 	protected function _ci_load_class($class, $params = NULL, $object_name = NULL)
@@ -1002,6 +1003,7 @@ 
 	 * @param	string
 	 * @param	bool
 	 * @param	string	an optional object name
+	 * @param string $class
 	 * @return	null
 	 */
 	protected function _ci_init_class($class, $prefix = '', $config = FALSE, $object_name = NULL)
@@ -1109,7 +1111,7 @@ 
 	 * libraries, and helpers to be loaded automatically.
 	 *
 	 * @param	array
-	 * @return	void
+	 * @return	false|null
 	 */
 	private function _ci_autoloader()
 	{
@@ -1207,6 +1209,7 @@ 
 	 * Get a reference to a specific library or model
 	 *
 	 * @param 	string
+	 * @param string $component
 	 * @return	bool
 	 */
 	protected function &_ci_get_component($component)
@@ -1224,6 +1227,7 @@ 
 	 *
 	 * @param	mixed
 	 * @param 	string
+	 * @param string $extension
 	 * @return	array
 	 */
 	protected function _ci_prep_filename($filename, $extension)

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

Braces +17 added lines, -29 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
  *
@@ -695,8 +697,7 @@ 
 			$void = array_shift($this->_ci_helper_paths);
 			$void = array_shift($this->_ci_view_paths);
 			$void = array_shift($config->_config_paths);
-		}
-		else
+		} else
 		{
 			$path = rtrim($path, '/').'/';
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -753,8 +754,7 @@ 
 		{
 			$_ci_x = explode('/', $_ci_path);
 			$_ci_file = end($_ci_x);
-		}
-		else
+		} else
 		{
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
 			$_ci_file = ($_ci_ext == '') ? $_ci_view.'.php' : $_ci_view;
@@ -827,8 +827,7 @@ 
 		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))));
-		}
-		else
+		} else
 		{
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
 		}
@@ -856,8 +855,7 @@ 
 		if (ob_get_level() > $this->_ci_ob_level + 1)
 		{
 			ob_end_flush();
-		}
-		else
+		} else
 		{
 			$_ci_CI->output->append_output(ob_get_contents());
 			@ob_end_clean();
@@ -1025,18 +1023,15 @@ 
 					{
 						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');
 						break;
-					}
-					elseif (file_exists($path .'config/'.strtolower($class).'.php'))
+					} elseif (file_exists($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');
 						break;
@@ -1050,17 +1045,14 @@ 
 			if (class_exists('CI_'.$class))
 			{
 				$name = 'CI_'.$class;
-			}
-			elseif (class_exists(config_item('subclass_prefix').$class))
+			} elseif (class_exists(config_item('subclass_prefix').$class))
 			{
 				$name = config_item('subclass_prefix').$class;
-			}
-			else
+			} else
 			{
 				$name = $class;
 			}
-		}
-		else
+		} else
 		{
 			$name = $prefix.$class;
 		}
@@ -1079,8 +1071,7 @@ 
 		if (is_null($object_name))
 		{
 			$classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class];
-		}
-		else
+		} else
 		{
 			$classvar = $object_name;
 		}
@@ -1093,8 +1084,7 @@ 
 		if ($config !== NULL)
 		{
 			$CI->$classvar = new $name($config);
-		}
-		else
+		} else
 		{
 			$CI->$classvar = new $name;
 		}
@@ -1116,8 +1106,7 @@ 
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'))
 		{
 			include(APPPATH.'config/'.ENVIRONMENT.'/autoload.php');
-		}
-		else
+		} else
 		{
 			include(APPPATH.'config/autoload.php');
 		}
@@ -1231,8 +1220,7 @@ 
 		if ( ! is_array($filename))
 		{
 			return array(strtolower(str_replace('.php', '', str_replace($extension, '', $filename)).$extension));
-		}
-		else
+		} else
 		{
 			foreach ($filename as $key => $val)
 			{

web_interface/astpp/system/core/Output.php

Doc Comments +11 added lines, -10 removed lines

@@ -133,7 +133,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
-	 * @return	void
+	 * @return	CI_Output
 	 */
 	function set_output($output)
 	{
@@ -151,7 +151,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
-	 * @return	void
+	 * @return	CI_Output
 	 */
 	function append_output($output)
 	{
@@ -180,7 +180,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param 	bool
-	 * @return	void
+	 * @return	null|CI_Output
 	 */
 	function set_header($header, $replace = TRUE)
 	{
@@ -206,7 +206,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string	extension of the file we're outputting
-	 * @return	void
+	 * @return	CI_Output
 	 */
 	function set_content_type($mime_type)
 	{
@@ -242,7 +242,7 @@ 
 	 * @access	public
 	 * @param	int		the status code
 	 * @param	string
-	 * @return	void
+	 * @return	CI_Output
 	 */
 	function set_status_header($code = 200, $text = '')
 	{
@@ -258,7 +258,7 @@ 
 	 *
 	 * @access	public
 	 * @param	bool
-	 * @return	void
+	 * @return	CI_Output
 	 */
 	function enable_profiler($val = TRUE)
 	{
@@ -276,7 +276,7 @@ 
 	 *
 	 * @access	public
 	 * @param	array
-	 * @return	void
+	 * @return	CI_Output
 	 */
 	function set_profiler_sections($sections)
 	{
@@ -295,7 +295,7 @@ 
 	 *
 	 * @access	public
 	 * @param	integer
-	 * @return	void
+	 * @return	CI_Output
 	 */
 	function cache($time)
 	{
@@ -319,7 +319,7 @@ 
 	 *
 	 * @access	public
 	 * @param 	string
-	 * @return	mixed
+	 * @return	boolean|null
 	 */
 	function _display($output = '')
 	{
@@ -456,6 +456,7 @@ 
 	 *
 	 * @access	public
 	 * @param 	string
+	 * @param string $output
 	 * @return	void
 	 */
 	function _write_cache($output)
@@ -509,7 +510,7 @@ 
 	 * @access	public
 	 * @param 	object	config class
 	 * @param 	object	uri class
-	 * @return	void
+	 * @return	boolean
 	 */
 	function _display_cache(&$CFG, &$URI)
 	{

Indentation +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		// Get mime types for later
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 		{
-		    include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
+			include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
 		}
 		else
 		{

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;
 

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
  *
@@ -97,8 +99,7 @@ 
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 		{
 		    include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
-		}
-		else
+		} else
 		{
 			include APPPATH.'config/mimes.php';
 		}
@@ -158,8 +159,7 @@ 
 		if ($this->final_output == '')
 		{
 			$this->final_output = $output;
-		}
-		else
+		} else
 		{
 			$this->final_output .= $output;
 		}
@@ -425,8 +425,7 @@ 
 				$output  = preg_replace("|</body>.*?</html>|is", '', $output);
 				$output .= $CI->profiler->run();
 				$output .= '</body></html>';
-			}
-			else
+			} else
 			{
 				$output .= $CI->profiler->run();
 			}
@@ -439,8 +438,7 @@ 
 		if (method_exists($CI, '_output'))
 		{
 			$CI->_output($output);
-		}
-		else
+		} else
 		{
 			echo $output;  // Send it to the browser!
 		}
@@ -489,8 +487,7 @@ 
 		{
 			fwrite($fp, $expire.'TS--->'.$output);
 			flock($fp, LOCK_UN);
-		}
-		else
+		} else
 		{
 			log_message('error', "Unable to secure a file lock for file at: ".$cache_path);
 			return;

web_interface/astpp/system/core/Security.php

Doc Comments +1 added lines, -1 removed lines

@@ -576,7 +576,7 @@
 	 * things like j a v a s c r i p t
 	 *
 	 * @param	type
-	 * @return	type
+	 * @return	string
 	 */
 	protected function _compact_exploded_words($matches)
 	{

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

Braces +4 added lines, -3 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');
+}
 
 // ------------------------------------------------------------------------
 
@@ -59,8 +61,7 @@ 
 		if ($download == "")
 		{
 			return $str;	
-		}
-		else
+		} else
 		{	
 			echo $str;
 		}		

web_interface/astpp/system/database/DB_active_rec.php

Doc Comments +35 added lines, -32 removed lines

@@ -70,7 +70,7 @@ 
 	 * Generates the SELECT portion of the query
 	 *
 	 * @param	string
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function select($select = '*', $escape = NULL)
 	{
@@ -108,7 +108,7 @@ 
 	 *
 	 * @param	string	the field
 	 * @param	string	an alias
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function select_max($select = '', $alias = '')
 	{
@@ -124,7 +124,7 @@ 
 	 *
 	 * @param	string	the field
 	 * @param	string	an alias
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function select_min($select = '', $alias = '')
 	{
@@ -140,7 +140,7 @@ 
 	 *
 	 * @param	string	the field
 	 * @param	string	an alias
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function select_avg($select = '', $alias = '')
 	{
@@ -156,7 +156,7 @@ 
 	 *
 	 * @param	string	the field
 	 * @param	string	an alias
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function select_sum($select = '', $alias = '')
 	{
@@ -175,7 +175,7 @@ 
 	 *
 	 * @param	string	the field
 	 * @param	string	an alias
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	protected function _max_min_avg_sum($select = '', $alias = '', $type = 'MAX')
 	{
@@ -215,6 +215,7 @@ 
 	 * Determines the alias name based on the table
 	 *
 	 * @param	string
+	 * @param string $item
 	 * @return	string
 	 */
 	protected function _create_alias_from_table($item)
@@ -235,7 +236,7 @@ 
 	 * Sets a flag which tells the query string compiler to add DISTINCT
 	 *
 	 * @param	bool
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function distinct($val = TRUE)
 	{
@@ -251,7 +252,8 @@ 
 	 * Generates the FROM portion of the query
 	 *
 	 * @param	mixed	can be a string or array
-	 * @return	object
+	 * @param string $from
+	 * @return	CI_DB_active_record
 	 */
 	public function from($from)
 	{
@@ -305,7 +307,7 @@ 
 	 * @param	string
 	 * @param	string	the join condition
 	 * @param	string	the type of join
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function join($table, $cond, $type = '')
 	{
@@ -359,7 +361,7 @@ 
 	 *
 	 * @param	mixed
 	 * @param	mixed
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function where($key, $value = NULL, $escape = TRUE)
 	{
@@ -376,7 +378,7 @@ 
 	 *
 	 * @param	mixed
 	 * @param	mixed
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function or_where($key, $value = NULL, $escape = TRUE)
 	{
@@ -393,7 +395,8 @@ 
 	 * @param	mixed
 	 * @param	mixed
 	 * @param	string
-	 * @return	object
+	 * @param boolean $escape
+	 * @return	CI_DB_active_record
 	 */
 	protected function _where($key, $value = NULL, $type = 'AND ', $escape = NULL)
 	{
@@ -460,7 +463,7 @@ 
 	 *
 	 * @param	string	The field to search
 	 * @param	array	The values searched on
-	 * @return	object
+	 * @return	null|CI_DB_active_record
 	 */
 	public function where_in($key = NULL, $values = NULL)
 	{
@@ -477,7 +480,7 @@ 
 	 *
 	 * @param	string	The field to search
 	 * @param	array	The values searched on
-	 * @return	object
+	 * @return	null|CI_DB_active_record
 	 */
 	public function or_where_in($key = NULL, $values = NULL)
 	{
@@ -494,7 +497,7 @@ 
 	 *
 	 * @param	string	The field to search
 	 * @param	array	The values searched on
-	 * @return	object
+	 * @return	null|CI_DB_active_record
 	 */
 	public function where_not_in($key = NULL, $values = NULL)
 	{
@@ -511,7 +514,7 @@ 
 	 *
 	 * @param	string	The field to search
 	 * @param	array	The values searched on
-	 * @return	object
+	 * @return	null|CI_DB_active_record
 	 */
 	public function or_where_not_in($key = NULL, $values = NULL)
 	{
@@ -529,7 +532,7 @@ 
 	 * @param	array	The values searched on
 	 * @param	boolean	If the statement would be IN or NOT IN
 	 * @param	string
-	 * @return	object
+	 * @return	null|CI_DB_active_record
 	 */
 	protected function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ')
 	{
@@ -576,7 +579,7 @@ 
 	 *
 	 * @param	mixed
 	 * @param	mixed
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function like($field, $match = '', $side = 'both')
 	{
@@ -593,7 +596,7 @@ 
 	 *
 	 * @param	mixed
 	 * @param	mixed
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function not_like($field, $match = '', $side = 'both')
 	{
@@ -610,7 +613,7 @@ 
 	 *
 	 * @param	mixed
 	 * @param	mixed
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function or_like($field, $match = '', $side = 'both')
 	{
@@ -627,7 +630,7 @@ 
 	 *
 	 * @param	mixed
 	 * @param	mixed
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function or_not_like($field, $match = '', $side = 'both')
 	{
@@ -645,7 +648,7 @@ 
 	 * @param	mixed
 	 * @param	mixed
 	 * @param	string
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '')
 	{
@@ -698,7 +701,7 @@ 
 	 * GROUP BY
 	 *
 	 * @param	string
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function group_by($by)
 	{
@@ -734,7 +737,7 @@ 
 	 *
 	 * @param	string
 	 * @param	string
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function having($key, $value = '', $escape = TRUE)
 	{
@@ -750,7 +753,7 @@ 
 	 *
 	 * @param	string
 	 * @param	string
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function or_having($key, $value = '', $escape = TRUE)
 	{
@@ -766,7 +769,7 @@ 
 	 *
 	 * @param	string
 	 * @param	string
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	protected function _having($key, $value = '', $type = 'AND ', $escape = TRUE)
 	{
@@ -812,7 +815,7 @@ 
 	 *
 	 * @param	string
 	 * @param	string	direction: asc or desc
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function order_by($orderby, $direction = '')
 	{
@@ -867,7 +870,7 @@ 
 	 *
 	 * @param	integer	the limit value
 	 * @param	integer	the offset value
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function limit($value, $offset = '')
 	{
@@ -887,7 +890,7 @@ 
 	 * Sets the OFFSET value
 	 *
 	 * @param	integer	the offset value
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function offset($offset)
 	{
@@ -903,7 +906,7 @@ 
 	 * @param	mixed
 	 * @param	string
 	 * @param	boolean
-	 * @return	object
+	 * @return	CI_DB_active_record
 	 */
 	public function set($key, $value = '', $escape = TRUE)
 	{
@@ -969,7 +972,7 @@ 
 	 * returned by an Active Record query.
 	 *
 	 * @param	string
-	 * @return	string
+	 * @return	integer
 	 */
 	public function count_all_results($table = '')
 	{
@@ -1096,7 +1099,7 @@ 
 	 * @param	mixed
 	 * @param	string
 	 * @param	boolean
-	 * @return	object
+	 * @return	null|CI_DB_active_record
 	 */
 	public function set_insert_batch($key, $value = '', $escape = TRUE)
 	{

Indentation +108 added lines, -108 removed lines

@@ -2016,138 +2016,138 @@
 
 
 /**
-	 * Insert__Update_Batch
-	 *
-         * Compiles an on duplicate key update string and runs the query
-         *
-         * @since     1.6.2
-         * @access    public
-         * @param     string    the table to retrieve the results from
-         * @param     array     an associative array of update value
-         * @return    object	 */
-    public function insert_update_batch($table = '', $set = NULL)
-    {
-            if ( ! is_null($set))
-            {
-                $this->set($set);
-            }
-
-            if (count($this->ar_set) == 0)
-            {
-                if ($this->db_debug)
-                {
-                        return $this->display_error('db_must_use_set');
-                }
-                    return FALSE;
-            }
-
-            if ($table == '')
-                    {
-                if ( ! isset($this->ar_from[0]))
-                {
-                    if ($this->db_debug)
-                    {
-                        return $this->display_error('db_must_set_table');
-                    }
-                    return FALSE;
-                }
+ * Insert__Update_Batch
+ *
+ * Compiles an on duplicate key update string and runs the query
+ *
+ * @since     1.6.2
+ * @access    public
+ * @param     string    the table to retrieve the results from
+ * @param     array     an associative array of update value
+ * @return    object	 */
+	public function insert_update_batch($table = '', $set = NULL)
+	{
+			if ( ! is_null($set))
+			{
+				$this->set($set);
+			}
+
+			if (count($this->ar_set) == 0)
+			{
+				if ($this->db_debug)
+				{
+						return $this->display_error('db_must_use_set');
+				}
+					return FALSE;
+			}
+
+			if ($table == '')
+					{
+				if ( ! isset($this->ar_from[0]))
+				{
+					if ($this->db_debug)
+					{
+						return $this->display_error('db_must_set_table');
+					}
+					return FALSE;
+				}
                 
-                $table = $this->ar_from[0];
-            }
+				$table = $this->ar_from[0];
+			}
     
         
 //            $sql = $this->_insert_update_batch($this->_protect_identifiers($this->dbprefix.$table), $this->ar_set );
 		for ($i = 1, $total = count($this->ar_set); $i < $total; $i++)
 		{
 
-		        $sql = $this->_insert_update_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_set[$this->_protect_identifiers($i)]);
+				$sql = $this->_insert_update_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_set[$this->_protect_identifiers($i)]);
 
 			//echo $sql;
 
 			$this->query($sql);
 		}
         
-            $this->_reset_write();
-            return $this->query($sql);
-     }
+			$this->_reset_write();
+			return $this->query($sql);
+	 }
 
 
 
   /**
-     * Insert_On_Duplicate_Update_Batch
-     *
-     * Compiles batch insert strings and runs the queries
-     * MODIFIED to do a MySQL 'ON DUPLICATE KEY UPDATE'
-     *
-     * @access public
-     * @param string the table to retrieve the results from
-     * @param array an associative array of insert values
-     * @return object
-     */
-     function insert_on_duplicate_update_batch($table = '', $set = NULL)
-     {
-          if ( ! is_null($set))
-          {
-                   $this->set_insert_batch($set);
-          }
+   * Insert_On_Duplicate_Update_Batch
+   *
+   * Compiles batch insert strings and runs the queries
+   * MODIFIED to do a MySQL 'ON DUPLICATE KEY UPDATE'
+   *
+   * @access public
+   * @param string the table to retrieve the results from
+   * @param array an associative array of insert values
+   * @return object
+   */
+	 function insert_on_duplicate_update_batch($table = '', $set = NULL)
+	 {
+		  if ( ! is_null($set))
+		  {
+				   $this->set_insert_batch($set);
+		  }
         
-          if (count($this->ar_set) == 0)
-          {
-                   if ($this->db_debug)
-                   {
-                    //No valid data array.  Folds in cases where keys and values did not match up
-                            return $this->display_error('db_must_use_set');
-                   }
-                   return FALSE;
-          }
-
-          if ($table == '')
-          {
-                  if ( ! isset($this->ar_from[0]))
-                  {
-                    if ($this->db_debug)
-                    {
-                             return $this->display_error('db_must_set_table');
-                    }
-                    return FALSE;
-                  }
-
-                  $table = $this->ar_from[0];
-          }
-          // Batch this baby
-          for ($i = 0, $total = count($this->ar_set); $i < $total; $i = $i + 500)
-          {
-                $sql = $this->_insert_on_duplicate_update_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_keys, array_slice($this->ar_set, $i, 500));
-
-                // echo $sql; 
-                $this->query($sql);
-          }
-          $this->_reset_write();
-          return TRUE;
-     }  
+		  if (count($this->ar_set) == 0)
+		  {
+				   if ($this->db_debug)
+				   {
+					//No valid data array.  Folds in cases where keys and values did not match up
+							return $this->display_error('db_must_use_set');
+				   }
+				   return FALSE;
+		  }
+
+		  if ($table == '')
+		  {
+				  if ( ! isset($this->ar_from[0]))
+				  {
+					if ($this->db_debug)
+					{
+							 return $this->display_error('db_must_set_table');
+					}
+					return FALSE;
+				  }
+
+				  $table = $this->ar_from[0];
+		  }
+		  // Batch this baby
+		  for ($i = 0, $total = count($this->ar_set); $i < $total; $i = $i + 500)
+		  {
+				$sql = $this->_insert_on_duplicate_update_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_keys, array_slice($this->ar_set, $i, 500));
+
+				// echo $sql; 
+				$this->query($sql);
+		  }
+		  $this->_reset_write();
+		  return TRUE;
+	 }  
 
 
 
 
 	/**
-          * Insert_on_duplicate_update_batch statement
-          *
-          * Generates a platform-specific insert string from the supplied data
-          * MODIFIED to include ON DUPLICATE UPDATE
-          *
-          * @access public
-        * @param string the table name
-          * @param array the insert keys
-          * @param array the insert values
-          * @return string
-          */
-         function _insert_on_duplicate_update_batch($table, $keys, $values)
-         {
-                  foreach($keys as $key)
-                  $update_fields[] = $key.'=VALUES('.$key.')';
+	 * Insert_on_duplicate_update_batch statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data
+	 * MODIFIED to include ON DUPLICATE UPDATE
+	 *
+	 * @access public
+	 * @param string the table name
+	 * @param array the insert keys
+	 * @param array the insert values
+	 * @return string
+	 */
+		 function _insert_on_duplicate_update_batch($table, $keys, $values)
+		 {
+				  foreach($keys as $key)
+				  $update_fields[] = $key.'=VALUES('.$key.')';
            
-                  return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);
-         } 
+				  return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);
+		 } 
 
 
 	/**

Spacing +21 added lines, -21 removed lines

@@ -28,26 +28,26 @@ 
  */
 class CI_DB_active_record extends CI_DB_driver {
 
-	var $ar_select				= array();
-	var $ar_distinct			= FALSE;
+	var $ar_select = array();
+	var $ar_distinct = FALSE;
 	var $ar_from				= array();
 	var $ar_join				= array();
-	var $ar_where				= array();
+	var $ar_where = array();
 	var $ar_like				= array();
-	var $ar_groupby				= array();
+	var $ar_groupby = array();
 	var $ar_having				= array();
 	var $ar_keys				= array();
 	var $ar_limit				= FALSE;
 	var $ar_offset				= FALSE;
 	var $ar_order				= FALSE;
 	var $ar_orderby				= array();
-	var $ar_set					= array();
+	var $ar_set = array();
 	var $ar_wherein				= array();
-	var $ar_aliased_tables		= array();
-	var $ar_store_array			= array();
+	var $ar_aliased_tables = array();
+	var $ar_store_array = array();
 
 	// Active Record Caching variables
-	var $ar_caching				= FALSE;
+	var $ar_caching = FALSE;
 	var $ar_cache_exists		= array();
 	var $ar_cache_select		= array();
 	var $ar_cache_from			= array();
@@ -57,10 +57,10 @@ 
 	var $ar_cache_groupby		= array();
 	var $ar_cache_having		= array();
 	var $ar_cache_orderby		= array();
-	var $ar_cache_set			= array();
+	var $ar_cache_set = array();
 	
-	var $ar_no_escape 			= array();
-	var $ar_cache_no_escape     = array();
+	var $ar_no_escape = array();
+	var $ar_cache_no_escape = array();
 
 	// --------------------------------------------------------------------
 
@@ -552,7 +552,7 @@ 
 
 		$prefix = (count($this->ar_where) == 0) ? '' : $type;
 
-		$where_in = $prefix . $this->_protect_identifiers($key) . $not . " IN (" . implode(", ", $this->ar_wherein) . ") ";
+		$where_in = $prefix.$this->_protect_identifiers($key).$not." IN (".implode(", ", $this->ar_wherein).") ";
 
 		$this->ar_where[] = $where_in;
 		if ($this->ar_caching === TRUE)
@@ -871,11 +871,11 @@ 
 	 */
 	public function limit($value, $offset = '')
 	{
-		$this->ar_limit = (int) $value;
+		$this->ar_limit = (int)$value;
 
 		if ($offset != '')
 		{
-			$this->ar_offset = (int) $offset;
+			$this->ar_offset = (int)$offset;
 		}
 
 		return $this;
@@ -979,7 +979,7 @@ 
 			$this->from($table);
 		}
 
-		$sql = $this->_compile_select($this->_count_string . $this->_protect_identifiers('numrows'));
+		$sql = $this->_compile_select($this->_count_string.$this->_protect_identifiers('numrows'));
 
 		$query = $this->query($sql);
 		$this->_reset_select();
@@ -990,7 +990,7 @@ 
 		}
 
 		$row = $query->row();
-		return (int) $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -1123,7 +1123,7 @@ 
 
 			if ($escape === FALSE)
 			{
-				$this->ar_set[] =  '('.implode(',', $row).')';
+				$this->ar_set[] = '('.implode(',', $row).')';
 			}
 			else
 			{
@@ -1134,7 +1134,7 @@ 
 					$clean[] = $this->escape($value);
 				}
 
-				$this->ar_set[] =  '('.implode(',', $clean).')';
+				$this->ar_set[] = '('.implode(',', $clean).')';
 			}
 		}
 
@@ -1942,8 +1942,8 @@ 
 
 		foreach ($this->ar_cache_exists as $val)
 		{
-			$ar_variable	= 'ar_'.$val;
-			$ar_cache_var	= 'ar_cache_'.$val;
+			$ar_variable = 'ar_'.$val;
+			$ar_cache_var = 'ar_cache_'.$val;
 
 			if (count($this->$ar_cache_var) == 0)
 			{
@@ -2143,7 +2143,7 @@ 
           */
          function _insert_on_duplicate_update_batch($table, $keys, $values)
          {
-                  foreach($keys as $key)
+                  foreach ($keys as $key)
                   $update_fields[] = $key.'=VALUES('.$key.')';
            
                   return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);

Braces +23 added lines, -37 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
  *
@@ -273,8 +275,7 @@ 
 					}
 				}
 
-			}
-			else
+			} else
 			{
 				$val = trim($val);
 
@@ -316,8 +317,7 @@ 
 			if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER')))
 			{
 				$type = '';
-			}
-			else
+			} else
 			{
 				$type .= ' ';
 			}
@@ -431,8 +431,7 @@ 
 				{
 					$k .= ' = ';
 				}
-			}
-			else
+			} else
 			{
 				$k = $this->_protect_identifiers($k, FALSE, $escape);
 			}
@@ -665,12 +664,10 @@ 
 			if ($side == 'before')
 			{
 				$like_statement = $prefix." $k $not LIKE '%{$v}'";
-			}
-			elseif ($side == 'after')
+			} elseif ($side == 'after')
 			{
 				$like_statement = $prefix." $k $not LIKE '{$v}%'";
-			}
-			else
+			} else
 			{
 				$like_statement = $prefix." $k $not LIKE '%{$v}%'";
 			}
@@ -820,8 +817,7 @@ 
 		{
 			$orderby = ''; // Random results want or don't need a field name
 			$direction = $this->_random_keyword;
-		}
-		elseif (trim($direction) != '')
+		} elseif (trim($direction) != '')
 		{
 			$direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC'), TRUE)) ? ' '.$direction : ' ASC';
 		}
@@ -842,8 +838,7 @@ 
 			}
 
 			$orderby = implode(', ', $temp);
-		}
-		else if ($direction != $this->_random_keyword)
+		} else if ($direction != $this->_random_keyword)
 		{
 			$orderby = $this->_protect_identifiers($orderby);
 		}
@@ -919,8 +914,7 @@ 
 			if ($escape === FALSE)
 			{
 				$this->ar_set[$this->_protect_identifiers($k)] = $v;
-			}
-			else
+			} else
 			{
 				$this->ar_set[$this->_protect_identifiers($k, FALSE, TRUE)] = $this->escape($v);
 			}
@@ -1124,8 +1118,7 @@ 
 			if ($escape === FALSE)
 			{
 				$this->ar_set[] =  '('.implode(',', $row).')';
-			}
-			else
+			} else
 			{
 				$clean = array();
 
@@ -1398,8 +1391,7 @@ 
 				if ($k2 == $index)
 				{
 					$index_set = TRUE;
-				}
-				else
+				} else
 				{
 					$not[] = $k.'-'.$v;
 				}
@@ -1407,8 +1399,7 @@ 
 				if ($escape === FALSE)
 				{
 					$clean[$this->_protect_identifiers($k2)] = $v2;
-				}
-				else
+				} else
 				{
 					$clean[$this->_protect_identifiers($k2)] = $this->escape($v2);
 				}
@@ -1449,8 +1440,7 @@ 
 			}
 
 			$table = $this->ar_from[0];
-		}
-		else
+		} else
 		{
 			$table = $this->_protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -1488,8 +1478,7 @@ 
 			}
 
 			$table = $this->ar_from[0];
-		}
-		else
+		} else
 		{
 			$table = $this->_protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -1531,8 +1520,7 @@ 
 			}
 
 			$table = $this->ar_from[0];
-		}
-		elseif (is_array($table))
+		} elseif (is_array($table))
 		{
 			foreach ($table as $single_table)
 			{
@@ -1541,8 +1529,7 @@ 
 
 			$this->_reset_write();
 			return;
-		}
-		else
+		} else
 		{
 			$table = $this->_protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -1679,16 +1666,14 @@ 
 		if ($select_override !== FALSE)
 		{
 			$sql = $select_override;
-		}
-		else
+		} else
 		{
 			$sql = ( ! $this->ar_distinct) ? 'SELECT ' : 'SELECT DISTINCT ';
 
 			if (count($this->ar_select) == 0)
 			{
 				$sql .= '*';
-			}
-			else
+			} else
 			{
 				// Cycle through the "select" portion of the query and prep each column name.
 				// The reason we protect identifiers here rather then in the select() function
@@ -2143,8 +2128,9 @@ 
           */
          function _insert_on_duplicate_update_batch($table, $keys, $values)
          {
-                  foreach($keys as $key)
-                  $update_fields[] = $key.'=VALUES('.$key.')';
+                  foreach($keys as $key) {
+                                    $update_fields[] = $key.'=VALUES('.$key.')';
+                  }
            
                   return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);
          } 

web_interface/astpp/system/database/DB_cache.php

Doc Comments +4 added lines, -2 removed lines

@@ -32,6 +32,7 @@ 
 	 *
 	 * Grabs the CI super object instance so we can access it.
 	 *
+	 * @param CI_DB_driver $db
 	 */
 	function __construct(&$db)
 	{
@@ -115,6 +116,7 @@ 
 	 *
 	 * @access	public
 	 * @return	bool
+	 * @param CI_DB_result $object
 	 */
 	function write($sql, $object)
 	{
@@ -156,7 +158,7 @@ 
 	 * Delete cache files within a particular directory
 	 *
 	 * @access	public
-	 * @return	bool
+	 * @return	boolean|null
 	 */
 	function delete($segment_one = '', $segment_two = '')
 	{
@@ -181,7 +183,7 @@ 
 	 * Delete all existing cache files
 	 *
 	 * @access	public
-	 * @return	bool
+	 * @return	boolean|null
 	 */
 	function delete_all()
 	{

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 class CI_DB_Cache {
 
 	var $CI;
-	var $db;	// allows passing of db object so that multiple database connections and returned db objects can be supported
+	var $db; // allows passing of db object so that multiple database connections and returned db objects can be supported
 
 	/**
 	 * Constructor
@@ -37,8 +37,8 @@ 
 	{
 		// Assign the main CI object to $this->CI
 		// and load the file helper since we use it a lot
-		$this->CI =& get_instance();
-		$this->db =& $db;
+		$this->CI = & get_instance();
+		$this->db = & $db;
 		$this->CI->load->helper('file');
 	}
 
@@ -64,7 +64,7 @@ 
 		}
 
 		// Add a trailing slash to the path if needed
-		$path = preg_replace("/(.+?)\/*$/", "\\1/",  $path);
+		$path = preg_replace("/(.+?)\/*$/", "\\1/", $path);
 
 		if ( ! is_dir($path) OR ! is_really_writable($path))
 		{
@@ -162,7 +162,7 @@ 
 	{
 		if ($segment_one == '')
 		{
-			$segment_one  = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1);
+			$segment_one = ($this->CI->uri->segment(1) == FALSE) ? 'default' : $this->CI->uri->segment(1);
 		}
 
 		if ($segment_two == '')

Braces +3 added lines, -1 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');
+}
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER

web_interface/astpp/system/database/DB_driver.php

Doc Comments +12 added lines, -9 removed lines

@@ -98,7 +98,7 @@ 
 	 *
 	 * @access	private Called by the constructor
 	 * @param	mixed
-	 * @return	void
+	 * @return	boolean
 	 */
 	function initialize()
 	{
@@ -164,7 +164,9 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	string
-	 * @return	resource
+	 * @param string $charset
+	 * @param string $collation
+	 * @return	boolean
 	 */
 	function db_set_charset($charset, $collation)
 	{
@@ -490,7 +492,7 @@ 
 	 * Start Transaction
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	false|null
 	 */
 	function trans_start($test_mode = FALSE)
 	{
@@ -573,6 +575,7 @@ 
 	 * @access	public
 	 * @param	string	the sql statement
 	 * @param	array	an array of bind data
+	 * @param boolean $binds
 	 * @return	string
 	 */
 	function compile_binds($sql, $binds)
@@ -633,7 +636,7 @@ 
 	 *
 	 * @access	public
 	 * @param	integer	The number of decimal places
-	 * @return	integer
+	 * @return	string
 	 */
 	function elapsed_time($decimals = 6)
 	{
@@ -1040,7 +1043,7 @@ 
 	 * Enable Query Caching
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	boolean
 	 */
 	function cache_on()
 	{
@@ -1054,7 +1057,7 @@ 
 	 * Disable Query Caching
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	boolean
 	 */
 	function cache_off()
 	{
@@ -1069,7 +1072,7 @@ 
 	 * Delete the cache files associated with a particular URI
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	boolean|null
 	 */
 	function cache_delete($segment_one = '', $segment_two = '')
 	{
@@ -1086,7 +1089,7 @@ 
 	 * Delete All cache files
 	 *
 	 * @access	public
-	 * @return	void
+	 * @return	boolean|null
 	 */
 	function cache_delete_all()
 	{
@@ -1104,7 +1107,7 @@ 
 	 * Initialize the Cache Class
 	 *
 	 * @access	private
-	 * @return	void
+	 * @return	boolean
 	 */
 	function _cache_init()
 	{

Spacing +23 added lines, -23 removed lines

@@ -40,16 +40,16 @@ 
 	var $dbcollat		= 'utf8_general_ci';
 	var $autoinit		= TRUE; // Whether to automatically initialize the DB
 	var $swap_pre		= '';
-	var $port			= '';
+	var $port = '';
 	var $pconnect		= FALSE;
-	var $conn_id		= FALSE;
+	var $conn_id = FALSE;
 	var $result_id		= FALSE;
 	var $db_debug		= FALSE;
 	var $benchmark		= 0;
 	var $query_count	= 0;
 	var $bind_marker	= '?';
-	var $save_queries	= TRUE;
-	var $queries		= array();
+	var $save_queries = TRUE;
+	var $queries = array();
 	var $query_times	= array();
 	var $data_cache		= array();
 	var $trans_enabled	= TRUE;
@@ -62,8 +62,8 @@ 
 	var $CACHE; // The cache class object
 
 	// Private variables
-	var $_protect_identifiers	= TRUE;
-	var $_reserved_identifiers	= array('*'); // Identifiers that should NOT be escaped
+	var $_protect_identifiers = TRUE;
+	var $_reserved_identifiers = array('*'); // Identifiers that should NOT be escaped
 
 	// These are use with Oracle
 	var $stmt_id;
@@ -260,7 +260,7 @@ 
 		}
 
 		// Verify table prefix and replace if necessary
-		if ( ($this->dbprefix != '' AND $this->swap_pre != '') AND ($this->dbprefix != $this->swap_pre) )
+		if (($this->dbprefix != '' AND $this->swap_pre != '') AND ($this->dbprefix != $this->swap_pre))
 		{
 			$sql = preg_replace("/(\W)".$this->swap_pre."(\S+?)/", "\\1".$this->dbprefix."\\2", $sql);
 		}
@@ -369,21 +369,21 @@ 
 
 		// Load and instantiate the result driver
 
-		$driver			= $this->load_rdriver();
-		$RES			= new $driver();
-		$RES->conn_id	= $this->conn_id;
-		$RES->result_id	= $this->result_id;
+		$driver = $this->load_rdriver();
+		$RES = new $driver();
+		$RES->conn_id = $this->conn_id;
+		$RES->result_id = $this->result_id;
 
 		if ($this->dbdriver == 'oci8')
 		{
 			$RES->stmt_id		= $this->stmt_id;
 			$RES->curs_id		= NULL;
-			$RES->limit_used	= $this->limit_used;
-			$this->stmt_id		= FALSE;
+			$RES->limit_used = $this->limit_used;
+			$this->stmt_id = FALSE;
 		}
 
 		// oci8 vars must be set before calling this
-		$RES->num_rows	= $RES->num_rows();
+		$RES->num_rows = $RES->num_rows();
 
 		// Is query caching enabled?  If so, we'll serialize the
 		// result object and save it to a cache file.
@@ -396,13 +396,13 @@ 
 			// result object, so we'll have to compile the data
 			// and save it)
 			$CR = new CI_DB_result();
-			$CR->num_rows		= $RES->num_rows();
-			$CR->result_object	= $RES->result_object();
-			$CR->result_array	= $RES->result_array();
+			$CR->num_rows = $RES->num_rows();
+			$CR->result_object = $RES->result_object();
+			$CR->result_array = $RES->result_array();
 
 			// Reset these since cached objects can not utilize resource IDs.
-			$CR->conn_id		= NULL;
-			$CR->result_id		= NULL;
+			$CR->conn_id = NULL;
+			$CR->result_id = NULL;
 
 			$this->CACHE->write($sql, $CR);
 		}
@@ -593,7 +593,7 @@ 
 		// The count of bind should be 1 less then the count of segments
 		// If there are more bind arguments trim it down
 		if (count($binds) >= count($segments)) {
-			$binds = array_slice($binds, 0, count($segments)-1);
+			$binds = array_slice($binds, 0, count($segments) - 1);
 		}
 
 		// Construct the binded query
@@ -1155,7 +1155,7 @@ 
 	 */
 	function display_error($error = '', $swap = '', $native = FALSE)
 	{
-		$LANG =& load_class('Lang', 'core');
+		$LANG = & load_class('Lang', 'core');
 		$LANG->load('db');
 
 		$heading = $LANG->line('db_error_heading');
@@ -1187,7 +1187,7 @@ 
 			}
 		}
 
-		$error =& load_class('Exceptions', 'core');
+		$error = & load_class('Exceptions', 'core');
 		echo $error->show_error($heading, $message, 'error_db');
 		exit;
 	}
@@ -1282,7 +1282,7 @@ 
 		// with an alias. While we're at it, we will escape the components
 		if (strpos($item, '.') !== FALSE)
 		{
-			$parts	= explode('.', $item);
+			$parts = explode('.', $item);
 
 			// Does the first segment of the exploded item match
 			// one of the aliases previously identified?  If so,

Braces +12 added lines, -19 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
  *
@@ -140,8 +142,7 @@ 
 					$this->display_error('db_unable_to_select', $this->database);
 				}
 				return FALSE;
-			}
-			else
+			} else
 			{
 				// We've selected the DB. Now we set the character set
 				if ( ! $this->db_set_charset($this->char_set, $this->dbcollat))
@@ -223,8 +224,7 @@ 
 		if (in_array($this->dbdriver, $driver_version_exceptions))
 		{
 			return $sql;
-		}
-		else
+		} else
 		{
 			$query = $this->query($sql);
 			return $query->row('ver');
@@ -683,12 +683,10 @@ 
 		if (is_string($str))
 		{
 			$str = "'".$this->escape_str($str)."'";
-		}
-		elseif (is_bool($str))
+		} elseif (is_bool($str))
 		{
 			$str = ($str === FALSE) ? 0 : 1;
-		}
-		elseif (is_null($str))
+		} elseif (is_null($str))
 		{
 			$str = 'NULL';
 		}
@@ -772,8 +770,7 @@ 
 				if (isset($row['TABLE_NAME']))
 				{
 					$retval[] = $row['TABLE_NAME'];
-				}
-				else
+				} else
 				{
 					$retval[] = array_shift($row);
 				}
@@ -839,8 +836,7 @@ 
 			if (isset($row['COLUMN_NAME']))
 			{
 				$retval[] = $row['COLUMN_NAME'];
-			}
-			else
+			} else
 			{
 				$retval[] = current($row);
 			}
@@ -940,8 +936,7 @@ 
 		if ( ! is_array($where))
 		{
 			$dest = array($where);
-		}
-		else
+		} else
 		{
 			$dest = array();
 			foreach ($where as $key => $val)
@@ -1011,8 +1006,7 @@ 
 				return $this->display_error('db_unsupported_function');
 			}
 			return FALSE;
-		}
-		else
+		} else
 		{
 			$args = (func_num_args() > 1) ? array_splice(func_get_args(), 1) : null;
 
@@ -1163,8 +1157,7 @@ 
 		if ($native == TRUE)
 		{
 			$message = $error;
-		}
-		else
+		} else
 		{
 			$message = ( ! is_array($error)) ? array(str_replace('%s', $swap, $LANG->line($error))) : $error;
 		}

web_interface/astpp/system/database/DB_result.php

Doc Comments +1 added lines

@@ -229,6 +229,7 @@
 	 *
 	 * @access	public
 	 * @return	object
+	 * @param string $type
 	 */
 	public function custom_row_object($n, $type)
 	{

Spacing +7 added lines, -7 removed lines

@@ -28,12 +28,12 @@ 
  */
 class CI_DB_result {
 
-	var $conn_id				= NULL;
-	var $result_id				= NULL;
-	var $result_array			= array();
-	var $result_object			= array();
-	var $custom_result_object	= array();
-	var $current_row			= 0;
+	var $conn_id = NULL;
+	var $result_id = NULL;
+	var $result_array = array();
+	var $result_object = array();
+	var $custom_result_object = array();
+	var $current_row = 0;
 	var $num_rows				= 0;
 	var $row_data				= NULL;
 
@@ -331,7 +331,7 @@ 
 		{
 			return $result;
 		}
-		return $result[count($result) -1];
+		return $result[count($result) - 1];
 	}
 
 	// --------------------------------------------------------------------

Braces +17 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
  *
@@ -47,9 +49,13 @@ 
 	 */
 	public function result($type = 'object')
 	{
-		if ($type == 'array') return $this->result_array();
-		else if ($type == 'object') return $this->result_object();
-		else return $this->custom_result_object($type);
+		if ($type == 'array') {
+			return $this->result_array();
+		} else if ($type == 'object') {
+			return $this->result_object();
+		} else {
+			return $this->custom_result_object($type);
+		}
 	}
 
 	// --------------------------------------------------------------------
@@ -185,9 +191,13 @@ 
 			$n = 0;
 		}
 
-		if ($type == 'object') return $this->row_object($n);
-		else if ($type == 'array') return $this->row_array($n);
-		else return $this->custom_row_object($n, $type);
+		if ($type == 'object') {
+			return $this->row_object($n);
+		} else if ($type == 'array') {
+			return $this->row_array($n);
+		} else {
+			return $this->custom_row_object($n, $type);
+		}
 	}
 
 	// --------------------------------------------------------------------

web_interface/astpp/system/database/drivers/cubrid/cubrid_driver.php

Doc Comments +4 added lines, -4 removed lines

@@ -149,7 +149,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	string
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_set_charset($charset, $collation)
 	{
@@ -381,7 +381,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
-	 * @return	string
+	 * @return	integer
 	 */
 	function count_all($table = '')
 	{
@@ -450,7 +450,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _field_data($table)
 	{
@@ -535,7 +535,7 @@ 
 	 *
 	 * @access	public
 	 * @param	type
-	 * @return	type
+	 * @return	string
 	 */
 	function _from_tables($tables)
 	{

Spacing +6 added lines, -6 removed lines

@@ -390,7 +390,7 @@ 
 			return 0;
 		}
 		
-		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows') . " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE));
+		$query = $this->query($this->_count_string.$this->_protect_identifiers('numrows')." FROM ".$this->_protect_identifiers($table, TRUE, NULL, FALSE));
 
 		if ($query->num_rows() == 0)
 		{
@@ -399,7 +399,7 @@ 
 
 		$row = $query->row();
 		$this->_reset_select();
-		return (int) $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -505,7 +505,7 @@ 
 		{
 			if (strpos($item, '.'.$id) !== FALSE)
 			{
-				$str = $this->_escape_char. str_replace('.', $this->_escape_char.'.', $item);
+				$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.', $item);
 
 				// remove duplicates if the user already included the escape
 				return preg_replace('/['.$this->_escape_char.']+/', $this->_escape_char, $str);
@@ -627,11 +627,11 @@ 
 
 		$limit = ( ! $limit) ? '' : ' LIMIT '.$limit;
 
-		$orderby = (count($orderby) >= 1)?' ORDER BY '.implode(", ", $orderby):'';
+		$orderby = (count($orderby) >= 1) ? ' ORDER BY '.implode(", ", $orderby) : '';
 
 		$sql = "UPDATE ".$table." SET ".implode(', ', $valstr);
 
-		$sql .= ($where != '' AND count($where) >=1) ? " WHERE ".implode(" ", $where) : '';
+		$sql .= ($where != '' AND count($where) >= 1) ? " WHERE ".implode(" ", $where) : '';
 
 		$sql .= $orderby.$limit;
 
@@ -655,7 +655,7 @@ 
 	function _update_batch($table, $values, $index, $where = NULL)
 	{
 		$ids = array();
-		$where = ($where != '' AND count($where) >=1) ? implode(" ", $where).' AND ' : '';
+		$where = ($where != '' AND count($where) >= 1) ? implode(" ", $where).' AND ' : '';
 
 		foreach ($values as $key => $val)
 		{

Braces +7 added lines, -9 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
  *
@@ -74,8 +76,7 @@ 
 			if (isset($this->auto_commit) && ! $this->auto_commit)
 			{
 				cubrid_set_autocommit($conn, CUBRID_AUTOCOMMIT_FALSE);
-			}
-			else
+			} else
 			{
 				cubrid_set_autocommit($conn, CUBRID_AUTOCOMMIT_TRUE);
 				$this->auto_commit = TRUE;
@@ -330,8 +331,7 @@ 
 		if (function_exists('cubrid_real_escape_string') AND is_resource($this->conn_id))
 		{
 			$str = cubrid_real_escape_string($str, $this->conn_id);
-		}
-		else
+		} else
 		{
 			$str = addslashes($str);
 		}
@@ -515,8 +515,7 @@ 
 		if (strpos($item, '.') !== FALSE)
 		{
 			$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char;
-		}
-		else
+		} else
 		{
 			$str = $this->_escape_char.$item.$this->_escape_char;
 		}
@@ -762,8 +761,7 @@ 
 		if ($offset == 0)
 		{
 			$offset = '';
-		}
-		else
+		} else
 		{
 			$offset .= ", ";
 		}

web_interface/astpp/system/database/drivers/cubrid/cubrid_utility.php

Doc Comments +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 	 * List databases
 	 *
 	 * @access	private
-	 * @return	array
+	 * @return	string|false
 	 */
 	function _list_databases()
 	{
@@ -56,7 +56,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	boolean
 	 * @link 	http://www.cubrid.org/manual/840/en/Optimize%20Database
 	 */
 	function _optimize_table($table)
@@ -76,7 +76,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	boolean
 	 * @link 	http://www.cubrid.org/manual/840/en/Checking%20Database%20Consistency
 	 */
 	function _repair_table($table)

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 		// connected database.
 		if ($this->conn_id)
 		{
-			return "SELECT '" . $this->database . "'";
+			return "SELECT '".$this->database."'";
 		}
 		else
 		{

Braces +4 added lines, -3 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
  *
@@ -40,8 +42,7 @@ 
 		if ($this->conn_id)
 		{
 			return "SELECT '" . $this->database . "'";
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}