From f33d2f92248abdddbe5d45d4eb6e0e980688853e Mon Sep 17 00:00:00 2001 From: gustavf Date: Thu, 29 Jun 2000 14:14:24 +0000 Subject: [PATCH] Removed dependency of IMAP from some more files. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@572 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/addrbook_popup.php | 13 ++++--------- src/addrbook_search.php | 9 +++------ src/addrbook_search_html.php | 7 ++----- src/options_submit.php | 5 +++-- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php index a9bee6e9..27fb93b3 100644 --- a/src/addrbook_popup.php +++ b/src/addrbook_popup.php @@ -8,21 +8,16 @@ 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($page_header_php)) include("../functions/page_header.php"); + if (!isset($auth_php)) + include("../functions/auth.php"); if (!isset($addressbook_php)) include("../functions/addressbook.php"); + + is_logged_in(); ?> diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 66c484e4..a4b74f4e 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -136,20 +136,17 @@ function bcc_address($addr) { 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($addressbook_php)) include("../functions/addressbook.php"); - // Authenticate user and load prefs - $imapConnection = sqimap_login($username, $key, - $imapServerAddress, $imapPort, 10); + is_logged_in(); include("../src/load_prefs.php"); - sqimap_logout ($imapConnection); displayHtmlHeader(); diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 11bc94e1..e07d8f9d 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -17,14 +17,12 @@ include("../config/config.php"); if (!isset($strings_php)) include("../functions/strings.php"); + if (!isset($auth_php)) + include("../functions/auth.php"); if (!isset($page_header_php)) include("../functions/page_header.php"); - if (!isset($imap_php)) - include("../functions/imap.php"); if (!isset($date_php)) include("../functions/date.php"); - if (!isset($mime_php)) - include("../functions/mime.php"); if (!isset($smtp_php)) include("../functions/smtp.php"); if (!isset($display_messages_php)) @@ -34,7 +32,6 @@ include("../src/load_prefs.php"); - // Insert hidden data function addr_insert_hidden() { global $body, $subject, $send_to, $send_to_cc, $send_to_bcc; diff --git a/src/options_submit.php b/src/options_submit.php index 643120ff..ea4276f1 100644 --- a/src/options_submit.php +++ b/src/options_submit.php @@ -9,13 +9,14 @@ include("../functions/page_header.php"); if (!isset($dipslay_messages_php)) include("../functions/display_messages.php"); - if (!isset($imap_php)) - include("../functions/imap.php"); if (!isset($array_php)) include("../functions/array.php"); + if (!isset($auth_php)) + include ("../functions/auth.php"); include("../src/load_prefs.php"); + is_logged_in(); setPref($data_dir, $username, "full_name", stripslashes($full_name)); setPref($data_dir, $username, "email_address", stripslashes($email_address)); -- 2.25.1