From cfinck@svn.reactos.org Sun Nov 11 16:56:59 2007
From: cfinck@svn.reactos.org
To: ros-diffs@reactos.org
Subject: [ros-diffs] [cfinck] 30360: - Avoid confusions about double escaping
 certain quotes by now using PHP's addslashes() function for all strings,
 which are inserted into JavaScript strings. All strings in the translations
 now have to be escaped the "usual" way. - Move the translation correctly in
 "languages.inc.php".
Date: Sun, 11 Nov 2007 15:56:58 +0000
Message-ID: <20071111155658.EB69FFEFE@mail.smartxx.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8623110762971814751=="

--===============8623110762971814751==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: cfinck
Date: Sun Nov 11 18:56:58 2007
New Revision: 30360

URL: http://svn.reactos.org/svn/reactos?rev=3D30360&view=3Drev
Log:
- Avoid confusions about double escaping certain quotes by now using PHP's ad=
dslashes() function for all strings, which are inserted into JavaScript strin=
gs.
  All strings in the translations now have to be escaped the "usual" way.
- Move the translation correctly in "languages.inc.php".

Modified:
    trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php
    trunk/web/reactos.org/htdocs/getbuilds/index.php
    trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php
    trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php
    trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php

Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuild=
s/getbuilds.js.php?rev=3D30360&r1=3D30359&r2=3D30360&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php (original)
+++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php Sun Nov 11 18:56:=
58 2007
@@ -91,7 +91,7 @@
 	{
 		// For some errors, we show a localized error message
 		if( http_request.responseXML.getElementsByTagName("message")[0].firstChild=
.data =3D=3D "LIMIT" )
-			alert( '<?php printf( $getbuilds_langres["rangelimitexceeded"], "' + http=
_request.responseXML.getElementsByTagName(\"limit\")[0].firstChild.data + '" =
); ?>' );
+			alert( '<?php printf( addslashes($getbuilds_langres["rangelimitexceeded"]=
), "' + http_request.responseXML.getElementsByTagName(\"limit\")[0].firstChil=
d.data + '" ); ?>' );
 		else
 			alert( http_request.responseXML.getElementsByTagName("message")[0].firstC=
hild.data );
 	=09
@@ -108,7 +108,7 @@
 		if( data["requesttype"] =3D=3D "FirstPageFullLoad" )
 		{
 			filenum =3D parseInt( http_request.responseXML.getElementsByTagName("file=
num")[0].firstChild.data );
-			html +=3D '<?php printf( $getbuilds_langres["foundfiles"], "<span id=3D\"=
filenum\">' + filenum + '</span>" ); ?>';
+			html +=3D '<?php printf( addslashes($getbuilds_langres["foundfiles"]), "<=
span id=3D\"filenum\">' + filenum + '</span>" ); ?>';
 		}
 		else
 			html +=3D document.getElementById("infobox").innerHTML;
@@ -121,12 +121,12 @@
 		if( currentpage =3D=3D 1 )
 		{
 			html +=3D '<strong>&laquo;</strong> ';
-			html +=3D '<strong>&lsaquo; <?php echo $getbuilds_langres["prevpage"]; ?>=
</strong> ';
-		}
-		else
-		{
-			html +=3D '<a href=3D"javascript:firstPage()" title=3D"<?php echo $getbui=
lds_langres["firstpage_title"]; ?>">&laquo;</a> ';
-			html +=3D '<a href=3D"javascript:prevPage()" title=3D"<?php echo $getbuil=
ds_langres["prevpage_title"]; ?>">&lsaquo; <?php echo $getbuilds_langres["pre=
vpage"]; ?></a> ';
+			html +=3D '<strong>&lsaquo; <?php echo addslashes($getbuilds_langres["pre=
vpage"]); ?></strong> ';
+		}
+		else
+		{
+			html +=3D '<a href=3D"javascript:firstPage()" title=3D"<?php echo addslas=
hes($getbuilds_langres["firstpage_title"]); ?>">&laquo;</a> ';
+			html +=3D '<a href=3D"javascript:prevPage()" title=3D"<?php echo addslash=
es($getbuilds_langres["prevpage_title"]); ?>">&lsaquo; <?php echo addslashes(=
$getbuilds_langres["prevpage"]); ?></a> ';
 		}
 	=09
 		html +=3D '<select id=3D"pagesel" size=3D"1" onchange=3D"pageboxChange(thi=
