pari: trunk r644 - in /trunk/config: numberplan.html scripts/astman.js

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Tue Apr 10 17:19:17 2007
New Revision: 644

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=644
Log:
Proper Escaping

Modified:
    trunk/config/numberplan.html
    trunk/config/scripts/astman.js

Modified: trunk/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/numberplan.html?view=diff&rev=644&r1=643&r2=644
==============================================================================
--- trunk/config/numberplan.html (original)
+++ trunk/config/numberplan.html Tue Apr 10 17:19:17 2007
@@ -564,9 +564,9 @@
 	for( var d in c ){
 		if ( c.hasOwnProperty(d) && c[d]['context'] && (c[d]['context'] == asterisk_guiTDPrefix + d ) ) {
 			trunks_desc[d] = new Object();
-			trunks_desc[d].comment = (c[d]['trunkname']) ? c[d]['trunkname'] : d ;
+			trunks_desc[d].comment = (c[d]['trunkname']) ? unescape(c[d]['trunkname']) : d ;
 			var New_OPTION = document.createElement('option');
-			New_OPTION.text =  trunks_desc[d].comment ;
+			New_OPTION.text =  unescape(trunks_desc[d].comment) ;
 			New_OPTION.value =d ;
 			try {
 				_$('trunks').add(New_OPTION, null); // W3C way

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?view=diff&rev=644&r1=643&r2=644
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Tue Apr 10 17:19:17 2007
@@ -203,9 +203,9 @@
 			for ( var y in b ){ 
 				if ( b.hasOwnProperty(y) ){ 
 					if(hascomma){
-						json_data += ', "' + y + '":"' + b[y] + '"' ; 
+						json_data += ', "' + y + '":"' + escape(b[y]) + '"' ; 
 					}else{
-						json_data += '"' + y + '":"' + b[y] + '"' ; 
+						json_data += '"' + y + '":"' + escape(b[y]) + '"' ; 
 						hascomma = 1;
 					}
 				}