From d03f35823cb991b22439f56fd7329fdac246b96b Mon Sep 17 00:00:00 2001 From: teepe Date: Sun, 27 Jan 2002 23:30:40 +0000 Subject: [PATCH] _top frame problem fix git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2254 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/auth.php | 4 ++++ functions/display_messages.php | 4 ++++ functions/page_header.php | 3 +++ src/options.php | 3 +++ src/signout.php | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/functions/auth.php b/functions/auth.php index 24c5e150..309a47c9 100644 --- a/functions/auth.php +++ b/functions/auth.php @@ -20,6 +20,10 @@ function is_logged_in () { return; } + if (!isset($frame_top)) { + $frame_top = '_top'; + } + set_up_language($squirrelmail_language, true); displayHtmlHeader( 'SquirrelMail', '', FALSE ); diff --git a/functions/display_messages.php b/functions/display_messages.php index 0025cbf6..d67bdf5e 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -15,6 +15,10 @@ function error_username_password_incorrect() { global $frame_top; + if (!isset($frame_top)) { + $frame_top = '_top'; + } + echo '
'. ''. ''. diff --git a/functions/page_header.php b/functions/page_header.php index e248728f..51b3c09d 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -54,6 +54,9 @@ function displayPageHeader($color, $mailbox) { displayHtmlHeader (); $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 ); + if (!isset($frame_top)) { + $frame_top = '_top'; + } /* Locate the first displayable form element diff --git a/src/options.php b/src/options.php index c010f106..298182c6 100644 --- a/src/options.php +++ b/src/options.php @@ -228,6 +228,9 @@ if ($optpage == SMOPT_PAGE_MAIN) { /* First, display the results of a submission, if needed. */ /**********************************************************/ if ($optmode == SMOPT_MODE_SUBMIT) { + if (isset($frame_top)) { + $frame_top = '_top'; + } /* Display a message indicating a successful save. */ echo '' . _("Successfully Saved Options") . ": $optpage_name
\n"; diff --git a/src/signout.php b/src/signout.php index 0dcdaef9..c8f07cd5 100644 --- a/src/signout.php +++ b/src/signout.php @@ -44,6 +44,10 @@ require_once('../functions/strings.php'); } } + if (!isset($frame_top)) { + $frame_top = '_top'; + } + // If a user hits reload on the last page, $base_uri isn't set // because it was deleted with the session. if (! isset($base_uri)) { -- 2.25.1