Official Mail_Fetch version

[squirrelmail.git] / functions / addressbook.php

diff --git a/functions/addressbook.php b/functions/addressbook.php
index 11cb7d09b5c342bd7b2c087972c3fbca61016f88..08246cd6cf9446d62b145f1872b2cc2f15690d19 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -1,16 +1,16 @@
 <?php
 
-  /**
-   **  addressbook.php
-   **
-   **  Functions and classes for the addressbook system.
-   **
-   **  $Id$
-   **/
-    
-   if (defined ('addressbook_php'))
-      return; 
-   define ('addressbook_php', true); 
+   /**
+    **  addressbook.php
+    **
+    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Functions and classes for the addressbook system.
+    **
+    **  $Id$
+    **/
+
 
    // This is the path to the global site-wide addressbook.
    // It looks and feels just like a user's .abook file
@@ -30,17 +30,17 @@
 
 
    // Include backends here.
-   include('../functions/abook_local_file.php');
-   include('../functions/abook_ldap_server.php');
+   require_once('../functions/abook_local_file.php');
+   require_once('../functions/abook_ldap_server.php');
 
    // Use this if you wanna have a global address book
    if (isset($address_book_global_filename))
-      include('../functions/abook_global_file.php');
+      include_once('../functions/abook_global_file.php');
 
    // Only load database backend if database is configured
    global $addrbook_dsn;
    if(isset($addrbook_dsn))
-      include('../functions/abook_database.php');
+      include_once('../functions/abook_database.php');
 
 
    // Create and initialize an addressbook object. 
@@ -315,7 +315,7 @@
         }
 
         if(eregi('[ \\:\\|\\#\\"\\!]', $userdata['nickname'])) {
-           $this->error = _("Nickname contain illegal characters");
+           $this->error = _("Nickname contains illegal characters");
            return false;
         }
 
@@ -393,7 +393,7 @@
         }
 
         if(eregi('[\\: \\|\\#"\\!]', $userdata['nickname'])) {
-           $this->error = _("Nickname contain illegal characters");
+           $this->error = _("Nickname contains illegal characters");
            return false;
         }