From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 9 Feb 2000 14:54:46 +0000 (+0000)
Subject: Made deleting messages smarter.. detects if trash folder exists or not
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=aff57ea55796bf1f66d7ab9b374d3e7ca5cd11bb

Made deleting messages smarter.. detects if trash folder exists or not


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

diff --git a/functions/imap.php b/functions/imap.php
index 88189760..169d1a27 100644
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -308,6 +308,8 @@
          $success = copyMessages($imapConnection, $a, $b, $trash_folder);
          if ($success == true)
             setMessageFlag($imapConnection, $a, $b, "Deleted");
+         else
+            echo "There was an error moving the messages.<BR>Messages NOT deleted.";
       } else {
          setMessageFlag($imapConnection, $a, $b, "Deleted");
       }
diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index 430d5d8c..dcbd7b99 100644
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-09 07:26-0500\n"
+"POT-Creation-Date: 2000-02-09 09:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,437 +14,424 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: squirrelmail/src/compose.php:48 squirrelmail/src/compose.php:84
+#: src/compose.php:48 src/compose.php:84
 msgid "No Message"
 msgstr ""
 
-#: squirrelmail/src/compose.php:54
+#: src/compose.php:54
 msgid "-------- Original Message ---------\n"
 msgstr ""
 
-#: squirrelmail/src/compose.php:154 squirrelmail/src/read_body.php:155
+#: src/compose.php:154 src/read_body.php:155
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:165
+#: src/compose.php:165
 msgid "CC"
 msgstr ""
 
-#: squirrelmail/src/compose.php:186 squirrelmail/src/read_body.php:125
+#: src/compose.php:186 src/read_body.php:125
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:220
+#: src/compose.php:208 src/compose.php:221
 msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:227
+#: src/compose.php:228
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:233
+#: src/compose.php:234
 msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:246
+#: src/compose.php:247
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/src/compose.php:266
+#: src/compose.php:267
 msgid "You have not entered a message body."
 msgstr ""
 
-#: squirrelmail/src/compose.php:270
+#: src/compose.php:271
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose.php:273
+#: src/compose.php:274
 msgid "You have not entered a subject."
 msgstr ""
 
-#: squirrelmail/src/compose.php:294
+#: src/compose.php:295
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 
-#: squirrelmail/src/download.php:18
+#: src/download.php:18
 msgid "Viewing a plain text attachment"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:148 squirrelmail/src/download.php:23
+#: functions/mime.php:148 src/download.php:23
 msgid "Download this as a file"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:24 squirrelmail/src/folders.php:18
+#: functions/page_header.php:24 src/folders.php:18
 msgid "Folders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:29
+#: src/folders.php:29
 msgid "Delete Folder"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:218
-#: squirrelmail/src/folders.php:52 squirrelmail/src/read_body.php:100
+#: functions/mailbox_display.php:218 src/folders.php:52 src/read_body.php:100
 msgid "Delete"
 msgstr ""
 
-#: squirrelmail/src/folders.php:58
+#: src/folders.php:58
 msgid "Create Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:64
+#: src/folders.php:64
 msgid "as a subfolder of"
 msgstr ""
 
-#: squirrelmail/src/folders.php:87
+#: src/folders.php:87
 msgid "Let this folder contain subfolders"
 msgstr ""
 
-#: squirrelmail/src/folders.php:94
+#: src/folders.php:94
 msgid "Rename a Folder"
 msgstr ""
 
-#: squirrelmail/src/folders.php:116
+#: src/folders.php:116
 msgid "Rename"
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:20
+#: src/folders_create.php:20
 msgid ""
 "Illegal folder name.  Please select a different name.<BR><A "
 "HREF=\"../src/folders.php\">Click here to go back</A>."
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:35
+#: src/folders_create.php:36
 msgid "Folder Created!"
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:36
-#: squirrelmail/src/folders_delete.php:80
-msgid "You will be automatically forwarded."
+#: src/folders_create.php:38
+msgid "The folder has been successfully created."
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:36
-#: squirrelmail/src/folders_delete.php:80
-msgid "If not,"
+#: src/folders_create.php:40 src/folders_delete.php:85
+#: src/options_submit.php:33
+msgid "Click here"
 msgstr ""
 
