iNextrix / ASTPP

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

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))
 					{
@@ -174,7 +174,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)
@@ -192,7 +192,7 @@ 
 					$key = array($key_name);
 				}
 
-				$sql .= ",\n\tKEY {$key_name} (" . implode(', ', $key) . ")";
+				$sql .= ",\n\tKEY {$key_name} (".implode(', ', $key).")";
 			}
 		}
 
@@ -243,7 +243,7 @@ 
 
 		if ($after_field != '')
 		{
-			$sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);
+			$sql .= ' AFTER '.$this->db->_protect_identifiers($after_field);
 		}
 
 		return $sql;

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

Spacing +8 added lines, -8 removed lines

@@ -381,7 +381,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)
 		{
@@ -390,7 +390,7 @@ 
 
 		$row = $query->row();
 		$this->_reset_select();
-		return (int) $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -496,7 +496,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);
@@ -613,16 +613,16 @@ 
 	{
 		foreach ($values as $key => $val)
 		{
-			$valstr[] = $key . ' = ' . $val;
+			$valstr[] = $key.' = '.$val;
 		}
 
 		$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;
 
@@ -646,7 +646,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)
 		{
@@ -656,7 +656,7 @@ 
 			{
 				if ($field != $index)
 				{
-					$final[$field][] =  'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field];
+					$final[$field][] = 'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field];
 				}
 			}
 		}

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

Spacing +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
 			}
 
 			// Trim off the end comma
-			$field_str = preg_replace( "/, $/" , "" , $field_str);
+			$field_str = preg_replace("/, $/", "", $field_str);
 
 
 			// Build the insert string
@@ -193,7 +193,7 @@ 
 				}
 
 				// Remove the comma at the end of the string
-				$val_str = preg_replace( "/, $/" , "" , $val_str);
+				$val_str = preg_replace("/, $/", "", $val_str);
 
 				// Build the INSERT string
 				$output .= 'INSERT INTO '.$table.' ('.$field_str.') VALUES ('.$val_str.');'.$newline;

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

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

web_interface/astpp/system/database/drivers/pdo/pdo_forge.php

Spacing +4 added lines, -4 removed lines

@@ -102,7 +102,7 @@ 
 
 				$sql .= "\n\t".$this->db->_protect_identifiers($field);
 
-				$sql .=  ' '.$attributes['TYPE'];
+				$sql .= ' '.$attributes['TYPE'];
 
 				if (array_key_exists('CONSTRAINT', $attributes))
 				{
@@ -144,7 +144,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)
@@ -160,7 +160,7 @@ 
 					$key = array($this->db->_protect_identifiers($key));
 				}
 
-				$sql .= ",\n\tFOREIGN KEY (" . implode(', ', $key) . ")";
+				$sql .= ",\n\tFOREIGN KEY (".implode(', ', $key).")";
 			}
 		}
 
@@ -233,7 +233,7 @@ 
 
 		if ($after_field != '')
 		{
-			$sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);
+			$sql .= ' AFTER '.$this->db->_protect_identifiers($after_field);
 		}
 
 		return $sql;

web_interface/astpp/system/database/drivers/pdo/pdo_driver.php

Spacing +13 added lines, -13 removed lines

@@ -59,7 +59,7 @@ 
 			$this->_like_escape_chr = '';
 			
 			//Prior to this version, the charset can't be set in the dsn
-			if(is_php('5.3.6'))
+			if (is_php('5.3.6'))
 			{
 				$this->hostname .= ";charset={$this->char_set}";
 			}
@@ -243,7 +243,7 @@ 
 		// Reset the transaction failure flag.
 		// If the $test_mode flag is set to TRUE transactions will be rolled back
 		// even if the queries produce a successful result.
-		$this->_trans_failure = (bool) ($test_mode === TRUE);
+		$this->_trans_failure = (bool)($test_mode === TRUE);
 
 		return $this->conn_id->beginTransaction();
 	}
@@ -332,7 +332,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);
 		}
@@ -361,18 +361,18 @@ 
 	 * @access	public
 	 * @return	integer
 	 */
