iNextrix / ASTPP

web_interface/astpp/system/database/DB_utility.php

Spacing +6 added lines, -6 removed lines

@@ -25,7 +25,7 @@ 
 class CI_DB_utility extends CI_DB_forge {
 
 	var $db;
-	var $data_cache		= array();
+	var $data_cache = array();
 
 	/**
 	 * Constructor
@@ -36,8 +36,8 @@ 
 	function __construct()
 	{
 		// Assign the main database object to $this->db
-		$CI =& get_instance();
-		$this->db =& $CI->db;
+		$CI = & get_instance();
+		$this->db = & $CI->db;
 
 		log_message('debug', "Database Utility Class Initialized");
 	}
@@ -260,7 +260,7 @@ 
 		extract($params);
 
 		// Load the xml helper
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->helper('xml');
 
 		// Generate the result
@@ -345,7 +345,7 @@ 
 		// Is the encoder supported?  If not, we'll either issue an
 		// error or use plain text depending on the debug settings
 		if (($prefs['format'] == 'gzip' AND ! @function_exists('gzencode'))
-		OR ($prefs['format'] == 'zip'  AND ! @function_exists('gzcompress')))
+		OR ($prefs['format'] == 'zip' AND ! @function_exists('gzcompress')))
 		{
 			if ($this->db->db_debug)
 			{
@@ -399,7 +399,7 @@ 
 
 			// Load the Zip class and output it
 
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->load->library('zip');
 			$CI->zip->add_data($prefs['filename'], $this->_backup($prefs));
 			return $CI->zip->get_zip();

web_interface/astpp/system/database/DB_driver.php

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,

web_interface/astpp/system/database/DB_forge.php

Spacing +9 added lines, -9 removed lines

@@ -24,10 +24,10 @@ 
  */
 class CI_DB_forge {
 
-	var $fields			= array();
-	var $keys			= array();
-	var $primary_keys	= array();
-	var $db_char_set	=	'';
+	var $fields = array();
+	var $keys = array();
+	var $primary_keys = array();
+	var $db_char_set = '';
 
 	/**
 	 * Constructor
@@ -38,8 +38,8 @@ 
 	function __construct()
 	{
 		// Assign the main database object to $this->db
-		$CI =& get_instance();
-		$this->db =& $CI->db;
+		$CI = & get_instance();
+		$this->db = & $CI->db;
 		log_message('debug', "Database Forge Class Initialized");
 	}
 
@@ -371,9 +371,9 @@ 
 	 */
 	function _reset()
 	{
-		$this->fields		= array();
-		$this->keys			= array();
-		$this->primary_keys	= array();
+		$this->fields = array();
+		$this->keys = array();
+		$this->primary_keys = array();
 	}
 
 }

web_interface/astpp/system/database/DB_cache.php

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 == '')

web_interface/astpp/system/database/DB_result.php

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

web_interface/astpp/system/database/DB_active_rec.php

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

web_interface/astpp/system/helpers/file_helper.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 		$data = '';
 		if (filesize($file) > 0)
 		{
-			$data =& fread($fp, filesize($file));
+			$data = & fread($fp, filesize($file));
 		}
 
 		flock($fp, LOCK_UN);
@@ -438,17 +438,17 @@ 
 		// Owner
 		$symbolic .= (($perms & 0x0100) ? 'r' : '-');
 		$symbolic .= (($perms & 0x0080) ? 'w' : '-');
-		$symbolic .= (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x' ) : (($perms & 0x0800) ? 'S' : '-'));
+		$symbolic .= (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x') : (($perms & 0x0800) ? 'S' : '-'));
 
 		// Group
 		$symbolic .= (($perms & 0x0020) ? 'r' : '-');
 		$symbolic .= (($perms & 0x0010) ? 'w' : '-');
-		$symbolic .= (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x' ) : (($perms & 0x0400) ? 'S' : '-'));
+		$symbolic .= (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x') : (($perms & 0x0400) ? 'S' : '-'));
 
 		// World
 		$symbolic .= (($perms & 0x0004) ? 'r' : '-');
 		$symbolic .= (($perms & 0x0002) ? 'w' : '-');
-		$symbolic .= (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x' ) : (($perms & 0x0200) ? 'T' : '-'));
+		$symbolic .= (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x') : (($perms & 0x0200) ? 'T' : '-'));
 
 		return $symbolic;
 	}

web_interface/astpp/system/helpers/xml_helper.php

Spacing +4 added lines, -4 removed lines

@@ -46,19 +46,19 @@
 
 		if ($protect_all === TRUE)
 		{
-			$str = preg_replace("/&(\w+);/",  "$temp\\1;", $str);
+			$str = preg_replace("/&(\w+);/", "$temp\\1;", $str);
 		}
 
-		$str = str_replace(array("&","<",">","\"", "'", "-"),
+		$str = str_replace(array("&", "<", ">", "\"", "'", "-"),
 							array("&amp;", "&lt;", "&gt;", "&quot;", "&apos;", "&#45;"),
 							$str);
 
 		// Decode the temp markers back to entities
-		$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
+		$str = preg_replace("/$temp(\d+);/", "&#\\1;", $str);
 
 		if ($protect_all === TRUE)
 		{
-			$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
+			$str = preg_replace("/$temp(\w+);/", "&\\1;", $str);
 		}
 
 		return $str;

web_interface/astpp/system/helpers/typography_helper.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
 {
 	function nl2br_except_pre($str)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		$CI->load->library('typography');
 
@@ -62,7 +62,7 @@ 
 {
 	function auto_typography($str, $strip_js_event_handlers = TRUE, $reduce_linebreaks = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->library('typography');
 		return $CI->typography->auto_typography($str, $strip_js_event_handlers, $reduce_linebreaks);
 	}
@@ -82,7 +82,7 @@ 
  */
 if ( ! function_exists('entity_decode'))
 {
-	function entity_decode($str, $charset='UTF-8')
+	function entity_decode($str, $charset = 'UTF-8')
 	{
 		global $SEC;
 		return $SEC->entity_decode($str, $charset);