فهرست منبع

fixed delimiter presence when not connected to imap server

teepe 24 سال پیش
والد
کامیت
7f40ec5014
3فایلهای تغییر یافته به همراه9 افزوده شده و 4 حذف شده
  1. 3 2
      functions/page_header.php
  2. 4 1
      src/redirect.php
  3. 2 1
      src/signout.php

+ 3 - 2
functions/page_header.php

@@ -38,12 +38,13 @@
    }
 
    function displayPageHeader($color, $mailbox) {
+      global $delimiter;
       displayHtmlHeader ();
 
       echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\" onLoad='if ( ( document.forms.length > 0 ) && ( document.forms[0].elements[0].type == \"text\" ) ) { document.forms[0].elements[0].focus(); }'>\n\n";
 
       /** Here is the header and wrapping table **/
-      $shortBoxName = readShortMailboxName($mailbox, ".");
+      $shortBoxName = readShortMailboxName($mailbox, $delimiter);
       echo "<A NAME=pagetop></A>\n";
       echo "<table cellpadding=1 cellspacing=1 BGCOLOR=\"$color[9]\" width=100%><tr><td>";
       echo "<TABLE BGCOLOR=\"$color[9]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
@@ -79,4 +80,4 @@
       echo "</TABLE>\n\n";
       echo "</td></tr></table>";
   }
-?>
+?>

+ 4 - 1
src/redirect.php

@@ -77,12 +77,15 @@
          echo "</center>";
          echo "</body></html>\n";
          exit;
+      } else {
+         $delimiter = sqimap_get_delimiter ($imapConnection);
       }
       sqimap_logout($imapConnection);
 
       $username = $login_username;
       session_register ('username');
       setcookie('key', $key, 0, $base_uri);
+      setcookie('delimiter', $delimiter, 0, $base_uri);
       do_hook ('login_verified');
    }
 
@@ -96,4 +99,4 @@
          urlencode($rcptemail));
    else
       header("Location: webmail.php");
-?>
+?>

+ 2 - 1
src/signout.php

@@ -35,6 +35,7 @@
    do_hook('logout');
    setcookie('username', '', 0, $base_uri);
    setcookie('key', '', 0, $base_uri);
+   setcookie('delimiter', '', 0, $base_uri);
    session_destroy();
 
    if ($signout_page) {
@@ -81,4 +82,4 @@ CELLPADDING="2" ALIGN="CENTER">
   </TR>
 </TABLE>
 </BODY>
-</HTML>
+</HTML>