From ea02e1c841a34cb67600d40eb0ef53dbf172d5bd Mon Sep 17 00:00:00 2001
From: chriskl <chriskl>
Date: Fri, 23 May 2003 06:11:06 +0000
Subject: [PATCH] bump version to 3.0, update history, fix reload browser after
 drop database bug

---
 BUGS                  |  2 ++
 HISTORY               |  6 ++++++
 all_db.php            |  6 +++---
 classes/Misc.php      | 17 +++++++++++------
 libraries/lib.inc.php |  4 ++--
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/BUGS b/BUGS
index cd46a27c..156ecf4c 100644
--- a/BUGS
+++ b/BUGS
@@ -2,3 +2,5 @@
   it should use $misc->printVal($var) instead of htmlspecialchars($var).
 * Fix grant option/grantor stuff
 * Schema support for privileges
+* First and last links in browse table
+
diff --git a/HISTORY b/HISTORY
index e6f4005d..f60eca65 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,12 @@
 phpPgAdmin History
 ------------------
 
+Version 3.0
+-----------
+
+* Japanese update from Tadashi Jokagi
+* Fix drop database reload browser bug
+
 Version 3.0-beta-1
 -------------------
 
diff --git a/all_db.php b/all_db.php
index 2d0973e0..c468f129 100644
--- a/all_db.php
+++ b/all_db.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage databases within a server
 	 *
-	 * $Id: all_db.php,v 1.13 2003/05/17 15:52:48 chriskl Exp $
+	 * $Id: all_db.php,v 1.14 2003/05/23 06:11:06 chriskl Exp $
 	 */
 
 	// Include application functions
@@ -18,7 +18,7 @@
 	 */
 	function doDrop($confirm) {
 		global $data, $localData, $misc;
-		global $PHP_SELF, $lang, $_reload_browser;
+		global $PHP_SELF, $lang, $_reload_drop_database;
 
 		if ($confirm) { 
 			echo "<h2>{$lang['strdatabases']}: ", $misc->printVal($_REQUEST['database']), ": {$lang['strdrop']}</h2>\n";
@@ -35,7 +35,7 @@
 			$localData->close();
 			$status = $data->dropDatabase($_POST['database']);
 			if ($status == 0) {
-				$_reload_browser = true;
+				$_reload_drop_database = true;
 				doDefault($lang['strdatabasedropped']);
 			}
 			else
diff --git a/classes/Misc.php b/classes/Misc.php
index cc7b2a2a..d75c8d04 100644
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -2,7 +2,7 @@
 	/**
 	 * Class to hold various commonly used functions
 	 *
-	 * $Id: Misc.php,v 1.33 2003/05/19 06:08:07 chriskl Exp $
+	 * $Id: Misc.php,v 1.34 2003/05/23 06:11:06 chriskl Exp $
 	 */
 	 
 	class Misc {
@@ -196,10 +196,11 @@
 		 * @param $doBody True to output body tag, false otherwise
 		 */
 		function printFooter($doBody = true) {
-			global $_reload_browser;
-			
+			global $_reload_browser, $_reload_drop_database;
+
 			if ($doBody) {
-				if (isset($_reload_browser)) $this->printReload();
+				if (isset($_reload_browser)) $this->printReload(false);
+				elseif (isset($_reload_drop_database)) $this->printReload(true);
 				echo "</body>\n";
 			}
 			echo "</html>\n";
@@ -224,10 +225,14 @@
 
 		/**
 		 * Outputs JavaScript code that will reload the browser
+		 * @param $database True if dropping a database, false otherwise
 		 */
-		function printReload() {
+		function printReload($database) {
 			echo "<script language=\"JavaScript\">\n";
-			echo "\tparent.frames.browser.location.reload();\n";
+			if ($database)
+				echo "\tparent.frames.browser.location.href=\"browser.php\";\n";
+			else
+				echo "\tparent.frames.browser.location.reload();\n";
 			echo "</script>\n";
 		}
 
diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index 8ac98b2d..907fe0f3 100644
--- 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.50 2003/05/22 01:44:34 chriskl Exp $
+	 * $Id: lib.inc.php,v 1.51 2003/05/23 06:11:07 chriskl Exp $
 	 */
 	
 	// Set error reporting level to max
@@ -13,7 +13,7 @@
 	$appName = 'phpPgAdmin';
 
 	// Application version
-	$appVersion = '3.0-beta-1';
+	$appVersion = '3.0';
 
 
 	// Check to see if the configuration file exists, if not, explain
-- 
2.39.5