We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
squirrelmail
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Removed dependency of IMAP from some more files.

gustavf 25 years ago
parent
ff4875a57f
commit
8f4d23215c
4 changed files with 12 additions and 22 deletions
Unified View Show Diff Stats
  1. 4 9
      src/addrbook_popup.php
  2. 3 6
      src/addrbook_search.php
  3. 2 5
      src/addrbook_search_html.php
  4. 3 2
      src/options_submit.php

+ 4 - 9
src/addrbook_popup.php
View File 

@@ -8,21 +8,16 @@
 
 
 
    session_start();
 
    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))
 
    if (!isset($config_php))
 
       include("../config/config.php");
 
       include("../config/config.php");
 
    if (!isset($page_header_php))
 
    if (!isset($page_header_php))
 
       include("../functions/page_header.php");
 
       include("../functions/page_header.php");
 
+   if (!isset($auth_php))
 
+      include("../functions/auth.php");
 
    if (!isset($addressbook_php))
 
    if (!isset($addressbook_php))
 
       include("../functions/addressbook.php");
 
       include("../functions/addressbook.php");
 
+
 
+   is_logged_in();
 
 ?>
 
 ?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">

+ 3 - 6
src/addrbook_search.php
View File 

@@ -136,20 +136,17 @@ function bcc_address($addr) {
 
       include("../config/config.php");
 
       include("../config/config.php");
 
    if (!isset($array_php))
 
    if (!isset($array_php))
 
       include("../functions/array.php");
 
       include("../functions/array.php");
 
+   if (!isset($auth_php))
 
+      include("../functions/auth.php");
 
    if (!isset($strings_php))
 
    if (!isset($strings_php))
 
       include("../functions/strings.php");
 
       include("../functions/strings.php");
 
-   if (!isset($imap_php))
 
-      include("../functions/imap.php");
 
    if (!isset($page_header_php))
 
    if (!isset($page_header_php))
 
       include("../functions/page_header.php");
 
       include("../functions/page_header.php");
 
    if (!isset($addressbook_php))
 
    if (!isset($addressbook_php))
 
       include("../functions/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");
 
    include("../src/load_prefs.php");
 
-   sqimap_logout ($imapConnection);
 
 
 
    displayHtmlHeader();
 
    displayHtmlHeader();

+ 2 - 5
src/addrbook_search_html.php
View File 

@@ -17,14 +17,12 @@
 
       include("../config/config.php");
 
       include("../config/config.php");
 
    if (!isset($strings_php))
 
    if (!isset($strings_php))
 
       include("../functions/strings.php");
 
       include("../functions/strings.php");
 
+   if (!isset($auth_php))
 
+      include("../functions/auth.php");
 
    if (!isset($page_header_php))
 
    if (!isset($page_header_php))
 
       include("../functions/page_header.php");
 
       include("../functions/page_header.php");
 
-   if (!isset($imap_php))
 
-      include("../functions/imap.php");
 
    if (!isset($date_php))
 
    if (!isset($date_php))
 
       include("../functions/date.php");
 
       include("../functions/date.php");
 
-   if (!isset($mime_php))
 
-      include("../functions/mime.php");
 
    if (!isset($smtp_php))
 
    if (!isset($smtp_php))
 
       include("../functions/smtp.php");
 
       include("../functions/smtp.php");
 
    if (!isset($display_messages_php))
 
    if (!isset($display_messages_php))
 
@@ -34,7 +32,6 @@
 
 
 
    include("../src/load_prefs.php");
 
    include("../src/load_prefs.php");
 
 
 
-
 
    // Insert hidden data
 
    // Insert hidden data
 
    function addr_insert_hidden() {
 
    function addr_insert_hidden() {
 
       global $body, $subject, $send_to, $send_to_cc, $send_to_bcc;
 
       global $body, $subject, $send_to, $send_to_cc, $send_to_bcc;

+ 3 - 2
src/options_submit.php
View File 

@@ -9,13 +9,14 @@
 
       include("../functions/page_header.php");
 
       include("../functions/page_header.php");
 
    if (!isset($dipslay_messages_php))
 
    if (!isset($dipslay_messages_php))
 
       include("../functions/display_messages.php");
 
       include("../functions/display_messages.php");
 
-   if (!isset($imap_php))
 
-      include("../functions/imap.php");
 
    if (!isset($array_php))
 
    if (!isset($array_php))
 
       include("../functions/array.php");
 
       include("../functions/array.php");
 
+   if (!isset($auth_php))
 
+      include ("../functions/auth.php");
 
 
 
    include("../src/load_prefs.php");
 
    include("../src/load_prefs.php");
 
 
 
+   is_logged_in();
 
 
 
    setPref($data_dir, $username, "full_name", stripslashes($full_name));
 
    setPref($data_dir, $username, "full_name", stripslashes($full_name));
 
    setPref($data_dir, $username, "email_address", stripslashes($email_address));
 
    setPref($data_dir, $username, "email_address", stripslashes($email_address));

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5