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

Formatting

Browse Source
This commit is contained in:
Miles Lott 2005-09-29 11:31:02 +00:00
parent c5f0daa001
commit eefec39e13
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,12 +433,12 @@
{
// don't search about any fields any more
$search_filter = array(
'fn' => 'cn',
'n_given' => 'givenname',
'n_family' => 'sn',
'email' => 'mail',
'org_name' => 'o',
'org_unit' => 'ou'
'fn' => 'cn',
'n_given' => 'givenname',
'n_family' => 'sn',
'email' => 'mail',
'org_name' => 'o',
'org_unit' => 'ou'
);
$myfilter = $this->makefilter($filterfields,$search_filter,$GLOBALS['egw']->common->ldap_addslashes($query),$DEBUG);
}
@ -460,17 +460,20 @@
/* 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... */
if (empty($order)) {
if(empty($order))
{
$order_array = 'array("'
. $this->stock_contact_fields['n_family'] . '", "'
. $this->stock_contact_fields['n_given'] . '", "'
. $this->stock_contact_fields['email'] . '")';
} else {
. $this->stock_contact_fields['n_family'] . '", "'
. $this->stock_contact_fields['n_given'] . '", "'
. $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'] . "')";
. $this->stock_contact_fields[$order] . "','"
. $this->stock_contact_fields['n_family'] . "', '"
. $this->stock_contact_fields['n_given'] . "', '"
. $this->stock_contact_fields['email'] . "')";
}
# a little bit of functional programming
$function = 'return contacts::_cmp(' . $order_array . ",'" . $sort . "'," . '$a, $b);';