hopefully fixed [ NONE ] problem

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

diff --git a/ChangeLog b/ChangeLog
index d2ad7e2..b72e26b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 Version 0.4pre2 -- DEVELOPMENT
 ------------------------------
+- Replying sets the "Answered" flag on the original message
+- When message is sent, it sends you to the folder you were looking at.
 - HTML based search of address books (javascript an option)
 - Made folder listing look first at subscribed folders, making it
-  faster, even if you don't have $folder_prefix set.
+     faster, even if you don't have $folder_prefix set.
 - Fixed some bugs with default sent and trash folders
 - Fixed some bugs with folder manipulating
 
-
 Version 0.4pre1 -- April 29, 2000
 ---------------------------------
 - For speed's sake, unseen messages are only noted on INBOX in left
@@ -37,6 +38,7 @@ Version 0.4pre1 -- April 29, 2000
     across different IMAP servers
 
 
+
 Version 0.3.1 -- March 13, 2000
 -------------------------------
 - Fixed a bug that didn't allow downloading of attachments

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 02a35b4..0ead476 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -40,8 +40,16 @@
    $send_to_bcc = stripslashes($send_to_bcc);
    $subject = stripslashes($subject);
 
+   echo "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
+   echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>\n";
+   echo _("Address Book Search");
+   echo "   </TD></TR>\n";
+   echo "</TABLE>\n";
+
+
    echo "<center>";
    echo "<form method=post action=\"compose.php?html_addr_search=true\">";
+   echo _("Enter your search criteria:") . "<br>";
    echo "   <input type=text value=\"$query\"name=query>";
    echo "   <input type=submit value=Submit>";
    echo "   <input type=hidden value=\"$body\" name=body>";
@@ -101,7 +109,7 @@
       }
       print "</TABLE>";
       echo "<input type=hidden value=1 name=html_addr_search_done>";
-      echo "<center><input type=submit value=addr_search_done name=\"Use Addresses\"></center>";
+      echo "<center><input type=submit name=addr_search_done value=\"Use Addresses\"></center>";
       echo "</form>";
    }
 

diff --git a/src/compose.php b/src/compose.php
index 1e16bd2..3bbb5f1 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -312,7 +312,7 @@
    } // function checkInput()
 
 
-   if ($mailbox == "")
+   if (($mailbox == "") || ($mailbox == "None"))
       $mailbox = "INBOX";
 
    if(isset($send)) {

diff --git a/src/folders_create.php b/src/folders_create.php
index 45b1a5d..e8f08c7 100644 (file)
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -17,8 +17,7 @@
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
    $dm = sqimap_get_delimiter($imapConnection);
 
-   if (strpos($folder_name, "\"") || strpos($folder_name, ".") ||
-       strpos($folder_name, "/") || strpos($folder_name, "\\") ||
+   if (strpos($folder_name, "\"") || strpos($folder_name, "\\") ||
        strpos($folder_name, "'") || strpos($folder_name, "$dm")) {
       plain_error_message(_("Illegal folder name.  Please select a different name.")."<BR><A HREF=\"../src/folders.php\">"._("Click here to go back")."</A>.", $color);
       exit;
@@ -35,7 +34,7 @@
       $subfolder = $folder_prefix . $subfolder;
    }
 
-   if (trim($subfolder_orig) == "[ None ]") {
+   if ((trim($subfolder_orig) == "[ None ]") || (trim(stripslashes($subfolder_orig)) == "[ None ]")) {
       sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, "");
    } else {
       sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");