SQL window naming fix. Drop 4 unused variables from lib.inc.php. Remove unused file...

diff --git a/databases.php b/databases.php
deleted file mode 100755 (executable)
index 571e49e..0000000
--- a/databases.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-       /**
-        * List databases in a server
-        * @param $webdbServerID The ID of the current server
-        *
-        * $Id: databases.php,v 1.5 2003/12/17 09:11:32 chriskl Exp $
-        */
-
-       // Include application functions
-       include_once('./libraries/lib.inc.php');
-
-       $misc->printHeader($lang['strdatabases']);
-       $misc->printBody();
-?>
-
-<h1><?php echo $appName ?></h1>
-
-<p><?php echo $appIntro ?></p>
-
-<?php
-       $misc->printFooter();
-?>

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index c2bc419cccd38aa8cf8984a166fc937e077228cb..bf3f7d7e72be7c39003a0f5f433897bf05cab34c 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.75 2004/05/08 14:45:10 chriskl Exp $
+        * $Id: lib.inc.php,v 1.76 2004/05/31 09:46:37 soranzo Exp $
         */
        
        // Set error reporting level to max
@@ -97,19 +97,13 @@
        ini_set('magic_quotes_sybase', 0);
        ini_set('arg_separator.output', '&');
        
-       // If login action is set, then set login variables
+       // If login action is set, then set session variables
        if (isset($_POST['formServer']) && isset($_POST['formUsername']) && 
                isset($_POST['formPassword']) && isset($_POST['formLanguage'])) {
-               $webdbServerID = $_POST['formServer'];
-               $webdbUsername = $_POST['formUsername'];
-               $webdbPassword = $_POST['formPassword'];
-               $webdbLanguage = $_POST['formLanguage'];
-
-               // Register some session variables
-               $_SESSION['webdbServerID'] = $webdbServerID;
-               $_SESSION['webdbUsername'] = $webdbUsername;
-               $_SESSION['webdbPassword'] = $webdbPassword;
-               $_SESSION['webdbLanguage'] = $webdbLanguage;
+               $_SESSION['webdbServerID'] = $_POST['formServer'];
+               $_SESSION['webdbUsername'] = $_POST['formUsername'];
+               $_SESSION['webdbPassword'] = $_POST['formPassword'];
+               $_SESSION['webdbLanguage'] = $_POST['formLanguage'];
        }
 
        // If the logged in settings aren't present, put up the login screen.

diff --git a/topbar.php b/topbar.php
index 805c361a6a98c7a1c32a1e2fd37273fa26af7cf6..b85eae5ea4b2d776c241d4e6fa9121d38e784629 100755 (executable)
--- a/topbar.php
+++ b/topbar.php
@@ -3,14 +3,14 @@
        /**
         * Top menu for phpPgAdmin
         *
-        * $Id: topbar.php,v 1.22 2004/05/28 08:41:58 chriskl Exp $
+        * $Id: topbar.php,v 1.23 2004/05/31 09:46:37 soranzo Exp $
         */
 
        // Include application functions
        include_once('./libraries/lib.inc.php');
        
        // To prevent SQL popup windows from conflicting
-       $window_id = "sqledit_{$_SESSION['webdbServerID']}_" . rand();
+       $window_id = 'sqledit_' . urlencode($conf['servers'][$_SESSION['webdbServerID']]['host'] .'_' . $conf['servers'][$_SESSION['webdbServerID']]['port']);
        
        $misc->printHeader();
        $misc->printBody('topbar');