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

small cleanup

Browse Source
This commit is contained in:
Carsten Wolff 2006-01-06 02:47:45 +00:00
parent b55f6deb14
commit a0f4331554
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,11 +336,11 @@
if($filter) if($filter)
{ {
if($DEBUG) { echo 'DEBUG - Inbound filter is: #'.$filter.'#'; } if($DEBUG) { echo 'DEBUG - Inbound filter is: #'.$filter.'#'; }
foreach(explode(',',$filter) as $f) foreach(explode(',',$filter) as $f)
{ {
list($name,$value) = explode('=',$f,2); list($name,$value) = explode('=',$f,2);
if ($this->stock_contact_fields[$name]) if ($this->stock_contact_fields[$name])
{ {
$filterfields[$this->stock_contact_fields[$name]] = $value; $filterfields[$this->stock_contact_fields[$name]] = $value;
@ -456,21 +456,11 @@
/* Use usort to sort the complete result, since ldap_search can not do that */ /* Use usort to sort the complete result, since ldap_search can not do that */
@set_time_limit(0); /* Try not to die, this can take some time on slow machines... */ @set_time_limit(0); /* Try not to die, this can take some time on slow machines... */
if(empty($order)) $order_array = "array('";
{ if(!empty($order)) $order_array .= $this->stock_contact_fields[$order] . "','";
$order_array = 'array("' $order_array .= $this->stock_contact_fields['n_family'] . "', '"
. $this->stock_contact_fields['n_family'] . '", "' . $this->stock_contact_fields['n_given'] . "', '"
. $this->stock_contact_fields['n_given'] . '", "' . $this->stock_contact_fields['email'] . "')";
. $this->stock_contact_fields['email'] . '")';
}
else
{
$order_array = "array('"
. $this->stock_contact_fields[$order] . "','"
. $this->stock_contact_fields['n_family'] . "', '"
. $this->stock_contact_fields['n_given'] . "', '"
. $this->stock_contact_fields['email'] . "')";
}
# remove the "count" field from the array, because usort screws up associative arrays # remove the "count" field from the array, because usort screws up associative arrays
unset($ldap_fields['count']); unset($ldap_fields['count']);
# sort the array # sort the array
@ -672,7 +662,7 @@
echo '<br>AND query: "' . $aquery . '"'; echo '<br>AND query: "' . $aquery . '"';
echo '<br>OR query: "' . $oquery . '"'; echo '<br>OR query: "' . $oquery . '"';
echo '<br>Full query: "' . $fquery . '"'; echo '<br>Full query: "' . $fquery . '"';
echo '<br>Will search in "' . $GLOBALS['egw_info']['server']['ldap_contact_context'] . '"'; echo '<br>Will search in "' . $GLOBALS['egw_info']['server']['ldap_contact_context'] . '"';
} }
return $fquery; return $fquery;