From b2cbb2d779eb82de75697d93bd2a31aedfe21614 Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Tue, 4 Dec 2012 16:28:25 +0000
Subject: [PATCH] Fixed export of server status monitor settings

---
 file_echo.php               |  5 +++--
 js/server_status_monitor.js | 25 ++++++++++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/file_echo.php b/file_echo.php
index 39e43d4712..d910b74e28 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -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'])) {
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index 2b62f459bb..854c3371d5 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -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() {