From dbdd40a19cabc2682d1ca627098dd144cae67877 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Tue, 13 Oct 2009 20:01:52 +0000
Subject: [PATCH] Introduce queries_redirect function

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1190 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 adminer/database.inc.php          | 2 +-
 adminer/db.inc.php                | 2 +-
 adminer/include/editing.inc.php   | 2 +-
 adminer/include/functions.inc.php | 9 +++++++++
 adminer/processlist.inc.php       | 2 +-
 adminer/select.inc.php            | 4 ++--
 adminer/user.inc.php              | 2 +-
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index f0d36679..6479ea56 100644
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -27,7 +27,7 @@ if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP c
 			if (!$row) {
 				queries("DROP DATABASE " . idf_escape(DB));
 			}
-			query_redirect(queries(), preg_replace('~db=[^&]*&~', '', ME) . "db=" . urlencode($_POST["name"]), lang('Database has been renamed.'), !$row, false, $row);
+			queries_redirect(preg_replace('~db=[^&]*&~', '', ME) . "db=" . urlencode($_POST["name"]), lang('Database has been renamed.'), !$row);
 		}
 	} else {
 		// alter database
diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index 0c7bbb34..e74b8ffa 100644
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -33,7 +33,7 @@ if ($tables_views && !$error) {
 			}
 		}
 	}
-	query_redirect(queries(), substr(ME, 0, -1), $message, $result, false, !$result);
+	queries_redirect(substr(ME, 0, -1), $message, $result);
 }
 
 page_header(lang('Database') . ": " . h(DB), $error, false);
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index e631b421..09fdb130 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -282,7 +282,7 @@ function drop_create($drop, $create, $location, $message_drop, $message_alter, $
 	}
 	$dropped = strlen($name) && ($_POST["dropped"] || queries($drop));
 	$created = queries($create);
-	if (!query_redirect(queries(), $location, (strlen($name) ? $message_alter : $message_create), $created, false, !$created) && $dropped) {
+	if (!queries_redirect($location, (strlen($name) ? $message_alter : $message_create), $created) && $dropped) {
 		$_SESSION["messages"][] = $message_drop;
 	}
 	return $dropped;
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 2140e818..e53d798b 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -252,6 +252,15 @@ function queries($query = null) {
 	return $connection->query($query);
 }
 
+/** Redirect by remembered queries
+* @param string
+* @param string
+* @param bool
+*/
+function queries_redirect($location, $message, $redirect) {
+	return query_redirect(queries(), $location, $message, $redirect, false, !$redirect);
+}
+
 /** Remove parameter from query string
 * @param string
 * @return string
diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index 7c88716a..b8b1d3c8 100644
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -6,7 +6,7 @@ if ($_POST && !$error) {
 			$killed++;
 		}
 	}
-	query_redirect(queries(), ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"], false, !$killed && $_POST["kill"]);
+	queries_redirect(ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"]);
 }
 
 page_header(lang('Process list'), $error);
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 1bd75b52..a7ad4aea 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -85,7 +85,7 @@ if ($_POST && !$error) {
 					}
 				}
 			}
-			query_redirect(queries(), remove_from_uri("page"), lang('%d item(s) have been affected.', $affected), $result, false, !$result);
+			queries_redirect(remove_from_uri("page"), lang('%d item(s) have been affected.', $affected), $result);
 			//! display edit page in case of an error
 		} elseif (is_string($file = get_file("csv_file", true))) {
 			$file = preg_replace("~^\xEF\xBB\xBF~", '', $file); //! character set
@@ -111,7 +111,7 @@ if ($_POST && !$error) {
 					}
 				}
 			}
-			query_redirect(queries(), remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result, false, !$result);
+			queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result);
 		} else {
 			$error = upload_error($file);
 		}
diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index 42da4b4f..df47e2da 100644
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -91,7 +91,7 @@ if ($_POST && !$error) {
 				}
 			}
 		}
-		query_redirect(queries(), ME . "privileges=", (isset($_GET["host"]) ? lang('User has been altered.') : lang('User has been created.')), !$error, false, $error);
+		queries_redirect(ME . "privileges=", (isset($_GET["host"]) ? lang('User has been altered.') : lang('User has been created.')), !$error);
 		if ($old_user != $new_user) {
 			// delete new user in case of an error
 			$connection->query("DROP USER $new_user");