s)">';
@@ -135,7 +135,7 @@
 		{
 			pagecount =3D 1;
 		=09
-			html +=3D '<option selected=3D"selected" value=3D"' + currentpage + '-' +=
 startrev + '"><?php echo $getbuilds_langres["page"]; ?> ' + currentpage;
+			html +=3D '<option selected=3D"selected" value=3D"' + currentpage + '-' +=
 startrev + '"><?php echo addslashes($getbuilds_langres["page"]); ?> ' + curr=
entpage;
 		=09
 			if( http_request.responseXML.getElementsByTagName("filenum")[0].firstChil=
d.data > 0 )
 				html +=3D ' - ' + http_request.responseXML.getElementsByTagName("firstre=
v")[0].firstChild.data + ' ... ' + http_request.responseXML.getElementsByTagN=
ame("lastrev")[0].firstChild.data + '</option>';
@@ -147,26 +147,26 @@
 	=09
 		if( http_request.responseXML.getElementsByTagName("morefiles")[0].firstChi=
ld.data =3D=3D 0 )
 		{
-			html +=3D '<strong><?php echo $getbuilds_langres["nextpage"]; ?> &rsaquo;=
</strong> ';
+			html +=3D '<strong><?php echo addslashes($getbuilds_langres["nextpage"]);=
 ?> &rsaquo;</strong> ';
 			html +=3D '<strong>&raquo;</strong>';
 		}
 		else
 		{
-			html +=3D '<a href=3D"javascript:nextPage()" title=3D"<?php echo $getbuil=
ds_langres["nextpage_title"]; ?>"><?php echo $getbuilds_langres["nextpage"]; =
?> &rsaquo;</a> ';
-			html +=3D '<a href=3D"javascript:lastPage()" title=3D"<?php echo $getbuil=
ds_langres["lastpage_title"]; ?>">&raquo;</a>';
+			html +=3D '<a href=3D"javascript:nextPage()" title=3D"<?php echo addslash=
es($getbuilds_langres["nextpage_title"]); ?>"><?php echo addslashes($getbuild=
s_langres["nextpage"]); ?> &rsaquo;</a> ';
+			html +=3D '<a href=3D"javascript:lastPage()" title=3D"<?php echo addslash=
es($getbuilds_langres["lastpage_title"]); ?>">&raquo;</a>';
 		}
 	=09
 		html +=3D '</td></tr></table>';
=20
 		// File table
 		html +=3D '<table class=3D"datatable" cellspacing=3D"0" cellpadding=3D"1">=
';
-		html +=3D '<thead><tr class=3D"head"><th class=3D"fname"><?php echo $getbu=
ilds_langres["filename"]; ?></th><th class=3D"fsize"><?php echo $getbuilds_la=
ngres["filesize"]; ?></th><th class=3D"fdate"><?php echo $getbuilds_langres["=
filedate"]; ?></th></tr></thead>';
+		html +=3D '<thead><tr class=3D"head"><th class=3D"fname"><?php echo addsla=
shes($getbuilds_langres["filename"]); ?></th><th class=3D"fsize"><?php echo a=
ddslashes($getbuilds_langres["filesize"]); ?></th><th class=3D"fdate"><?php e=
cho addslashes($getbuilds_langres["filedate"]); ?></th></tr></thead>';
 		html +=3D '<tbody>';
 	=09
 		var files =3D http_request.responseXML.getElementsByTagName("file");
 =09
 		if( files.length =3D=3D 0 )
-			html +=3D '<tr class=3D"odd"><td><?php printf( $getbuilds_langres["nofile=
s"], "' + fullrange + '" ); ?></td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+			html +=3D '<tr class=3D"odd"><td><?php printf( addslashes($getbuilds_lang=
res["nofiles"]), "' + fullrange + '" ); ?></td><td>&nbsp;</td><td>&nbsp;</td>=
</tr>';
 		else
 		{
 			var oddeven =3D false;
@@ -216,7 +216,7 @@
 		// If I use "innerHTML" here, the first <OPTION> start tag gets dropped in=
 the IE...
 		// Therefore I have to use the DOM functions in this case.
 		var option_elem =3D document.createElement("option");
-		var option_text =3D document.createTextNode( '<?php echo $getbuilds_langre=
s["page"]; ?> ' + pagecount + ' - ' + http_request.responseXML.getElementsByT=
agName("firstrev")[0].firstChild.data + ' ... ' + http_request.responseXML.ge=
tElementsByTagName("lastrev")[0].firstChild.data );
+		var option_text =3D document.createTextNode( '<?php echo addslashes($getbu=
ilds_langres["page"]); ?> ' + pagecount + ' - ' + http_request.responseXML.ge=
tElementsByTagName("firstrev")[0].firstChild.data + ' ... ' + http_request.re=
sponseXML.getElementsByTagName("lastrev")[0].firstChild.data );
 	=09
 		option_elem.value =3D pagecount + "-" + data["new_startrev"];
 		option_elem.appendChild( option_text );

Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuild=
s/index.php?rev=3D30360&r1=3D30359&r2=3D30360&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/getbuilds/index.php (original)
+++ trunk/web/reactos.org/htdocs/getbuilds/index.php Sun Nov 11 18:56:58 2007
@@ -149,19 +149,19 @@
 			document.write(
 				'<table id=3D"showrev" cellspacing=3D"0" cellpadding=3D"5">' +
 					'<tr>' +
-						'<td><?php echo $getbuilds_langres["showrevfiles"]; ?>: </td>' +
+						'<td><?php echo addslashes($getbuilds_langres["showrevfiles"]); ?>: </=
td>' +
 						'<td>' +
 							'<span id=3D"revcontrols">' +
-								'<img src=3D"images/leftarrow.gif" alt=3D"&lt;" title=3D"<?php echo =
$getbuilds_langres["prevrev"]; ?>" onclick=3D"prevRev();"> ' +
+								'<img src=3D"images/leftarrow.gif" alt=3D"&lt;" title=3D"<?php echo =
addslashes($getbuilds_langres["prevrev"]); ?>" onclick=3D"prevRev();"> ' +
 								'<input type=3D"text" id=3D"revnum" value=3D"<?php echo $rev; ?>" si=
ze=3D"12" onkeyup=3D"checkRevNum(this);"> ' +
-								'<img src=3D"images/rightarrow.gif" alt=3D"&gt;" title=3D"<?php echo=
 $getbuilds_langres["nextrev"]; ?>" onclick=3D"nextRev();"><br>' +
+								'<img src=3D"images/rightarrow.gif" alt=3D"&gt;" title=3D"<?php echo=
 addslashes($getbuilds_langres["nextrev"]); ?>" onclick=3D"nextRev();"><br>' +
 							'</span>' +
 						=09
-							'<img src=3D"images/info.gif" alt=3D"INFO:"> <?php printf( $getbuilds=
_langres["rangeinfo"], $rev, ($rev - 50), $rev ); ?>' +
+							'<img src=3D"images/info.gif" alt=3D"INFO:"> <?php printf( addslashes=
($getbuilds_langres["rangeinfo"]), $rev, ($rev - 50), $rev ); ?>' +
 						'</td>' +
 					'</tr>' +
 					'<tr>' +
