EGroupware / egroupware

api/src/Storage/Base.php

Spacing +220 added lines, -220 removed lines

@@ -179,7 +179,7 @@ 
 	 * @param string $timestamp_type =null default null=leave them as is, 'ts'|'integer' use integer unix timestamps,
 	 * 	'object' use Api\DateTime objects or 'string' use DB timestamp (Y-m-d H:i:s) string
 	 */
-	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false,$timestamp_type=null)
+	function __construct($app = '', $table = '', Api\Db $db = null, $column_prefix = '', $no_clone = false, $timestamp_type = null)
 	{
 		// ease the transition to api
 		if ($app == 'phpgwapi') $app = 'api';
@@ -200,11 +200,11 @@ 
 
 			if (!$no_clone) $this->db->set_app($app);
 
-			if ($table) $this->setup_table($app,$table,$column_prefix);
+			if ($table) $this->setup_table($app, $table, $column_prefix);
 		}
 		$this->init();
 
-		if ((int) $this->debug >= 4)
+		if ((int)$this->debug >= 4)
 		{
 			echo "<p>".__METHOD__."('$app','$table')</p>\n";
 			_debug_array($this);
@@ -219,21 +219,21 @@ 
 	 * 	null=leave them as is, 'ts'|'integer' use integer unix timestamps, 'object' use Api\DateTime objects,
 	 *  'string' use DB timestamp (Y-m-d H:i:s) string
 	 */
-	public function set_times($timestamp_type=false)
+	public function set_times($timestamp_type = false)
 	{
 		if ($timestamp_type !== false) $this->timestamp_type = $timestamp_type;
 
 		// set current time
-		switch($this->timestamp_type)
+		switch ($this->timestamp_type)
 		{
 			case 'object':
 				$this->now = new Api\DateTime('now');
 				break;
 			case 'string':
-				$this->now = Api\DateTime::to('now',Api\DateTime::DATABASE);
+				$this->now = Api\DateTime::to('now', Api\DateTime::DATABASE);
 				break;
 			default:
-				$this->now = Api\DateTime::to('now','ts');
+				$this->now = Api\DateTime::to('now', 'ts');
 		}
 		$this->tz_offset_s = Api\DateTime::tz_offset_s();
 	}
@@ -247,10 +247,10 @@ 
 	 * @param string $table table-name
 	 * @param string $colum_prefix ='' column prefix to automatic remove from the column-name, if the column name starts with it
 	 */
-	function setup_table($app,$table,$colum_prefix='')
+	function setup_table($app, $table, $colum_prefix = '')
 	{
 		$this->table_name = $table;
-		$this->table_def = $this->db->get_table_definitions($app,$table);
+		$this->table_def = $this->db->get_table_definitions($app, $table);
 		if (!$this->table_def || !is_array($this->table_def['fd']))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."('$app','$table'): No table definition for '$table' found !!!");
@@ -258,14 +258,14 @@ 
 		$this->db_key_cols = $this->db_data_cols = $this->db_cols = array();
 		$this->autoinc_id = '';
 		$len_prefix = strlen($colum_prefix);
-		foreach($this->table_def['fd'] as $col => $def)
+		foreach ($this->table_def['fd'] as $col => $def)
 		{
 			$name = $col;
-			if ($len_prefix && substr($name,0,$len_prefix) == $colum_prefix)
+			if ($len_prefix && substr($name, 0, $len_prefix) == $colum_prefix)
 			{
-				$name = substr($col,$len_prefix);
+				$name = substr($col, $len_prefix);
 			}
-			if (in_array($col,$this->table_def['pk']))
+			if (in_array($col, $this->table_def['pk']))
 			{
 				$this->db_key_cols[$col] = $name;
 			}
@@ -281,13 +281,13 @@ 
 			}
 			if ($def['type'] == 'bool') $this->has_bools = true;
 
-			foreach($this->table_def['uc'] as $k => $uni_index)
+			foreach ($this->table_def['uc'] as $k => $uni_index)
 			{
-				if (is_array($uni_index) && in_array($name,$uni_index))
+				if (is_array($uni_index) && in_array($name, $uni_index))
 				{
 					$this->db_uni_cols[$k][$col] = $name;
 				}
-				elseif($name === $uni_index)
+				elseif ($name === $uni_index)
 				{
 					$this->db_uni_cols[$col] = $name;
 				}
@@ -302,9 +302,9 @@ 
 	function convert_all_timestamps()
 	{
 		$check_already_included = !empty($this->timestamps);
-		foreach($this->table_def['fd'] as $name => $data)
+		foreach ($this->table_def['fd'] as $name => $data)
 		{
-			if ($data['type'] == 'timestamp' && (!$check_already_included || !in_array($name,$this->timestamps)))
+			if ($data['type'] == 'timestamp' && (!$check_already_included || !in_array($name, $this->timestamps)))
 			{
 				$this->timestamps[] = $name;
 			}
@@ -318,22 +318,22 @@ 
 	 */
 	function data_merge($new)
 	{
-		if ((int) $this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new, true).")</p>\n";
 
 		if (!is_array($new) || !count($new))
 		{
 			return;
 		}
-		foreach($this->db_cols as $db_col => $col)
+		foreach ($this->db_cols as $db_col => $col)
 		{
-			if (array_key_exists($col,$new))
+			if (array_key_exists($col, $new))
 			{
 				$this->data[$col] = $new[$col];
 			}
 		}
-		foreach($this->non_db_cols as $db_col => $col)
+		foreach ($this->non_db_cols as $db_col => $col)
 		{
-			if (array_key_exists($col,$new))
+			if (array_key_exists($col, $new))
 			{
 				$this->data[$col] = $new[$col];
 			}
@@ -342,7 +342,7 @@ 
 		{
 			$this->data[self::USER_TIMEZONE_READ] = $new[self::USER_TIMEZONE_READ];
 		}
-		if ((int) $this->debug >= 4) _debug_array($this->data);
+		if ((int)$this->debug >= 4) _debug_array($this->data);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function db2data($data=null)
+	function db2data($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -374,7 +374,7 @@ 
 		}
 		if ($this->timestamps)
 		{
-			foreach($this->timestamps as $name)
+			foreach ($this->timestamps as $name)
 			{
 				if (isset($data[$name]) && $data[$name])
 				{
@@ -384,7 +384,7 @@ 
 					}
 					else
 					{
-						$data[$name] = Api\DateTime::server2user($data[$name],$this->timestamp_type);
+						$data[$name] = Api\DateTime::server2user($data[$name], $this->timestamp_type);
 					}
 				}
 			}
@@ -400,7 +400,7 @@ 
 					throw new Api\Exception\WrongParameter(__METHOD__."(): No table definition for '$this->table' found !!!");
 				}
 			}
-			foreach($this->table_def['fd'] as $col => $def)
+			foreach ($this->table_def['fd'] as $col => $def)
 			{
 				if ($def['type'] == 'bool' && isset($data[$col]))
 				{
@@ -432,7 +432,7 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function data2db($data=null)
+	function data2db($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -440,11 +440,11 @@ 
 		}
 		if ($this->timestamps)
 		{
-			foreach($this->timestamps as $name)
+			foreach ($this->timestamps as $name)
 			{
 				if (isset($data[$name]) && $data[$name])
 				{
-					$data[$name] = Api\DateTime::user2server($data[$name],$this->timestamp_type);
+					$data[$name] = Api\DateTime::user2server($data[$name], $this->timestamp_type);
 				}
 			}
 		}
@@ -457,7 +457,7 @@ 
 	 * @param array $keys =array() array with keys in form internalName => value
 	 * @return array internal data after init
 	 */
-	function init($keys=array())
+	function init($keys = array())
 	{
 		$this->data = array();
 
@@ -481,7 +481,7 @@ 
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 * @return array|boolean data if row could be retrived else False
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
 		if (!is_array($keys))
 		{
@@ -502,16 +502,16 @@ 
 		}
 		if (!$query)	// no primary key in keys, lets try the data_cols for a unique key
 		{
-			foreach($this->db_uni_cols as $db_col => $col)
+			foreach ($this->db_uni_cols as $db_col => $col)
 			{
 				if (!is_array($col) && $this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
 				}
-				elseif(is_array($col))
+				elseif (is_array($col))
 				{
 					$q = array();
-					foreach($col as $db_c => $c)
+					foreach ($col as $db_c => $c)
 					{
 						if ($this->data[$col] == '')
 						{
@@ -526,7 +526,7 @@ 
 		}
 		if (!$query)	// no unique key in keys, lets try everything else
 		{
-			foreach($this->db_data_cols as $db_col => $col)
+			foreach ($this->db_data_cols as $db_col => $col)
 			{
 				if ($this->data[$col] != '')
 				{
@@ -542,27 +542,27 @@ 
 		}
 		if ($join)	// Prefix the columns with the table-name, as they might exist in the join
 		{
-			foreach($query as $col => $val)
+			foreach ($query as $col => $val)
 			{
-				if (is_int($col) || strpos($join,$col) === false) continue;
-				$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
+				if (is_int($col) || strpos($join, $col) === false) continue;
+				$query[] = $this->db->expression($this->table_name, $this->table_name.'.', array($col=>$val));
 				unset($query[$col]);
 			}
 		}
 		// copy direct SQL parts from $keys
-		for($i = 0; is_array($keys) && isset($keys[$i]); ++$i)
+		for ($i = 0; is_array($keys) && isset($keys[$i]); ++$i)
 		{
 			$query[] = $keys[$i];
 		}
-		foreach($this->db->select($this->table_name,'*'.($extra_cols?','.(is_array($extra_cols)?implode(',',$extra_cols):$extra_cols):''),
-			$query,__LINE__,__FILE__,False,'',$this->app,0,$join) as $row)
+		foreach ($this->db->select($this->table_name, '*'.($extra_cols ? ','.(is_array($extra_cols) ?implode(',', $extra_cols) : $extra_cols) : ''),
+			$query, __LINE__, __FILE__, False, '', $this->app, 0, $join) as $row)
 		{
 			$cols = $this->db_cols;
 			if ($extra_cols)	// extra columns to report
 			{
-				foreach(is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
+				foreach (is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
 				{
-					if (FALSE!==stripos($col,' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i','\\1',$col);
+					if (FALSE !== stripos($col, ' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i', '\\1', $col);
 					$cols[$col] = $col;
 				}
 			}
@@ -575,7 +575,7 @@ 
 			// store user timezone used for reading
 			$this->data[self::USER_TIMEZONE_READ] = Api\DateTime::$user_timezone->getName();
 
-			if ((int) $this->debug >= 4)
+			if ((int)$this->debug >= 4)
 			{
 				echo "data =\n"; _debug_array($this->data);
 			}
@@ -585,7 +585,7 @@ 
 		{
 			unset($this->data[$this->db_key_cols[$this->autoinc_id]]);
 		}
-		if ((int) $this->debug >= 4) echo "nothing found !!!</p>\n";
+		if ((int)$this->debug >= 4) echo "nothing found !!!</p>\n";
 
 		$this->db2data();
 
@@ -599,7 +599,7 @@ 
 	 * @param string|array $extra_where =null extra where clause, eg. to check an etag, returns true if no affected rows!
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function save($keys=null,$extra_where=null)
+	function save($keys = null, $extra_where = null)
 	{
 		if (is_array($keys) && count($keys)) $this->data_merge($keys);
 
@@ -618,65 +618,65 @@ 
 		}
 		$this->data2db();
 
-		if ((int) $this->debug >= 4) { echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
+		if ((int)$this->debug >= 4) { echo "so_sql::save(".print_r($keys, true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
 
 		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])	// insert with auto id
 		{
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				if (!$this->autoinc_id || $db_col != $this->autoinc_id)	// not write auto-inc-id
 				{
-					if (!array_key_exists($col,$this->data) && 	// handling of unset columns in $this->data
-						(isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value
+					if (!array_key_exists($col, $this->data) && // handling of unset columns in $this->data
+						(isset($this->table_def['fd'][$db_col]['default']) || // we have a default value
 						 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 					{
-						continue;	// no need to write that (unset) column
+						continue; // no need to write that (unset) column
 					}
 					if ($this->table_def['fd'][$db_col]['type'] == 'varchar' &&
 						strlen($this->data[$col]) > $this->table_def['fd'][$db_col]['precision'])
 					{
 						// truncate the field to mamimum length, if upper layers didn't care
-						$data[$db_col] = substr($this->data[$col],0,$this->table_def['fd'][$db_col]['precision']);
+						$data[$db_col] = substr($this->data[$col], 0, $this->table_def['fd'][$db_col]['precision']);
 					}
 					else
 					{
-						$data[$db_col] = (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
+						$data[$db_col] = (string)$this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 					}
 				}
 			}
-			$this->db->insert($this->table_name,$data,false,__LINE__,__FILE__,$this->app);
+			$this->db->insert($this->table_name, $data, false, __LINE__, __FILE__, $this->app);
 
 			if ($this->autoinc_id)
 			{
-				$this->data[$this->db_key_cols[$this->autoinc_id]] = $this->db->get_last_insert_id($this->table_name,$this->autoinc_id);
+				$this->data[$this->db_key_cols[$this->autoinc_id]] = $this->db->get_last_insert_id($this->table_name, $this->autoinc_id);
 			}
 		}
 		else // insert in table without auto id or update of existing row, dont write colums unset in $this->data
 		{
-			foreach($this->db_data_cols as $db_col => $col)
+			foreach ($this->db_data_cols as $db_col => $col)
 			{
 				// we need to update columns set to null: after a $this->data[$col]=null:
 				// - array_key_exits($col,$this->data) === true
 				// - isset($this->data[$col]) === false
-				if (!array_key_exists($col,$this->data) &&	// handling of unset columns in $this->data
-					($this->autoinc_id ||			// update of table with auto id or
-					 isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value or
+				if (!array_key_exists($col, $this->data) && // handling of unset columns in $this->data
+					($this->autoinc_id || // update of table with auto id or
+					 isset($this->table_def['fd'][$db_col]['default']) || // we have a default value or
 					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 				{
-					continue;	// no need to write that (unset) column
+					continue; // no need to write that (unset) column
 				}
-				$data[$db_col] = !is_object($this->data[$col]) && (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
+				$data[$db_col] = !is_object($this->data[$col]) && (string)$this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 			}
 			// allow to add direct sql updates, eg. "etag=etag+1" with int keys
 			if (is_array($keys) && isset($keys[0]))
 			{
-				for($n=0; isset($keys[$n]); ++$n)
+				for ($n = 0; isset($keys[$n]); ++$n)
 				{
 					$data[] = $keys[$n];
 				}
 			}
 			$keys = $extra_where;
-			foreach($this->db_key_cols as $db_col => $col)
+			foreach ($this->db_key_cols as $db_col => $col)
 			{
 				$keys[$db_col] = $this->data[$col];
 			}
@@ -687,16 +687,16 @@ 
 			}
 			if ($this->autoinc_id)
 			{
-				$this->db->update($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app);
+				$this->db->update($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app);
 				if (($nothing_affected = !$this->db->Errno && !$this->db->affected_rows()) && $extra_where)
 				{
-					return true;	// extra_where not met, eg. etag wrong
+					return true; // extra_where not met, eg. etag wrong
 				}
 			}
 			// always try an insert if we have no autoinc_id, as we dont know if the data exists
 			if (!$this->autoinc_id || $nothing_affected)
 			{
-				$this->db->insert($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app);
+				$this->db->insert($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app);
 			}
 		}
 		$this->db2data();
@@ -711,7 +711,7 @@ 
 	 * @param boolean $merge =true if true $fields will be merged with $this->data (after update!), otherwise $this->data will be just $fields
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function update($_fields,$merge=true)
+	function update($_fields, $merge = true)
 	{
 		if ($merge) $this->data_merge($_fields);
 
@@ -719,23 +719,23 @@ 
 
 		// extract the keys from $fields or - if not set there - from $this->data
 		$keys = array();
-		foreach($this->db_key_cols as $col => $name)
+		foreach ($this->db_key_cols as $col => $name)
 		{
 			$keys[$col] = isset($fields[$name]) ? $fields[$name] : $this->data[$name];
 			unset($fields[$name]);
 		}
 		// extract the data from $fields
 		$data = array();
-		foreach($this->db_data_cols as $col => $name)
+		foreach ($this->db_data_cols as $col => $name)
 		{
-			if (array_key_exists($name,$fields))
+			if (array_key_exists($name, $fields))
 			{
 				$data[$col] = $fields[$name];
 				unset($fields[$name]);
 			}
 		}
 		// add direct sql like 'etag=etag+1' (it has integer keys)
-		foreach($fields as $key => $value)
+		foreach ($fields as $key => $value)
 		{
 			if (is_int($key))
 			{
@@ -744,9 +744,9 @@ 
 		}
 		if (!$data)
 		{
-			return 0;	// nothing to update
+			return 0; // nothing to update
 		}
-		if (!$this->db->update($this->table_name,$data,$keys,__LINE__,__FILE__,$this->app))
+		if (!$this->db->update($this->table_name, $data, $keys, __LINE__, __FILE__, $this->app))
 		{
 			return $this->db->Errno;
 		}
@@ -760,7 +760,7 @@ 
 	 * @param boolean $only_return_query =false return $query of delete call to db object, but not run it (used by so_sql_cf!)
 	 * @return int|array affected rows, should be 1 if ok, 0 if an error or array with id's if $only_return_ids
 	 */
-	function delete($keys=null,$only_return_query=false)
+	function delete($keys = null, $only_return_query = false)
 	{
 		if ($this->autoinc_id && $keys && !is_array($keys))
 		{
@@ -774,7 +774,7 @@ 
 		else	// data and keys are supplied in $keys
 		{
 			$data = $keys; $keys = array();
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				if (isset($data[$col]))
 				{
@@ -782,7 +782,7 @@ 
 				}
 			}
 			// keep sql fragments (with integer key)
-			foreach($data as $key => $val)
+			foreach ($data as $key => $val)
 			{
 				if (is_int($key))
 				{
@@ -792,7 +792,7 @@ 
 		}
 		$data = $this->data2db($data);
 
-		foreach($keys as $db_col => $col)
+		foreach ($keys as $db_col => $col)
 		{
 			if (is_int($db_col))
 			{
@@ -805,7 +805,7 @@ 
 		}
 		if ($only_return_query) return $query;
 
-		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
+		$this->db->delete($this->table_name, $query, __LINE__, __FILE__, $this->app);
 
 		return $this->db->affected_rows();
 	}
@@ -833,15 +833,15 @@ 
 	 * @todo return an interator instead of an array
 	 * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-		if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria, true).",'$only_keys','$order_by',".print_r($extra_cols, true).",'$wildcard','$empty','$op','$start',".print_r($filter, true).",'$join')</p>\n";
 
 		// if extending class or instanciator set columns to search, convert string criteria to array
 		if ($criteria && !is_array($criteria))
 		{
-			$search = $this->search2criteria($criteria,$wildcard,$op);
+			$search = $this->search2criteria($criteria, $wildcard, $op);
 			$criteria = array($search);
 		}
 		if (!is_array($criteria))
@@ -851,7 +851,7 @@ 
 		else
 		{
 			$criteria = $this->data2db($criteria);
-			foreach($criteria as $col => $val)
+			foreach ($criteria as $col => $val)
 			{
 				if (is_int($col))
 				{
@@ -859,7 +859,7 @@ 
 				}
 				elseif ($empty || $val != '')
 				{
-					if (!($db_col = array_search($col,$this->db_cols)))
+					if (!($db_col = array_search($col, $this->db_cols)))
 					{
 						$db_col = $col;
 					}
@@ -870,7 +870,7 @@ 
 							$this->table_def['fd'][$db_col]['nullable'] !== false)
 						{
 							unset($criteria[$col]);
-							$query[] =  '(' . $db_col . ' IS NULL OR ' . $db_col . " = '')";
+							$query[] = '('.$db_col.' IS NULL OR '.$db_col." = '')";
 						}
 						else
 						{
@@ -878,10 +878,10 @@ 
 						}
 					}
 					elseif ($wildcard || $criteria[$col][0] == '!' ||
-						is_string($criteria[$col]) && (strpos($criteria[$col],'*')!==false || strpos($criteria[$col],'?')!==false))
+						is_string($criteria[$col]) && (strpos($criteria[$col], '*') !== false || strpos($criteria[$col], '?') !== false))
 					{
 						// if search pattern alread contains a wildcard, do NOT add further ones automatic
-						if (is_string($criteria[$col]) && (strpos($criteria[$col],'*')!==false || strpos($criteria[$col],'?')!==false))
+						if (is_string($criteria[$col]) && (strpos($criteria[$col], '*') !== false || strpos($criteria[$col], '?') !== false))
 						{
 							$wildcard = '';
 						}
@@ -890,19 +890,19 @@ 
 						if ($criteria[$col][0] == '!')
 						{
 							$cmp_op = ' NOT'.$cmp_op;
-							$criteria[$col] = substr($criteria[$col],1);
+							$criteria[$col] = substr($criteria[$col], 1);
 							$negate = true;
 						}
-						foreach(explode(' ',$criteria[$col]) as $crit)
+						foreach (explode(' ', $criteria[$col]) as $crit)
 						{
 							$query[] = ($negate ? ' ('.$db_col.' IS NULL OR ' : '').$db_col.$cmp_op.
-								$this->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$crit).$wildcard).
+								$this->db->quote($wildcard.str_replace(array('%', '_', '*', '?'), array('\\%', '\\_', '%', '_'), $crit).$wildcard).
 								($negate ? ') ' : '');
 						}
 					}
-					elseif (strpos($db_col,'.') !== false)	// we have a table-name specified
+					elseif (strpos($db_col, '.') !== false)	// we have a table-name specified
 					{
-						list($table,$only_col) = explode('.',$db_col);
+						list($table, $only_col) = explode('.', $db_col);
 						$type = $this->db->get_column_attribute($only_col, $table, true, 'type');
 						if (empty($type))
 						{
@@ -910,15 +910,15 @@ 
 						}
 						if (is_array($val) && count($val) > 1)
 						{
-							foreach($val as &$v)
+							foreach ($val as &$v)
 							{
 								$v = $this->db->quote($v, $type);
 							}
-							$query[] = $sql = $db_col.' IN (' .implode(',',$val).')';
+							$query[] = $sql = $db_col.' IN ('.implode(',', $val).')';
 						}
 						else
 						{
-							$query[] = $db_col.'='.$this->db->quote(is_array($val)?array_shift($val):$val,$type);
+							$query[] = $db_col.'='.$this->db->quote(is_array($val) ?array_shift($val) : $val, $type);
 						}
 					}
 					else
@@ -927,7 +927,7 @@ 
 					}
 				}
 			}
-			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ',$query);
+			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ', $query);
 		}
 		if (is_array($filter))
 		{
@@ -935,19 +935,19 @@ 
 			$data2db_filter = $this->data2db($filter);
 			if (!is_array($data2db_filter)) {
 				echo function_backtrace()."<br/>\n";
-				echo "filter=";_debug_array($filter);
-				echo "data2db(filter)=";_debug_array($data2db_filter);
+				echo "filter="; _debug_array($filter);
+				echo "data2db(filter)="; _debug_array($data2db_filter);
 			}
-			foreach($data2db_filter as $col => $val)
+			foreach ($data2db_filter as $col => $val)
 			{
 				if ($val !== '')
 				{
 					// check if a db-internal name conversation necessary
-					if (!is_int($col) && ($c = array_search($col,$this->db_cols)))
+					if (!is_int($col) && ($c = array_search($col, $this->db_cols)))
 					{
-						$col = $this->table_name . '.' . $c;
+						$col = $this->table_name.'.'.$c;
 					}
-					if(is_int($col))
+					if (is_int($col))
 					{
 						$db_filter[] = $val;
 					}
@@ -965,35 +965,35 @@ 
 			{
 				if ($op != 'AND')
 				{
-					$db_filter[] = '('.$this->db->column_data_implode(' '.$op.' ',$query).')';
+					$db_filter[] = '('.$this->db->column_data_implode(' '.$op.' ', $query).')';
 				}
 				else
 				{
-					$db_filter = array_merge($db_filter,$query);
+					$db_filter = array_merge($db_filter, $query);
 				}
 			}
 			$query = $db_filter;
 		}
-		if ((int) $this->debug >= 4)
+		if ((int)$this->debug >= 4)
 		{
-			echo "<p>so_sql::search(,only_keys=$only_keys,order_by='$order_by',wildcard='$wildcard',empty=$empty,$op,start='$start',".print_r($filter,true).") query=".print_r($query,true).", total='$this->total'</p>\n";
+			echo "<p>so_sql::search(,only_keys=$only_keys,order_by='$order_by',wildcard='$wildcard',empty=$empty,$op,start='$start',".print_r($filter, true).") query=".print_r($query, true).", total='$this->total'</p>\n";
 			echo "<br>criteria = "; _debug_array($criteria);
 		}
 		if ($only_keys === true)
 		{
 			$colums = array_keys($this->db_key_cols);
-			foreach($colums as &$column)
+			foreach ($colums as &$column)
 			{
-				$column = $this->table_name . '.' . $column;
+				$column = $this->table_name.'.'.$column;
 			}
 		}
 		elseif (is_array($only_keys))
 		{
 			$colums = array();
-			foreach($only_keys as $key => $col)
+			foreach ($only_keys as $key => $col)
 			{
 				//Convert ambiguous columns to prefixed tablename.column name
-				$colums[] = ($db_col = array_search($col,$this->db_cols)) ?  $this->table_name .'.'.$db_col.' AS '.$col :$col;
+				$colums[] = ($db_col = array_search($col, $this->db_cols)) ? $this->table_name.'.'.$db_col.' AS '.$col : $col;
 			}
 		}
 		elseif (!$only_keys)
@@ -1023,20 +1023,20 @@ 
 			{
 				$colums[$key] = $this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id;
 			}
-			elseif (!is_array($colums) && strpos($colums,$this->autoinc_id) !== false)
+			elseif (!is_array($colums) && strpos($colums, $this->autoinc_id) !== false)
 			{
-				$colums = preg_replace('/(?<! AS)([ ,]+)'.preg_quote($this->autoinc_id).'([ ,]+)/','\\1'.$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id.'\\2',$colums);
+				$colums = preg_replace('/(?<! AS)([ ,]+)'.preg_quote($this->autoinc_id).'([ ,]+)/', '\\1'.$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id.'\\2', $colums);
 			}
 		}
-		$num_rows = 0;	// as spec. in max_matches in the user-prefs
-		if (is_array($start)) list($start,$num_rows) = $start;
+		$num_rows = 0; // as spec. in max_matches in the user-prefs
+		if (is_array($start)) list($start, $num_rows) = $start;
 
 		// fix GROUP BY clause to contain all non-aggregate selected columns
-		if ($order_by && stripos($order_by,'GROUP BY') !== false)
+		if ($order_by && stripos($order_by, 'GROUP BY') !== false)
 		{
 			$order_by = $this->fix_group_by_columns($order_by, $colums, $this->table_name, $this->autoinc_id);
 		}
-		elseif ($order_by && stripos($order_by,'ORDER BY')===false && stripos($order_by,'GROUP BY')===false && stripos($order_by,'HAVING')===false)
+		elseif ($order_by && stripos($order_by, 'ORDER BY') === false && stripos($order_by, 'GROUP BY') === false && stripos($order_by, 'HAVING') === false)
 		{
 			$order_by = 'ORDER BY '.$order_by;
 		}
@@ -1059,9 +1059,9 @@ 
 				);
 				if (!$union_cols)	// union used the colum-names of the first query
 				{
-					$union_cols = $this->_get_columns($only_keys,$extra_cols);
+					$union_cols = $this->_get_columns($only_keys, $extra_cols);
 				}
-				return true;	// waiting for further calls, before running the union-query
+				return true; // waiting for further calls, before running the union-query
 			}
 			// running the union query now
 			if ($start !== false)	// need to get the total too, saved in $this->total
@@ -1072,10 +1072,10 @@ 
 				}
 				else	// cant do a count, have to run the query without limit
 				{
-					$this->total = $this->db->union($union,__LINE__,__FILE__)->NumRows();
+					$this->total = $this->db->union($union, __LINE__, __FILE__)->NumRows();
 				}
 			}
-			$rs = $this->db->union($union,__LINE__,__FILE__,$order_by,$start,$num_rows);
+			$rs = $this->db->union($union, __LINE__, __FILE__, $order_by, $start, $num_rows);
 			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
 
 			$cols = $union_cols;
@@ -1089,21 +1089,21 @@ 
 				{
 					$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
 				}
-				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
+				elseif (!$need_full_no_count && (!$join || stripos($join, 'LEFT JOIN') !== false))
 				{
-					$this->total = $this->db->select($this->table_name,'COUNT(*)',$query,__LINE__,__FILE__,false,'',$this->app,0,$join)->fetchColumn();
+					$this->total = $this->db->select($this->table_name, 'COUNT(*)', $query, __LINE__, __FILE__, false, '', $this->app, 0, $join)->fetchColumn();
 				}
 				else	// cant do a count, have to run the query without limit
 				{
-					$this->total = $this->db->select($this->table_name,$colums,$query,__LINE__,__FILE__,false,$order_by,false,0,$join)->NumRows();
+					$this->total = $this->db->select($this->table_name, $colums, $query, __LINE__, __FILE__, false, $order_by, false, 0, $join)->NumRows();
 				}
 			}
-			$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
-				$start,$order_by,$this->app,$num_rows,$join);
+			$rs = $this->db->select($this->table_name, $mysql_calc_rows.$colums, $query, __LINE__, __FILE__,
+				$start, $order_by, $this->app, $num_rows, $join);
 			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
-			$cols = $this->_get_columns($only_keys,$extra_cols);
+			$cols = $this->_get_columns($only_keys, $extra_cols);
 		}
-		if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		if ((int)$this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
 
 		if ($mysql_calc_rows)
 		{
@@ -1112,14 +1112,14 @@ 
 		// ToDo: Implement that as an iterator, as $rs is also an interator and we could return one instead of an array
 		if ($this->search_return_iterator)
 		{
-			return new Db2DataIterator($this,$rs);
+			return new Db2DataIterator($this, $rs);
 		}
 		$arr = array();
 		$n = 0;
-		if ($rs) foreach($rs as $row)
+		if ($rs) foreach ($rs as $row)
 		{
 			$data = array();
-			foreach($cols as $db_col => $col)
+			foreach ($cols as $db_col => $col)
 			{
 				$data[$col] = (isset($row[$db_col]) ? $row[$db_col] : $row[$col]);
 			}
@@ -1149,7 +1149,7 @@ 
 		$matches = null;
 		if (substr($GLOBALS['egw']->db->Type, 0, 5) == 'mysql' || !preg_match('/(GROUP BY .*)(HAVING.*|ORDER BY.*)?$/iU', $group_by, $matches))
 		{
-			return $group_by;	// nothing to do
+			return $group_by; // nothing to do
 		}
 		$changes = 0;
 		$group_by_cols = preg_split('/, */', trim(substr($matches[1], 9)));
@@ -1159,9 +1159,9 @@ 
 			$columns = preg_split('/, */', $columns);
 
 			// fix columns containing commas as part of function calls
-			for($n = 0; $n < count($columns); ++$n)
+			for ($n = 0; $n < count($columns); ++$n)
 			{
-				$col =& $columns[$n];
+				$col = & $columns[$n];
 				while (substr_count($col, '(') > substr_count($col, ')') && ++$n < count($columns))
 				{
 					$col .= ','.$columns[$n];
@@ -1170,7 +1170,7 @@ 
 			}
 			unset($col);
 		}
-		foreach($columns as $n => $col)
+		foreach ($columns as $n => $col)
 		{
 			if ($col == '*')
 			{
@@ -1183,7 +1183,7 @@ 
 			{
 				if (($pos = stripos($col, 'DISTINCT ')) !== false)
 				{
-					$col = substr($col, $pos+9);
+					$col = substr($col, $pos + 9);
 				}
 				$alias = $col;
 				if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
@@ -1201,7 +1201,7 @@ 
 		$ret = $group_by;
 		if ($changes)
 		{
-			$ret = str_replace($matches[1], 'GROUP BY '.implode(',', $group_by_cols).' ',  $group_by);
+			$ret = str_replace($matches[1], 'GROUP BY '.implode(',', $group_by_cols).' ', $group_by);
 			//error_log(__METHOD__."('$group_by', ".array2string($columns).") group_by_cols=".array2string($group_by_cols)." changed to $ret");
 		}
 		return $ret;
@@ -1221,12 +1221,12 @@ 
 	 * @param array $search_cols =array() List of columns to search.  If not provided, all columns in $this->db_cols will be considered
 	 * @return array or column => value pairs
 	 */
-	public function search2criteria($_pattern,&$wildcard='',&$op='AND',$extra_col=null, $search_cols = array())
+	public function search2criteria($_pattern, &$wildcard = '', &$op = 'AND', $extra_col = null, $search_cols = array())
 	{
 		$pattern = trim($_pattern);
 		// This function can get called multiple times.  Make sure it doesn't re-process.
 		if (empty($pattern) || is_array($pattern)) return $pattern;
-		if(strpos($pattern, 'CAST(COALESCE(') !== false)
+		if (strpos($pattern, 'CAST(COALESCE(') !== false)
 		{
 			return $pattern;
 		}
@@ -1243,24 +1243,24 @@ 
 		$numeric_columns = array();
 
 		// Special handling for an ID search, #<int>
-		if(strpos($_pattern, '#') === 0 && is_numeric(substr($_pattern, 1)))
+		if (strpos($_pattern, '#') === 0 && is_numeric(substr($_pattern, 1)))
 		{
-			return array('(' . $this->table_name.'.'. $this->autoinc_id . '=' . (int)substr($_pattern,1) . ')');
+			return array('('.$this->table_name.'.'.$this->autoinc_id.'='.(int)substr($_pattern, 1).')');
 		}
-		if(!$search_cols)
+		if (!$search_cols)
 		{
 			$search_cols = $this->get_default_search_columns();
 		}
 		// Concat all fields to be searched together, so the conditions operate across the whole record
-		foreach($search_cols as $col)
+		foreach ($search_cols as $col)
 		{
 			$col_name = $col;
 			$table = $this->table_name;
-			if (strpos($col,'.') !== false)
+			if (strpos($col, '.') !== false)
 			{
-				list($table,$col_name) = explode('.',$col);
+				list($table, $col_name) = explode('.', $col);
 			}
-			$table_def = $table == $this->table_name ? $this->table_def : $this->db->get_table_definitions(true,$table);
+			$table_def = $table == $this->table_name ? $this->table_def : $this->db->get_table_definitions(true, $table);
 			if ($table_def['fd'][$col_name] && in_array($table_def['fd'][$col_name]['type'], $numeric_types))
 			{
 				$numeric_columns[] = $col;
@@ -1268,11 +1268,11 @@ 
 			}
 			if ($this->db->Type == 'mysql' && $table_def['fd'][$col_name]['type'] === 'ascii' && preg_match('/[\x80-\xFF]/', $_pattern))
 			{
-				continue;	// will only give sql error
+				continue; // will only give sql error
 			}
-			$columns[] = sprintf($this->db->capabilities[Api\Db::CAPABILITY_CAST_AS_VARCHAR],"COALESCE($col,'')");
+			$columns[] = sprintf($this->db->capabilities[Api\Db::CAPABILITY_CAST_AS_VARCHAR], "COALESCE($col,'')");
 		}
-		if(!$columns)
+		if (!$columns)
 		{
 			return array();
 		}
@@ -1281,9 +1281,9 @@ 
 		$break = ' ';
 		$token = strtok($pattern, $break);
 
-		while($token)
+		while ($token)
 		{
-			if($token == strtoupper(lang('AND')) || $token == 'AND')
+			if ($token == strtoupper(lang('AND')) || $token == 'AND')
 			{
 				$token = '+'.strtok($break);
 			}
@@ -1296,10 +1296,10 @@ 
 			{
 				$token = '-'.strtok($break);
 			}
-			if ($token[0]=='"')
+			if ($token[0] == '"')
 			{
-				$token = substr($token, 1,strlen($token));
- 				if(substr($token, -1) != '"')
+				$token = substr($token, 1, strlen($token));
+ 				if (substr($token, -1) != '"')
 				{
 					$token .= ' '.strtok('"');
 				}
@@ -1310,16 +1310,16 @@ 
 			}
 
 			// prepend and append extra wildcard %, if pattern does NOT already contain wildcards
-			if (strpos($token,'*') === false && strpos($token,'?') === false)
+			if (strpos($token, '*') === false && strpos($token, '?') === false)
 			{
-				$wildcard = '%';	// if pattern contains no wildcards, add them before AND after the pattern
+				$wildcard = '%'; // if pattern contains no wildcards, add them before AND after the pattern
 			}
 			else
 			{
-				$wildcard = '';		// no extra wildcard, if pattern already contains some
+				$wildcard = ''; // no extra wildcard, if pattern already contains some
 			}
 
-			switch($token[0])
+			switch ($token[0])
 			{
 				case '+':
 					$op = 'AND';
@@ -1334,32 +1334,32 @@ 
 					$op = 'OR';
 					break;
 			}
-			$token_filter = ' '.call_user_func_array(array($GLOBALS['egw']->db,'concat'),$columns).' '.
-				$this->db->capabilities['case_insensitive_like'] . ' ' .
-				$GLOBALS['egw']->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$token).$wildcard);
+			$token_filter = ' '.call_user_func_array(array($GLOBALS['egw']->db, 'concat'), $columns).' '.
+				$this->db->capabilities['case_insensitive_like'].' '.
+				$GLOBALS['egw']->db->quote($wildcard.str_replace(array('%', '_', '*', '?'), array('\\%', '\\_', '%', '_'), $token).$wildcard);
 
 			// Compare numeric token as equality for numeric columns
 			// skip user-wildcards (*,?) in is_numeric test, but not SQL wildcards, which get escaped and give sql-error
-			if (is_numeric(str_replace(array('*','?'), '', $token)))
+			if (is_numeric(str_replace(array('*', '?'), '', $token)))
 			{
 				$numeric_filter = array();
-				foreach($numeric_columns as $col)
+				foreach ($numeric_columns as $col)
 				{
-					if($wildcard == '')
+					if ($wildcard == '')
 					{
 						// Token has a wildcard from user, use LIKE
-						$numeric_filter[] = "($col IS NOT NULL AND CAST($col AS CHAR) " .
-							$this->db->capabilities['case_insensitive_like'] . ' ' .
-							$GLOBALS['egw']->db->quote(str_replace(array('*','?'), array('%','_'), $token)) . ')';
+						$numeric_filter[] = "($col IS NOT NULL AND CAST($col AS CHAR) ".
+							$this->db->capabilities['case_insensitive_like'].' '.
+							$GLOBALS['egw']->db->quote(str_replace(array('*', '?'), array('%', '_'), $token)).')';
 					}
 					else
 					{
 						$numeric_filter[] = "($col IS NOT NULL AND $col = $token)";
 					}
 				}
-				if(count($numeric_filter) > 0)
+				if (count($numeric_filter) > 0)
 				{
-					$token_filter = '(' . $token_filter . ' OR ' . implode(' OR ', $numeric_filter) . ')';
+					$token_filter = '('.$token_filter.' OR '.implode(' OR ', $numeric_filter).')';
 				}
 			}
 			$criteria[$op][] = $token_filter;
@@ -1367,32 +1367,32 @@ 
 			$token = strtok($break);
 		}
 
-		if($criteria['NOT'])
+		if ($criteria['NOT'])
 		{
-			$filter[] = 'NOT (' . implode(' OR ', $criteria['NOT']) . ') ';
+			$filter[] = 'NOT ('.implode(' OR ', $criteria['NOT']).') ';
 		}
-		if($criteria['AND'])
+		if ($criteria['AND'])
 		{
-			$filter[] = implode(' AND ', $criteria['AND']) . ' ';
+			$filter[] = implode(' AND ', $criteria['AND']).' ';
 		}
-		if($criteria['OR'])
+		if ($criteria['OR'])
 		{
-			$filter[] = '(' . implode(' OR ', $criteria['OR']) . ') ';
+			$filter[] = '('.implode(' OR ', $criteria['OR']).') ';
 		}
 
-		if(count($filter))
+		if (count($filter))
 		{
-			$result = '(' . implode(' AND ', $filter) . ')';
+			$result = '('.implode(' AND ', $filter).')';
 		}
 
 		// OR extra column on the end so a null or blank won't block a hit in the main columns
 		if ($extra_col)
 		{
-			$result .= (strlen($result) ? ' OR ' : ' ') . "$extra_col = " . $GLOBALS['egw']->db->quote($pattern);
+			$result .= (strlen($result) ? ' OR ' : ' ')."$extra_col = ".$GLOBALS['egw']->db->quote($pattern);
 		}
 
 		$op = 'OR';
-		return array('(' . $result . ')');
+		return array('('.$result.')');
 	}
 
 	/**
@@ -1411,21 +1411,21 @@ 
 		$numeric_types = array('auto', 'int', 'float', 'double');
 
 		// Skip some numeric columns that don't make sense to search if we have to default to all columns
-		if(is_null($this->columns_to_search))
+		if (is_null($this->columns_to_search))
 		{
-			foreach($search_cols as $key => &$col)
+			foreach ($search_cols as $key => &$col)
 			{
 				// If the name as given isn't a real column name, and adding the prefix doesn't help, skip it
-				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
+				if (!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
 					// Can't search this column
 					unset($search_cols[$key]);
 					continue;
 				}
-				if(in_array($this->table_def['fd'][$col]['type'], $numeric_types))
+				if (in_array($this->table_def['fd'][$col]['type'], $numeric_types))
 				{
-					foreach($skip_columns_with as $bad)
+					foreach ($skip_columns_with as $bad)
 					{
-						if(strpos($col, $bad) !== false)
+						if (strpos($col, $bad) !== false)
 						{
 							unset($search_cols[$key]);
 							continue 2;
@@ -1447,7 +1447,7 @@ 
 	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @return array with columns as db-name => internal-name pairs
 	 */
-	function _get_columns($only_keys,$extra_cols)
+	function _get_columns($only_keys, $extra_cols)
 	{
 		//echo "_get_columns() only_keys="; _debug_array($only_keys); echo "extra_cols="; _debug_array($extra_cols);
 		if ($only_keys === true)	// only primary key
@@ -1458,7 +1458,7 @@ 
 		{
 			$cols = array();
 			$distinct_checked = false;
-			foreach(is_array($only_keys) ? $only_keys : explode(',', $only_keys) as $col)
+			foreach (is_array($only_keys) ? $only_keys : explode(',', $only_keys) as $col)
 			{
 				if (!$distinct_checked)
 				{
@@ -1467,17 +1467,17 @@ 
 				}
 				if (!$col || $col == '*' || $col == $this->table_name.'.*')	// all columns
 				{
-					$cols = array_merge($cols,$this->db_cols);
+					$cols = array_merge($cols, $this->db_cols);
 				}
 				else	// only the specified columns
 				{
-					if (stripos($col,'as'))	// if there's already an explicit naming of the column, just use it
+					if (stripos($col, 'as'))	// if there's already an explicit naming of the column, just use it
 					{
-						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i', '\\1', $col);
 						$cols[$col] = $col;
 						continue;
 					}
-					if (($db_col = array_search($col,$this->db_cols)) !== false)
+					if (($db_col = array_search($col, $this->db_cols)) !== false)
 					{
 						$cols[$db_col] = $col;
 					}
@@ -1490,10 +1490,10 @@ 
 		}
 		if ($extra_cols)	// extra columns to report
 		{
-			foreach(is_array($extra_cols) ? $extra_cols : explode(',',$extra_cols) as $col)
+			foreach (is_array($extra_cols) ? $extra_cols : explode(',', $extra_cols) as $col)
 			{
-				if (stripos($col,'as ')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
-				if (($db_col = array_search($col,$this->db_cols)) !== false)
+				if (stripos($col, 'as ') !== false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i', '\\1', $col);
+				if (($db_col = array_search($col, $this->db_cols)) !== false)
 				{
 					$cols[$db_col] = $col;
 				}
@@ -1520,12 +1520,12 @@ 
 	 * @param string|array $extra_cols =array()
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false,$extra_cols=array())
+	function get_rows($query, &$rows, &$readonlys, $join = '', $need_full_no_count = false, $only_keys = false, $extra_cols = array())
 	{
-		unset($readonlys);	// required by function signature, but not used in this default implementation
-		if ((int) $this->debug >= 4)
+		unset($readonlys); // required by function signature, but not used in this default implementation
+		if ((int)$this->debug >= 4)
 		{
-			echo "<p>so_sql::get_rows(".print_r($query,true).",,)</p>\n";
+			echo "<p>so_sql::get_rows(".print_r($query, true).",,)</p>\n";
 		}
 		$criteria = array();
 		$op = 'AND';
@@ -1533,11 +1533,11 @@ 
 		{
 			$criteria = $query['search'];
 		}
-		$rows = $this->search($criteria,$only_keys,$query['order']?$query['order'].' '.$query['sort']:'',$extra_cols,
-			'',false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
-			$query['col_filter'],$join,$need_full_no_count);
+		$rows = $this->search($criteria, $only_keys, $query['order'] ? $query['order'].' '.$query['sort'] : '', $extra_cols,
+			'', false, $op, $query['num_rows'] ? array((int)$query['start'], $query['num_rows']) : (int)$query['start'],
+			$query['col_filter'], $join, $need_full_no_count);
 
-		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		if (!$rows) $rows = array(); // otherwise false returned from search would be returned as array(false)
 
 		return $this->total;
 	}
@@ -1548,7 +1548,7 @@ 
 	 * @param array $data =null data-set to check, defaults to $this->data
 	 * @return int 0: all keys are unique, 1: first key not unique, 2: ...
 	 */
-	function not_unique($data=null)
+	function not_unique($data = null)
 	{
 		if (!is_array($data))
 		{
@@ -1561,12 +1561,12 @@ 
 		{
 			$uni_keys[] = $this->db_key_cols;
 		}
-		foreach($uni_keys as $db_col => $col)
+		foreach ($uni_keys as $db_col => $col)
 		{
 			if (is_array($col))
 			{
 				$query = array();
-				foreach($col as $db_c => $c)
+				foreach ($col as $db_c => $c)
 				{
 					$query[$db_c] = $data[$c];
 				}
@@ -1575,17 +1575,17 @@ 
 			{
 				$query = array($db_col => $data[$col]);
 			}
-			foreach($this->db->select($this->table_name,$this->db_key_cols,$query,__LINE__,__FILE__,false,'',$this->app) as $other)
+			foreach ($this->db->select($this->table_name, $this->db_key_cols, $query, __LINE__, __FILE__, false, '', $this->app) as $other)
 			{
-				foreach($this->db_key_cols as $key_col)
+				foreach ($this->db_key_cols as $key_col)
 				{
 					if ($data[$key_col] != $other[$key_col])
 					{
-						if ((int) $this->debug >= 4)
+						if ((int)$this->debug >= 4)
 						{
 							echo "<p>not_unique in ".array2string($col)." as for '$key_col': '${data[$key_col]}' != '${other[$key_col]}'</p>\n";
 						}
-						return $n;	// different entry => $n not unique
+						return $n; // different entry => $n not unique
 					}
 				}
 			}
@@ -1606,7 +1606,7 @@ 
 	 * @param string $order ='' order, default '' = same as (first) $value_col
 	 * @return array with key_col => value_col pairs or array if more then one value_col given (keys as in value_col)
 	 */
-	function query_list($value_col,$key_col='',$filter=array(),$order='')
+	function query_list($value_col, $key_col = '', $filter = array(), $order = '')
 	{
 		static $cache = array();
 
@@ -1619,16 +1619,16 @@ 
 		if (!is_array($value_col)) $value_col = array($value_col);
 
 		$cols = $ret = array();
-		foreach($value_col as $key => $col)
+		foreach ($value_col as $key => $col)
 		{
 			$matches = null;
-			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i',$col,$matches) ? $matches[1] : $col;
+			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i', $col, $matches) ? $matches[1] : $col;
 		}
 		if (!$order) $order = current($cols);
 
-		if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
+		if (($search = & $this->search(array(), ($key_col ? $key_col.',' : 'DISTINCT ').implode(',', $value_col), $order, '', '', false, 'AND', false, $filter)))
 		{
-			if (preg_match('/AS ([a-z_0-9]+)$/i',$key_col,$matches))
+			if (preg_match('/AS ([a-z_0-9]+)$/i', $key_col, $matches))
 			{
 				$key_col = $matches[1];
 			}
@@ -1636,12 +1636,12 @@ 
 			{
 				$key_col = current($cols);
 			}
-			foreach($search as $row)
+			foreach ($search as $row)
 			{
 				if (count($cols) > 1)
 				{
 					$data = array();
-					foreach($cols as $key => $col)
+					foreach ($cols as $key => $col)
 					{
 						$data[$key] = $row[$col];
 					}
@@ -1653,7 +1653,7 @@ 
 				if ($data) $ret[$row[$key_col]] = $data;
 			}
 		}
-		return $cache[$cache_key] =& $ret;
+		return $cache[$cache_key] = & $ret;
 	}
 
 	/**
@@ -1662,13 +1662,13 @@ 
 	 * @param string $column =null name of column or null for all (default)
 	 * @return array|string array with internal-name => comment pairs, or string with comment, if $column given
 	 */
-	public function get_comments($column=null)
+	public function get_comments($column = null)
 	{
-		static $comments=null;
+		static $comments = null;
 
 		if (is_null($comments))
 		{
-			foreach($this->db_cols as $db_col => $col)
+			foreach ($this->db_cols as $db_col => $col)
 			{
 				$comments[$col] = $this->table_def['fd'][$db_col]['comment'];
 			}

Braces +193 added lines, -51 removed lines

@@ -182,7 +182,10 @@ 
 	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false,$timestamp_type=null)
 	{
 		// ease the transition to api
-		if ($app == 'phpgwapi') $app = 'api';
+		if ($app == 'phpgwapi')
+		{
+			$app = 'api';
+		}
 
 		if ($no_clone)
 		{
@@ -198,9 +201,15 @@ 
 		{
 			$this->app = $app;
 
-			if (!$no_clone) $this->db->set_app($app);
+			if (!$no_clone)
+			{
+				$this->db->set_app($app);
+			}
 
-			if ($table) $this->setup_table($app,$table,$column_prefix);
+			if ($table)
+			{
+				$this->setup_table($app,$table,$column_prefix);
+			}
 		}
 		$this->init();
 
@@ -221,7 +230,10 @@ 
 	 */
 	public function set_times($timestamp_type=false)
 	{
-		if ($timestamp_type !== false) $this->timestamp_type = $timestamp_type;
+		if ($timestamp_type !== false)
+		{
+			$this->timestamp_type = $timestamp_type;
+		}
 
 		// set current time
 		switch($this->timestamp_type)
@@ -279,7 +291,10 @@ 
 			{
 				$this->autoinc_id = $col;
 			}
-			if ($def['type'] == 'bool') $this->has_bools = true;
+			if ($def['type'] == 'bool')
+			{
+				$this->has_bools = true;
+			}
 
 			foreach($this->table_def['uc'] as $k => $uni_index)
 			{
@@ -318,7 +333,10 @@ 
 	 */
 	function data_merge($new)
 	{
-		if ((int) $this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		}
 
 		if (!is_array($new) || !count($new))
 		{
@@ -342,7 +360,10 @@ 
 		{
 			$this->data[self::USER_TIMEZONE_READ] = $new[self::USER_TIMEZONE_READ];
 		}
-		if ((int) $this->debug >= 4) _debug_array($this->data);
+		if ((int) $this->debug >= 4)
+		{
+			_debug_array($this->data);
+		}
 	}
 
 	/**
@@ -486,7 +507,10 @@ 
 		if (!is_array($keys))
 		{
 			$pk = array_values($this->db_key_cols);
-			if ($pk) $keys = array($pk[0] => $keys);
+			if ($pk)
+			{
+				$keys = array($pk[0] => $keys);
+			}
 		}
 
 		$this->init($keys);
@@ -500,13 +524,16 @@ 
 				$query[$db_col] = $this->data[$col];
 			}
 		}
-		if (!$query)	// no primary key in keys, lets try the data_cols for a unique key
+		if (!$query)
+		{
+			// no primary key in keys, lets try the data_cols for a unique key
 		{
 			foreach($this->db_uni_cols as $db_col => $col)
 			{
 				if (!is_array($col) && $this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 				elseif(is_array($col))
 				{
@@ -520,31 +547,43 @@ 
 						}
 						$q[$db_c] = $this->data[$c];
 					}
-					if ($q) $query += $q;
+					if ($q)
+					{
+						$query += $q;
+					}
 				}
 			}
 		}
-		if (!$query)	// no unique key in keys, lets try everything else
+		if (!$query)
+		{
+			// no unique key in keys, lets try everything else
 		{
 			foreach($this->db_data_cols as $db_col => $col)
 			{
 				if ($this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 			}
 		}
-		if (!$query)	// keys has no cols
+		if (!$query)
+		{
+			// keys has no cols
 		{
 			$this->db2data();
+		}
 
 			return False;
 		}
-		if ($join)	// Prefix the columns with the table-name, as they might exist in the join
+		if ($join)
+		{
+			// Prefix the columns with the table-name, as they might exist in the join
 		{
 			foreach($query as $col => $val)
 			{
 				if (is_int($col) || strpos($join,$col) === false) continue;
+		}
 				$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
 				unset($query[$col]);
 			}
@@ -558,11 +597,14 @@ 
 			$query,__LINE__,__FILE__,False,'',$this->app,0,$join) as $row)
 		{
 			$cols = $this->db_cols;
-			if ($extra_cols)	// extra columns to report
+			if ($extra_cols)
+			{
+				// extra columns to report
 			{
 				foreach(is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
 				{
 					if (FALSE!==stripos($col,' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i','\\1',$col);
+			}
 					$cols[$col] = $col;
 				}
 			}
@@ -585,7 +627,10 @@ 
 		{
 			unset($this->data[$this->db_key_cols[$this->autoinc_id]]);
 		}
-		if ((int) $this->debug >= 4) echo "nothing found !!!</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "nothing found !!!</p>\n";
+		}
 
 		$this->db2data();
 
@@ -601,7 +646,10 @@ 
 	 */
 	function save($keys=null,$extra_where=null)
 	{
-		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+		if (is_array($keys) && count($keys))
+		{
+			$this->data_merge($keys);
+		}
 
 		// check if data contains user timezone during read AND user changed timezone since then
 		// --> load old timezone for the rest of this request
@@ -618,9 +666,13 @@ 
 		}
 		$this->data2db();
 
-		if ((int) $this->debug >= 4) { echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
+		if ((int) $this->debug >= 4)
+		{
+echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
 
-		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])	// insert with auto id
+		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])
+		{
+			// insert with auto id
 		{
 			foreach($this->db_cols as $db_col => $col)
 			{
@@ -630,7 +682,9 @@ 
 						(isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value
 						 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 					{
-						continue;	// no need to write that (unset) column
+						continue;
+		}
+		// no need to write that (unset) column
 					}
 					if ($this->table_def['fd'][$db_col]['type'] == 'varchar' &&
 						strlen($this->data[$col]) > $this->table_def['fd'][$db_col]['precision'])
@@ -661,9 +715,13 @@ 
 				if (!array_key_exists($col,$this->data) &&	// handling of unset columns in $this->data
 					($this->autoinc_id ||			// update of table with auto id or
 					 isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value or
-					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
+					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))
 				{
-					continue;	// no need to write that (unset) column
+					// column is nullable
+				{
+					continue;
+				}
+				// no need to write that (unset) column
 				}
 				$data[$db_col] = !is_object($this->data[$col]) && (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 			}
@@ -680,9 +738,12 @@ 
 			{
 				$keys[$db_col] = $this->data[$col];
 			}
-			if (!$data && !$this->autoinc_id)	// happens if all columns are in the primary key
+			if (!$data && !$this->autoinc_id)
+			{
+				// happens if all columns are in the primary key
 			{
 				$data = $keys;
+			}
 				$keys = False;
 			}
 			if ($this->autoinc_id)
@@ -713,7 +774,10 @@ 
 	 */
 	function update($_fields,$merge=true)
 	{
-		if ($merge) $this->data_merge($_fields);
+		if ($merge)
+		{
+			$this->data_merge($_fields);
+		}
 
 		$fields = $this->data2db($_fields);
 
@@ -766,9 +830,12 @@ 
 		{
 			$keys = array($this->autoinc_id => $keys);
 		}
-		if (!is_array($keys) || !count($keys))	// use internal data
+		if (!is_array($keys) || !count($keys))
+		{
+			// use internal data
 		{
 			$data = $this->data;
+		}
 			$keys = $this->db_key_cols;
 		}
 		else	// data and keys are supplied in $keys
@@ -803,7 +870,10 @@ 
 				$query[$db_col] = $data[$col];
 			}
 		}
-		if ($only_return_query) return $query;
+		if ($only_return_query)
+		{
+			return $query;
+		}
 
 		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
 
@@ -836,7 +906,10 @@ 
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-		if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		}
 
 		// if extending class or instanciator set columns to search, convert string criteria to array
 		if ($criteria && !is_array($criteria))
@@ -900,9 +973,12 @@ 
 								($negate ? ') ' : '');
 						}
 					}
-					elseif (strpos($db_col,'.') !== false)	// we have a table-name specified
+					elseif (strpos($db_col,'.') !== false)
+					{
+						// we have a table-name specified
 					{
 						list($table,$only_col) = explode('.',$db_col);
+					}
 						$type = $this->db->get_column_attribute($only_col, $table, true, 'type');
 						if (empty($type))
 						{
@@ -927,13 +1003,17 @@ 
 					}
 				}
 			}
-			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ',$query);
+			if (is_array($query) && $op != 'AND')
+			{
+				$query = $this->db->column_data_implode(' '.$op.' ',$query);
+			}
 		}
 		if (is_array($filter))
 		{
 			$db_filter = array();
 			$data2db_filter = $this->data2db($filter);
-			if (!is_array($data2db_filter)) {
+			if (!is_array($data2db_filter))
+			{
 				echo function_backtrace()."<br/>\n";
 				echo "filter=";_debug_array($filter);
 				echo "data2db(filter)=";_debug_array($data2db_filter);
@@ -1029,7 +1109,10 @@ 
 			}
 		}
 		$num_rows = 0;	// as spec. in max_matches in the user-prefs
-		if (is_array($start)) list($start,$num_rows) = $start;
+		if (is_array($start))
+		{
+			list($start,$num_rows) = $start;
+		}
 
 		// fix GROUP BY clause to contain all non-aggregate selected columns
 		if ($order_by && stripos($order_by,'GROUP BY') !== false)
@@ -1057,18 +1140,24 @@ 
 					'append' => $order_by,
 					'join'   => $join,
 				);
-				if (!$union_cols)	// union used the colum-names of the first query
+				if (!$union_cols)
+				{
+					// union used the colum-names of the first query
 				{
 					$union_cols = $this->_get_columns($only_keys,$extra_cols);
 				}
+				}
 				return true;	// waiting for further calls, before running the union-query
 			}
 			// running the union query now
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$union[0]['cols'] = ($mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ').$union[0]['cols'];
+			}
 				}
 				else	// cant do a count, have to run the query without limit
 				{
@@ -1076,18 +1165,24 @@ 
 				}
 			}
 			$rs = $this->db->union($union,__LINE__,__FILE__,$order_by,$start,$num_rows);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 
 			$cols = $union_cols;
 			$union = $union_cols = array();
 		}
 		else	// no UNION
 		{
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
+			}
 				}
 				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
 				{
@@ -1100,10 +1195,16 @@ 
 			}
 			$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
 				$start,$order_by,$this->app,$num_rows,$join);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 			$cols = $this->_get_columns($only_keys,$extra_cols);
 		}
-		if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		}
 
 		if ($mysql_calc_rows)
 		{
@@ -1116,9 +1217,12 @@ 
 		}
 		$arr = array();
 		$n = 0;
-		if ($rs) foreach($rs as $row)
+		if ($rs)
+		{
+			foreach($rs as $row)
 		{
 			$data = array();
+		}
 			foreach($cols as $db_col => $col)
 			{
 				$data[$col] = (isset($row[$db_col]) ? $row[$db_col] : $row[$col]);
@@ -1186,9 +1290,15 @@ 
 					$col = substr($col, $pos+9);
 				}
 				$alias = $col;
-				if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
+				if (stripos($col, ' AS '))
+				{
+					list($col, $alias) = preg_split('/ +AS +/i', $col);
+				}
 				// do NOT group by constant expressions
-				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col)) continue;
+				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col))
+				{
+					continue;
+				}
 				if (!in_array($col, $group_by_cols) && !in_array($alias, $group_by_cols))
 				{
 					// instead of aliased primary key, we have to use original column incl. table-name as alias is ambigues
@@ -1225,7 +1335,10 @@ 
 	{
 		$pattern = trim($_pattern);
 		// This function can get called multiple times.  Make sure it doesn't re-process.
-		if (empty($pattern) || is_array($pattern)) return $pattern;
+		if (empty($pattern) || is_array($pattern))
+		{
+			return $pattern;
+		}
 		if(strpos($pattern, 'CAST(COALESCE(') !== false)
 		{
 			return $pattern;
@@ -1300,7 +1413,7 @@ 
 			{
 				$token = substr($token, 1,strlen($token));
  				if(substr($token, -1) != '"')
-				{
+ 				{
 					$token .= ' '.strtok('"');
 				}
 				else
@@ -1416,7 +1529,8 @@ 
 			foreach($search_cols as $key => &$col)
 			{
 				// If the name as given isn't a real column name, and adding the prefix doesn't help, skip it
-				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
+				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols)))
+				{
 					// Can't search this column
 					unset($search_cols[$key]);
 					continue;
@@ -1450,10 +1564,13 @@ 
 	function _get_columns($only_keys,$extra_cols)
 	{
 		//echo "_get_columns() only_keys="; _debug_array($only_keys); echo "extra_cols="; _debug_array($extra_cols);
-		if ($only_keys === true)	// only primary key
+		if ($only_keys === true)
+		{
+			// only primary key
 		{
 			$cols = $this->db_key_cols;
 		}
+		}
 		else
 		{
 			$cols = array();
@@ -1462,18 +1579,27 @@ 
 			{
 				if (!$distinct_checked)
 				{
-					if (stripos($col, 'DISTINCT ') === 0) $col = substr($col, 9);
+					if (stripos($col, 'DISTINCT ') === 0)
+					{
+						$col = substr($col, 9);
+					}
 					$distinct_checked = true;
 				}
-				if (!$col || $col == '*' || $col == $this->table_name.'.*')	// all columns
+				if (!$col || $col == '*' || $col == $this->table_name.'.*')
+				{
+					// all columns
 				{
 					$cols = array_merge($cols,$this->db_cols);
 				}
+				}
 				else	// only the specified columns
 				{
-					if (stripos($col,'as'))	// if there's already an explicit naming of the column, just use it
+					if (stripos($col,'as'))
+					{
+						// if there's already an explicit naming of the column, just use it
 					{
 						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+					}
 						$cols[$col] = $col;
 						continue;
 					}
@@ -1488,11 +1614,14 @@ 
 				}
 			}
 		}
-		if ($extra_cols)	// extra columns to report
+		if ($extra_cols)
+		{
+			// extra columns to report
 		{
 			foreach(is_array($extra_cols) ? $extra_cols : explode(',',$extra_cols) as $col)
 			{
 				if (stripos($col,'as ')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+		}
 				if (($db_col = array_search($col,$this->db_cols)) !== false)
 				{
 					$cols[$db_col] = $col;
@@ -1537,7 +1666,11 @@ 
 			'',false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
 			$query['col_filter'],$join,$need_full_no_count);
 
-		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		if (!$rows)
+		{
+			$rows = array();
+		}
+		// otherwise false returned from search would be returned as array(false)
 
 		return $this->total;
 	}
@@ -1616,7 +1749,10 @@ 
 		{
 			return $cache[$cache_key];
 		}
-		if (!is_array($value_col)) $value_col = array($value_col);
+		if (!is_array($value_col))
+		{
+			$value_col = array($value_col);
+		}
 
 		$cols = $ret = array();
 		foreach($value_col as $key => $col)
@@ -1624,7 +1760,10 @@ 
 			$matches = null;
 			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i',$col,$matches) ? $matches[1] : $col;
 		}
-		if (!$order) $order = current($cols);
+		if (!$order)
+		{
+			$order = current($cols);
+		}
 
 		if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
 		{
@@ -1650,7 +1789,10 @@ 
 				{
 					$data = $row[current($cols)];
 				}
-				if ($data) $ret[$row[$key_col]] = $data;
+				if ($data)
+				{
+					$ret[$row[$key_col]] = $data;
+				}
 			}
 		}
 		return $cache[$cache_key] =& $ret;