extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 21:01:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix IDE warnings

Browse Source
This commit is contained in:
Ralf Becker 2014-10-01 19:05:33 +00:00
parent b1e77ca062
commit b537c3963d
2 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etemplate/inc/class.so_sql.inc.php
View File

@ -6,7 +6,7 @@
* @package etemplate * @package etemplate
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker@outdoor-training.de> * @author Ralf Becker <RalfBecker@outdoor-training.de>
* @copyright 2002-13 by RalfBecker@outdoor-training.de * @copyright 2002-14 by RalfBecker@outdoor-training.de
* @version $Id$ * @version $Id$
*/ */
@ -172,7 +172,7 @@ class so_sql
* @param string $app should be set if table-defs to be read from <app>/setup/tables_current.inc.php * @param string $app should be set if table-defs to be read from <app>/setup/tables_current.inc.php
* @param string $table should be set if table-defs to be read from <app>/setup/tables_current.inc.php * @param string $table should be set if table-defs to be read from <app>/setup/tables_current.inc.php
* @param egw_db $db database object, if not the one in $GLOBALS['egw']->db should be used, eg. for an other database * @param egw_db $db database object, if not the one in $GLOBALS['egw']->db should be used, eg. for an other database
* @param string $colum_prefix='' column prefix to automatic remove from the column-name, if the column name starts with it * @param string $column_prefix ='' column prefix to automatic remove from the column-name, if the column name starts with it
* @param boolean $no_clone =false can we avoid to clone the db-object, default no * @param boolean $no_clone =false can we avoid to clone the db-object, default no
* new code using appnames and foreach(select(...,$app) can set it to avoid an extra instance of the db object * new code using appnames and foreach(select(...,$app) can set it to avoid an extra instance of the db object
* @param string $timestamp_type =null default null=leave them as is, 'ts'|'integer' use integer unix timestamps, * @param string $timestamp_type =null default null=leave them as is, 'ts'|'integer' use integer unix timestamps,
@ -710,15 +710,15 @@ class so_sql
/** /**
* Update only the given fields, if the primary key is not given, it will be taken from $this->data * Update only the given fields, if the primary key is not given, it will be taken from $this->data
* *
* @param array $fields * @param array $_fields
* @param boolean $merge =true if true $fields will be merged with $this->data (after update!), otherwise $this->data will be just $fields * @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 * @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); if ($merge) $this->data_merge($_fields);
$fields = $this->data2db($fields); $fields = $this->data2db($_fields);
// extract the keys from $fields or - if not set there - from $this->data // extract the keys from $fields or - if not set there - from $this->data
$keys = array(); $keys = array();
@ -1185,16 +1185,16 @@ class so_sql
/** /**
* Return criteria array for a given search pattern * Return criteria array for a given search pattern
* *
* @param string $pattern search pattern incl. * or ? as wildcard, if no wildcards used we append and prepend one! * @param string $_pattern search pattern incl. * or ? as wildcard, if no wildcards used we append and prepend one!
* @param string &$wildcard ='' on return wildcard char to use, if pattern does not already contain wildcards! * @param string &$wildcard ='' on return wildcard char to use, if pattern does not already contain wildcards!
* @param string &$op ='AND' on return boolean operation to use, if pattern does not start with ! we use OR else AND * @param string &$op ='AND' on return boolean operation to use, if pattern does not start with ! we use OR else AND
* @param string $extra_col =null extra column to search * @param string $extra_col =null extra column to search
* @param array $search_cols =array() List of columns to search. If not provided, all columns in $this->db_cols will be considered * @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 * @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); $pattern = trim($_pattern);
// This function can get called multiple times. Make sure it doesn't re-process. // 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) if(strpos($pattern, 'CAST(COALESCE(') !== false)
@ -1624,7 +1624,7 @@ class so_sql
/** /**
* Get comments for all columns or a specific one * Get comments for all columns or a specific one
* *
* @param $column=null name of column or null for all (default) * @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 * @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)

4
etemplate/inc/class.so_sql_cf.inc.php
View File

@ -6,7 +6,7 @@
* @package etemplate * @package etemplate
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker@outdoor-training.de> * @author Ralf Becker <RalfBecker@outdoor-training.de>
* @copyright 2009-13 by RalfBecker@outdoor-training.de * @copyright 2009-14 by RalfBecker@outdoor-training.de
* @version $Id$ * @version $Id$
*/ */
@ -105,7 +105,7 @@ class so_sql_cf extends so_sql
* @param string $app application name to load table schemas * @param string $app application name to load table schemas
* @param string $table name of the table to use * @param string $table name of the table to use
* @param string $extra_table name of the custom field table * @param string $extra_table name of the custom field table
* @param string $colum_prefix='' column prefix to automatic remove from the column-name, if the column name starts with it * @param string $column_prefix ='' column prefix to automatic remove from the column-name, if the column name starts with it
* @param string $extra_key ='_name' column name for cf name column (will be prefixed with colum prefix, if starting with _) * @param string $extra_key ='_name' column name for cf name column (will be prefixed with colum prefix, if starting with _)
* @param string $extra_value ='_value' column name for cf value column (will be prefixed with colum prefix, if starting with _) * @param string $extra_value ='_value' column name for cf value column (will be prefixed with colum prefix, if starting with _)
* @param string $extra_id ='_id' column name for cf id column (will be prefixed with colum prefix, if starting with _) * @param string $extra_id ='_id' column name for cf id column (will be prefixed with colum prefix, if starting with _)