- included strings.php before config.php to avoid warning (see Bug #130107 )

[squirrelmail.git] / functions / addressbook.php

diff --git a/functions/addressbook.php b/functions/addressbook.php
index bafa53be7a4e8aeb18e96195a2afe4c1bdb34a56..8779c99e84564d5c4af0d26452c2b8d4e2c4a9d3 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -13,6 +13,7 @@
    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) {
@@ -33,10 +34,10 @@
       if($onlylocal)
        return $abook;
 
-      // Load configured LDAP servers
-      if(is_array($ldap_server)) {
+      // Load configured LDAP servers (if PHP has LDAP support)
+      if(is_array($ldap_server) && function_exists("ldap_connect")) {
         reset($ldap_server);
-        while(list($key,$param) = each($ldap_server)) {
+        while(list($undef,$param) = each($ldap_server)) {
            if(is_array($param)) {
               $r = $abook->add_backend("ldap_server", $param);
               if(!$r && $showerr) {
@@ -53,6 +54,16 @@
       return $abook;
    }
 
+   
+   // 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;
+   }
 
 
   /**
@@ -60,6 +71,7 @@
    ** backends and provide services to the functions above.
    **
    **/
+   
    class AddressBook { 
       var $backends    = array();
       var $numbackends = 0;
@@ -116,51 +128,53 @@
 
       // Return a list of addresses matching expression in
       // all backends of a given type.
-      function search($expression, $btype = "") {
+      function search($expression, $bnum = -1) {
         $ret = array();
         $this->error = "";
 
-        $sel = $this->get_backend_list($btype);
-        $failed = 0;
-        for($i = 0 ; $i < sizeof($sel) ; $i++) {
-           $backend = &$sel[$i];
-           $backend->error = "";
-           $res = $backend->search($expression);
-           if(is_array($res)) {
-              $ret = array_merge($ret, $res);
-           } else {
-              $this->error = $this->error . "<br>\n". $backend->error;
-              $failed++;
+        // Search all backends
+        if($bnum == -1) {
+           $sel = $this->get_backend_list("");
+           $failed = 0;
+           for($i = 0 ; $i < sizeof($sel) ; $i++) {
+              $backend = &$sel[$i];
+              $backend->error = "";
+              $res = $backend->search($expression);
+              if(is_array($res)) {
+                 $ret = array_merge($ret, $res);
+              } else {
+                 $this->error = $this->error . "<br>\n". $backend->error;
+                 $failed++;
+              }
            }
+
+           // Only fail if all backends failed
+           if($failed >= sizeof($sel))
+              return false;
+
         }
 
-        // Only fail if all backends failed
-        if($failed >= sizeof($sel))
-           return false;
+        // Search only one backend
+        else {
+           $ret = $this->backends[$bnum]->search($expression);
+           if(!is_array($ret)) {
+              $this->error = $this->error . "<br>\n". $this->backends[$bnum]->error;
+              return false;
+           }
+        }
 
         return $ret;
       }
 
-
+      
       // Return a sorted search
-      function s_search($expression, $btype = "") {
-
-        $ret = $this->search($expression, $btype);
-        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;
+      function s_search($expression, $bnum = -1) {
+             
+        $ret = $this->search($expression, $bnum);
+        if(!is_array($ret))
+           return $ret;
+            usort($ret, 'cmp');
+            return $ret;
       }
 
 
@@ -198,10 +212,14 @@
 
 
       // Return all addresses
-      function list_addr() {
+      function list_addr($bnum = -1) {
         $ret = array();
 
-        $sel = $this->get_backend_list("local");
+        if($bnum == -1) 
+           $sel = $this->get_backend_list("local");
+        else
+           $sel = array(0 => &$this->backends[$bnum]);
+
         for($i = 0 ; $i < sizeof($sel) ; $i++) {
            $backend = &$sel[$i];
            $backend->error = "";
@@ -318,13 +336,19 @@
            $this->error = _("E-mail address is missing");
            return false;
         }
+
+        if(eregi("[\: \|\#\"\!]", $userdata["nickname"])) {
+           $this->error = _("Nickname contain illegal characters");
+           return false;
+        }
+
         if(empty($userdata["nickname"])) {
            $userdata["nickname"] = $userdata["email"];
         }
 
         // Check that specified backend is writable
         if(!$this->backends[$bnum]->writeable) {
-           $this->error = _("Addressbook $bnum is read-only");
+           $this->error = _("Addressbook is read-only");;
            return false;
         }
 
@@ -340,8 +364,8 @@
         return false;  // Not reached
       } // end of modify()
 
-   } // End of class Addressbook
 
+   } // End of class Addressbook
 
   /**
    ** Generic backend that all other backends extend