From 2917956fe5583e1458f7d9303e5a2ea225725765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Dr=C3=B6scher?= <dhn2@users.sourceforge.net>
Date: Mon, 16 Oct 2006 13:42:17 +0000
Subject: [PATCH] #4760

No more eval()


git-svn-id: file:///svn/phpbb/trunk@6505 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/subSilver/template/editor.js     | 24 +++++++------
 .../subSilver/template/posting_body.html      | 35 ++++++++++---------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/phpBB/styles/subSilver/template/editor.js b/phpBB/styles/subSilver/template/editor.js
index e64cf87067..910e87b74a 100644
--- a/phpBB/styles/subSilver/template/editor.js
+++ b/phpBB/styles/subSilver/template/editor.js
@@ -23,7 +23,7 @@ var is_mac = (clientPC.indexOf('mac') != -1);
 */
 function helpline(help)
 {
-	document.forms[form_name].helpbox.value = eval(help + '_help');
+	document.forms[form_name].helpbox.value = help_line[help];
 }
 
 /**
@@ -123,9 +123,11 @@ function insert_text(text, spaces, popup)
 {
 	var textarea;
 	
-	if (!popup) {
+	if (!popup) 
+	{
 		textarea = document.forms[form_name].elements[text_name];
-	} else {
+	} else 
+	{
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
 	if (spaces) 
@@ -172,11 +174,11 @@ function addquote(post_id, username)
 
 	if (document.all)
 	{
-		eval('divarea = document.all.' + message_name + ';');
+		divarea = document.all[message_name];
 	}
 	else
 	{
-		eval("divarea = document.getElementById('" + message_name + "');");
+		divarea = document.getElementById(message_name);
 	}
 
 	// Get text selection - not only the post content :(
@@ -239,11 +241,11 @@ function bbstyle(bbnumber)
 		{
 			butnumber = arraypop(bbcode) - 1;
 			document.forms[form_name].elements[text_name].value += bbtags[butnumber + 1];
-			buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
+			buttext = document.forms[form_name]['addbbcode' + butnumber].value;
 		
 			if (buttext != '[*]')
 			{
-				eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
+				document.forms[form_name]['addbbcode' + butnumber].value = buttext.substr(0,(buttext.length - 1));				
 			}
 		}
 
@@ -351,11 +353,11 @@ function bbstyle(bbnumber)
 				insert_text(bbtags[butnumber]);
 			}
 
-			buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
+			buttext = document.forms[form_name]['addbbcode' + butnumber].value;
 
 			if (bbtags[butnumber] != '[*]')
 			{
-				eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
+				document.forms[form_name]['addbbcode' + butnumber].value = buttext.substr(0,(buttext.length - 1));
 			}
 			imageTag = false;
 		}
@@ -391,7 +393,7 @@ function bbstyle(bbnumber)
 		if (bbtags[bbnumber] != '[*]')
 		{
 			arraypush(bbcode, bbnumber + 1);
-			eval('document.forms[form_name].addbbcode'+bbnumber+'.value += "*"');
+			document.forms[form_name]['addbbcode' + bbnumber].value += "*";
 		}
 
 		document.forms[form_name].elements[text_name].focus();
@@ -491,4 +493,4 @@ function colorPalette(dir, width, height)
 		}
 	}
 	document.writeln('</table>');
-}
+}
\ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html
index 5acc3ef18b..7cc66d92fe 100644
--- a/phpBB/styles/subSilver/template/posting_body.html
+++ b/phpBB/styles/subSilver/template/posting_body.html
@@ -16,22 +16,25 @@ bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','
 imageTag = false;
 
 // Helpline messages
-b_help = "{LA_BBCODE_B_HELP}";
-i_help = "{LA_BBCODE_I_HELP}";
-u_help = "{LA_BBCODE_U_HELP}";
-q_help = "{LA_BBCODE_Q_HELP}";
-c_help = "{LA_BBCODE_C_HELP}";
-l_help = "{LA_BBCODE_L_HELP}";
-o_help = "{LA_BBCODE_O_HELP}";
-p_help = "{LA_BBCODE_P_HELP}";
-w_help = "{LA_BBCODE_W_HELP}";
-a_help = "{LA_BBCODE_A_HELP}";
-s_help = "{LA_BBCODE_S_HELP}";
-f_help = "{LA_BBCODE_F_HELP}";
-e_help = "{LA_BBCODE_E_HELP}";
-d_help = "{LA_BBCODE_D_HELP}";
-<!-- BEGIN custom_tags -->cb_{custom_tags.BBCODE_ID}_help = "{custom_tags.BBCODE_HELPLINE}";<!-- END custom_tags -->
-
+var help_line = {
+	b: '{LA_BBCODE_B_HELP}',
+	i: '{LA_BBCODE_I_HELP}',
+	u: '{LA_BBCODE_U_HELP}',
+	q: '{LA_BBCODE_Q_HELP}',
+	c: '{LA_BBCODE_C_HELP}',
+	l: '{LA_BBCODE_L_HELP}',
+	o: '{LA_BBCODE_O_HELP}',
+	p: '{LA_BBCODE_P_HELP}',
+	w: '{LA_BBCODE_W_HELP}',
+	a: '{LA_BBCODE_A_HELP}',
+	s: '{LA_BBCODE_S_HELP}',
+	f: '{LA_BBCODE_F_HELP}',
+	e: '{LA_BBCODE_E_HELP}',
+	d: '{LA_BBCODE_D_HELP}'
+	<!-- BEGIN custom_tags -->
+		,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}'
+	<!-- END custom_tags -->
+}
 
 function checkForm()
 {