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

Merge pull request #904 from igorw/ticket/11008

Browse source 
[PHPBB3-11008] Get rid of eval in javascript
This commit is contained in:
Nils Adermann 2012-07-20 15:16:07 -07:00
commit b3212bd7f9
10 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/adm/style/overall_header.html
View file

@ -62,11 +62,7 @@ function dE(n, s, type)
*/ */
function marklist(id, name, state) function marklist(id, name, state)
{ {
var parent = document.getElementById(id); var parent = document.getElementById(id) || document[id];
if (!parent)
{
eval('parent = document.' + id);
}
if (!parent) if (!parent)
{ {

6
phpBB/styles/prosilver/template/forum_fn.js
View file

@ -42,11 +42,7 @@ function jumpto()
*/ */
function marklist(id, name, state) function marklist(id, name, state)
{ {
var parent = document.getElementById(id); var parent = document.getElementById(id) || document[id];
if (!parent)
{
eval('parent = document.' + id);
}
if (!parent) if (!parent)
{ {

4
phpBB/styles/prosilver/template/login_body.html
View file

@ -2,7 +2,9 @@
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
onload_functions.push('document.getElementById("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->").focus();'); onload_functions.push(function () {
document.getElementById("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->").focus();
});
// ]]> // ]]>
</script> </script>

4
phpBB/styles/prosilver/template/overall_header.html
View file

@ -56,7 +56,7 @@
{ {
for (var i = 0; i < onload_functions.length; i++) for (var i = 0; i < onload_functions.length; i++)
{ {
eval(onload_functions[i]); onload_functions[i]();
} }
}; };
@ -64,7 +64,7 @@
{ {
for (var i = 0; i < onunload_functions.length; i++) for (var i = 0; i < onunload_functions.length; i++)
{ {
eval(onunload_functions[i]); onunload_functions[i]();
} }
}; };

2
phpBB/styles/prosilver/template/posting_editor.html
View file

@ -1,6 +1,6 @@
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
onload_functions.push('apply_onkeypress_event()'); onload_functions.push(apply_onkeypress_event);
// ]]> // ]]>
</script> </script>

4
phpBB/styles/prosilver/template/search_body.html
View file

@ -2,7 +2,9 @@
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
onload_functions.push('document.getElementById("keywords").focus();'); onload_functions.push(function () {
document.getElementById("keywords").focus();
});
// ]]> // ]]>
</script> </script>

4
phpBB/styles/prosilver/template/simple_header.html
View file

@ -26,7 +26,7 @@
{ {
for (var i = 0; i < onload_functions.length; i++) for (var i = 0; i < onload_functions.length; i++)
{ {
eval(onload_functions[i]); onload_functions[i]();
} }
} }
@ -34,7 +34,7 @@
{ {
for (var i = 0; i < onunload_functions.length; i++) for (var i = 0; i < onunload_functions.length; i++)
{ {
eval(onunload_functions[i]); onunload_functions[i]();
} }
} }

2
phpBB/styles/prosilver/template/ucp_register.html
View file

@ -12,7 +12,7 @@
} }
<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_REFRESH --> <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_REFRESH -->
onload_functions.push('apply_onkeypress_event()'); onload_functions.push(apply_onkeypress_event);
<!-- ENDIF --> <!-- ENDIF -->
// ]]> // ]]>

6
phpBB/styles/subsilver2/template/memberlist_search.html
View file

@ -43,11 +43,7 @@
*/ */
function marklist(id, name, state) function marklist(id, name, state)
{ {
var parent = document.getElementById(id); var parent = document.getElementById(id) || document[id];
if (!parent)
{
eval('parent = document.' + id);
}
if (!parent) if (!parent)
{ {

6
phpBB/styles/subsilver2/template/overall_header.html
View file

@ -71,11 +71,7 @@ function find_username(url)
*/ */
function marklist(id, name, state) function marklist(id, name, state)
{ {
var parent = document.getElementById(id); var parent = document.getElementById(id) || document[id];
if (!parent)
{
eval('parent = document.' + id);
}
if (!parent) if (!parent)
{ {