makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#4760

Browse source 
No more eval()


git-svn-id: file:///svn/phpbb/trunk@6505 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Dominik Dröscher 2006-10-16 13:42:17 +00:00
parent 1d1e6d4603
commit 2917956fe5
2 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/styles/subSilver/template/editor.js
View file

@ -23,7 +23,7 @@ var is_mac = (clientPC.indexOf('mac') != -1);
*/ */
function helpline(help) 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; var textarea;
if (!popup) { if (!popup)
{
textarea = document.forms[form_name].elements[text_name]; textarea = document.forms[form_name].elements[text_name];
} else { } else
{
textarea = opener.document.forms[form_name].elements[text_name]; textarea = opener.document.forms[form_name].elements[text_name];
} }
if (spaces) if (spaces)
@ -172,11 +174,11 @@ function addquote(post_id, username)
if (document.all) if (document.all)
{ {
eval('divarea = document.all.' + message_name + ';'); divarea = document.all[message_name];
} }
else else
{ {
eval("divarea = document.getElementById('" + message_name + "');"); divarea = document.getElementById(message_name);
} }
// Get text selection - not only the post content :( // Get text selection - not only the post content :(
@ -239,11 +241,11 @@ function bbstyle(bbnumber)
{ {
butnumber = arraypop(bbcode) - 1; butnumber = arraypop(bbcode) - 1;
document.forms[form_name].elements[text_name].value += bbtags[butnumber + 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 != '[*]') 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]); insert_text(bbtags[butnumber]);
} }
buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value'); buttext = document.forms[form_name]['addbbcode' + butnumber].value;
if (bbtags[butnumber] != '[*]') 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; imageTag = false;
} }
@ -391,7 +393,7 @@ function bbstyle(bbnumber)
if (bbtags[bbnumber] != '[*]') if (bbtags[bbnumber] != '[*]')
{ {
arraypush(bbcode, bbnumber + 1); 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(); document.forms[form_name].elements[text_name].focus();
@ -491,4 +493,4 @@ function colorPalette(dir, width, height)
} }
} }
document.writeln('</table>'); document.writeln('</table>');
} }

35
phpBB/styles/subSilver/template/posting_body.html
View file

@ -16,22 +16,25 @@ bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','
imageTag = false; imageTag = false;
// Helpline messages // Helpline messages
b_help = "{LA_BBCODE_B_HELP}"; var help_line = {
i_help = "{LA_BBCODE_I_HELP}"; b: '{LA_BBCODE_B_HELP}',
u_help = "{LA_BBCODE_U_HELP}"; i: '{LA_BBCODE_I_HELP}',
q_help = "{LA_BBCODE_Q_HELP}"; u: '{LA_BBCODE_U_HELP}',
c_help = "{LA_BBCODE_C_HELP}"; q: '{LA_BBCODE_Q_HELP}',
l_help = "{LA_BBCODE_L_HELP}"; c: '{LA_BBCODE_C_HELP}',
o_help = "{LA_BBCODE_O_HELP}"; l: '{LA_BBCODE_L_HELP}',
p_help = "{LA_BBCODE_P_HELP}"; o: '{LA_BBCODE_O_HELP}',
w_help = "{LA_BBCODE_W_HELP}"; p: '{LA_BBCODE_P_HELP}',
a_help = "{LA_BBCODE_A_HELP}"; w: '{LA_BBCODE_W_HELP}',
s_help = "{LA_BBCODE_S_HELP}"; a: '{LA_BBCODE_A_HELP}',
f_help = "{LA_BBCODE_F_HELP}"; s: '{LA_BBCODE_S_HELP}',
e_help = "{LA_BBCODE_E_HELP}"; f: '{LA_BBCODE_F_HELP}',
d_help = "{LA_BBCODE_D_HELP}"; e: '{LA_BBCODE_E_HELP}',
<!-- BEGIN custom_tags -->cb_{custom_tags.BBCODE_ID}_help = "{custom_tags.BBCODE_HELPLINE}";<!-- END custom_tags --> d: '{LA_BBCODE_D_HELP}'
<!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}'
<!-- END custom_tags -->
}
function checkForm() function checkForm()
{ {