-						'<td><?php echo $getbuilds_langres["isotype"]; ?>: </td>' +
+						'<td><?php echo addslashes($getbuilds_langres["isotype"]); ?>: </td>' +
 						'<td>' +
 							'<input type=3D"checkbox" id=3D"bootcd-dbg" checked=3D"checked"> Debu=
g Boot CDs ' +
 							'<input type=3D"checkbox" id=3D"livecd-dbg" checked=3D"checked"> Debu=
g Live CDs ' +
@@ -172,10 +172,10 @@
 				'</table>'	 +
=20
 				'<div id=3D"controlbox">' +
-					'<input type=3D"button" onclick=3D"showRev();" value=3D"<?php echo $get=
builds_langres["showrev"]; ?>" />' +
+					'<input type=3D"button" onclick=3D"showRev();" value=3D"<?php echo adds=
lashes($getbuilds_langres["showrev"]); ?>" />' +
 				=09
 					'<span id=3D"ajaxloadinginfo">' +
-						'<img src=3D"images/ajax_loading.gif"> <?php echo $getbuilds_langres["=
gettinglist"]; ?>...' +
+						'<img src=3D"images/ajax_loading.gif"> <?php echo addslashes($getbuild=
s_langres["gettinglist"]); ?>...' +
 					'</span>' +
 				'</div>' +
=20
@@ -183,14 +183,14 @@
 					'<table class=3D"datatable" cellspacing=3D"0" cellpadding=3D"1">' +
 						'<thead>' +
 							'<tr class=3D"head">' +
-								'<th class=3D"fname"><?php echo $getbuilds_langres["filename"]; ?></=
th>' +
-								'<th class=3D"fsize"><?php echo $getbuilds_langres["filesize"]; ?></=
th>' +
-								'<th class=3D"fdate"><?php echo $getbuilds_langres["filedate"]; ?></=
th>' +
+								'<th class=3D"fname"><?php echo addslashes($getbuilds_langres["filen=
ame"]); ?></th>' +
+								'<th class=3D"fsize"><?php echo addslashes($getbuilds_langres["files=
ize"]); ?></th>' +
+								'<th class=3D"fdate"><?php echo addslashes($getbuilds_langres["filed=
ate"]); ?></th>' +
 							'</tr>' +
 						'</thead>' +
 						'<tbody>' +
 							'<tr class=3D"odd">' +
