mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-08 07:36:44 +02:00
Code Issues Releases Wiki Activity

Introduce queries_redirect function

Browse Source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1190 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana
2009-10-13 20:01:52 +00:00
parent 50881f8942
commit dbdd40a19c
7 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/database.inc.php
View File

@@ -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

2
adminer/db.inc.php
View File

@@ -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);

2
adminer/include/editing.inc.php
View File

@@ -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;

9
adminer/include/functions.inc.php
View File

@@ -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

2
adminer/processlist.inc.php
View File

@@ -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);

4
adminer/select.inc.php
View File

@@ -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);
}

2
adminer/user.inc.php
View File

@@ -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");