-#: squirrelmail/src/folders_create.php:36
-#: squirrelmail/src/folders_delete.php:80
-msgid "click here"
+#: src/folders_create.php:42 src/folders_delete.php:87
+#: src/options_submit.php:35
+msgid "to continue."
 msgstr ""
 
-#: squirrelmail/src/folders_delete.php:79
+#: src/folders_delete.php:81
 msgid "Folder Deleted!"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_do.php:67
+#: src/folders_delete.php:83
+msgid "The folder has been successfully deleted."
+msgstr ""
+
+#: src/folders_rename_do.php:67
 msgid "Return"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:26
+#: src/folders_rename_getname.php:26
 msgid "Rename a folder"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:30
+#: src/folders_rename_getname.php:30
 msgid "New name:"
 msgstr ""
 
-#: squirrelmail/src/folders_rename_getname.php:34
-#: squirrelmail/src/options.php:258
+#: src/folders_rename_getname.php:34 src/options.php:258
 msgid "Submit"
 msgstr ""
 
-#: squirrelmail/src/left_main.php:85
+#: src/left_main.php:87
 msgid "refresh folder list"
 msgstr ""
 
-#: squirrelmail/src/load_prefs.php:15
+#: src/load_prefs.php:15
 msgid "Theme: "
 msgstr ""
 
-#: squirrelmail/src/load_prefs.php:17
+#: src/load_prefs.php:17
 msgid " was not found."
 msgstr ""
 
-#: squirrelmail/src/load_prefs.php:19
+#: src/load_prefs.php:19
 msgid "Exiting abnormally"
 msgstr ""
 
-#: squirrelmail/src/login.php:29
+#: src/login.php:29
 msgid "SquirrelMail version $version<BR>By the SquirrelMail Development Team"
 msgstr ""
 
-#: squirrelmail/src/login.php:42
+#: src/login.php:42
 msgid "Name:"
 msgstr ""
 
-#: squirrelmail/src/login.php:50
+#: src/login.php:50
 msgid "Password:"
 msgstr ""
 
-#: squirrelmail/src/login.php:60
+#: src/login.php:60
 msgid "Login"
 msgstr ""
 
-#: squirrelmail/src/move_messages.php:59 squirrelmail/src/move_messages.php:85
+#: src/move_messages.php:59 src/move_messages.php:85
 msgid "No messages were selected."
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:25 squirrelmail/src/options.php:27
+#: functions/page_header.php:25 src/options.php:27
 msgid "Options"
 msgstr ""
 
-#: squirrelmail/src/options.php:38
+#: src/options.php:38
 msgid "         Full Name:"
 msgstr ""
 
-#: squirrelmail/src/options.php:51
+#: src/options.php:51
 msgid "         Reply-to:"
 msgstr ""
 
-#: squirrelmail/src/options.php:64
+#: src/options.php:64
 msgid "         Theme:"
 msgstr ""
 
-#: squirrelmail/src/options.php:88
+#: src/options.php:88
 msgid "         Move deleted messages to "
 msgstr ""
 
-#: squirrelmail/src/options.php:112
+#: src/options.php:112
 msgid "         Wrap incoming text at:"
 msgstr ""
 
-#: squirrelmail/src/options.php:129
+#: src/options.php:129
 msgid "         Size of editor window (in characters):"
 msgstr ""
 
-#: squirrelmail/src/options.php:146
+#: src/options.php:146
 msgid "         Time between auto refresh of folder list:"
 msgstr ""
 
-#: squirrelmail/src/options.php:244
+#: src/options.php:244
 msgid "Use a signature?"
 msgstr ""
 
-#: squirrelmail/src/options_submit.php:29
+#: src/options_submit.php:29
 msgid "Options Saved!"
 msgstr ""
 
-#: squirrelmail/src/options_submit.php:31
+#: src/options_submit.php:31
 msgid "Your options have been saved."
 msgstr ""
 