-								'<td><?php echo $getbuilds_langres["pleasewait"]; ?>...</td>' +
+								'<td><?php echo addslashes($getbuilds_langres["pleasewait"]); ?>...<=
/td>' +
 								'<td>&nbsp;</td>' +
 								'<td>&nbsp;</td>' +
 							'</tr>' +

Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuild=
s/lang/fr.inc.php?rev=3D30360&r1=3D30359&r2=3D30360&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php (original)
+++ trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php Sun Nov 11 18:56:5=
8 2007
@@ -31,7 +31,7 @@
 	$getbuilds_langres["showrev"] =3D "Montrer";
 	$getbuilds_langres["gettinglist"] =3D "R=C3=83=C2=A9cup=C3=83=C2=A9ration d=
e la liste des fichiers";
 	$getbuilds_langres["rangeinfo"] =3D "Vous pouvez entrer un num=C3=83=C2=A9r=
o de r=C3=83=C2=A9vision (p.e. %s) ou un intervalle de r=C3=83=C2=A9visions (=
p.e. %s-%s)";
-	$getbuilds_langres["isotype"] =3D "Montrer les types d\'images de CD ";
+	$getbuilds_langres["isotype"] =3D "Montrer les types d'images de CD ";
 =09
 	$getbuilds_langres["foundfiles"] =3D "%s fichiers trouv=C3=83=C2=A9s !";
 =09
@@ -48,8 +48,8 @@
 	$getbuilds_langres["filedate"] =3D "Derniers changements";
 	$getbuilds_langres["pleasewait"] =3D "Veuillez patienter";
 =09
-	$getbuilds_langres["nofiles"] 	 =3D "Il n\'y a pas de fichiers disponibles =
pour la r=C3=83=C2=A9vision %s !";
+	$getbuilds_langres["nofiles"] 	 =3D "Il n'y a pas de fichiers disponibles p=
our la r=C3=83=C2=A9vision %s !";
 	$getbuilds_langres["invalidrev"] =3D "Num=C3=83=C2=A9ro de r=C3=83=C2=A9vis=
ion invalide !";
 =09
-	$getbuilds_langres["rangelimitexceeded"] =3D "L\'intervalle de r=C3=83=C2=
=A9visions ne peut contenir qu\'un maximum de %s r=C3=83=C2=A9visions !";
+	$getbuilds_langres["rangelimitexceeded"] =3D "L'intervalle de r=C3=83=C2=A9=
visions ne peut contenir qu'un maximum de %s r=C3=83=C2=A9visions !";
 ?>

Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuild=
s/lang/it.inc.php?rev=3D30360&r1=3D30359&r2=3D30360&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php (original)
+++ trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php Sun Nov 11 18:56:5=
8 2007
@@ -29,7 +29,7 @@
 	$getbuilds_langres["prevrev"] =3D "Revisione precedente";
 	$getbuilds_langres["nextrev"] =3D "Revisione successiva";
 	$getbuilds_langres["showrev"] =3D "Mostrare";
-	$getbuilds_langres["gettinglist"] =3D "Ottentendo l\'elenco dei file";
+	$getbuilds_langres["gettinglist"] =3D "Ottentendo l'elenco dei file";
 	$getbuilds_langres["rangeinfo"] =3D "Puoi inserire un numero di revisione (=
ad es. %s) oppure un range di revisioni (ad es. %s-%s)";
 	$getbuilds_langres["isotype"] =3D "Mostrare imagini cd";
 =09
@@ -41,7 +41,7 @@
 	$getbuilds_langres["page"] =3D "Pagina";
 	$getbuilds_langres["nextpage"] =3D "Successiva";
 	$getbuilds_langres["nextpage_title"] =3D "Pagina successiva";
-	$getbuilds_langres["lastpage_title"] =3D "Andare all\'ultima pagina";
+	$getbuilds_langres["lastpage_title"] =3D "Andare all'ultima pagina";
 =09
 	$getbuilds_langres["filename"] =3D "Nome file";
 	$getbuilds_langres["filesize"] =3D "Dimensioni";

Modified: trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuild=
s/languages.inc.php?rev=3D30360&r1=3D30359&r2=3D30360&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php (original)
+++ trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php Sun Nov 11 18:56=
:58 2007
@@ -11,8 +11,8 @@
 	$getbuilds_languages =3D array(
 		"en" =3D> "English",
 		"de" =3D> "Deutsch (German)",
+		"es" =3D> "Espa=C3=83=C2=B1ol (Spanish)",
 		"fr" =3D> "Fran=C3=83=C2=A7ais (French)",
-		"es" =3D> "Espa=C3=83=C2=B1ol (Spanish)",
 		"it" =3D> "Italiano (Italian)",
 		"lt" =3D> "Lietuvi=C3=85=C2=B3 (Lithuanian)",
 	);



--===============8623110762971814751==--