- Fixed: hardware setup, passwords containing specials characters

- Fixed: devices tab, adding device with names containing specials characters

Author: gizmocuz

History.txt

@@ -57,6 +57,8 @@ Version 2.0.xxxx (xxxx 2015)
 - Changed: Moved curl folder to windows libraries folder (windows compiler, download the new WindowsLibraries.zip)
 - Implemented: 'Custom HTTP' notification system
 - Implemented: notifications, option to send to specific systems
+- Fixed: hardware setup, passwords containing specials characters
+- Fixed: devices tab, adding device with names containing specials characters
 
 Version 2.0.2284 (February 22th 2015)
 - Fixed: Firefox, RGBW/Setpoint popup

www/app/DevicesController.js

@@ -398,7 +398,7 @@ define(['app'], function (app) {
 			  if ( bValid ) {
 				  $( this ).dialog( "close" );
 				  $.ajax({
-					 url: "json.htm?type=setused&idx=" + $.devIdx + '&name=' + $("#dialog-adddevice #devicename").val() + '&used=true',
+					 url: "json.htm?type=setused&idx=" + $.devIdx + '&name=' + encodeURIComponent($("#dialog-adddevice #devicename").val()) + '&used=true',
 					 async: false, 
 					 dataType: 'json',
 					 success: function(data) {
@@ -438,7 +438,7 @@ define(['app'], function (app) {
 			  if ( bValid ) {
 				  $( this ).dialog( "close" );
 				  $.ajax({
-					 url: "json.htm?type=setused&idx=" + $.devIdx + '&name=' + $("#dialog-addlightdevicedev #devicename").val() + '&used=true&maindeviceidx=' + MainDeviceIdx,
+					 url: "json.htm?type=setused&idx=" + $.devIdx + '&name=' + encodeURIComponent($("#dialog-addlightdevicedev #devicename").val()) + '&used=true&maindeviceidx=' + MainDeviceIdx,
 					 async: false, 
 					 dataType: 'json',
 					 success: function(data) {

www/app/HardwareController.js

@@ -143,7 +143,7 @@ define(['app'], function (app) {
 					ShowNotify($.t('Please enter an Valid Port!'), 2500, true);
 					return;
 				}
-				var password=$("#hardwarecontent #divlogin #password").val();		
+				var password=encodeURIComponent($("#hardwarecontent #divlogin #password").val());
 				$.ajax({
 					 url: "json.htm?type=command&param=updatehardware&htype=" + hardwaretype + 
 						"&address=" + address + 
@@ -184,7 +184,7 @@ define(['app'], function (app) {
 					return;
 				}		
 				var username=$("#hardwarecontent #divlogin #username").val();
-				var password=$("#hardwarecontent #divlogin #password").val();
+				var password=encodeURIComponent($("#hardwarecontent #divlogin #password").val());
 				$.ajax({
 					 url: "json.htm?type=command&param=updatehardware&htype=" + hardwaretype +
 						"&address=" + address + 
@@ -314,7 +314,7 @@ define(['app'], function (app) {
 			}
 			else if ((text.indexOf("ICY") >= 0) || (text.indexOf("Toon") >= 0) || (text.indexOf("PVOutput") >= 0)) {
 				var username = $("#hardwarecontent #divlogin #username").val();
-				var password = $("#hardwarecontent #divlogin #password").val();
+				var password = encodeURIComponent($("#hardwarecontent #divlogin #password").val());
 				$.ajax({
 					url: "json.htm?type=command&param=updatehardware&htype=" + hardwaretype +
 					   "&port=1" +
@@ -445,7 +445,7 @@ define(['app'], function (app) {
 					ShowNotify($.t('Please enter an Valid Port!'), 2500, true);
 					return;
 				}
-				var password=$("#hardwarecontent #divlogin #password").val();
+				var password=encodeURIComponent($("#hardwarecontent #divlogin #password").val());
 				$.ajax({
 					 url: "json.htm?type=command&param=addhardware&htype=" + hardwaretype + "&address=" + address + "&port=" + port + "&name=" + name + "&password=" + password + "&enabled=" + bEnabled + "&datatimeout=" + datatimeout,
 					 async: false, 
@@ -515,7 +515,7 @@ define(['app'], function (app) {
 					return;
 				}		
 				var username=$("#hardwarecontent #divlogin #username").val();
-				var password = $("#hardwarecontent #divlogin #password").val();
+				var password = encodeURIComponent($("#hardwarecontent #divlogin #password").val());
 
 				if ((text.indexOf("Harmony") >= 0) && (username == "")) {
 					ShowNotify($.t('Please enter a username!'), 2500, true);
@@ -593,7 +593,7 @@ define(['app'], function (app) {
 			else if ((text.indexOf("ICY") >= 0)||(text.indexOf("Toon") >= 0)||(text.indexOf("PVOutput") >= 0))
 			{
 				var username=$("#hardwarecontent #divlogin #username").val();
-				var password=$("#hardwarecontent #divlogin #password").val();
+				var password=encodeURIComponent($("#hardwarecontent #divlogin #password").val());
 				$.ajax({
 					 url: "json.htm?type=command&param=addhardware&htype=" + hardwaretype +
 					 "&port=1" + 

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 852
+# ref 856
 
 CACHE:
 # CSS