holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working on searching...

Browse Source 
- Check default column names to avoid DB errors
- Prefix default column names with table name to avoid ambiguity
- Handle single words in quotes
This commit is contained in:
Nathan Gray 2010-04-01 20:48:16 +00:00
parent 93cf9c2e84
commit 5e23cfb764
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1082,10 +1082,17 @@ class so_sql
{ {
$token = '-'.strtok($break); $token = '-'.strtok($break);
} }
if ($token[0]=='"') if ($token[0]=='"')
{ {
$token = substr($token, 1,strlen($token)); $token = substr($token, 1,strlen($token));
$token .= ' '.strtok('"'); if(substr($token, -1) != '"')
{
$token .= ' '.strtok('"');
}
else
{
$token = substr($token, 0, -1);
}
} }
// prepend and append extra wildcard %, if pattern does NOT already contain wildcards // prepend and append extra wildcard %, if pattern does NOT already contain wildcards
@ -1189,8 +1196,14 @@ class so_sql
// Skip some numeric columns that don't make sense to search if we have to default to all columns // 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))) {
// 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)
@ -1202,6 +1215,8 @@ class so_sql
} }
} }
} }
// Prefix with table name to avoid ambiguity
$col = $this->table_name.'.'.$col;
} }
} }
return $search_cols; return $search_cols;