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

Date localization

Browse Source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@917 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana
2009-07-27 16:32:56 +00:00
parent f93c84e4d8
commit a0def4790e
17 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
adminer/include/adminer.inc.php
View File

@@ -110,7 +110,7 @@ class Adminer {
}
/** Value printed in select table
* @param string escaped value to print
* @param string HTML-escaped value to print
* @param string link to foreign key
* @param array single field returned from fields()
* @return string
@@ -123,6 +123,15 @@ class Adminer {
return ($link ? "<a href=\"$link\">$return</a>" : $return);
}
/** Value conversion used in select and edit
* @param string
* @param array single field returned from fields()
* @return
*/
function editVal($val, $field) {
return $val;
}
/** Print columns box in select
* @param array result of selectColumnsProcess()
* @param array selectable columns
@@ -263,7 +272,7 @@ class Adminer {
$return[] = "MATCH (" . idf_escape($val["col"]) . ") AGAINST (" . $dbh->quote($val["val"]) . " IN BOOLEAN MODE)";
} else {
$in = process_length($val["val"]);
$cond = " $val[op]" . (ereg('NULL$', $val["op"]) ? "" : (ereg('IN$', $val["op"]) ? " (" . (strlen($in) ? $in : "NULL") . ")" : " " . $dbh->quote($val["val"])));
$cond = " $val[op]" . (ereg('NULL$', $val["op"]) ? "" : (ereg('IN$', $val["op"]) ? " (" . (strlen($in) ? $in : "NULL") . ")" : " " . $this->processInput($fields[$val["col"]], $val["val"])));
if (strlen($val["col"])) {
$return[] = idf_escape($val["col"]) . $cond;
} else {
@@ -379,15 +388,14 @@ class Adminer {
}
/** Process sent input
* @param string field name
* @param array single field from fields()
* @param string
* @param string
* @return string expression to use in a query
*/
function processInput($name, $field) {
function processInput($field, $value, $function = "") {
global $dbh;
$idf = bracket_escape($name);
$function = $_POST["function"][$idf];
$value = $_POST["fields"][$idf];
$name = $field["field"];
$return = $dbh->quote($value);
if (ereg('^(now|uuid)$', $function)) {
$return = "$function()";

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

@@ -318,7 +318,7 @@ function input($field, $value, $function) {
} elseif (strpos($field["type"], "text") !== false) {
echo '<textarea name="fields[' . $name . ']" cols="50" rows="12"' . $onchange . '>' . htmlspecialchars($value) . '</textarea>';
} elseif (ereg('binary|blob', $field["type"])) {
echo (ini_get("file_uploads") ? '<input type="file" name="' . $name . '"' . $onchange . '>' : lang('File uploads are disabled.') . ' ');
echo (ini_get("file_uploads") ? '<input type="file" name="' . $name . '"' . $onchange . '>' : lang('File uploads are disabled.'));
} else {
// int(3) is only a display hint
$maxlength = (!ereg('int', $field["type"]) && preg_match('~^([0-9]+)(,([0-9]+))?$~', $field["length"], $match) ? ($match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0)) : ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0));
@@ -327,9 +327,9 @@ function input($field, $value, $function) {
}
}
function process_input($name, $field) {
function process_input($field) {
global $dbh, $adminer;
$idf = bracket_escape($name);
$idf = bracket_escape($field["field"]);
$function = $_POST["function"][$idf];
$value = $_POST["fields"][$idf];
if ($field["type"] == "enum" ? $value == -1 : $function == "orig") {
@@ -347,7 +347,7 @@ function process_input($name, $field) {
}
return "_binary" . $dbh->quote($file);
} else {
return $adminer->processInput($name, $field);
return $adminer->processInput($field, $value, $function);
}
}