iNextrix / ASTPP

web_interface/astpp/system/database/drivers/sqlite/sqlite_driver.php

Doc Comments +6 added lines, -6 removed lines

@@ -119,7 +119,7 @@ 
 	 * Select the database
 	 *
 	 * @access	private called by the base class
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_select()
 	{
@@ -134,7 +134,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	string
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_set_charset($charset, $collation)
 	{
@@ -337,7 +337,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
-	 * @return	string
+	 * @return	integer
 	 */
 	function count_all($table = '')
 	{
@@ -389,7 +389,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string	the table name
-	 * @return	string
+	 * @return	boolean
 	 */
 	function _list_columns($table = '')
 	{
@@ -406,7 +406,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _field_data($table)
 	{
@@ -491,7 +491,7 @@ 
 	 *
 	 * @access	public
 	 * @param	type
-	 * @return	type
+	 * @return	string
 	 */
 	function _from_tables($tables)
 	{

Spacing +6 added lines, -6 removed lines

@@ -293,7 +293,7 @@ 
 		// escape LIKE condition wildcards
 		if ($like === TRUE)
 		{
-			$str = str_replace(	array('%', '_', $this->_like_escape_chr),
+			$str = str_replace(array('%', '_', $this->_like_escape_chr),
 								array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr),
 								$str);
 		}
@@ -346,7 +346,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)
 		{
@@ -355,7 +355,7 @@ 
 
 		$row = $query->row();
 		$this->_reset_select();
-		return (int) $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -461,7 +461,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);
@@ -545,11 +545,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;
 

Braces +5 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -471,8 +473,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;
 		}
@@ -627,8 +628,7 @@ 
 		if ($offset == 0)
 		{
 			$offset = '';
-		}
-		else
+		} else
 		{
 			$offset .= ", ";
 		}

web_interface/astpp/system/database/drivers/sqlite/sqlite_forge.php

Doc Comments +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 	 * @param	mixed	primary key(s)
 	 * @param	mixed	key(s)
 	 * @param	boolean	should 'IF NOT EXISTS' be added to the SQL
-	 * @return	bool
+	 * @return	string
 	 */
 	function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists)
 	{
@@ -202,7 +202,7 @@ 
 	 * @param	string	the default value
 	 * @param	boolean	should 'NOT NULL' be added
 	 * @param	string	the field after which we should add the new field
-	 * @return	object
+	 * @return	false|string
 	 */
 	function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '')
 	{

Spacing +4 added lines, -4 removed lines

@@ -100,7 +100,7 @@ 
 
 				$sql .= "\n\t".$this->db->_protect_identifiers($field);
 
-				$sql .=  ' '.$attributes['TYPE'];
+				$sql .= ' '.$attributes['TYPE'];
 
 				if (array_key_exists('CONSTRAINT', $attributes))
 				{
@@ -142,7 +142,7 @@ 
 		if (count($primary_keys) > 0)
 		{
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);
-			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";
+			$sql .= ",\n\tPRIMARY KEY (".implode(', ', $primary_keys).")";
 		}
 
 		if (is_array($keys) && count($keys) > 0)
@@ -158,7 +158,7 @@ 
 					$key = array($this->db->_protect_identifiers($key));
 				}
 
-				$sql .= ",\n\tUNIQUE (" . implode(', ', $key) . ")";
+				$sql .= ",\n\tUNIQUE (".implode(', ', $key).")";
 			}
 		}
 
@@ -235,7 +235,7 @@ 
 
 		if ($after_field != '')
 		{
-			$sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);
+			$sql .= ' AFTER '.$this->db->_protect_identifiers($after_field);
 		}
 
 		return $sql;

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
  *
@@ -96,8 +98,7 @@ 
 			if (is_numeric($field))
 			{
 				$sql .= "\n\t$attributes";
-			}
-			else
+			} else
 			{
 				$attributes = array_change_key_case($attributes, CASE_UPPER);
 
@@ -123,8 +124,7 @@ 
 				if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE)
 				{
 					$sql .= ' NULL';
-				}
-				else
+				} else
 				{
 					$sql .= ' NOT NULL';
 				}
