Skip to content

Commit b03480c

Browse files
live627live627
committed
no more eval
Signed-off-by: John Rayes <[email protected]>
1 parent 908c47d commit b03480c

24 files changed

+269
-431
lines changed

‎Themes/default/Admin.template.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ function template_admin()
112112
echo '
113113
<script>
114114
var oAdminIndex = new smf_AdminIndex({
115-
sSelf: \'oAdminCenter\',
116115
117116
bLoadAnnouncements: true,
118117
sAnnouncementTemplate: ', Utils::JavaScriptEscape('
@@ -696,7 +695,7 @@ function doAutoSubmit()
696695
document.forms.autoSubmit.cont.value = "', Lang::$txt['not_done_continue'], ' (" + countdown + ")";
697696
countdown--;
698697
699-
setTimeout("doAutoSubmit();", 1000);
698+
setTimeout(doAutoSubmit, 1000);
700699
}
701700
</script>';
702701
}
@@ -1487,7 +1486,7 @@ function doAutoSubmit()
14871486
document.forms.recount_form.recount_now.value = "', Lang::$txt['errors_recount_now'], ' (" + countdown + ")";
14881487
countdown--;
14891488
1490-
setTimeout("doAutoSubmit();", 1000);
1489+
setTimeout(doAutoSubmit, 1000);
14911490
}
14921491
</script>';
14931492
}

‎Themes/default/Calendar.template.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ function update()
983983
else
984984
icons[i].src = "', Utils::$context['onimg'], '";
985985
986-
window.setTimeout("update();", 500);
986+
window.setTimeout(update, 500);
987987
}
988988
// Checks for variable in theArray.
989989
function in_array(variable, theArray)
@@ -1078,7 +1078,7 @@ function update()
10781078
else
10791079
icons[i].src = "', Utils::$context['onimg'], '";
10801080
1081-
window.setTimeout("update();", 500);
1081+
window.setTimeout(update, 500);
10821082
}
10831083
// Checks for variable in theArray.
10841084
function in_array(variable, theArray)
@@ -1171,7 +1171,7 @@ function update()
11711171
else
11721172
icons[i].src = "', Utils::$context['onimg'], '";
11731173
1174-
window.setTimeout("update();", 500);
1174+
window.setTimeout(update, 500);
11751175
}
11761176
// Checks for variable in theArray.
11771177
function in_array(variable, theArray)

