Removed dependency on IMAP. Uses auth.php instead.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@571 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/addressbook.php b/src/addressbook.php
index da7585de778eb8296d345c3c0f2bb95e3c0d3172..78eefe635a9c9236490c6a5527641798a7727e3f 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -8,23 +8,14 @@
 
    session_start();
 
-   if(!isset($logged_in)) {
-      echo _("You must login first.");
-      exit;
-   }
-   if(!isset($username) || !isset($key)) {
-      echo _("You need a valid user and password to access this page!");
-      exit;
-   }
-
    if (!isset($config_php))
       include("../config/config.php");
    if (!isset($array_php))
       include("../functions/array.php");
+   if (!isset($auth_php))
+      include("../functions/auth.php");
    if (!isset($strings_php))
       include("../functions/strings.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
    if (!isset($page_header_php))
       include("../functions/page_header.php");
    if (!isset($display_messages_php))
@@ -32,6 +23,7 @@
    if (!isset($addressbook_php))
       include("../functions/addressbook.php");
 
+   is_logged_in();
 
    // Sort array by the key "name"
    function alistcmp($a,$b) {   
@@ -83,12 +75,7 @@
    }
 
 
-   // IMAP Login
-   $imapConnection = sqimap_login ($username, $key, 
-                                  $imapServerAddress, $imapPort, 10);
    include("../src/load_prefs.php");
-   sqimap_logout ($imapConnection);
-
 
    // Open addressbook, with error messages on but without LDAP (the
    // second "true"). Don't need LDAP here anyway