_top frame problem fix

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

diff --git a/functions/auth.php b/functions/auth.php
index 24c5e150c16e429ca432303f29f97bbaa9ab58e4..309a47c944e8ceaec8f6f1dfe6737dec1ad9c064 100644 (file)
--- 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 0025cbf63676eabb2a0c4589505a5eb31fbe0235..d67bdf5ead0efb56c8515b990e23a24d2b39b12d 100644 (file)
--- 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 '<BR>'.
                 '<TABLE COLS=1 WIDTH="75%" NOBORDER BGCOLOR="' . $color[4] . '" ALIGN=CENTER>'.
                 '<TR BGCOLOR="' . $color[0] . '">'.

diff --git a/functions/page_header.php b/functions/page_header.php
index e248728fcdbe3f4b658ec8cd8dc2cce23008bcb5..51b3c09d735856346476063b694ffb58b66f67d4 100644 (file)
--- 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 c010f106e6e729e7b7e68aaa22a87dd2e4d3c3f5..298182c6c9284652f11906113b28137a59634f41 100644 (file)
--- 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 '<B>' . _("Successfully Saved Options") . ": $optpage_name</B><BR>\n";
 

diff --git a/src/signout.php b/src/signout.php
index 0dcdaef991cd371903f42898c242a2585603553c..c8f07cd57029595e658af62f22f894cf02d17429 100644 (file)
--- 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)) {