@@ -918,19 +918,19 @@ discard block |
||
918 | 918 | $quickbuttons = array( |
919 | 919 | 'quote' => array( |
920 | 920 | 'label' => $txt['reply_quote'], |
921 | - 'href' => $scripturl.'?action=pm;sa=send;f='.$context['folder'].($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '').';pmsg='.$message['id'].';quote;u='.($context['folder'] == 'sent' ? '' : $message['member']['id']), |
|
921 | + 'href' => $scripturl . '?action=pm;sa=send;f=' . $context['folder'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';pmsg=' . $message['id'] . ';quote;u=' . ($context['folder'] == 'sent' ? '' : $message['member']['id']), |
|
922 | 922 | 'icon' => 'quote', |
923 | 923 | 'show' => !$message['member']['is_guest'] |
924 | 924 | ), |
925 | 925 | 'reply' => array( |
926 | 926 | 'label' => $txt['reply'], |
927 | - 'href' => $scripturl.'?action=pm;sa=send;f='.$context['folder'].($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '').';pmsg='.$message['id'].';u='.$message['member']['id'], |
|
927 | + 'href' => $scripturl . '?action=pm;sa=send;f=' . $context['folder'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';pmsg=' . $message['id'] . ';u=' . $message['member']['id'], |
|
928 | 928 | 'icon' => 'reply_button', |
929 | 929 | 'show' => !$message['member']['is_guest'] |
930 | 930 | ), |
931 | 931 | 'reply_quote' => array( |
932 | 932 | 'label' => $txt['reply_quote'], |
933 | - 'href' => $scripturl.'?action=pm;sa=send;f='.$context['folder'].($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '').';pmsg='.$message['id'].';quote', |
|
933 | + 'href' => $scripturl . '?action=pm;sa=send;f=' . $context['folder'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';pmsg=' . $message['id'] . ';quote', |
|
934 | 934 | 'icon' => 'quote', |
935 | 935 | 'show' => $message['member']['is_guest'] |
936 | 936 | ) |
@@ -1956,7 +1956,7 @@ discard block |
||
1956 | 1956 | <div class="floatright smalltext righttext"> |
1957 | 1957 | <div class="recipient_to">« <strong>', $txt['to'], ':</strong> ', implode(', ', $draft['recipients']['to']), ' »</div>'; |
1958 | 1958 | |
1959 | - if(!empty($draft['recipients']['bcc'])) |
|
1959 | + if (!empty($draft['recipients']['bcc'])) |
|
1960 | 1960 | echo' |
1961 | 1961 | <div class="pm_bbc">« <strong>', $txt['pm_bcc'], ':</strong> ', implode(', ', $draft['recipients']['bcc']), ' »</div>'; |
1962 | 1962 |
@@ -393,17 +393,17 @@ discard block |
||
393 | 393 | $quickbuttons = array( |
394 | 394 | 'approve' => array( |
395 | 395 | 'label' => $txt['approve'], |
396 | - 'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';approve='.$item['id'], |
|
396 | + 'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';approve=' . $item['id'], |
|
397 | 397 | 'icon' => 'approve', |
398 | 398 | ), |
399 | 399 | 'delete' => array( |
400 | 400 | 'label' => $txt['remove'], |
401 | - 'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';delete='.$item['id'], |
|
401 | + 'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';delete=' . $item['id'], |
|
402 | 402 | 'icon' => 'remove_button', |
403 | 403 | 'show' => $item['can_delete'] |
404 | 404 | ), |
405 | 405 | 'quickmod' => array( |
406 | - 'content' => '<input type="checkbox" name="item[]" value="'.$item['id'].'" checked>', |
|
406 | + 'content' => '<input type="checkbox" name="item[]" value="' . $item['id'] . '" checked>', |
|
407 | 407 | 'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 |
408 | 408 | ), |
409 | 409 | ); |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | $quickbuttons = array( |
469 | 469 | 'delete' => array( |
470 | 470 | 'label' => $txt['remove_message'], |
471 | - 'href' => $scripturl.'?action=moderate;area=userwatch;sa=post;delete='.$post['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'], |
|
471 | + 'href' => $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
472 | 472 | 'javascript' => 'data-confirm="' . $txt['mc_watched_users_delete_post'] . '" class="you_sure"', |
473 | 473 | 'icon' => 'remove_button', |
474 | 474 | 'show' => $post['can_delete'] |
@@ -645,13 +645,13 @@ discard block |
||
645 | 645 | 'quickbuttons' => array( |
646 | 646 | 'edit' => array( |
647 | 647 | 'label' => $txt['draft_edit'], |
648 | - 'href' => $scripturl.'?action=post;'.(empty($row['id_topic']) ? 'board='.$row['id_board'] : 'topic='.$row['id_topic']).'.0;id_draft='.$row['id_draft'], |
|
648 | + 'href' => $scripturl . '?action=post;' . (empty($row['id_topic']) ? 'board=' . $row['id_board'] : 'topic=' . $row['id_topic']) . '.0;id_draft=' . $row['id_draft'], |
|
649 | 649 | 'icon' => 'modify_button' |
650 | 650 | ), |
651 | 651 | 'delete' => array( |
652 | 652 | 'label' => $txt['draft_delete'], |
653 | - 'href' => $scripturl.'?action=profile;u='.$context['member']['id'].';area=showdrafts;delete='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'], |
|
654 | - 'javascript' => 'data-confirm="'.$txt['draft_remove'].'" class="you_sure"', |
|
653 | + 'href' => $scripturl . '?action=profile;u=' . $context['member']['id'] . ';area=showdrafts;delete=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
654 | + 'javascript' => 'data-confirm="' . $txt['draft_remove'] . '" class="you_sure"', |
|
655 | 655 | 'icon' => 'remove_button' |
656 | 656 | ), |
657 | 657 | ), |
@@ -837,13 +837,13 @@ discard block |
||
837 | 837 | 'quickbuttons' => array( |
838 | 838 | 'edit' => array( |
839 | 839 | 'label' => $txt['draft_edit'], |
840 | - 'href' => $scripturl.'?action=pm;sa=showpmdrafts;id_draft='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'], |
|
840 | + 'href' => $scripturl . '?action=pm;sa=showpmdrafts;id_draft=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
841 | 841 | 'icon' => 'modify_button' |
842 | 842 | ), |
843 | 843 | 'delete' => array( |
844 | 844 | 'label' => $txt['draft_delete'], |
845 | - 'href' => $scripturl.'?action=pm;sa=showpmdrafts;delete='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'], |
|
846 | - 'javascript' => 'data-confirm="'.$txt['draft_remove'].'?" class="you_sure"', |
|
845 | + 'href' => $scripturl . '?action=pm;sa=showpmdrafts;delete=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
846 | + 'javascript' => 'data-confirm="' . $txt['draft_remove'] . '?" class="you_sure"', |
|
847 | 847 | 'icon' => 'remove_button' |
848 | 848 | ), |
849 | 849 | ), |
@@ -93,13 +93,13 @@ discard block |
||
93 | 93 | ), |
94 | 94 | 'ignore' => array( |
95 | 95 | 'label' => $report['ignore'] ? $txt['mc_reportedp_unignore'] : $txt['mc_reportedp_ignore'], |
96 | - 'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;ignore='.(int)!$report['ignore'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-ignore_token_var'].'='.$context['mod-report-ignore_token'], |
|
96 | + 'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;ignore=' . (int) !$report['ignore'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-ignore_token_var'] . '=' . $context['mod-report-ignore_token'], |
|
97 | 97 | 'javascript' => !$report['ignore'] ? ' class="you_sure" data-confirm="' . $txt['mc_reportedp_ignore_confirm'] . '"' : '', |
98 | 98 | 'icon' => 'ignore' |
99 | 99 | ), |
100 | 100 | 'close' => array( |
101 | 101 | 'label' => $context['view_closed'] ? $txt['mc_reportedp_open'] : $txt['mc_reportedp_close'], |
102 | - 'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;closed='.(int)!$report['closed'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-closed_token_var'].'='.$context['mod-report-closed_token'], |
|
102 | + 'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;closed=' . (int) !$report['closed'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-closed_token_var'] . '=' . $context['mod-report-closed_token'], |
|
103 | 103 | 'icon' => $context['view_closed'] ? 'folder' : 'close', |
104 | 104 | ), |
105 | 105 | ); |
@@ -108,17 +108,17 @@ discard block |
||
108 | 108 | if ($context['report_type'] == 'posts') |
109 | 109 | $context['reports'][$key]['quickbuttons']['delete'] = array( |
110 | 110 | 'label' => $txt['mc_reportedp_delete'], |
111 | - 'href' => $scripturl.'?action=deletemsg;topic='.$report['topic']['id'].'.0;msg='.$report['topic']['id_msg'].';modcenter;'.$context['session_var'].'='.$context['session_id'], |
|
112 | - 'javascript' => 'data-confirm="'.$txt['mc_reportedp_delete_confirm'].'" class="you_sure"', |
|
111 | + 'href' => $scripturl . '?action=deletemsg;topic=' . $report['topic']['id'] . '.0;msg=' . $report['topic']['id_msg'] . ';modcenter;' . $context['session_var'] . '=' . $context['session_id'], |
|
112 | + 'javascript' => 'data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '" class="you_sure"', |
|
113 | 113 | 'icon' => 'delete', |
114 | 114 | 'show' => !$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards'])) |
115 | 115 | ); |
116 | 116 | |
117 | 117 | // Ban reported member/post author link |
118 | 118 | if ($context['report_type'] == 'members') |
119 | - $ban_link = $scripturl.'?action=admin;area=ban;sa=add;u='.$report['user']['id'].';'.$context['session_var'].'='.$context['session_id']; |
|
119 | + $ban_link = $scripturl . '?action=admin;area=ban;sa=add;u=' . $report['user']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']; |
|
120 | 120 | else |
121 | - $ban_link = $scripturl.'?action=admin;area=ban;sa=add'.(!empty($report['author']['id']) ? ';u='.$report['author']['id'] : ';msg='.$report['topic']['id_msg']).';'.$context['session_var'].'='.$context['session_id']; |
|
121 | + $ban_link = $scripturl . '?action=admin;area=ban;sa=add' . (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']) . ';' . $context['session_var'] . '=' . $context['session_id']; |
|
122 | 122 | |
123 | 123 | $context['reports'][$key]['quickbuttons'] += array( |
124 | 124 | 'ban' => array( |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | 'show' => !$report['closed'] && !empty($context['report_manage_bans']) && ($context['report_type'] == 'posts' || $context['report_type'] == 'members' && !empty($report['user']['id'])) |
129 | 129 | ), |
130 | 130 | 'quickmod' => array( |
131 | - 'content' => '<input type="checkbox" name="close[]" value="'.$report['id'].'">', |
|
131 | + 'content' => '<input type="checkbox" name="close[]" value="' . $report['id'] . '">', |
|
132 | 132 | 'show' => !$context['view_closed'] |
133 | 133 | ) |
134 | 134 | ); |
@@ -1104,44 +1104,44 @@ |
||
1104 | 1104 | $output['quickbuttons'] = array( |
1105 | 1105 | 'reply_to_all' => array( |
1106 | 1106 | 'label' => $txt['reply_to_all'], |
1107 | - 'href' => $scripturl.'?action=pm;sa=send;f='.$context['folder'].($context['current_label_id'] != -1 ? ';l=' .$context['current_label_id'] : '').';pmsg='.$output['id'].';quote;u=all', |
|
1107 | + 'href' => $scripturl . '?action=pm;sa=send;f=' . $context['folder'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';pmsg=' . $output['id'] . ';quote;u=all', |
|
1108 | 1108 | 'icon' => 'reply_all_button', |
1109 | 1109 | 'show' => $context['can_send_pm'] && !$output['member']['is_guest'] && $output['number_recipients'] > 1 |
1110 | 1110 | ), |
1111 | 1111 | 'reply' => array( |
1112 | 1112 | 'label' => $txt['reply'], |
1113 | - 'href' => $scripturl.'?action=pm;sa=send;f='.$context['folder'].($context['current_label_id'] != -1 ? ';l=' .$context['current_label_id'] : '').';pmsg='.$output['id'].';u='.$output['member']['id'], |
|
1113 | + 'href' => $scripturl . '?action=pm;sa=send;f=' . $context['folder'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';pmsg=' . $output['id'] . ';u=' . $output['member']['id'], |
|
1114 | 1114 | 'icon' => 'reply_button', |
1115 | 1115 | 'show' => $context['can_send_pm'] && !$output['member']['is_guest'] |
1116 | 1116 | ), |
1117 | 1117 | 'quote' => array( |
1118 | 1118 | 'label' => $txt['quote_action'], |
1119 | - 'href' => $scripturl.'?action=pm;sa=send;f='.$context['folder'].($context['current_label_id'] != -1 ? ';l=' .$context['current_label_id'] : '').';pmsg='.$output['id'].';quote'.($context['folder'] == 'sent' ? '' : ';u=' .$output['member']['id']), |
|
1119 | + 'href' => $scripturl . '?action=pm;sa=send;f=' . $context['folder'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';pmsg=' . $output['id'] . ';quote' . ($context['folder'] == 'sent' ? '' : ';u=' . $output['member']['id']), |
|
1120 | 1120 | 'icon' => 'quote', |
1121 | 1121 | 'show' => $context['can_send_pm'] && !$output['member']['is_guest'] |
1122 | 1122 | ), |
1123 | 1123 | 'reply_quote' => array( |
1124 | 1124 | 'label' => $txt['reply_quote'], |
1125 | - 'href' => $scripturl.'?action=pm;sa=send;f='.$context['folder'].($context['current_label_id'] != -1 ? ';l=' .$context['current_label_id'] : '').';pmsg='.$output['id'].';quote', |
|
1125 | + 'href' => $scripturl . '?action=pm;sa=send;f=' . $context['folder'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';pmsg=' . $output['id'] . ';quote', |
|
1126 | 1126 | 'icon' => 'quote', |
1127 | 1127 | 'show' => $context['can_send_pm'] && $output['member']['is_guest'] |
1128 | 1128 | ), |
1129 | 1129 | 'delete' => array( |
1130 | 1130 | 'label' => $txt['delete'], |
1131 | - 'href' => $scripturl.'?action=pm;sa=pmactions;pm_actions%5b'.$output['id'].'%5D=delete;f='.$context['folder'].';start='.$context['start'].($context['current_label_id'] != -1 ? ';l=' .$context['current_label_id'] : '').';'.$context['session_var'].'='.$context['session_id'], |
|
1132 | - 'javascript' => 'data-confirm="'.addslashes($txt['remove_message_question']).'" class="you_sure"', |
|
1131 | + 'href' => $scripturl . '?action=pm;sa=pmactions;pm_actions%5b' . $output['id'] . '%5D=delete;f=' . $context['folder'] . ';start=' . $context['start'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
1132 | + 'javascript' => 'data-confirm="' . addslashes($txt['remove_message_question']) . '" class="you_sure"', |
|
1133 | 1133 | 'icon' => 'remove_button', |
1134 | 1134 | ), |
1135 | 1135 | 'more' => array( |
1136 | 1136 | 'report' => array( |
1137 | 1137 | 'label' => $txt['pm_report_to_admin'], |
1138 | - 'href' => $scripturl .'?action=pm;sa=report;l=' .$context['current_label_id'] .';pmsg=' .$output['id'], |
|
1138 | + 'href' => $scripturl . '?action=pm;sa=report;l=' . $context['current_label_id'] . ';pmsg=' . $output['id'], |
|
1139 | 1139 | 'icon' => 'error', |
1140 | 1140 | 'show' => $output['can_report'] |
1141 | 1141 | ), |
1142 | 1142 | ), |
1143 | 1143 | 'quickmod' => array( |
1144 | - 'content' => '<input type="checkbox" name="pms[]" id="deletedisplay'.$output['id'].'" value="'.$output['id'].'" onclick="document.getElementById(\'deletelisting'.$output['id'].'\').checked = this.checked;">', |
|
1144 | + 'content' => '<input type="checkbox" name="pms[]" id="deletedisplay' . $output['id'] . '" value="' . $output['id'] . '" onclick="document.getElementById(\'deletelisting' . $output['id'] . '\').checked = this.checked;">', |
|
1145 | 1145 | 'show' => empty($context['display_mode']) |
1146 | 1146 | ) |
1147 | 1147 | ); |
@@ -463,20 +463,20 @@ |
||
463 | 463 | $context['posts'][$key]['quickbuttons'] = array( |
464 | 464 | 'reply' => array( |
465 | 465 | 'label' => $txt['reply'], |
466 | - 'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'], |
|
466 | + 'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'], |
|
467 | 467 | 'icon' => 'reply_button', |
468 | 468 | 'show' => $post['can_reply'] |
469 | 469 | ), |
470 | 470 | 'quote' => array( |
471 | 471 | 'label' => $txt['quote_action'], |
472 | - 'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'].';quote='.$post['id'], |
|
472 | + 'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'] . ';quote=' . $post['id'], |
|
473 | 473 | 'icon' => 'quote', |
474 | 474 | 'show' => $post['can_quote'] |
475 | 475 | ), |
476 | 476 | 'delete' => array( |
477 | 477 | 'label' => $txt['remove'], |
478 | - 'href' => $scripturl.'?action=deletemsg;msg='.$post['id'].';topic='.$post['topic'].';recent;'.$context['session_var'].'='.$context['session_id'], |
|
479 | - 'javascript' => 'data-confirm="'.$txt['remove_message'].'" class="you_sure"', |
|
478 | + 'href' => $scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';recent;' . $context['session_var'] . '=' . $context['session_id'], |
|
479 | + 'javascript' => 'data-confirm="' . $txt['remove_message'] . '" class="you_sure"', |
|
480 | 480 | 'icon' => 'remove_button', |
481 | 481 | 'show' => $post['can_delete'] |
482 | 482 | ), |
@@ -1282,7 +1282,7 @@ |
||
1282 | 1282 | // File Upload. |
1283 | 1283 | if ($context['can_post_attachment']) |
1284 | 1284 | { |
1285 | - $acceptedFiles = implode(',', array_map(function ($val) use ($smcFunc) |
|
1285 | + $acceptedFiles = implode(',', array_map(function($val) use ($smcFunc) |
|
1286 | 1286 | { |
1287 | 1287 | return '.' . $smcFunc['htmltrim']($val); |
1288 | 1288 | }, explode(',', $context['allowed_extensions']))); |
@@ -619,7 +619,7 @@ |
||
619 | 619 | if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) |
620 | 620 | fatal_lang_error('login_ssl_required', false); |
621 | 621 | |
622 | - $password = isset($_POST['oldpasswrd']) ? $_POST['oldpasswrd'] : ''; |
|
622 | + $password = isset($_POST['oldpasswrd']) ? $_POST['oldpasswrd'] : ''; |
|
623 | 623 | |
624 | 624 | // You didn't even enter a password! |
625 | 625 | if (trim($password) == '') |
@@ -1155,7 +1155,7 @@ |
||
1155 | 1155 | // We're really just checking for entries which are create table AND add columns (etc). |
1156 | 1156 | $tables = array(); |
1157 | 1157 | |
1158 | - usort($db_package_log, function ($a, $b) |
|
1158 | + usort($db_package_log, function($a, $b) |
|
1159 | 1159 | { |
1160 | 1160 | if ($a[0] == $b[0]) |
1161 | 1161 | return 0; |