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

Upload error only if not other error

Browse Source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@507 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana
2008-09-30 12:22:24 +00:00
parent 49f7886f41
commit 4bee1c0f30
1 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
sql.inc.php
View File

@@ -5,48 +5,50 @@ if (isset($_POST["query"])) {
} }
page_header(lang('SQL command'), $error); page_header(lang('SQL command'), $error);
if (!$error && $_POST && is_string($query = (isset($_POST["query"]) ? $_POST["query"] : get_file("sql_file")))) { if (!$error && $_POST) {
$delimiter = ";"; if (is_string($query = (isset($_POST["query"]) ? $_POST["query"] : get_file("sql_file")))) {
$offset = 0; $delimiter = ";";
$empty = true; $offset = 0;
while (rtrim($query)) { $empty = true;
if (!$offset && preg_match('~^\\s*DELIMITER\\s+(.+)~i', $query, $match)) { while (rtrim($query)) {
$delimiter = preg_quote($match[1], '~'); if (!$offset && preg_match('~^\\s*DELIMITER\\s+(.+)~i', $query, $match)) {
$query = substr($query, strlen($match[0])); $delimiter = preg_quote($match[1], '~');
} elseif (preg_match("~$delimiter|['`\"]|/\\*|-- |#|\$~", $query, $match, PREG_OFFSET_CAPTURE, $offset)) { $query = substr($query, strlen($match[0]));
if ($match[0][0] && $match[0][0] != $delimiter) { } elseif (preg_match("~$delimiter|['`\"]|/\\*|-- |#|\$~", $query, $match, PREG_OFFSET_CAPTURE, $offset)) {
$pattern = ($match[0][0] == "-- " || $match[0][0] == "#" ? '~.*~' : ($match[0][0] == "/*" ? '~.*\\*/~sU' : '~\\G([^\\\\' . $match[0][0] . ']+|\\\\.)*(' . $match[0][0] . '|$)~s')); if ($match[0][0] && $match[0][0] != $delimiter) {
preg_match($pattern, $query, $match, PREG_OFFSET_CAPTURE, $match[0][1] + 1); $pattern = ($match[0][0] == "-- " || $match[0][0] == "#" ? '~.*~' : ($match[0][0] == "/*" ? '~.*\\*/~sU' : '~\\G([^\\\\' . $match[0][0] . ']+|\\\\.)*(' . $match[0][0] . '|$)~s'));
$offset = $match[0][1] + strlen($match[0][0]); preg_match($pattern, $query, $match, PREG_OFFSET_CAPTURE, $match[0][1] + 1);
} else { $offset = $match[0][1] + strlen($match[0][0]);
$empty = false;
echo "<pre class='jush-sql'>" . htmlspecialchars(substr($query, 0, $match[0][1])) . "</pre>\n";
//! don't allow changing of character_set_results, convert encoding of displayed query
if (!$mysql->multi_query(substr($query, 0, $match[0][1]))) {
echo "<p class='error'>" . lang('Error in query') . ": " . htmlspecialchars($mysql->error) . "</p>\n";
} else { } else {
do { $empty = false;
$result = $mysql->store_result(); echo "<pre class='jush-sql'>" . htmlspecialchars(substr($query, 0, $match[0][1])) . "</pre>\n";
if (is_object($result)) { //! don't allow changing of character_set_results, convert encoding of displayed query
select($result); if (!$mysql->multi_query(substr($query, 0, $match[0][1]))) {
} else { echo "<p class='error'>" . lang('Error in query') . ": " . htmlspecialchars($mysql->error) . "</p>\n";
if (preg_match("~^\\s*(CREATE|DROP)(\\s+|/\\*.*\\*/|(#|-- )[^\n]*\n)+(DATABASE|SCHEMA)\\b~isU", $query)) { } else {
unset($_SESSION["databases"][$_GET["server"]]); do {
$result = $mysql->store_result();
if (is_object($result)) {
select($result);
} else {
if (preg_match("~^\\s*(CREATE|DROP)(\\s+|/\\*.*\\*/|(#|-- )[^\n]*\n)+(DATABASE|SCHEMA)\\b~isU", $query)) {
unset($_SESSION["databases"][$_GET["server"]]);
}
echo "<p class='message'>" . lang('Query executed OK, %d row(s) affected.', $mysql->affected_rows) . "</p>\n";
} }
echo "<p class='message'>" . lang('Query executed OK, %d row(s) affected.', $mysql->affected_rows) . "</p>\n"; } while ($mysql->next_result());
} }
} while ($mysql->next_result()); $query = substr($query, $match[0][1] + strlen($match[0][0]));
$offset = 0;
} }
$query = substr($query, $match[0][1] + strlen($match[0][0]));
$offset = 0;
} }
} }
if ($empty) {
echo "<p class='message'>" . lang('No commands to execute.') . "</p>\n";
}
} else {
echo "<p class='error'>" . lang('Unable to upload a file.') . "</p>\n";
} }
if ($empty) {
echo "<p class='message'>" . lang('No commands to execute.') . "</p>\n";
}
} elseif ($_POST) {
echo "<p class='error'>" . lang('Unable to upload a file.') . "</p>\n";
} }
?> ?>