From 3751dc7f2496f452e00dc7410136a0aec101d797 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 14 Sep 2000 12:45:53 +0000
Subject: [PATCH] tweaks, fixed some misspellings, added a few hooks

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@741 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 doc/plugin.txt                | 4 +++-
 functions/imap_mailbox.php    | 6 ++++++
 functions/mailbox_display.php | 1 +
 functions/mime.php            | 1 +
 index.php                     | 2 +-
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/plugin.txt b/doc/plugin.txt
index fd32cd2f..2e8f354a 100644
--- a/doc/plugin.txt
+++ b/doc/plugin.txt
@@ -90,7 +90,7 @@ List of hooks
   * options_personal_save         src/options_personal.php
   * options_display_bottom        src/options_display.php
   * options_display_inside        src/options_display.php
-  * options_display_sav           src/options_display.php
+  * options_display_save          src/options_display.php
   * options_folders_bottom        src/options_folders.php
   * options_folders_inside        src/options_folders.php
   * options_folders_save          src/options_folders.php
@@ -100,6 +100,7 @@ List of hooks
   loading_prefs                   src/load_prefs.php
   mailbox_index_before            functions/mailbox_display.php
   mailbox_index_after             functions/mailbox_display.php
+  mailbox_form_before             functions/mailbox_display.php
   right_main_after_header         src/right_main.php
   right_main_bottom               src/right_main.php
   login_top                       src/login.php
@@ -114,6 +115,7 @@ List of hooks
   help_chapter                    src/help.php
   abook_html_search_below         src/addrbook_search_html.php
   addressbook_bottom              src/addressbook.php
+  attachment $type0/$type1        functions/mime.php
    
 (*) Options
 -----------
diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 26d05d10..e7e4aad4 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -43,6 +43,8 @@
     **  Selects a mailbox
     ******************************************************************************/
    function sqimap_mailbox_select ($imap_stream, $mailbox, $hide=true, $recent=false) {
+      global $auto_expunge;
+      
       fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
      	$read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
       if ($recent) {
@@ -53,6 +55,10 @@
          }
          return $r[1];
       }
+      if ($auto_expunge) {
+         fputs ($imap_stream, "a001 EXPUNGE\r\n");
+         $tmp = sqimap_read_data($imap_stream, "a001", $a, $b, true);
+      }   
    }
 
    
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 8924617f..87074a06 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -229,6 +229,7 @@
       echo "<TR><TD BGCOLOR=\"$color[0]\">";
 
       echo "\n\n\n<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage\">";
+      do_hook("mailbox_form_before");
       echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=60% ALIGN=LEFT VALIGN=CENTER>\n";
diff --git a/functions/mime.php b/functions/mime.php
index 3bae25af..29ad2265 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -493,6 +493,7 @@
                if ($message->header->description)
                   $body .= "&nbsp;&nbsp;<b>" . htmlspecialchars($message->header->description)."</b>";
                $body .= "&nbsp;(<a href=\"../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent\">"._("download")."</a>)\n";     
+               do_hook("attachment $type0/$type1");
                $body .= "</TT><BR>";
                $num++;
             }
diff --git a/index.php b/index.php
index 2e5cde83..436e8e20 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-   include "functions/strings.php";
+   include "./functions/strings.php";
 
    $location = get_location();
    header("Location: $location/src/login.php\n\n");
-- 
2.25.1