-#: squirrelmail/src/options_submit.php:33
-msgid "Click here"
-msgstr ""
-
-#: squirrelmail/src/options_submit.php:35
-msgid "to continue."
-msgstr ""
-
-#: squirrelmail/src/read_body.php:34
+#: src/read_body.php:34
 msgid "more"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:35
+#: src/read_body.php:35
 msgid "less"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:97
+#: src/read_body.php:97
 msgid "Message List"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:106
+#: src/read_body.php:106
 msgid "Forward"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:109
+#: src/read_body.php:109
 msgid "Reply"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:112
+#: src/read_body.php:112
 msgid "Reply All"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:135
+#: src/read_body.php:135
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/read_body.php:145
+#: src/read_body.php:145
 msgid "Date:"
 msgstr ""
 
-#: squirrelmail/src/right_main.php:11
+#: src/right_main.php:11
 msgid "You must "
 msgstr ""
 
-#: squirrelmail/src/right_main.php:13
+#: src/right_main.php:13
 msgid "login"
 msgstr ""
 
-#: squirrelmail/src/right_main.php:15
+#: src/right_main.php:15
 msgid " first."
 msgstr ""
 
-#: squirrelmail/src/right_main.php:19 squirrelmail/src/webmail.php:10
+#: src/right_main.php:19 src/webmail.php:10
 msgid "You need a valid user and password to access this page!"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:15 squirrelmail/src/signout.php:24
+#: functions/page_header.php:15 src/signout.php:24
 msgid "Sign Out"
 msgstr ""
 
-#: squirrelmail/src/signout.php:31
+#: src/signout.php:31
 msgid "You have been successfully signed out."
 msgstr ""
 
-#: squirrelmail/src/signout.php:34
+#: src/signout.php:34
 msgid "Click here to "
 msgstr ""
 
-#: squirrelmail/src/signout.php:36
+#: src/signout.php:36
 msgid "log back in."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:17
+#: functions/display_messages.php:17
 msgid "Unknown user or password incorrect."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:17
+#: functions/display_messages.php:17
 msgid "Click here to try again"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:29
+#: functions/display_messages.php:29
 msgid "Welcome to $org_name's WebMail system"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:38
+#: functions/display_messages.php:38
 msgid "Running SquirrelMail version $version (c) 1999-2000."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:56
+#: functions/display_messages.php:56
 msgid "Messages Deleted"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:58
+#: functions/display_messages.php:58
 msgid "The selected messages were deleted successfully."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:61
-#: squirrelmail/functions/display_messages.php:78
-#: squirrelmail/functions/display_messages.php:95
+#: functions/display_messages.php:61 functions/display_messages.php:78
+#: functions/display_messages.php:95
 msgid "Click here to return to "
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:73
+#: functions/display_messages.php:73
 msgid "Messages Moved"
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:75
+#: functions/display_messages.php:75
 msgid "The selected messages were moved successfully."
 msgstr ""
 
-#: squirrelmail/functions/display_messages.php:90
-#: squirrelmail/functions/display_messages.php:106
+#: functions/display_messages.php:90 functions/display_messages.php:106
 msgid "ERROR"
 msgstr ""
 
-#: squirrelmail/functions/mailbox.php:52
+#: functions/mailbox.php:52
 msgid "Error in message header fetching.  Start message: "
 msgstr ""
 
-#: squirrelmail/functions/mailbox.php:52
+#: functions/mailbox.php:52
 msgid "End message: "
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:162
+#: functions/mailbox_display.php:162
 msgid "Viewing messages "
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:162
+#: functions/mailbox_display.php:162
 msgid " to "
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:166
+#: functions/mailbox_display.php:166
 msgid "Viewing message "
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:166
+#: functions/mailbox_display.php:166
 msgid "total"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:172
-#: squirrelmail/functions/mailbox_display.php:176
-#: squirrelmail/functions/mailbox_display.php:275
-#: squirrelmail/functions/mailbox_display.php:279
+#: functions/mailbox_display.php:172 functions/mailbox_display.php:176
+#: functions/mailbox_display.php:275 functions/mailbox_display.php:279
 msgid "Previous"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:173
