* Hopefully squashed all those annoying "flags" workarounds

[squirrelmail.git] / functions / addressbook.php

diff --git a/functions/addressbook.php b/functions/addressbook.php
index 4d043555c60da5d4f5afc1f95ce4f32f112871a6..fa53c7e30c5e591f678331c921b1de314ec45640 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -56,7 +56,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)) {
@@ -280,7 +281,7 @@
            $userdata['nickname'] = $userdata['email'];
         }
 
-        if(eregi('[ \:\|\#\"\!]', $userdata['nickname'])) {
+        if(eregi('[ \\:\\|\\#\\"\\!]', $userdata['nickname'])) {
            $this->error = _("Nickname contain illegal characters");
            return false;
         }