-	function insert_id($name=NULL)
+	function insert_id($name = NULL)
 	{
 		//Convenience method for postgres insertid
 		if (strpos($this->hostname, 'pgsql') !== FALSE)
 		{
 			$v = $this->_version();
 
-			$table	= func_num_args() > 0 ? func_get_arg(0) : NULL;
+			$table = func_num_args() > 0 ? func_get_arg(0) : NULL;
 
 			if ($table == NULL && $v >= '8.1')
 			{
-				$sql='SELECT LASTVAL() as ins_id';
+				$sql = 'SELECT LASTVAL() as ins_id';
 			}
 			$query = $this->query($sql);
 			$row = $query->row();
@@ -403,7 +403,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)
 		{
@@ -412,7 +412,7 @@ 
 
 		$row = $query->row();
 		$this->_reset_select();
-		return (int) $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
@@ -520,7 +520,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);
@@ -623,11 +623,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;
 
@@ -650,7 +650,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)
 		{
@@ -660,7 +660,7 @@ 
 			{
 				if ($field != $index)
 				{
-					$final[$field][] =  'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field];
+					$final[$field][] = 'WHEN '.$index.' = '.$val[$index].' THEN '.$val[$field];
 				}
 			}
 		}

web_interface/astpp/system/database/drivers/pdo/pdo_result.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	
 		try
 		{
-			for($i = 0; $i < $this->num_fields(); $i++)
+			for ($i = 0; $i < $this->num_fields(); $i++)
 			{
 				$data[] = $this->result_id->getColumnMeta($i);
 			}

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

Spacing +5 added lines, -5 removed lines

@@ -81,7 +81,7 @@ 
 			{
 				$attributes = array_change_key_case($attributes, CASE_UPPER);
 
-				$sql .= "\n\t\"" . $this->db->_protect_identifiers($field) . "\"";
+				$sql .= "\n\t\"".$this->db->_protect_identifiers($field)."\"";
 
 				if (array_key_exists('NAME', $attributes))
 				{
@@ -185,11 +185,11 @@ 
 		// If there is a PK defined
 		if (count($primary_keys) > 0)
 		{
-			$key_name = "pk_" . $table . "_" .
+			$key_name = "pk_".$table."_".
 				$this->db->_protect_identifiers(implode('_', $primary_keys));
 			
 			$primary_keys = $this->db->_protect_identifiers($primary_keys);
-			$sql .= ",\n\tCONSTRAINT " . $key_name . " PRIMARY KEY(" . implode(', ', $primary_keys) . ")";
+			$sql .= ",\n\tCONSTRAINT ".$key_name." PRIMARY KEY(".implode(', ', $primary_keys).")";
 		}
 
 		if (is_array($keys) && count($keys) > 0)
@@ -207,7 +207,7 @@ 
 					$key = array($key_name);
 				}
 				
-				$sql .= ",\n\tKEY \"{$key_name}\" (" . implode(', ', $key) . ")";
+				$sql .= ",\n\tKEY \"{$key_name}\" (".implode(', ', $key).")";
 			}
 		}
 
@@ -258,7 +258,7 @@ 
 
 		if ($after_field != '')
 		{
-			$sql .= ' AFTER ' . $this->db->_protect_identifiers($after_field);
+			$sql .= ' AFTER '.$this->db->_protect_identifiers($after_field);
 		}
 
 		return $sql;

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

Spacing +7 added lines, -7 removed lines

@@ -83,11 +83,11 @@ 
 
 		while ($field = cubrid_fetch_field($this->result_id))
 		{
-			$F				= new stdClass();
+			$F = new stdClass();
 			$F->name		= $field->name;
 			$F->type		= $field->type;
-			$F->default		= $field->def;
-			$F->max_length	= $field->max_length;
+			$F->default = $field->def;
+			$F->max_length = $field->max_length;
 
 			// At this moment primary_key property is not returned when
 			// cubrid_fetch_field is called. The following code will
@@ -103,9 +103,9 @@ 
 			// The query will search for exact single columns, thus
 			// compound PK is not supported.
 			$res = cubrid_query($this->conn_id,
-				"SELECT COUNT(*) FROM db_index WHERE class_name = '" . $field->table .
-				"' AND is_primary_key = 'YES' AND index_name = 'pk_" .
-				$field->table . "_" . $field->name . "'"
+				"SELECT COUNT(*) FROM db_index WHERE class_name = '".$field->table.
+				"' AND is_primary_key = 'YES' AND index_name = 'pk_".
+				$field->table."_".$field->name."'"
 			);
 
 			if ($res)
@@ -139,7 +139,7 @@ 
 	 */
 	function free_result()
 	{
-		if(is_resource($this->result_id) ||
+		if (is_resource($this->result_id) ||
 			get_resource_type($this->result_id) == "Unknown" &&
 			preg_match('/Resource id #/', strval($this->result_id)))
 		{