projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e2b6aa4)
allow sm to be in an embedded frame
authorteepe <teepe@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Fri, 25 Jan 2002 17:15:57 +0000 (17:15 +0000)
committerteepe <teepe@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Fri, 25 Jan 2002 17:15:57 +0000 (17:15 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2240 7612ce4b-ef26-0410-bec9-ea0150e637f0

config/conf.pl patch | blob | blame | history
config/config_default.php patch | blob | blame | history
functions/auth.php patch | blob | blame | history
functions/display_messages.php patch | blob | blame | history
functions/page_header.php patch | blob | blame | history
src/options.php patch | blob | blame | history
src/signout.php patch | blob | blame | history

diff --git a/config/conf.pl b/config/conf.pl
index 562605de11d78676c33fdfbfc524e1f347c2f346..3be511ea33203eb7c8d5827aabe8958235e958c2 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -327,6 +327,7 @@ while (($command ne "q") && ($command ne "Q")) {
       print "3.  Organization Title   : $WHT$org_title$NRM\n";
       print "4.  Signout Page         : $WHT$signout_page$NRM\n";
       print "5.  Default Language     : $WHT$squirrelmail_default_language$NRM\n";
+      print "6.  Top Frame            : $WHT$frame_top$NRM\n";
       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 2) {
@@ -503,7 +504,8 @@ while (($command ne "q") && ($command ne "Q")) {
          elsif ($command == 2) { $org_logo   = command2 (); }
          elsif ($command == 3) { $org_title  = command3 (); }
          elsif ($command == 4) { $signout_page  = command4 (); }
-        elsif ($command == 5) { $squirrelmail_default_language = command5(); }
+         elsif ($command == 5) { $squirrelmail_default_language = command5(); }
+         elsif ($command == 6) { $frame_top = command6(); }
       } elsif ($menu == 2) {
          if    ($command == 1)  { $domain                 = command11 (); }
          elsif ($command == 2)  { $imapServerAddress      = command12 (); }
@@ -644,6 +646,23 @@ sub command5 {
    return $new_signout_page;
 }
 
+# Default top frame
+sub command6 {
+    print "SquirrelMail defaults to using the whole of the browser window.\n";
+    print "This allows you to keep it within a specified frame. The default\n";
+    print "is '_top'\n";
+    print "\n";
+    print "[$WHT$frame_top$NRM]: $WHT";
+    $new_frame_top = <STDIN>;
+    if ($new_frame_top eq "\n") {
+        $new_frame_top = '_top';
+    } else {
+        $new_frame_top =~ s/[\r|\n]//g;
+        $new_frame_top =~ s/^\s+$//g;
+    }
+    return $new_frame_top;
+}
+
 ####################################################################################
 
 # domain
@@ -1815,11 +1834,12 @@ sub save_data {
         print CF "\$config_use_color = $config_use_color;\n"; 
         print CF "\n";
      
-        print CF "global \$org_name, \$org_logo, \$org_title, \$signout_page;\n";
+        print CF "global \$org_name, \$org_logo, \$org_title, \$signout_page, \$frame_top;\n";
         print CF "\$org_name      = \"$org_name\";\n";
         print CF "\$org_logo      = '$org_logo';\n";
         print CF "\$org_title     = \"$org_title\";\n";
         print CF "\$signout_page  = '$signout_page';\n";
+        print CF "\$frame_top     = '$frame_top';\n";
         print CF "\n";
      
         print CF "global \$motd;\n";
diff --git a/config/config_default.php b/config/config_default.php
index 6cb02a44b1aeb405c404aecb7b166cac550864de..afb55a8b33f6e2422325ee73850818d991763fe5 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -431,6 +431,15 @@ $default_unseen_type   = 1;
 global $invert_time;
 $invert_time = false;
 
+/**
+ * By default SquirrelMail takes up the whole browser window,
+ * this allows you to embed it within sites using frames. Set
+ * this to the frame you want it to stay in.
+ */
+
+global $frame_top;
+$frame_top = '_top';
+
 global $plugins;
 /**
  * To install plugins, just add elements to this array that have
diff --git a/functions/auth.php b/functions/auth.php
index 287be6ce7013143de410f98aefd0d5d3b7a9cadd..24c5e150c16e429ca432303f29f97bbaa9ab58e4 100644 (file)
--- a/functions/auth.php
+++ b/functions/auth.php
@@ -14,7 +14,7 @@
 require_once( '../functions/page_header.php' );
 
 function is_logged_in () {
-    global $squirrelmail_language;
+    global $squirrelmail_language, $frame_top;
 
     if ( session_is_registered('user_is_logged_in') ) {
         return;
@@ -27,9 +27,9 @@ function is_logged_in () {
     echo "<body bgcolor=\"ffffff\">\n" .
          '<br><br><center><b>' .
          _("You must be logged in to access this page.").'</b><br><br>' .
-         "<a href=\"../src/login.php\" target=\"_top\">"._("Go to the login page")."</a>\n" .
+         "<a href=\"../src/login.php\" target=\"$frame_top\">"._("Go to the login page")."</a>\n" .
          "</center></body></html>\n";
     exit;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/functions/display_messages.php b/functions/display_messages.php
index 048594283a94b8f4b238b292706325e4581e2b6a..0025cbf63676eabb2a0c4589505a5eb31fbe0235 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -13,6 +13,7 @@
  */
 
 function error_username_password_incorrect() {
+    global $frame_top;
 
     echo '<BR>'.
                 '<TABLE COLS=1 WIDTH="75%" NOBORDER BGCOLOR="' . $color[4] . '" ALIGN=CENTER>'.
@@ -21,7 +22,7 @@ function error_username_password_incorrect() {
                 '</TR>' .
                 '<TR><TD>'.
                     '<CENTER><BR>' . _("Unknown user or password incorrect.") .
-                    '<BR><A HREF="login.php" TARGET=_top>' .
+                    '<BR><A HREF="login.php" TARGET='.$frame_top.'>' .
                     _("Click here to try again") .
                     '</A>.</CENTER>'.
                 '</TD></TR>'.
diff --git a/functions/page_header.php b/functions/page_header.php
index a38f076435b0555092f905e3f056bb55f34dabfe..e248728fcdbe3f4b658ec8cd8dc2cce23008bcb5 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -49,7 +49,7 @@ function displayInternalLink($path, $text, $target='') {
 
 function displayPageHeader($color, $mailbox) {
 
-    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF;
+    global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top;
 
     displayHtmlHeader ();
 
@@ -111,7 +111,7 @@ function checkForm() {
     }
     echo  "      </TD>\n"
         . "      <TD ALIGN=right><b>\n";
-    displayInternalLink ('src/signout.php', _("Sign Out"), '_top');
+    displayInternalLink ('src/signout.php', _("Sign Out"), $frame_top);
     echo "      </b></TD>\n"
         . "   </TR>\n"
         . "   <TR BGCOLOR=\"$color[4]\">\n"
diff --git a/src/options.php b/src/options.php
index dad4282779dd1ed622c1355ce8aa1c1ee8884b97..c010f106e6e729e7b7e68aaa22a87dd2e4d3c3f5 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -235,7 +235,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
         if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) {
             echo '<A HREF="../src/left_main.php" TARGET="left">' . _("Refresh Folder List") . '</A><BR>';
         } else if ($max_refresh) {
-            echo '<A HREF="../src/webmail.php?right_frame=options.php" TARGET="_top">' . _("Refresh Page") . '</A><BR>';
+            echo '<A HREF="../src/webmail.php?right_frame=options.php" TARGET="$frame_top">' . _("Refresh Page") . '</A><BR>';
         }
     }
     /******************************************/
diff --git a/src/signout.php b/src/signout.php
index 9a37ca208aaa324d45d0b709abe096731bfa6fae..0dcdaef991cd371903f42898c242a2585603553c 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -88,7 +88,7 @@ CELLPADDING="2" ALIGN="CENTER">
     <TD ALIGN="CENTER">
       <?php do_hook('logout_above_text'); ?>
       <?php echo _("You have been successfully signed out.") ?><BR>
-      <A HREF="login.php" TARGET="_top">
+      <A HREF="login.php" TARGET="<?php echo $frame_top ?>">
       <?php echo _("Click here to log back in.") ?>
       </A><BR><BR>
     </TD>
Unnamed repository; edit this file 'description' to name the repository.