[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13161-g309c44e

Fri Aug 5 13:26:01 CEST 2011

The branch, master has been updated
       via  309c44e6333423e234b1b97b5954259531ce98a7 (commit)
       via  9f425de0e727b4219e50111b25c362164d420284 (commit)
       via  d368a81ccaf2c1013bd49cbf51ec23be346aeffb (commit)
       via  af6f02c03b2c5a4a2dff0ab7f666f82b472479ff (commit)
       via  0c514efe7c62375e2150bc0c28b08f01f13f2080 (commit)
      from  f753fb3dc8c7ed4de212b7a99e0dcb3f451fee62 (commit)


- Log -----------------------------------------------------------------
commit 309c44e6333423e234b1b97b5954259531ce98a7
Merge: f753fb3dc8c7ed4de212b7a99e0dcb3f451fee62 9f425de0e727b4219e50111b25c362164d420284
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Aug 5 13:25:06 2011 +0200

    Merge remote-tracking branch 'tyron/master'
    
    Conflicts:
    	js/functions.js

commit 9f425de0e727b4219e50111b25c362164d420284
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Fri Aug 5 13:30:10 2011 +0300

    changed mime to text/plain since application/json doesn't work in ff

commit d368a81ccaf2c1013bd49cbf51ec23be346aeffb
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Fri Aug 5 11:35:09 2011 +0300

    Chart import config now returned as application/json to prevent possible XSS attacks

commit af6f02c03b2c5a4a2dff0ab7f666f82b472479ff
Merge: 0c514efe7c62375e2150bc0c28b08f01f13f2080 dd2dc3a5a7665a09bd128571ea1ac9a4389d68db
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Fri Aug 5 10:50:11 2011 +0300

    Merge remote-tracking branch 'origin/master'

commit 0c514efe7c62375e2150bc0c28b08f01f13f2080
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Fri Aug 5 10:50:00 2011 +0300

    Grammar fix

-----------------------------------------------------------------------

Summary of changes:
 file_echo.php                |   10 ++++++++--
 js/functions.js              |    1 -
 js/server_status.js          |    4 +++-
 libraries/advisory_rules.txt |    2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/file_echo.php b/file_echo.php
index 5e92cb7..2f65de4 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -9,6 +9,7 @@
 
 require_once './libraries/common.inc.php';
 
+/* For chart exporting */
 if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
     $allowed = array(
         'image/png'     => 'png',
@@ -53,10 +54,15 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
     /* Send data */
     echo $data;
 
+/* For monitor chart config export */
 } else if (isset($_REQUEST['monitorconfig'])) {
     PMA_download_header('monitor.cfg', 'application/force-download');
     echo urldecode($_REQUEST['monitorconfig']);
+
+/* For monitor chart config import */
 } else if (isset($_REQUEST['import'])) {
-    echo '<html><body>' . file_get_contents($_FILES['file']['tmp_name']) . '</body></html>';
+    header('Content-type: text/plain');
+    if(!file_exists($_FILES['file']['tmp_name'])) exit();
+    echo file_get_contents($_FILES['file']['tmp_name']);
 }
-?>
+?>
\ No newline at end of file
diff --git a/js/functions.js b/js/functions.js
index 48003f1..0cca1d1 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -29,7 +29,6 @@ var codemirror_editor = false;
  */
 var chart_activeTimeouts = new Object();
 
-
 /**
  * Add a hidden field to the form to indicate that this will be an
  * Ajax request (only if this hidden field does not exist)
diff --git a/js/server_status.js b/js/server_status.js
index 60a3490..eced236 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -1029,7 +1029,9 @@ $(function() {
 
                 // Try loading config
                 try {
-                    json = $.secureEvalJSON($('body',$('iframe#monitorConfigUpload')[0].contentWindow.document).html());
+                    var data = $('body',$('iframe#monitorConfigUpload')[0].contentWindow.document).html();
+                    // Chrome wraps around '<pre style="word-wrap: break-word; white-space: pre-wrap;">' to any text content -.-
+                    json = $.secureEvalJSON(data.substring(data.indexOf("{"), data.lastIndexOf("}") + 1));
                 } catch (err) {
                     alert(PMA_messages['strFailedParsingConfig']);
                     $('div#emptyDialog').dialog('close');
diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt
index 309c1c1..9e1b0ec 100644
--- a/libraries/advisory_rules.txt
+++ b/libraries/advisory_rules.txt
@@ -191,7 +191,7 @@ rule 'rate of joins without indexes'
 	(Select_range_check + Select_scan + Select_full_join) / Uptime
 	value * 60 * 60 > 1
 	There are too many joins without indexes.
-	This means that joins are doing full table scans. Adding indexes for the fields being used in the join conditions will greatly speed up the table joins
+	This means that joins are doing full table scans. Adding indexes for the fields being used in the join conditions will greatly speed up table joins
 	Table joins average: %s, this value should be less than 1 per hour | PMA_bytime(value,2)
 
 rule 'rate of reading first index entry'


hooks/post-receive
-- 
phpMyAdmin