‎Themes/default/Display.template.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@ function template_main()
336336
{
337337
echo '
338338
var oInTopicModeration = new InTopicModeration({
339-
sSelf: \'oInTopicModeration\',
340339
sCheckboxContainerMask: \'in_topic_mod_check_\',
341340
aMessageIds: [\'', implode('\', \'', Utils::$context['removableMessageIDs']), '\'],
342341
sSessionId: smf_session_id,
@@ -362,7 +361,6 @@ function template_main()
362361
// Add it to the mobile button strip as well
363362
echo '
364363
var oInTopicModerationMobile = new InTopicModeration({
365-
sSelf: \'oInTopicModerationMobile\',
366364
sCheckboxContainerMask: \'in_topic_mod_check_\',
367365
aMessageIds: [\'', implode('\', \'', Utils::$context['removableMessageIDs']), '\'],
368366
sSessionId: smf_session_id,
@@ -1020,7 +1018,6 @@ function insertQuoteFast(messageid)
10201018
echo '
10211019
<script>
10221020
var oDraftAutoSave = new smf_DraftAutoSave({
1023-
sSelf: \'oDraftAutoSave\',
10241021
sLastNote: \'draft_lastautosave\',
10251022
sLastID: \'id_draft\',', !empty(Utils::$context['post_box_name']) ? '
10261023
sSceditorID: \'' . Utils::$context['post_box_name'] . '\',' : '', '

‎Themes/default/GenericControls.template.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ function template_control_richedit_buttons($editor_id)
132132
</span>
133133
<script>
134134
var oDraftAutoSave = new smf_DraftAutoSave({
135-
sSelf: \'oDraftAutoSave\',
136135
sLastNote: \'draft_lastautosave\',
137136
sLastID: \'id_draft\',
138137
sSceditorID: \'', $editor_id, '\',

‎Themes/default/ManageAttachments.template.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ function template_maintenance()
187187
</form>
188188
<script>
189189
function start_progress() {
190-
setTimeout(\'show_msg()\', 1000);
190+
setTimeout(show_msg, 1000);
191191
}
192192
193193
function show_msg() {
@@ -197,7 +197,7 @@ function show_msg() {
197197
198198
function show_progress() {
199199
$(\'#show_progress\').on("load", "progress.php");
200-
setTimeout(\'show_progress()\', 1500);
200+
setTimeout(show_progress, 1500);
201201
}
202202
203203
</script>

‎Themes/default/ManageBans.template.php‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -209,24 +209,14 @@ function template_ban_edit()
209209
if (Utils::$context['ban']['is_new'] && empty($_REQUEST['u']))
210210
echo '
211211
var oAddMemberSuggest = new smc_AutoSuggest({
212-
sSelf: \'oAddMemberSuggest\',
213212
sSessionId: smf_session_id,
214213
sSessionVar: smf_session_var,
215214
sSuggestId: \'user\',
216215
sControlId: \'user\',
217216
sSearchType: \'member\',
218217
sTextDeleteItem: \'', Lang::$txt['autosuggest_delete_item'], '\',
219-
bItemList: false
220218
});
221219
222-
function onUpdateName(oAutoSuggest)
223-
{
224-
document.getElementById(\'user_check\').checked = true;
225-
return true;
226-
}
227-
oAddMemberSuggest.registerCallback(\'onBeforeUpdate\', \'onUpdateName\');';
228-
229-
echo '
230220
function confirmBan(aForm)
231221
{
232222
if (aForm.ban_name.value == \'\')
@@ -316,14 +306,12 @@ function template_ban_edit_trigger()
316306
</div><!-- #manage_bans -->
317307
<script>
318308
var oAddMemberSuggest = new smc_AutoSuggest({
319-
sSelf: \'oAddMemberSuggest\',
320309
sSessionId: smf_session_id,
321310
sSessionVar: smf_session_var,
322311
sSuggestId: \'username\',
323312
sControlId: \'user\',
324313
sSearchType: \'member\',
325314
sTextDeleteItem: \'', Lang::$txt['autosuggest_delete_item'], '\',
326-
bItemList: false
327315
});
328316
329317
function onUpdateName(oAutoSuggest)

‎Themes/default/ManageBoards.template.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,6 @@ function template_modify_board()
604604
605605
<script>
606606
var oModeratorSuggest = new smc_AutoSuggest({
607-
sSelf: \'oModeratorSuggest\',
608607
sSessionId: smf_session_id,
609608
sSessionVar: smf_session_var,
610609
sSuggestId: \'moderators\',
@@ -629,7 +628,6 @@ function template_modify_board()
629628
});
630629
631630
var oModeratorGroupSuggest = new smc_AutoSuggest({
632-
sSelf: \'oModeratorGroupSuggest\',
633631
sSessionId: smf_session_id,
634632
sSessionVar: smf_session_var,
635633
sSuggestId: \'moderator_groups\',

‎Themes/default/ManageMembergroups.template.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ function template_edit_group()
365365
</form>
366366
<script>
367367
var oModeratorSuggest = new smc_AutoSuggest({
368-
sSelf: \'oModeratorSuggest\',
369368
sSessionId: smf_session_id,
370369
sSessionVar: smf_session_var,
371370
sSuggestId: \'group_moderators\',
@@ -698,7 +697,6 @@ function template_group_members()
698697
echo '
699698
<script>
700699
var oAddMemberSuggest = new smc_AutoSuggest({
701-
sSelf: \'oAddMemberSuggest\',
702700
sSessionId: \'', Utils::$context['session_id'], '\',
703701
sSessionVar: \'', Utils::$context['session_var'], '\',
704702
sSuggestId: \'to_suggest\',

‎Themes/default/ManageNews.template.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ function template_email_members()
142142
</script>
143143
<script>
144144
var oMemberSuggest = new smc_AutoSuggest({
145-
sSelf: \'oMemberSuggest\',
146145
sSessionId: smf_session_id,
147146
sSessionVar: smf_session_var,
148147
sSuggestId: \'members\',
@@ -156,7 +155,6 @@ function template_email_members()
156155
aListItems: []
157156
});
158157
var oExcludeMemberSuggest = new smc_AutoSuggest({
159-
sSelf: \'oExcludeMemberSuggest\',
160158
sSessionId: \'', Utils::$context['session_id'], '\',
161159
sSessionVar: \'', Utils::$context['session_var'], '\',
162160
sSuggestId: \'exclude_members\',

‎Themes/default/ManagePaid.template.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,15 +324,13 @@ function template_modify_user_subscription()
324324
</form>
325325
<script>
326326
var oAddMemberSuggest = new smc_AutoSuggest({
327-
sSelf: \'oAddMemberSuggest\',
328327
sSessionId: smf_session_id,
329328
sSessionVar: smf_session_var,
330329
sSuggestId: \'name_subscriber\',
331330
sControlId: \'name_control\',
332331
sSearchType: \'member\',
333332
sTextDeleteItem: \'', Lang::$txt['autosuggest_delete_item'], '\',
334-
bItemList: false
335-
});
333+
});
336334
</script>';
337335

338336
if (!empty(Utils::$context['pending_payments']))

0 commit comments

Comments
 (0)