@@ -155,8 +155,7 @@ 
 				if (is_array($key))
 				{
 					$key = $this->db->_protect_identifiers($key);
-				}
-				else
+				} else
 				{
 					$key = array($this->db->_protect_identifiers($key));
 				}
@@ -208,8 +207,7 @@ 
 		if ($null === NULL)
 		{
 			$sql .= ' NULL';
-		}
-		else
+		} else
 		{
 			$sql .= ' NOT NULL';
 		}

web_interface/astpp/system/database/drivers/sqlite/sqlite_result.php

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 	 * result set starts at zero
 	 *
 	 * @access	private
-	 * @return	array
+	 * @return	boolean
 	 */
 	function _data_seek($n = 0)
 	{

Spacing +4 added lines, -4 removed lines

@@ -86,12 +86,12 @@ 
 		$retval = array();
 		for ($i = 0; $i < $this->num_fields(); $i++)
 		{
-			$F				= new stdClass();
+			$F = new stdClass();
 			$F->name		= sqlite_field_name($this->result_id, $i);
 			$F->type		= 'varchar';
-			$F->max_length	= 0;
+			$F->max_length = 0;
 			$F->primary_key = 0;
-			$F->default		= '';
+			$F->default = '';
 
 			$retval[] = $F;
 		}
@@ -164,7 +164,7 @@ 
 			$arr = sqlite_fetch_array($this->result_id, SQLITE_ASSOC);
 			if (is_array($arr))
 			{
-				$obj = (object) $arr;
+				$obj = (object)$arr;
 				return $obj;
 			} else {
 				return NULL;

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/drivers/sqlite/sqlite_utility.php

Doc Comments +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	boolean
 	 */
 	function _optimize_table($table)
 	{
@@ -69,7 +69,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	boolean
 	 */
 	function _repair_table($table)
 	{

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/drivers/sqlsrv/sqlsrv_driver.php

Doc Comments +5 added lines, -4 removed lines

@@ -126,7 +126,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	string
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_set_charset($charset, $collation)
 	{
@@ -141,6 +141,7 @@ 
 	 *
 	 * @access	private called by the base class
 	 * @param	string	an SQL query
+	 * @param string $sql
 	 * @return	resource
 	 */
 	function _execute($sql)
@@ -299,7 +300,7 @@ 
 	*
 	* @access private
 	* @param string $version
-	* @return int16 major version number
+	* @return string major version number
 	*/
 	function _parse_major_version($version)
 	{
@@ -389,7 +390,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _field_data($table)
 	{
@@ -466,7 +467,7 @@ 
 	 *
 	 * @access	public
 	 * @param	type
-	 * @return	type
+	 * @return	string
 	 */
 	function _from_tables($tables)
 	{

Indentation +21 added lines, -21 removed lines

@@ -277,13 +277,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Insert ID
-	*
-	* Returns the last id created in the Identity column.
-	*
-	* @access public
-	* @return integer
-	*/
+	 * Insert ID
+	 *
+	 * Returns the last id created in the Identity column.
+	 *
+	 * @access public
+	 * @return integer
+	 */
 	function insert_id()
 	{
 		return $this->query('select @@IDENTITY as insert_id')->row('insert_id');
@@ -292,15 +292,15 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Parse major version
-	*
-	* Grabs the major version number from the
-	* database server version string passed in.
-	*
-	* @access private
-	* @param string $version
-	* @return int16 major version number
-	*/
+	 * Parse major version
+	 *
+	 * Grabs the major version number from the
+	 * database server version string passed in.
+	 *
+	 * @access private
+	 * @param string $version
+	 * @return int16 major version number
+	 */
 	function _parse_major_version($version)
 	{
 		preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info);
@@ -310,11 +310,11 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Version number query string
-	*
-	* @access public
-	* @return string
-	*/
+	 * Version number query string
+	 *
+	 * @access public
+	 * @return string
+	 */
 	function _version()
 	{
 		$info = sqlsrv_server_info($this->conn_id);

Spacing +7 added lines, -7 removed lines

@@ -69,7 +69,7 @@ 
 		
 		// If the username and password are both empty, assume this is a 
 		// 'Windows Authentication Mode' connection.
-		if(empty($connection['UID']) && empty($connection['PWD'])) {
+		if (empty($connection['UID']) && empty($connection['PWD'])) {
 			unset($connection['UID'], $connection['PWD']);
 		}
 
@@ -115,7 +115,7 @@ 
 	 */
 	function db_select()
 	{
-		return $this->_execute('USE ' . $this->database);
+		return $this->_execute('USE '.$this->database);
 	}
 
 	// --------------------------------------------------------------------
@@ -338,7 +338,7 @@ 
 		if ($table == '')
 			return '0';
 	
-		$query = $this->query("SELECT COUNT(*) AS numrows FROM " . $this->dbprefix . $table);
+		$query = $this->query("SELECT COUNT(*) AS numrows FROM ".$this->dbprefix.$table);
 		
 		if ($query->num_rows() == 0)
 			return '0';
@@ -393,7 +393,7 @@ 
 	 */
 	function _field_data($table)
 	{
-		return "SELECT TOP 1 * FROM " . $this->_escape_table($table);	
+		return "SELECT TOP 1 * FROM ".$this->_escape_table($table);	
 	}
 
 	// --------------------------------------------------------------------
@@ -407,7 +407,7 @@ 
 	function _error_message()
 	{
 		$error = array_shift(sqlsrv_errors());
-		return !empty($error['message']) ? $error['message'] : null;
+		return ! empty($error['message']) ? $error['message'] : null;
 	}
 
 	// --------------------------------------------------------------------
@@ -513,7 +513,7 @@ 
 	 */
 	function _update($table, $values, $where)
 	{
-		foreach($values as $key => $val)
+		foreach ($values as $key => $val)
 		{
 			$valstr[] = $key." = ".$val;
 		}
@@ -574,7 +574,7 @@ 
 	{
 		$i = $limit + $offset;
 	
-		return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$i.' ', $sql);		
+		return preg_replace('/(^\SELECT (DISTINCT)?)/i', '\\1 TOP '.$i.' ', $sql);		
 	}
 
 	// --------------------------------------------------------------------

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -335,13 +337,15 @@ 
 	 */
 	function count_all($table = '')
 	{
-		if ($table == '')
-			return '0';
+		if ($table == '') {
+					return '0';
+		}
 	
 		$query = $this->query("SELECT COUNT(*) AS numrows FROM " . $this->dbprefix . $table);
 		
-		if ($query->num_rows() == 0)
-			return '0';
+		if ($query->num_rows() == 0) {
+					return '0';
+		}
 
 		$row = $query->row();
 		$this->_reset_select();

web_interface/astpp/system/database/drivers/sqlsrv/sqlsrv_forge.php

Doc Comments +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the database name
-	 * @return	bool
+	 * @return	string
 	 */
 	function _create_database($name)
 	{
@@ -43,7 +43,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the database name
-	 * @return	bool
+	 * @return	string
 	 */
 	function _drop_database($name)
 	{
@@ -56,7 +56,7 @@ 
 	 * Drop Table
 	 *
 	 * @access	private
-	 * @return	bool
+	 * @return	string
 	 */
 	function _drop_table($table)
 	{
@@ -74,7 +74,7 @@ 
 	 * @param	mixed	primary key(s)
 	 * @param	mixed	key(s)
 	 * @param	boolean	should 'IF NOT EXISTS' be added to the SQL
-	 * @return	bool
+	 * @return	string
 	 */
 	function _create_table($table, $fields, $primary_keys, $keys, $if_not_exists)
 	{
@@ -186,7 +186,7 @@ 
 	 * @param	string	the default value
 	 * @param	boolean	should 'NOT NULL' be added
 	 * @param	string	the field after which we should add the new field
-	 * @return	object
+	 * @return	string
 	 */
 	function _alter_table($alter_type, $table, $column_name, $column_definition = '', $default_value = '', $null = '', $after_field = '')
 	{

Spacing +4 added lines, -4 removed lines

@@ -103,7 +103,7 @@ 
 
 				$sql .= "\n\t".$this->db->_protect_identifiers($field);
 
-				$sql .=  ' '.$attributes['TYPE'];
+				$sql .= ' '.$attributes['TYPE'];
 
 				if (array_key_exists('CONSTRAINT', $attributes))
 				{
@@ -145,7 +145,7 @@ 
 		if (count($primary_keys) > 0)
 		{
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);
-			$sql .= ",\n\tPRIMARY KEY (" . implode(', ', $primary_keys) . ")";
+			$sql .= ",\n\tPRIMARY KEY (".implode(', ', $primary_keys).")";
 		}
 
 		if (is_array($keys) && count($keys) > 0)
@@ -161,7 +161,7 @@ 
 					$key = array($this->db->_protect_identifiers($key));
 				}
 
-				$sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")";
+				$sql .= ",\n\tFOREIGN KEY (".implode(', ', $key).")";
 			}
 		}
 
@@ -216,7 +216,7 @@ 
 
 		if ($after_field != '')
 		{
-			$sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);
+			$sql .= ' AFTER '.$this->db->_protect_identifiers($after_field);
 		}
 
 		return $sql;

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
  *
@@ -96,8 +98,7 @@ 
 			if (is_numeric($field))
 			{
 				$sql .= "\n\t$attributes";
-			}
-			else
+			} else
 			{
 				$attributes = array_change_key_case($attributes, CASE_UPPER);
 
@@ -123,8 +124,7 @@ 
 				if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE)
 				{
 					$sql .= ' NULL';
-				}
-				else
+				} else
 				{
 					$sql .= ' NOT NULL';
 				}
@@ -155,8 +155,7 @@ 
 				if (is_array($key))
 				{
 					$key = $this->db->_protect_identifiers($key);
-				}
-				else
+				} else
 				{
 					$key = array($this->db->_protect_identifiers($key));
 				}
@@ -208,8 +207,7 @@ 
 		if ($null === NULL)
 		{
 			$sql .= ' NULL';
-		}
-		else
+		} else
 		{
 			$sql .= ' NOT NULL';
 		}

web_interface/astpp/system/database/drivers/sqlsrv/sqlsrv_utility.php

Doc Comments +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 	 * List databases
 	 *
 	 * @access	private
-	 * @return	bool
+	 * @return	string
 	 */
 	function _list_databases()
 	{
@@ -44,7 +44,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	boolean
 	 */
 	function _optimize_table($table)
 	{
@@ -60,7 +60,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	boolean
 	 */
 	function _repair_table($table)
 	{

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/helpers/file_helper.php

Doc Comments +10 added lines

@@ -38,6 +38,9 @@ 
  */
 if ( ! function_exists('read_file'))
 {
+	/**
+	 * @param string $file
+	 */
 	function read_file($file)
 	{
 		if ( ! file_exists($file))
@@ -85,6 +88,10 @@ 
  */
 if ( ! function_exists('write_file'))
 {
+	/**
+	 * @param string $path
+	 * @param string $data
+	 */
 	function write_file($path, $data, $mode = FOPEN_WRITE_CREATE_DESTRUCTIVE)
 	{
 		if ( ! $fp = @fopen($path, $mode))
@@ -278,6 +285,9 @@ 
 */
 if ( ! function_exists('get_file_info'))
 {
+	/**
+	 * @param string $file
+	 */
 	function get_file_info($file, $returned_values = array('name', 'server_path', 'size', 'date'))
 	{
 

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

Braces +18 added lines, -31 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
  *
@@ -139,8 +141,7 @@ 
 					{
 						delete_files($path.DIRECTORY_SEPARATOR.$filename, $del_dir, $level + 1);
 					}
-				}
-				else
+				} else
 				{
 					unlink($path.DIRECTORY_SEPARATOR.$filename);
 				}
@@ -191,15 +192,13 @@ 
 				if (@is_dir($source_dir.$file) && strncmp($file, '.', 1) !== 0)
 				{
 					get_filenames($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE);
-				}
-				elseif (strncmp($file, '.', 1) !== 0)
+				} elseif (strncmp($file, '.', 1) !== 0)
 				{
 					$_filedata[] = ($include_path == TRUE) ? $source_dir.$file : $file;
 				}
 			}
 			return $_filedata;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -244,8 +243,7 @@ 
 				if (@is_dir($source_dir.$file) AND strncmp($file, '.', 1) !== 0 AND $top_level_only === FALSE)
 				{
 					get_dir_file_info($source_dir.$file.DIRECTORY_SEPARATOR, $top_level_only, TRUE);
-				}
-				elseif (strncmp($file, '.', 1) !== 0)
+				} elseif (strncmp($file, '.', 1) !== 0)
 				{
 					$_filedata[$file] = get_file_info($source_dir.$file);
 					$_filedata[$file]['relative_path'] = $relative_path;
@@ -253,8 +251,7 @@ 
 			}
 
 			return $_filedata;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -355,8 +352,7 @@ 
 			if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 			{
 				include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
-			}
-			elseif (is_file(APPPATH.'config/mimes.php'))
+			} elseif (is_file(APPPATH.'config/mimes.php'))
 			{
 				include(APPPATH.'config/mimes.php');
 			}
@@ -373,13 +369,11 @@ 
 			{
 				// Multiple mime types, just give the first one
 				return current($mimes[$extension]);
-			}
-			else
+			} else
 			{
 				return $mimes[$extension];
 			}
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -405,32 +399,25 @@ 
 		if (($perms & 0xC000) == 0xC000)
 		{
 			$symbolic = 's'; // Socket
-		}
-		elseif (($perms & 0xA000) == 0xA000)
+		} elseif (($perms & 0xA000) == 0xA000)
 		{
 			$symbolic = 'l'; // Symbolic Link
-		}
-		elseif (($perms & 0x8000) == 0x8000)
+		} elseif (($perms & 0x8000) == 0x8000)
 		{
 			$symbolic = '-'; // Regular
-		}
-		elseif (($perms & 0x6000) == 0x6000)
+		} elseif (($perms & 0x6000) == 0x6000)
 		{
 			$symbolic = 'b'; // Block special
-		}
-		elseif (($perms & 0x4000) == 0x4000)
+		} elseif (($perms & 0x4000) == 0x4000)
 		{
 			$symbolic = 'd'; // Directory
-		}
-		elseif (($perms & 0x2000) == 0x2000)
+		} elseif (($perms & 0x2000) == 0x2000)
 		{
 			$symbolic = 'c'; // Character special
-		}
-		elseif (($perms & 0x1000) == 0x1000)
+		} elseif (($perms & 0x1000) == 0x1000)
 		{
 			$symbolic = 'p'; // FIFO pipe
-		}
-		else
+		} else
 		{
 			$symbolic = 'u'; // Unknown
 		}

web_interface/astpp/system/helpers/security_helper.php

Doc Comments +3 added lines

@@ -73,6 +73,9 @@
  */
 if ( ! function_exists('do_hash'))
 {
+	/**
+	 * @param string $str
+	 */
 	function do_hash($str, $type = 'sha1')
 	{
 		if ($type == 'sha1')

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 {
 	function xss_clean($str, $is_image = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->security->xss_clean($str, $is_image);
 	}
 }
@@ -57,7 +57,7 @@ 
 {
 	function sanitize_filename($filename)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->security->sanitize_filename($filename);
 	}
 }
@@ -119,7 +119,7 @@ 
 {
 	function encode_php_tags($str)
 	{
-		return str_replace(array('<?php', '<?PHP', '<?', '?>'),  array('&lt;?php', '&lt;?PHP', '&lt;?', '?&gt;'), $str);
+		return str_replace(array('<?php', '<?PHP', '<?', '?>'), array('&lt;?php', '&lt;?PHP', '&lt;?', '?&gt;'), $str);
 	}
 }
 

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