beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Save select data by AJAX

Browse source
This commit is contained in:
Jakub Vrana 2010-10-17 07:50:40 +02:00
parent 8d4b241156
commit a6bbe1bb3b
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adminer/include/functions.inc.php
View file

@ -345,7 +345,7 @@ function redirect($location, $message = null) {
restart_session(); restart_session();
$_SESSION["messages"][] = $message; $_SESSION["messages"][] = $message;
} }
if (isset($location)) { if (isset($location) && $_SERVER["HTTP_X_REQUESTED_WITH"] != "XMLHttpRequest") {
header("Location: " . ($location != "" ? $location : ".")); header("Location: " . ($location != "" ? $location : "."));
exit; exit;
} }

4
adminer/select.inc.php
View file

@ -333,7 +333,7 @@ if (!$columns) {
} }
} }
$id = h("val[$unique_idf][" . bracket_escape($key) . "]"); $id = h("val[$unique_idf][" . bracket_escape($key) . "]");
$value = $_POST["val"][$unique_idf][bracket_escape($key)]; $value = ($error ? $_POST["val"][$unique_idf][bracket_escape($key)] : null);
$h_value = h(isset($value) ? $value : $row[$key]); $h_value = h(isset($value) ? $value : $row[$key]);
$long = strpos($val, "<i>...</i>"); $long = strpos($val, "<i>...</i>");
$editable = is_utf8($val) && !$long && $rows[$n][$key] == $row[$key] && !$functions[$key]; $editable = is_utf8($val) && !$long && $rows[$n][$key] == $row[$key] && !$functions[$key];
@ -380,7 +380,7 @@ if (!$columns) {
if (!information_schema(DB)) { if (!information_schema(DB)) {
?> ?>
<fieldset><legend><?php echo lang('Edit'); ?></legend><div> <fieldset><legend><?php echo lang('Edit'); ?></legend><div>
<input type="submit" value="<?php echo lang('Save'); ?>" title="<?php echo lang('Double click on a value to modify it.'); ?>"> <input type="submit" value="<?php echo lang('Save'); ?>" title="<?php echo lang('Double click on a value to modify it.'); ?>" onclick='return !ajaxForm(this.form);'>
<input type="submit" name="edit" value="<?php echo lang('Edit'); ?>"> <input type="submit" name="edit" value="<?php echo lang('Edit'); ?>">
<input type="submit" name="clone" value="<?php echo lang('Clone'); ?>"> <input type="submit" name="clone" value="<?php echo lang('Clone'); ?>">
<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?> (' + (this.form['all'].checked ? <?php echo $found_rows; ?> : formChecked(this, /check/)) + ')');"> <input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?> (' + (this.form['all'].checked ? <?php echo $found_rows; ?> : formChecked(this, /check/)) + ')');">

24
adminer/static/functions.js
View file

@ -136,17 +136,22 @@ var ajaxTimeout;
/** Create AJAX request /** Create AJAX request
* @param string * @param string
* @param string
* @return XMLHttpRequest or false in case of an error * @return XMLHttpRequest or false in case of an error
*/ */
function ajax(url) { function ajax(url, data) {
var xmlhttp = (window.XMLHttpRequest ? new XMLHttpRequest() : (window.ActiveXObject ? new ActiveXObject('Microsoft.XMLHTTP') : false)); var xmlhttp = (window.XMLHttpRequest ? new XMLHttpRequest() : (window.ActiveXObject ? new ActiveXObject('Microsoft.XMLHTTP') : false));
if (xmlhttp) { if (xmlhttp) {
var currentState = ++ajaxState; var currentState = ++ajaxState;
clearTimeout(ajaxTimeout); clearTimeout(ajaxTimeout);
ajaxTimeout = setTimeout(function () { ajaxTimeout = setTimeout(function () {
setHtml('main', '<img src="../adminer/static/loader.gif" alt="">'); setHtml('main', '<img src="../adminer/static/loader.gif" alt="">');
}, 1000); // defer displaying loader }, 500); // defer displaying loader
xmlhttp.open('GET', url); var method = (data === undefined ? 'GET' : 'POST');
xmlhttp.open(method, url);
if (method == 'POST') {
xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
}
xmlhttp.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); xmlhttp.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
xmlhttp.onreadystatechange = function () { xmlhttp.onreadystatechange = function () {
if (xmlhttp.readyState == 4 && currentState == ajaxState) { if (xmlhttp.readyState == 4 && currentState == ajaxState) {
@ -154,10 +159,11 @@ function ajax(url) {
setHtml('main', xmlhttp.responseText); setHtml('main', xmlhttp.responseText);
if (window.jush) { if (window.jush) {
jush.highlight_tag('code'); jush.highlight_tag('code');
jush.highlight_tag('pre', 0);
} }
} }
}; };
xmlhttp.send(''); xmlhttp.send(data);
} }
return xmlhttp; return xmlhttp;
} }
@ -170,11 +176,15 @@ function ajaxForm(form) {
var params = [ ]; var params = [ ];
for (var i=0; i < form.elements.length; i++) { for (var i=0; i < form.elements.length; i++) {
var el = form.elements[i]; var el = form.elements[i];
if (el.name && (!/checkbox|radio/i.test(el.type) || el.checked)) { if (el.name && (!/checkbox|radio|submit|file/i.test(el.type) || el.checked)) {
params.push(el.name + '=' + encodeURIComponent(/select/i.test(el.tagName) ? selectValue(el) : el.value)); params.push(encodeURIComponent(el.name) + '=' + encodeURIComponent(/select/i.test(el.tagName) ? selectValue(el) : el.value));
} }
} }
return ajax((form.action || location.pathname) + '?' + params.join('&')); if (form.method == 'post') {
return ajax(form.action || location.href, params.join('&'));
} else {
return ajax((form.action || location.pathname) + '?' + params.join('&'));
}
} }