* Got bored and copied all the validate.php and define() stuff to 1.1

[squirrelmail.git] / functions / addressbook.php

diff --git a/functions/addressbook.php b/functions/addressbook.php
index 4d043555c60da5d4f5afc1f95ce4f32f112871a6..26b6aed3a8c71a1f0f17db38c4ace99f4eb5959a 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -8,7 +8,9 @@
    **  $Id$
    **/
     
-   $addressbook_php = true;
+   if (defined ('addressbook_php'))
+      return; 
+   define ('addressbook_php', true); 
 
    // Include backends here.
    include('../functions/abook_local_file.php');
@@ -56,7 +58,8 @@
        return $abook;
 
       // Load configured LDAP servers (if PHP has LDAP support)
-      if(is_array($ldap_server) && function_exists('ldap_connect')) {
+      if(isset($ldap_server) && is_array($ldap_server) && 
+          function_exists('ldap_connect')) {
         reset($ldap_server);
         while(list($undef,$param) = each($ldap_server)) {
            if(is_array($param)) {
@@ -111,7 +114,7 @@
         $ret = array();
         for($i = 1 ; $i <= $this->numbackends ; $i++) {
            if(empty($type) || $type == $this->backends[$i]->btype) {
-              array_push($ret, &$this->backends[$i]);
+              $ret[] = &$this->backends[$i];
            }
         }
         return $ret;
@@ -280,7 +283,7 @@
            $userdata['nickname'] = $userdata['email'];
         }
 
-        if(eregi('[ \:\|\#\"\!]', $userdata['nickname'])) {
+        if(eregi('[ \\:\\|\\#\\"\\!]', $userdata['nickname'])) {
            $this->error = _("Nickname contain illegal characters");
            return false;
         }