gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed export of server status monitor settings

Browse Source
This commit is contained in:
Rouslan Placella 2012-12-04 16:28:25 +00:00
parent 5b4bf0cf78
commit b2cbb2d779
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
file_echo.php
View File

@ -7,6 +7,7 @@
* @package PhpMyAdmin
*/
define('PMA_MINIMUM_COMMON', true);
require_once 'libraries/common.inc.php';
/* For chart exporting */
@ -49,14 +50,14 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
}
/* Send download header */
PMA_download_header($filename, $_REQUEST['type'], strlen($data));
PMA_downloadHeader($filename, $_REQUEST['type'], strlen($data));
/* Send data */
echo $data;
} else if (isset($_REQUEST['monitorconfig'])) {
/* For monitor chart config export */
PMA_download_header('monitor.cfg', 'application/force-download');
PMA_downloadHeader('monitor.cfg', 'application/force-download');
echo urldecode($_REQUEST['monitorconfig']);
} else if (isset($_REQUEST['import'])) {

25
js/server_status_monitor.js
View File

@ -572,25 +572,32 @@ AJAX.registerOnload('server_status_monitor.js', function() {
$('a[href="#exportMonitorConfig"]').click(function() {
var gridCopy = {};
$.each(runtime.charts, function(key, elem) {
gridCopy[key] = {};
gridCopy[key].nodes = elem.nodes;
gridCopy[key].settings = elem.settings;
gridCopy[key].title = elem.title;
});
var exportData = {
monitorCharts: gridCopy,
monitorSettings: monitorSettings
};
var $form;
$('body').append($form = $('<form method="post" action="file_echo.php?' + url_query + '&filename=1" style="display:none;"></form>'));
$form.append('<input type="hidden" name="monitorconfig" value="' + encodeURI($.toJSON(exportData)) + '">');
$form.submit();
$form.remove();
$('<form />', {
"class": "disableAjax",
method: "post",
action: "file_echo.php?" + url_query + "&filename=1",
style: "display:none;"
})
.append(
$('<input />', {
type: "hidden",
name: "monitorconfig",
value: $.toJSON(exportData)
})
)
.appendTo('body')
.submit()
.remove();
});
$('a[href="#importMonitorConfig"]').click(function() {