Merge pull request #932 from ktsaou/master

properly encode and decode strings passed between netdata servers

diff --git a/web/goto-host-from-alarm.html b/web/goto-host-from-alarm.html
index 55b5f14bee867c520a09e24ea8bc07d2c2a5e5e5..e95d9d189409f051110f344373d515b22eddcadd 100755 (executable)
--- a/web/goto-host-from-alarm.html
+++ b/web/goto-host-from-alarm.html
@@ -39,7 +39,7 @@
         while(len--) {
             var p = variables[len].split('=');
             if(urlOptions.hasProperty(p[0]) && typeof p[1] !== 'undefined')
-                urlOptions[p[0]] = p[1];
+                urlOptions[p[0]] = decodeURIComponent(p[1]);
         }
     }
 
@@ -47,9 +47,9 @@
         return url + '#top'
             + ';nowelcome=1'
             + ';show_alarms=1'
-            + ';chart=' + urlOptions.chart.toString()
-            + ';family=' + urlOptions.family.toString()
-            + ';alarm=' + urlOptions.alarm.toString()
+            + ';chart=' + encodeURIComponent(urlOptions.chart.toString())
+            + ';family=' + encodeURIComponent(urlOptions.family.toString())
+            + ';alarm=' + encodeURIComponent(urlOptions.alarm.toString())
             + ';alarm_unique_id=' + urlOptions.alarm_unique_id.toString()
             + ';alarm_id=' + urlOptions.alarm_id.toString()
             + ';alarm_event_id=' + urlOptions.alarm_event_id.toString()

diff --git a/web/index.html b/web/index.html
index 6c618535f025325cea3afcbebb18ab39c6a66af5..5c7cb84fd1406c48ddbd694e3bddab1e2d81bea1 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -457,7 +457,7 @@
                 if(len !== 0) {
                     var p = variables[len].split('=');
                     if(urlOptions.hasProperty(p[0]) && typeof p[1] !== 'undefined')
-                        urlOptions[p[0]] = p[1];
+                        urlOptions[p[0]] = decodeURIComponent(p[1]);
                 }
                 else {
                     if(variables[len].length > 0)