fixed some cyrus problems and a bug in reloading the left frame where the

time was set to "" rather than "None".

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

diff --git a/functions/imap.php b/functions/imap.php
index 169d1a2761ad8507365710deafff3bed30a03f35..cec1048b0e39ffc2762316aa40997558f26f1b56 100644 (file)
--- a/functions/imap.php
+++ b/functions/imap.php
@@ -46,13 +46,13 @@
    /** Parse the incoming mailbox name and return a string that is the FOLDER.MAILBOX **/
    function findMailboxName($mailbox) {
       $mailbox = trim($mailbox);
-//      if (substr($mailbox,  strlen($mailbox)-1, strlen($mailbox)) == "\"") {
-//         $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
-//         $pos = strrpos($mailbox, "\"") + 1;
-//         $box = substr($mailbox, $pos, strlen($mailbox));
-//      } else {
+      if (substr($mailbox,  strlen($mailbox)-1, strlen($mailbox)) == "\"") {
+         $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
+         $pos = strrpos($mailbox, "\"") + 1;
+         $box = substr($mailbox, $pos, strlen($mailbox));
+      } else {
          $box = substr($mailbox, strrpos($mailbox, " ")+1, strlen($mailbox));
-//      }
+      }
       return $box;
    }
 

diff --git a/src/left_main.php b/src/left_main.php
index 812515b9644e8da1509bba536508a7409502bbab..9cbe1b372c498e7d7d3b805627d509c1fd923f81 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -23,7 +23,7 @@
    function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $color, $move_to_trash) {
       require ("../config/config.php");
 
-      $mailboxURL = urlencode($mailbox);
+      $mailboxURL = urlencode($real_box);
       selectMailbox($imapConnection, $real_box, $numNessages);
       $unseen = unseenMessages($imapConnection, $numUnseen);
 
@@ -70,7 +70,7 @@
 
    /** If it was a successful login, lets load their preferences **/
    include("../src/load_prefs.php");
-   if (isset($left_refresh) && ($left_refresh != "None")) {
+   if (isset($left_refresh) && ($left_refresh != "None") && ($left_refresh != "")) {
       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\">";
@@ -88,6 +88,7 @@
    echo "</A>)</FONT></CENTER><BR>";
    echo "<FONT FACE=\"Arial,Helvetica\">\n";
    $delimeter = findMailboxDelimeter($imapConnection);
+
    for ($i = 0;$i < count($boxes); $i++) {
       $line = "";
       $mailbox = $boxes[$i]["FORMATTED"];