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

Fix for BUG 900342 - determine preloaded query string which includes wildcards

Browse Source
This commit is contained in:
Miles Lott 2004-02-20 16:47:06 +00:00
parent 745a6c347b
commit 265b36c9eb
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpgwapi/inc/class.contacts_ldap.inc.php
View File

@ -516,11 +516,25 @@
return $qarray; return $qarray;
} }
$first = $last = "*";
if(strstr($query,"*"))
{
if(substr($query,-1) == "*")
{
$last = '';
}
if(substr($query,1) == "*")
{
$first = '';
}
}
if(@is_array($extra)) if(@is_array($extra))
{ {
if($DEBUG) { echo '<br>Searching...'; } if($DEBUG) { echo '<br>Searching...'; }
foreach($extra as $name => $value) foreach($extra as $name => $value)
{ {
$qarray[] = array($value => $query); $qarray[] = array($value => $query);
} }
} }
@ -557,7 +571,7 @@
} }
else else
{ {
$oquery .= '(' . $x . '=*' . $y . '*)'; $oquery .= '(' . $x . '=' . $first . $y . $last . ')';
$hasor = True; $hasor = True;
} }
} }
@ -565,7 +579,7 @@
elseif($value == $query) elseif($value == $query)
{ {
/* searching */ /* searching */
$oquery .= '(' . $name . '=*' . $value . '*)'; $oquery .= '(' . $name . '=' . $first . $value . $last . ')';
$hasor = True; $hasor = True;
} }
else else
@ -615,6 +629,7 @@
echo '<br>Will search in "' . $GLOBALS['phpgw_info']['server']['ldap_contact_context'] . '"'; echo '<br>Will search in "' . $GLOBALS['phpgw_info']['server']['ldap_contact_context'] . '"';
} }
// echo $fquery;
return $fquery; return $fquery;
} }