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

remove PHP3 legacy code and fix performance bug in sorting ldap_search results.

Browse Source
This commit is contained in:
Carsten Wolff 2005-09-28 13:10:22 +00:00
parent 7bba0e916d
commit c5f0daa001
2 changed files with 41 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
phpgwapi/inc/class.contacts.inc.php
View File

@ -232,95 +232,39 @@
return ($a[1]<$b[1])?1:-1;
}
/*
comesafter ($s1, $s2)
Returns 1 if $s1 comes after $s2 alphabetically, 0 if not.
*/
function comesafter ($s1, $s2)
{
/*
We don't want to overstep the bounds of one of the strings and segfault,
so let's see which one is shorter.
*/
$order = 1;
if((strlen($s1) == 0))
{
return 0;
}
if((strlen($s2) == 0))
{
return 1;
}
if(strlen ($s1) > strlen ($s2))
{
$temp = $s1;
$s1 = $s2;
$s2 = $temp;
$order = 0;
}
for ($index = 0; $index < strlen ($s1); $index++)
{
/* $s1 comes after $s2 */
if (strtolower($s1[$index]) > strtolower($s2[$index])) { return ($order); }
/* $s1 comes before $s2 */
if (strtolower($s1[$index]) < strtolower($s2[$index])) { return (1 - $order); }
}
/* Special case in which $s1 is a substring of $s2 */
return ($order);
}
/*
* asortbyindex ($sortarray, $index)
/**
* To be used in usort()
*
* Sort a multi-dimensional array by a second-degree index. For instance, the 0th index
* of the Ith member of both the group and user arrays is a string identifier. In the
* case of a user array this is the username; with the group array it is the group name.
* asortby
* compares two 2-dimensional arrays a and b.
* The first dimension holds the key, the array is sorted by.
* The second dimension holds the data, that's actually string-compared.
*
* @author Carsten Wolff <wolffc@egroupware.org>
* @param array $fields The fields, the array is to be sorted by. Use of multiple keys is for subsorting.
* @param string $order ASC | DESC ascending or descending order
* @param array $a one item
* @param array $b the other item
* @return integer -1 | 0 | 1 equals: a is smaller | the same | larger than b.
*/
function asortbyindex ($sortarray, $index)
function _cmp($fields, $order, $a, $b)
{
$lastindex = count($sortarray) - 2;
for ($subindex = 0; $subindex < $lastindex; $subindex++)
foreach ($fields as $field)
{
$lastiteration = $lastindex - $subindex;
for ($iteration = 0; $iteration < $lastiteration; $iteration++)
$result = strcasecmp($a[$field][0], $b[$field][0]);
if ($result == 0)
{
$nextchar = 0;
if ($this->comesafter($sortarray[$iteration][$index], $sortarray[$iteration + 1][$index]))
{
$temp = $sortarray[$iteration];
$sortarray[$iteration] = $sortarray[$iteration + 1];
$sortarray[$iteration + 1] = $temp;
}
continue;
}
if ($order == "DESC")
{
return -$result;
}
else
{
return $result;
}
}
return ($sortarray);
}
function arsortbyindex ($sortarray, $index)
{
$lastindex = count($sortarray) - 1;
for ($subindex = $lastindex; $subindex > 0; $subindex--)
{
$lastiteration = $lastindex - $subindex;
for ($iteration = $lastiteration; $iteration > 0; $iteration--)
{
$nextchar = 0;
if ($this->comesafter($sortarray[$iteration][$index], $sortarray[$iteration - 1][$index]))
{
$temp = $sortarray[$iteration];
$sortarray[$iteration] = $sortarray[$iteration - 1];
$sortarray[$iteration - 1] = $temp;
}
}
}
return ($sortarray);
return 0;
}
function formatted_address($id, $business = True, $afont = '', $asize = '2')

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

@ -458,16 +458,23 @@
/* echo '<br>total="'.$this->total_records.'"'; */
if($DEBUG) { echo '<br>Query returned "'.$this->total_records.'" records.'; }
/* Use shared sorting routines, based on sort and order */
/* 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($sort == 'ASC')
{
$ldap_fields = $this->asortbyindex($ldap_fields, $this->stock_contact_fields[$order]);
}
else
{
$ldap_fields = $this->arsortbyindex($ldap_fields, $this->stock_contact_fields[$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 {
$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'] . "')";
}
# a little bit of functional programming
$function = 'return contacts::_cmp(' . $order_array . ",'" . $sort . "'," . '$a, $b);';
usort($ldap_fields, create_function('$a, $b', $function));
/*
This logic allows you to limit rows, or not.