git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@932
7612ce4b-ef26-0410-bec9-
ea0150e637f0
include("../functions/abook_local_file.php");
include("../functions/abook_ldap_server.php");
include("../functions/abook_local_file.php");
include("../functions/abook_ldap_server.php");
// Create and initialize an addressbook object.
// Returns the created object
function addressbook_init($showerr = true, $onlylocal = false) {
// Create and initialize an addressbook object.
// Returns the created object
function addressbook_init($showerr = true, $onlylocal = false) {
+
+ // Had to move this function outside of the Addressbook Class
+ // PHP 4.0.4 Seemed to be having problems with inline functions.
+ function cmp($a,$b) {
+ if($a["backend"] > $b["backend"])
+ return 1;
+ else if($a["backend"] < $b["backend"])
+ return -1;
+ return (strtolower($a["name"]) > strtolower($b["name"])) ? 1 : -1;
+ }
** backends and provide services to the functions above.
**
**/
** backends and provide services to the functions above.
**
**/
class AddressBook {
var $backends = array();
var $numbackends = 0;
class AddressBook {
var $backends = array();
var $numbackends = 0;
// Return a sorted search
function s_search($expression, $bnum = -1) {
// Return a sorted search
function s_search($expression, $bnum = -1) {
-
- $ret = $this->search($expression, $bnum);
- if(!is_array($ret))
- return $ret;
-
- // Inline function - Not nice, but still..
- function cmp($a,$b) {
- if($a["backend"] > $b["backend"])
- return 1;
- else if($a["backend"] < $b["backend"])
- return -1;
-
- return (strtolower($a["name"]) > strtolower($b["name"])) ? 1 : -1;
- }
-
- usort($ret, 'cmp');
- return $ret;
+
+ $ret = $this->search($expression, $bnum);
+ if(!is_array($ret))
+ return $ret;
+ usort($ret, 'cmp');
+ return $ret;
return false; // Not reached
} // end of modify()
return false; // Not reached
} // end of modify()
- } // End of class Addressbook
+ } // End of class Addressbook
/**
** Generic backend that all other backends extend
/**
** Generic backend that all other backends extend