iNextrix / ASTPP

web_interface/astpp/system/database/drivers/mysql/mysql_forge.php

Doc Comments +4 added lines, -4 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)
 	{
@@ -140,7 +140,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)
 	{
@@ -212,7 +212,7 @@ 
 	 * @param	string	the column name
 	 * @param	array	fields
 	 * @param	string	the field after which we should add the new field
-	 * @return	object
+	 * @return	string
 	 */
 	function _alter_table($alter_type, $table, $fields, $after_field = '')
 	{

Spacing +4 added lines, -4 removed lines

@@ -86,7 +86,7 @@ 
 
 				if (array_key_exists('TYPE', $attributes))
 				{
-					$sql .=  ' '.$attributes['TYPE'];
+					$sql .= ' '.$attributes['TYPE'];
 				}
 
 				if (array_key_exists('CONSTRAINT', $attributes))
@@ -159,7 +159,7 @@ 
 		{
 			$key_name = $this->db->_protect_identifiers(implode('_', $primary_keys));
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);
-			$sql .= ",\n\tPRIMARY KEY ".$key_name." (" . implode(', ', $primary_keys) . ")";
+			$sql .= ",\n\tPRIMARY KEY ".$key_name." (".implode(', ', $primary_keys).")";
 		}
 
 		if (is_array($keys) && count($keys) > 0)
@@ -177,7 +177,7 @@ 
 					$key = array($key_name);
 				}
 
-				$sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")";
+				$sql .= ",\n\tKEY {$key_name} (".implode(', ', $key).")";
 			}
 		}
 
@@ -228,7 +228,7 @@ 
 
 		if ($after_field != '')
 		{
-			$sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);
+			$sql .= ' AFTER '.$this->db->_protect_identifiers($after_field);
 		}
 
 		return $sql;

Braces +6 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
  *
@@ -72,8 +74,7 @@ 
 			if (is_numeric($field))
 			{
 				$sql .= "\n\t$attributes";
-			}
-			else
+			} else
 			{
 				$attributes = array_change_key_case($attributes, CASE_UPPER);
 
@@ -107,8 +108,7 @@ 
 				if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE)
 				{
 					$sql .= ' NULL';
-				}
-				else
+				} else
 				{
 					$sql .= ' NOT NULL';
 				}
@@ -170,8 +170,7 @@ 
 				{
 					$key_name = $this->db->_protect_identifiers(implode('_', $key));
 					$key = $this->db->_protect_identifiers($key);
-				}
-				else
+				} else
 				{
 					$key_name = $this->db->_protect_identifiers($key);
 					$key = array($key_name);

web_interface/astpp/system/database/drivers/mysql/mysql_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 +3 added lines, -3 removed lines

@@ -94,9 +94,9 @@
 			$F				= new stdClass();
 			$F->name		= $field->Field;
 			$F->type		= $type;
-			$F->default		= $field->Default;
-			$F->max_length	= $length;
-			$F->primary_key = ( $field->Key == 'PRI' ? 1 : 0 );
+			$F->default = $field->Default;
+			$F->max_length = $length;
+			$F->primary_key = ($field->Key == 'PRI' ? 1 : 0);
 
 			$retval[] = $F;
 		}

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/oci8/oci8_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/odbc/odbc_driver.php

Doc Comments +6 added lines, -6 removed lines

@@ -124,7 +124,7 @@ 
 	 * Select the database
 	 *
 	 * @access	private called by the base class
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_select()
 	{
@@ -140,7 +140,7 @@ 
 	 * @access	public
 	 * @param	string
 	 * @param	string
-	 * @return	resource
+	 * @return	boolean
 	 */
 	function db_set_charset($charset, $collation)
 	{
@@ -368,7 +368,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string
-	 * @return	string
+	 * @return	integer
 	 */
 	function count_all($table = '')
 	{
@@ -437,7 +437,7 @@ 
 	 *
 	 * @access	public
 	 * @param	string	the table name
-	 * @return	object
+	 * @return	string
 	 */
 	function _field_data($table)
 	{
@@ -463,7 +463,7 @@ 
 	 * The error message number
 	 *
 	 * @access	private
-	 * @return	integer
+	 * @return	string
 	 */
 	function _error_number()
 	{
@@ -522,7 +522,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 +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/odbc/odbc_forge.php

Doc Comments +2 added lines, -2 removed lines

@@ -73,7 +73,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)
 	{
@@ -203,7 +203,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/postgre/postgre_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/application/modules/trunk/views/view_trunk_add_edit.php

Braces +4 added lines, -1 removed lines

@@ -20,7 +20,10 @@
     <section class="slice color-three no-margin">

 	<div class="w-section inverse no-padding">

             <div style="color:red;margin-left: 60px;">

-                <?php if (isset($validation_errors)) echo $validation_errors; ?> 

+                <?php if (isset($validation_errors)) {
+	echo $validation_errors;
+}
+?> 

             </div>

             <?php echo $form; ?>

         </div>      

web_interface/astpp/application/modules/animap/views/animap_add_edit.php

Braces +4 added lines, -1 removed lines

@@ -24,7 +24,10 @@
     <section class="slice color-three no-margin">
 	<div class="w-section inverse no-padding">
             <div style="color:red;margin-left: 60px;">
-                <?php if (isset($validation_errors)) echo $validation_errors; ?> 
+                <?php if (isset($validation_errors)) {
+	echo $validation_errors;
+}
+?> 
             </div>
             <?php echo $form; ?>
         </div>      

web_interface/astpp/application/modules/pricing/views/view_price_add_edit.php

Braces +4 added lines, -1 removed lines

@@ -20,7 +20,10 @@
     <section class="slice color-three no-margin">

 	<div class="w-section inverse no-padding">

             <div style="color:red;margin-left: 60px;">

-                <?php if (isset($validation_errors)) echo $validation_errors; ?> 

+                <?php if (isset($validation_errors)) {
+	echo $validation_errors;
+}
+?> 

             </div>

             <?php echo $form; ?>

         </div>