projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a951522)
fixed delimiter presence when not connected to imap server
authorteepe <teepe@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 1 Nov 2001 00:08:22 +0000 (00:08 +0000)
committerteepe <teepe@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 1 Nov 2001 00:08:22 +0000 (00:08 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1671 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/page_header.php patch | blob | blame | history
src/redirect.php patch | blob | blame | history
src/signout.php patch | blob | blame | history

diff --git a/functions/page_header.php b/functions/page_header.php
index 1cde34cfbc0285ab03b71f19d6bfdfe24fe7cb8c..349f32d731a3353049b2b0e41c38b2f14857454e 100644 (file)
--- a/functions/page_header.php
+++ b/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>";
   }
-?>
\ No newline at end of file
+?>
diff --git a/src/redirect.php b/src/redirect.php
index 269ea11c1d3210f3e7802b2e448e313723cd9b6e..5f4b1b21bff244c3a419af53dce3ada17563ae6e 100644 (file)
--- a/src/redirect.php
+++ b/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");
-?>
\ No newline at end of file
+?>
diff --git a/src/signout.php b/src/signout.php
index 6b54cc4ec8be3aaf08742134cac02e92a3262140..75839a2f1f787a71e27abb1195fbe6fa12aba75e 100644 (file)
--- a/src/signout.php
+++ b/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>
\ No newline at end of file
+</HTML>
Unnamed repository; edit this file 'description' to name the repository.