Ensure login frame is always at top level (Russell Smith)

diff --git a/HISTORY b/HISTORY
index f03193262f239021152cb07d72b620ac72ebba10..52d67278eaf632c09cc6012789e9a565e70fc25b 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,12 @@
 phpPgAdmin History
 ------------------
 
+Version 3.6-dev
+---------------
+
+Bugs
+* Ensure login frame is always at top level (Russell Smith)
+
 Version 3.5.1
 -------------
 

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index 8e9054d2d27507b43df43cee42ff1182f127b2aa..22a3d3feb0a4ead97dff74d4472cb42353910352 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.89 2005/01/04 23:49:41 soranzo Exp $
+        * $Id: lib.inc.php,v 1.90 2005/01/19 10:27:16 chriskl Exp $
         */
        
        // Set error reporting level to max
@@ -13,7 +13,7 @@
        $appName = 'phpPgAdmin';
 
        // Application version
-       $appVersion = '3.5';
+       $appVersion = '3.6-dev';
 
        // PostgreSQL and PHP minimum version
        $postgresqlMinVer = '7.0';

diff --git a/login.php b/login.php
index 8cd667ba1158bfc311dc32207f93c1f9ec544aac..0a66329a110790b122d0647af9ee4795937e3b74 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -3,7 +3,7 @@
        /**
         * Login screen
         *
-        * $Id: login.php,v 1.18 2004/07/12 01:49:15 chriskl Exp $
+        * $Id: login.php,v 1.19 2005/01/19 10:27:16 chriskl Exp $
         */
 
        // This needs to be an include once to prevent lib.inc.php infinite recursive includes.
@@ -87,7 +87,13 @@
        $lang['appcharset'] = 'UTF-8';
 
        // Output header        
-       $misc->printHeader($lang['strlogin']);
+       $misc->printHeader($lang['strlogin'], "<script language=\"javascript\" type=\"text/javascript\"><!--
+               // show login form in top frame
+               if (top != self) {
+                       window.top.location.href='./index.php';
+               }
+               //-->
+               </script>");
        $misc->printBody();
 ?>