From 1faeb90e02dac058f764fd9b3cd6b19848d1267c Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 6 Jul 2007 13:48:25 +0000 Subject: [PATCH] Rights git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@66 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- edit.inc.php | 96 ++++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/edit.inc.php b/edit.inc.php index 58d040fb..577a455b 100644 --- a/edit.inc.php +++ b/edit.inc.php @@ -1,15 +1,11 @@ $val) { - $where[] = idf_escape($key) . " = BINARY '" . mysql_real_escape_string($val) . "'"; - } +foreach ((array) $_GET["where"] as $key => $val) { + $where[] = idf_escape($key) . " = BINARY '" . mysql_real_escape_string($val) . "'"; //! enum and set } -if (is_array($_GET["null"])) { - foreach ($_GET["null"] as $key) { - $where[] = idf_escape($key) . " IS NULL"; - } +foreach ((array) $_GET["null"] as $key) { + $where[] = idf_escape($key) . " IS NULL"; } if ($_POST) { if (isset($_POST["delete"])) { @@ -17,17 +13,19 @@ if ($_POST) { $message = lang('Item has been deleted.'); } else { $set = array(); - foreach ($fields as $key => $field) { - if (preg_match('~char|text|set~', $field["type"]) ? $_POST["null"][$key] : !strlen($_POST["fields"][$key])) { - $value = "NULL"; + foreach ($_POST["fields"] as $key => $val) { + $name = bracket_escape($key, "back"); + $field = $fields[$name]; + if (preg_match('~char|text|set~', $field["type"]) ? $_POST["null"][$key] : !strlen($val)) { + $val = "NULL"; } elseif ($field["type"] == "enum") { - $value = intval($_POST["fields"][$key]); + $val = intval($val); } elseif ($field["type"] == "set") { - $value = array_sum((array) $_POST["fields"][$key]); + $val = array_sum((array) $val); } else { - $value = "'" . mysql_real_escape_string($_POST["fields"][$key]) . "'"; + $val = "'" . mysql_real_escape_string($val) . "'"; } - $set[] = idf_escape(bracket_escape($key, "back")) . " = $value"; + $set[] = idf_escape($name) . " = $val"; } if ($where) { $query = "UPDATE " . idf_escape($_GET["edit"]) . " SET " . implode(", ", $set) . " WHERE " . implode(" AND ", $where) . " LIMIT 1"; @@ -47,57 +45,59 @@ page_header(($_GET["where"] ? lang('Edit') : lang('Insert')) . ": " . htmlspecia if ($_POST) { echo "

" . lang('Error during saving') . ": " . htmlspecialchars($error) . "

\n"; $data = $_POST["fields"]; - foreach ($_POST["fields"] as $key => $val) { + foreach ($_POST["null"] as $key => $val) { $data[$key] = null; } } elseif ($where) { - $select = array("*"); + $select = array(); foreach ($fields as $name => $field) { - if ($field["type"] == "enum" || $field["type"] == "set") { - $select[] = "1*" . idf_escape($name) . " AS " . idf_escape($name); + if (in_array("select", $field["privileges"]) && in_array(($where ? "update" : "insert"), $field["privileges"])) { + $select[] = ($field["type"] == "enum" || $field["type"] == "set" ? "1*" . idf_escape($name) . " AS " : "") . idf_escape($name); } } - $data = mysql_fetch_assoc(mysql_query("SELECT " . implode(", ", $select) . " FROM " . idf_escape($_GET["edit"]) . " WHERE " . implode(" AND ", $where) . " LIMIT 1")); + $data = ($select ? mysql_fetch_assoc(mysql_query("SELECT " . implode(", ", $select) . " FROM " . idf_escape($_GET["edit"]) . " WHERE " . implode(" AND ", $where) . " LIMIT 1")) : array()); } else { $data = array(); } ?>
- +
$field) { - echo "\n"; } - if ($field["null"] && preg_match('~char|text|set~', $field["type"])) { - echo ''; - } - echo "\n"; } -echo "\n"; ?>
" . htmlspecialchars($name) . ""; - $value = ($data ? $data[$name] : $field["default"]); - $name = htmlspecialchars(bracket_escape($name)); - if ($field["type"] == "enum") { - echo ''; - preg_match_all("~'((?:[^']*|'')+)'~", $field["length"], $matches); - foreach ($matches[1] as $i => $val) { - $id = "field-$name-" . ($i+1); - echo ' '; + if (in_array(($where ? "update" : "insert"), $field["privileges"])) { + echo "
" . htmlspecialchars($name) . ""; + $value = ($data ? $data[$name] : $field["default"]); + $name = htmlspecialchars(bracket_escape($name)); + if ($field["type"] == "enum") { + echo ''; + preg_match_all("~'((?:[^']*|'')+)'~", $field["length"], $matches); + foreach ($matches[1] as $i => $val) { + $id = "field-$name-" . ($i+1); + echo ' '; + } + if ($field["null"]) { + $id = "field-$name-"; + echo ' '; + } + } elseif ($field["type"] == "set") { //! 64 bits + preg_match_all("~'((?:[^']*|'')+)'~", $field["length"], $matches); + foreach ($matches[1] as $i => $val) { + $id = "$name-" . ($i+1); + echo ' > $i) & 1 ? ' checked="checked"' : '') . ' />'; + } + } elseif (strpos($field["type"], "text") !== false) { + echo ''; + } else { //! binary + echo ''; } - if ($field["null"]) { - $id = "field-$name-"; - echo ' '; + if ($field["null"] && preg_match('~char|text|set~', $field["type"])) { + echo ''; } - } elseif ($field["type"] == "set") { //! 64 bits - preg_match_all("~'((?:[^']*|'')+)'~", $field["length"], $matches); - foreach ($matches[1] as $i => $val) { - $id = "$name-" . ($i+1); - echo ' > $i) & 1 ? ' checked="checked"' : '') . ' />'; - } - } elseif (strpos($field["type"], "text") !== false) { - echo ''; - } else { //! numbers, date, binary - echo ''; + echo "
" . ($where ? " " : "") . "
+