extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

* All apps - Add special search case for #<int> to only match the ID, not search the whole entry

Browse Source
This commit is contained in:
nathangray 2017-03-07 12:24:42 -07:00
parent 5926c5e7be
commit 0f83206907
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Storage/Base.php
View File

@ -1190,6 +1190,10 @@ class Base
/** /**
* Return criteria array for a given search pattern * Return criteria array for a given search pattern
* *
* We handle quoted text, wildcards and boolean operators (+/-, AND/OR). If
* the pattern is '#' followed by an integer, the search is limited to just
* the primary key.
*
* @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
@ -1218,6 +1222,11 @@ class Base
$numeric_types = array('auto', 'int', 'float', 'double', 'decimal'); $numeric_types = array('auto', 'int', 'float', 'double', 'decimal');
$numeric_columns = array(); $numeric_columns = array();
// Special handling for an ID search, #<int>
if(strpos($_pattern, '#') === 0 && is_numeric(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(); $search_cols = $this->get_default_search_columns();

1
infolog/inc/class.infolog_so.inc.php
View File

@ -886,6 +886,7 @@ class infolog_so
$wildcard = $op = null; $wildcard = $op = null;
$so_sql = new Api\Storage\Base('infolog', $this->info_table, $this->db); $so_sql = new Api\Storage\Base('infolog', $this->info_table, $this->db);
$so_sql->table_name = 'main';
$search = $so_sql->search2criteria($query['search'], $wildcard, $op, null, $columns); $search = $so_sql->search2criteria($query['search'], $wildcard, $op, null, $columns);
$sql_query = 'AND ('.(is_numeric($query['search']) ? 'main.info_id='.(int)$query['search'].' OR ' : ''). $sql_query = 'AND ('.(is_numeric($query['search']) ? 'main.info_id='.(int)$query['search'].' OR ' : '').
implode($op, $search) .')'; implode($op, $search) .')';