From d75032be81305473a31b115dd19084881c479885 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 20 May 2002 00:14:43 +0000
Subject: [PATCH] bug 556105

---
 ChangeLog      |  4 ++++
 read_dump.php3 | 55 ++++++++++++++++++++++++++------------------------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 807925e42..f61fedba1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-05-19 Marc Delisle  <lem9@users.sourceforge.net>
+    * read_dump.php3, bug 556105: do not execute a bookmark if asked to
+      only view it
+
 2002-05-19 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/german.inc.php3:
       - Updated serveral untranslated strings.
diff --git a/read_dump.php3 b/read_dump.php3
index 7a94ed7cf..70e0ac27e 100644
--- a/read_dump.php3
+++ b/read_dump.php3
@@ -327,35 +327,38 @@ if ($sql_query != '') {
         $sql_query_cpy = implode(";\n", $pieces) . ';';
     }
 
-    // Only one query to run
-    if ($pieces_count == 1 && !empty($pieces[0]) && $view_bookmark == 0) {
-        // sql.php3 will stripslash the query if get_magic_quotes_gpc
-        if (get_magic_quotes_gpc() == 1) {
-            $sql_query = addslashes($pieces[0]);
-        } else {
-            $sql_query = $pieces[0];
-        }
-        if (eregi('^(DROP|CREATE)[[:space:]]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)', $sql_query)) {
-            $reload = 1;
-        }
-        include('./sql.php3');
-        exit();
-    }
-
-    // Runs multiple queries
-    else if (mysql_select_db($db)) {
-        for ($i = 0; $i < $pieces_count; $i++) {
-            $a_sql_query = $pieces[$i];
-            $result = mysql_query($a_sql_query);
-            if ($result == FALSE) { // readdump failed
-                $my_die = $a_sql_query;
-                break;
+    // really run the query?
+    if ($view_bookmark == 0) {
+        // Only one query to run
+        if ($pieces_count == 1 && !empty($pieces[0])) {
+            // sql.php3 will stripslash the query if get_magic_quotes_gpc
+            if (get_magic_quotes_gpc() == 1) {
+                $sql_query = addslashes($pieces[0]);
+            } else {
+                $sql_query = $pieces[0];
             }
-            if (!isset($reload) && eregi('^(DROP|CREATE)[[:space:]]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)', $a_sql_query)) {
+            if (eregi('^(DROP|CREATE)[[:space:]]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)', $sql_query)) {
                 $reload = 1;
             }
-        } // end for
-    } // end else if
+            include('./sql.php3');
+            exit();
+        }
+
+        // Runs multiple queries
+        else if (mysql_select_db($db)) {
+            for ($i = 0; $i < $pieces_count; $i++) {
+                $a_sql_query = $pieces[$i];
+                $result = mysql_query($a_sql_query);
+                if ($result == FALSE) { // readdump failed
+                    $my_die = $a_sql_query;
+                    break;
+                }
+                if (!isset($reload) && eregi('^(DROP|CREATE)[[:space:]]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)', $a_sql_query)) {
+                    $reload = 1;
+                }
+            } // end for
+        } // end else if
+    } // end if (really run the query)
     unset($pieces);
 } // end if