-#: squirrelmail/functions/mailbox_display.php:181
-#: squirrelmail/functions/mailbox_display.php:276
-#: squirrelmail/functions/mailbox_display.php:280
-#: squirrelmail/functions/mailbox_display.php:284
+#: functions/mailbox_display.php:173 functions/mailbox_display.php:181
+#: functions/mailbox_display.php:276 functions/mailbox_display.php:280
+#: functions/mailbox_display.php:284
 msgid "Next"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:192
+#: functions/mailbox_display.php:192
 msgid "Move selected to:"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:214
+#: functions/mailbox_display.php:214
 msgid "Move"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:218
+#: functions/mailbox_display.php:218
 msgid "checked messages"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:230
+#: functions/mailbox_display.php:230
 msgid "From"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:238
+#: functions/mailbox_display.php:238
 msgid "Date"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:246
+#: functions/mailbox_display.php:246
 msgid "Subject"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:17
+#: functions/page_header.php:17
 msgid "Current Folder: "
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:22
+#: functions/page_header.php:22
 msgid "Compose"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:23
+#: functions/page_header.php:23
 msgid "Addresses"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:12
+#: functions/prefs.php:12
 msgid "Preference file "
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:12
+#: functions/prefs.php:12
 msgid " not found.  Exiting abnormally"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:35
+#: functions/prefs.php:35
 msgid "Preference file, "
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:35
+#: functions/prefs.php:35
 msgid ""
 ", does not exist.  Log out, and log back in to create a default preference "
 "file. "
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:77
+#: functions/prefs.php:77
 msgid "Error opening "
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:106
+#: functions/prefs.php:106
 msgid "Signature file not found."
 msgstr ""
diff --git a/src/folders_create.php b/src/folders_create.php
index e668ac2d..e4809731 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -32,10 +32,15 @@
    fputs($imapConnection, "1 logout\n");
 
    echo "<FONT FACE=\"Arial,Helvetica\">";
-   echo "<BR><BR><CENTER><B>" . _("Folder Created!") . "</B><BR><BR>";
-   echo _("You will be automatically forwarded.") . "<BR>" . _("If not,") . " <A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>" . _("click here") . "</a>.";   
-   echo "</CENTER></FONT>"; 
-         
+   echo "<BR><BR><BR><CENTER><B>";
+   echo _("Folder Created!");
+   echo "</B><BR><BR>";
+   echo _("The folder has been successfully created.");
+   echo "<BR><A HREF=\"webmail.php\" TARGET=_top>";
+   echo _("Click here");
+   echo " </A>";
+   echo _("to continue.");
+   echo "</CENTER></FONT>";
 ?>
 </BODY></HTML>
 
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 9b836009..b38a4d74 100644
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -8,7 +8,8 @@
 
    include("../src/load_prefs.php");
 
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
+   echo "<HTML>";
+   echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");  
    
    $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0);
@@ -76,8 +77,14 @@
    fputs($imapConnection, "1 logout");
 
    echo "<FONT FACE=\"Arial,Helvetica\">";
-   echo "<BR><BR><CENTER><B>" . _("Folder Deleted!") . "</B><BR><BR>";
-   echo _("You will be automatically forwarded.") . "<BR>" . _("If not,") . " <A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>" . _("click here") . "</A>";
+   echo "<BR><BR><BR><CENTER><B>";
+   echo _("Folder Deleted!");
+   echo "</B><BR><BR>";
+   echo _("The folder has been successfully deleted.");
+   echo "<BR><A HREF=\"webmail.php\" TARGET=_top>";
+   echo _("Click here");
+   echo " </A>";
+   echo _("to continue.");
    echo "</CENTER></FONT>"; 
    
    echo "</BODY></HTML>";
diff --git a/src/left_main.php b/src/left_main.php
index c9ba3d6a..812515b9 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -71,6 +71,8 @@
    /** If it was a successful login, lets load their preferences **/
    include("../src/load_prefs.php");
    if (isset($left_refresh) && ($left_refresh != "None")) {
+      echo "<META HTTP-EQUIV=\"Expires\" CONTENT=\"Thu, 01 Dec 1994 16:00:00 GMT\">";
+      echo "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">"; 
       echo "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php\">";
    }
    echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">";