From e0dcff78e5469c8dc71cc603dff6326fc4f7b3c2 Mon Sep 17 00:00:00 2001 From: teepe Date: Thu, 1 Nov 2001 00:08:22 +0000 Subject: [PATCH] fixed delimiter presence when not connected to imap server git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1671 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/page_header.php | 5 +++-- src/redirect.php | 5 ++++- src/signout.php | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/functions/page_header.php b/functions/page_header.php index 1cde34cf..349f32d7 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -38,12 +38,13 @@ } function displayPageHeader($color, $mailbox) { + global $delimiter; displayHtmlHeader (); echo "\n\n"; /** Here is the header and wrapping table **/ - $shortBoxName = readShortMailboxName($mailbox, "."); + $shortBoxName = readShortMailboxName($mailbox, $delimiter); echo "\n"; echo "

"; echo "\n"; @@ -79,4 +80,4 @@ echo "

\n\n"; echo "

"; } -?> \ No newline at end of file +?> diff --git a/src/redirect.php b/src/redirect.php index 269ea11c..5f4b1b21 100644 --- a/src/redirect.php +++ b/src/redirect.php @@ -77,12 +77,15 @@ echo ""; echo "\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 6b54cc4e..75839a2f 100644 --- 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"> - \ No newline at end of file + -- 2.25.1