(
" . implode(",
", array_map('Adminer\h', $index["columns"])) . ") AGAINST";
echo "
";
echo script("qsl('input').oninput = selectFieldChange;", "");
echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
@@ -541,7 +541,7 @@ class Adminer {
$return = array();
foreach ($indexes as $i => $index) {
if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
- $return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
+ $return[] = "MATCH (" . implode(", ", array_map('Adminer\idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
}
}
foreach ((array) $_GET["where"] as $key => $val) {
@@ -876,7 +876,7 @@ class Adminer {
dump_csv($row);
} else {
if (!$insert) {
- $insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
+ $insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('Adminer\idf_escape', $keys)) . ") VALUES";
}
foreach ($row as $key => $val) {
if ($generated[$key]) {
diff --git a/adminer/include/coverage.inc.php b/adminer/include/coverage.inc.php
index f2e80bf3..77069920 100644
--- a/adminer/include/coverage.inc.php
+++ b/adminer/include/coverage.inc.php
@@ -16,5 +16,5 @@ if (extension_loaded("xdebug") && file_exists(sys_get_temp_dir() . "/adminer_cov
}
}
xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
- register_shutdown_function('save_coverage');
+ register_shutdown_function('Adminer\save_coverage');
}
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 5b5a773d..590e90d4 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -554,11 +554,11 @@ function format_foreign_key($foreign_key) {
global $on_actions;
$db = $foreign_key["db"];
$ns = $foreign_key["ns"];
- return " FOREIGN KEY (" . implode(", ", array_map('idf_escape', $foreign_key["source"])) . ") REFERENCES "
+ return " FOREIGN KEY (" . implode(", ", array_map('Adminer\idf_escape', $foreign_key["source"])) . ") REFERENCES "
. ($db != "" && $db != $_GET["db"] ? idf_escape($db) . "." : "")
. ($ns != "" && $ns != $_GET["ns"] ? idf_escape($ns) . "." : "")
. idf_escape($foreign_key["table"])
- . " (" . implode(", ", array_map('idf_escape', $foreign_key["target"])) . ")" //! reuse $name - check in older MySQL versions
+ . " (" . implode(", ", array_map('Adminer\idf_escape', $foreign_key["target"])) . ")" //! reuse $name - check in older MySQL versions
. (preg_match("~^($on_actions)\$~", $foreign_key["on_delete"]) ? " ON DELETE $foreign_key[on_delete]" : "")
. (preg_match("~^($on_actions)\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
;
diff --git a/adminer/table.inc.php b/adminer/table.inc.php
index 6263518e..2709b72d 100644
--- a/adminer/table.inc.php
+++ b/adminer/table.inc.php
@@ -44,14 +44,14 @@ if (!is_view($table_status)) {
echo "
| " . lang('Source') . " | " . lang('Target') . " | " . lang('ON DELETE') . " | " . lang('ON UPDATE') . " | |
|---|
\n";
foreach ($foreign_keys as $name => $foreign_key) {
echo "
";
- echo "| " . implode(", ", array_map('h', $foreign_key["source"])) . "";
+ echo " | " . implode(", ", array_map('Adminer\h', $foreign_key["source"])) . "";
echo " | "
. ($foreign_key["db"] != "" && $foreign_key["db"] != DB ? "" . h($foreign_key["db"]) . "." : "")
. ($foreign_key["ns"] != "" && $foreign_key["ns"] != $_GET["ns"] ? "" . h($foreign_key["ns"]) . "." : "")
. h($foreign_key["table"])
. ""
;
- echo "(" . implode(", ", array_map('h', $foreign_key["target"])) . ")";
+ echo "(" . implode(", ", array_map('Adminer\h', $foreign_key["target"])) . ")";
echo " | " . h($foreign_key["on_delete"]);
echo " | " . h($foreign_key["on_update"]);
echo ' | ' . lang('Alter') . '';
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index a3562ee8..2deab4a8 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -423,10 +423,10 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
$subject = $_POST["email_subject"];
$message = $_POST["email_message"];
preg_match_all('~\{\$([a-z0-9_]+)\}~i', "$subject.$message", $matches); // allows {$name} in subject or message
- $rows = get_rows("SELECT DISTINCT $field" . ($matches[1] ? ", " . implode(", ", array_map('idf_escape', array_unique($matches[1]))) : "") . " FROM " . table($_GET["select"])
+ $rows = get_rows("SELECT DISTINCT $field" . ($matches[1] ? ", " . implode(", ", array_map('Adminer\idf_escape', array_unique($matches[1]))) : "") . " FROM " . table($_GET["select"])
. " WHERE $field IS NOT NULL AND $field != ''"
. ($where ? " AND " . implode(" AND ", $where) : "")
- . ($_POST["all"] ? "" : " AND ((" . implode(") OR (", array_map('where_check', (array) $_POST["check"])) . "))")
+ . ($_POST["all"] ? "" : " AND ((" . implode(") OR (", array_map('Adminer\where_check', (array) $_POST["check"])) . "))")
);
$fields = fields($_GET["select"]);
foreach ($this->rowDescriptions($rows, $foreignKeys) as $row) {
diff --git a/plugins/drivers/simpledb.php b/plugins/drivers/simpledb.php
index 2d6f6ec3..d78d4cb2 100644
--- a/plugins/drivers/simpledb.php
+++ b/plugins/drivers/simpledb.php
@@ -143,7 +143,7 @@ if (isset($_GET["simpledb"])) {
function _extractIds($table, $queryWhere, $limit) {
$return = array();
if (preg_match_all("~itemName\(\) = (('[^']*+')+)~", $queryWhere, $matches)) {
- $return = array_map('idf_unescape', $matches[1]);
+ $return = array_map('Adminer\idf_unescape', $matches[1]);
} else {
foreach (sdb_request_all('Select', 'Item', array('SelectExpression' => 'SELECT itemName() FROM ' . table($table) . $queryWhere . ($limit ? " LIMIT 1" : ""))) as $item) {
$return[] = $item->Name;
|