@@ -12,8 +12,9 @@ discard block |
||
12 | 12 | * @version 2.1 Beta 3 |
13 | 13 | */ |
14 | 14 | |
15 | -if (!defined('SMF')) |
|
15 | +if (!defined('SMF')) { |
|
16 | 16 | die('No direct access...'); |
17 | +} |
|
17 | 18 | |
18 | 19 | /** |
19 | 20 | * Report a post or profile to the moderator... ask for a comment. |
@@ -35,10 +36,11 @@ discard block |
||
35 | 36 | |
36 | 37 | // You can't use this if it's off or you are not allowed to do it. |
37 | 38 | // If we don't have the ID of something to report, we'll die with a no_access error below |
38 | - if (isset($_REQUEST['msg'])) |
|
39 | - isAllowedTo('report_any'); |
|
40 | - elseif (isset($_REQUEST['u'])) |
|
41 | - isAllowedTo('report_user'); |
|
39 | + if (isset($_REQUEST['msg'])) { |
|
40 | + isAllowedTo('report_any'); |
|
41 | + } elseif (isset($_REQUEST['u'])) { |
|
42 | + isAllowedTo('report_user'); |
|
43 | + } |
|
42 | 44 | |
43 | 45 | // Previewing or modifying? |
44 | 46 | if (isset($_POST['preview']) && !isset($_POST['save'])) |
@@ -56,19 +58,23 @@ discard block |
||
56 | 58 | } |
57 | 59 | |
58 | 60 | // If they're posting, it should be processed by ReportToModerator2. |
59 | - if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview'])) |
|
60 | - ReportToModerator2(); |
|
61 | + if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview'])) { |
|
62 | + ReportToModerator2(); |
|
63 | + } |
|
61 | 64 | |
62 | 65 | // We need a message ID or user ID to check! |
63 | - if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u'])) |
|
64 | - fatal_lang_error('no_access', false); |
|
66 | + if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u'])) { |
|
67 | + fatal_lang_error('no_access', false); |
|
68 | + } |
|
65 | 69 | |
66 | 70 | // For compatibility, accept mid, but we should be using msg. (not the flavor kind!) |
67 | - if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid'])) |
|
68 | - $_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg']; |
|
71 | + if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid'])) { |
|
72 | + $_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg']; |
|
73 | + } |
|
69 | 74 | // msg and mid empty - assume we're reporting a user |
70 | - elseif (!empty($_REQUEST['u'])) |
|
71 | - $_REQUEST['u'] = (int) $_REQUEST['u']; |
|
75 | + elseif (!empty($_REQUEST['u'])) { |
|
76 | + $_REQUEST['u'] = (int) $_REQUEST['u']; |
|
77 | + } |
|
72 | 78 | |
73 | 79 | // Set up some form values |
74 | 80 | $context['report_type'] = isset($_REQUEST['msg']) ? 'msg' : 'u'; |
@@ -89,8 +95,9 @@ discard block |
||
89 | 95 | 'id_msg' => $_REQUEST['msg'], |
90 | 96 | ) |
91 | 97 | ); |
92 | - if ($smcFunc['db_num_rows']($result) == 0) |
|
93 | - fatal_lang_error('no_board', false); |
|
98 | + if ($smcFunc['db_num_rows']($result) == 0) { |
|
99 | + fatal_lang_error('no_board', false); |
|
100 | + } |
|
94 | 101 | list ($_REQUEST['msg'], $member, $starter) = $smcFunc['db_fetch_row']($result); |
95 | 102 | $smcFunc['db_free_result']($result); |
96 | 103 | |
@@ -101,8 +108,7 @@ discard block |
||
101 | 108 | |
102 | 109 | // The submit URL is different for users than it is for posts |
103 | 110 | $context['submit_url'] = $scripturl . '?action=reporttm;msg=' . $_REQUEST['msg'] . ';topic=' . $topic; |
104 | - } |
|
105 | - else |
|
111 | + } else |
|
106 | 112 | { |
107 | 113 | // Check the user's ID |
108 | 114 | $result = $smcFunc['db_query']('', ' |
@@ -114,8 +120,9 @@ discard block |
||
114 | 120 | ) |
115 | 121 | ); |
116 | 122 | |
117 | - if ($smcFunc['db_num_rows']($result) == 0) |
|
118 | - fatal_lang_error('no_user', false); |
|
123 | + if ($smcFunc['db_num_rows']($result) == 0) { |
|
124 | + fatal_lang_error('no_user', false); |
|
125 | + } |
|
119 | 126 | list($_REQUEST['u'], $display_name, $username) = $smcFunc['db_fetch_row']($result); |
120 | 127 | |
121 | 128 | $context['current_user'] = $_REQUEST['u']; |
@@ -170,10 +177,11 @@ discard block |
||
170 | 177 | is_not_guest(); |
171 | 178 | |
172 | 179 | // You must have the proper permissions! |
173 | - if (isset($_REQUEST['msg'])) |
|
174 | - isAllowedTo('report_any'); |
|
175 | - else |
|
176 | - isAllowedTo('report_user'); |
|
180 | + if (isset($_REQUEST['msg'])) { |
|
181 | + isAllowedTo('report_any'); |
|
182 | + } else { |
|
183 | + isAllowedTo('report_user'); |
|
184 | + } |
|
177 | 185 | |
178 | 186 | // Make sure they aren't spamming. |
179 | 187 | spamProtection('reporttm'); |
@@ -187,17 +195,20 @@ discard block |
||
187 | 195 | $post_errors = array(); |
188 | 196 | |
189 | 197 | // Check their session. |
190 | - if (checkSession('post', '', false) != '') |
|
191 | - $post_errors[] = 'session_timeout'; |
|
198 | + if (checkSession('post', '', false) != '') { |
|
199 | + $post_errors[] = 'session_timeout'; |
|
200 | + } |
|
192 | 201 | |
193 | 202 | // Make sure we have a comment and it's clean. |
194 | - if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '') |
|
195 | - $post_errors[] = 'no_comment'; |
|
203 | + if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '') { |
|
204 | + $post_errors[] = 'no_comment'; |
|
205 | + } |
|
196 | 206 | |
197 | 207 | $poster_comment = strtr($smcFunc['htmlspecialchars']($_POST['comment']), array("\r" => '', "\t" => '')); |
198 | 208 | |
199 | - if ($smcFunc['strlen']($poster_comment) > 254) |
|
200 | - $post_errors[] = 'post_too_long'; |
|
209 | + if ($smcFunc['strlen']($poster_comment) > 254) { |
|
210 | + $post_errors[] = 'post_too_long'; |
|
211 | + } |
|
201 | 212 | |
202 | 213 | // Any errors? |
203 | 214 | if (!empty($post_errors)) |
@@ -205,8 +216,9 @@ discard block |
||
205 | 216 | loadLanguage('Errors'); |
206 | 217 | |
207 | 218 | $context['post_errors'] = array(); |
208 | - foreach ($post_errors as $post_error) |
|
209 | - $context['post_errors'][$post_error] = $txt['error_' . $post_error]; |
|
219 | + foreach ($post_errors as $post_error) { |
|
220 | + $context['post_errors'][$post_error] = $txt['error_' . $post_error]; |
|
221 | + } |
|
210 | 222 | |
211 | 223 | return ReportToModerator(); |
212 | 224 | } |
@@ -215,8 +227,7 @@ discard block |
||
215 | 227 | { |
216 | 228 | // Handle this elsewhere to keep things from getting too long |
217 | 229 | reportPost($_POST['msg'], $poster_comment); |
218 | - } |
|
219 | - else |
|
230 | + } else |
|
220 | 231 | { |
221 | 232 | reportUser($_POST['u'], $poster_comment); |
222 | 233 | } |
@@ -247,8 +258,9 @@ discard block |
||
247 | 258 | 'id_msg' => $_POST['msg'], |
248 | 259 | ) |
249 | 260 | ); |
250 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
251 | - fatal_lang_error('no_board', false); |
|
261 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
262 | + fatal_lang_error('no_board', false); |
|
263 | + } |
|
252 | 264 | $message = $smcFunc['db_fetch_assoc']($request); |
253 | 265 | $smcFunc['db_free_result']($request); |
254 | 266 | |
@@ -264,18 +276,20 @@ discard block |
||
264 | 276 | 'ignored' => 1, |
265 | 277 | ) |
266 | 278 | ); |
267 | - if ($smcFunc['db_num_rows']($request) != 0) |
|
268 | - list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request); |
|
279 | + if ($smcFunc['db_num_rows']($request) != 0) { |
|
280 | + list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request); |
|
281 | + } |
|
269 | 282 | |
270 | 283 | $smcFunc['db_free_result']($request); |
271 | 284 | |
272 | 285 | // If we're just going to ignore these, then who gives a monkeys... |
273 | - if (!empty($ignore)) |
|
274 | - redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']); |
|
286 | + if (!empty($ignore)) { |
|
287 | + redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']); |
|
288 | + } |
|
275 | 289 | |
276 | 290 | // Already reported? My god, we could be dealing with a real rogue here... |
277 | - if (!empty($id_report)) |
|
278 | - $smcFunc['db_query']('', ' |
|
291 | + if (!empty($id_report)) { |
|
292 | + $smcFunc['db_query']('', ' |
|
279 | 293 | UPDATE {db_prefix}log_reported |
280 | 294 | SET num_reports = num_reports + 1, time_updated = {int:current_time} |
281 | 295 | WHERE id_report = {int:id_report}', |
@@ -284,11 +298,13 @@ discard block |
||
284 | 298 | 'id_report' => $id_report, |
285 | 299 | ) |
286 | 300 | ); |
301 | + } |
|
287 | 302 | // Otherwise, we shall make one! |
288 | 303 | else |
289 | 304 | { |
290 | - if (empty($message['real_name'])) |
|
291 | - $message['real_name'] = $message['poster_name']; |
|
305 | + if (empty($message['real_name'])) { |
|
306 | + $message['real_name'] = $message['poster_name']; |
|
307 | + } |
|
292 | 308 | |
293 | 309 | $id_report = $smcFunc['db_insert']('', |
294 | 310 | '{db_prefix}log_reported', |
@@ -367,8 +383,9 @@ discard block |
||
367 | 383 | 'id_member' => $_POST['u'] |
368 | 384 | ) |
369 | 385 | ); |
370 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
371 | - fatal_lang_error('no_user', false); |
|
386 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
387 | + fatal_lang_error('no_user', false); |
|
388 | + } |
|
372 | 389 | $user = $smcFunc['db_fetch_assoc']($request); |
373 | 390 | $smcFunc['db_free_result']($request); |
374 | 391 | |
@@ -388,18 +405,20 @@ discard block |
||
388 | 405 | 'ignored' => 1, |
389 | 406 | ) |
390 | 407 | ); |
391 | - if ($smcFunc['db_num_rows']($request) != 0) |
|
392 | - list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request); |
|
408 | + if ($smcFunc['db_num_rows']($request) != 0) { |
|
409 | + list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request); |
|
410 | + } |
|
393 | 411 | |
394 | 412 | $smcFunc['db_free_result']($request); |
395 | 413 | |
396 | 414 | // If we're just going to ignore these, then who gives a monkeys... |
397 | - if (!empty($ignore)) |
|
398 | - redirectexit('action=profile;u=' . $_POST['u']); |
|
415 | + if (!empty($ignore)) { |
|
416 | + redirectexit('action=profile;u=' . $_POST['u']); |
|
417 | + } |
|
399 | 418 | |
400 | 419 | // Already reported? My god, we could be dealing with a real rogue here... |
401 | - if (!empty($id_report)) |
|
402 | - $smcFunc['db_query']('', ' |
|
420 | + if (!empty($id_report)) { |
|
421 | + $smcFunc['db_query']('', ' |
|
403 | 422 | UPDATE {db_prefix}log_reported |
404 | 423 | SET num_reports = num_reports + 1, time_updated = {int:current_time} |
405 | 424 | WHERE id_report = {int:id_report}', |
@@ -408,6 +427,7 @@ discard block |
||
408 | 427 | 'id_report' => $id_report, |
409 | 428 | ) |
410 | 429 | ); |
430 | + } |
|
411 | 431 | // Otherwise, we shall make one! |
412 | 432 | else |
413 | 433 | { |
@@ -1,9 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
4 | -if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
|
4 | +if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) { |
|
5 | 5 | include (dirname(dirname(__FILE__)) . '/index.php'); |
6 | -else |
|
6 | +} else { |
|
7 | 7 | exit; |
8 | +} |
|
8 | 9 | |
9 | 10 | ?> |
10 | 11 | \ No newline at end of file |
@@ -1,9 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
4 | -if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
|
4 | +if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) { |
|
5 | 5 | include (dirname(dirname(__FILE__)) . '/index.php'); |
6 | -else |
|
6 | +} else { |
|
7 | 7 | exit; |
8 | +} |
|
8 | 9 | |
9 | 10 | ?> |
10 | 11 | \ No newline at end of file |
@@ -1,9 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
4 | -if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
|
4 | +if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) { |
|
5 | 5 | include (dirname(dirname(__FILE__)) . '/index.php'); |
6 | -else |
|
6 | +} else { |
|
7 | 7 | exit; |
8 | +} |
|
8 | 9 | |
9 | 10 | ?> |
10 | 11 | \ No newline at end of file |
@@ -1,9 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
4 | -if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
|
4 | +if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) { |
|
5 | 5 | include (dirname(dirname(__FILE__)) . '/index.php'); |
6 | -else |
|
6 | +} else { |
|
7 | 7 | exit; |
8 | +} |
|
8 | 9 | |
9 | 10 | ?> |
10 | 11 | \ No newline at end of file |
@@ -1,9 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
4 | -if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
|
4 | +if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) { |
|
5 | 5 | include (dirname(dirname(__FILE__)) . '/index.php'); |
6 | -else |
|
6 | +} else { |
|
7 | 7 | exit; |
8 | +} |
|
8 | 9 | |
9 | 10 | ?> |
10 | 11 | \ No newline at end of file |
@@ -1,9 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
4 | -if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
|
4 | +if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) { |
|
5 | 5 | include (dirname(dirname(__FILE__)) . '/index.php'); |
6 | -else |
|
6 | +} else { |
|
7 | 7 | exit; |
8 | +} |
|
8 | 9 | |
9 | 10 | ?> |
10 | 11 | \ No newline at end of file |
@@ -1,9 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
4 | -if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
|
4 | +if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) { |
|
5 | 5 | include (dirname(dirname(__FILE__)) . '/index.php'); |
6 | -else |
|
6 | +} else { |
|
7 | 7 | exit; |
8 | +} |
|
8 | 9 | |
9 | 10 | ?> |
10 | 11 | \ No newline at end of file |
@@ -14,8 +14,9 @@ discard block |
||
14 | 14 | * @version 2.1 Beta 3 |
15 | 15 | */ |
16 | 16 | |
17 | -if (!defined('SMF')) |
|
17 | +if (!defined('SMF')) { |
|
18 | 18 | die('No direct access...'); |
19 | +} |
|
19 | 20 | |
20 | 21 | /** |
21 | 22 | * Shows a listing of registered members. |
@@ -110,8 +111,9 @@ discard block |
||
110 | 111 | |
111 | 112 | $context['custom_profile_fields'] = getCustFieldsMList(); |
112 | 113 | |
113 | - if (!empty($context['custom_profile_fields']['columns'])) |
|
114 | - $context['columns'] += $context['custom_profile_fields']['columns']; |
|
114 | + if (!empty($context['custom_profile_fields']['columns'])) { |
|
115 | + $context['columns'] += $context['custom_profile_fields']['columns']; |
|
116 | + } |
|
115 | 117 | |
116 | 118 | $context['colspan'] = 0; |
117 | 119 | $context['disabled_fields'] = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array(); |
@@ -147,12 +149,12 @@ discard block |
||
147 | 149 | call_integration_hook('integrate_memberlist_buttons'); |
148 | 150 | |
149 | 151 | // Jump to the sub action. |
150 | - if (isset($subActions[$context['listing_by']])) |
|
151 | - call_helper($subActions[$context['listing_by']][1]); |
|
152 | - |
|
153 | - else |
|
154 | - call_helper($subActions['all'][1]); |
|
155 | -} |
|
152 | + if (isset($subActions[$context['listing_by']])) { |
|
153 | + call_helper($subActions[$context['listing_by']][1]); |
|
154 | + } else { |
|
155 | + call_helper($subActions['all'][1]); |
|
156 | + } |
|
157 | + } |
|
156 | 158 | |
157 | 159 | /** |
158 | 160 | * List all members, page by page, with sorting. |
@@ -177,8 +179,9 @@ discard block |
||
177 | 179 | if ($use_cache) |
178 | 180 | { |
179 | 181 | // Maybe there's something cached already. |
180 | - if (!empty($modSettings['memberlist_cache'])) |
|
181 | - $memberlist_cache = smf_json_decode($modSettings['memberlist_cache'], true); |
|
182 | + if (!empty($modSettings['memberlist_cache'])) { |
|
183 | + $memberlist_cache = smf_json_decode($modSettings['memberlist_cache'], true); |
|
184 | + } |
|
182 | 185 | |
183 | 186 | // The chunk size for the cached index. |
184 | 187 | $cache_step_size = 500; |
@@ -234,13 +237,15 @@ discard block |
||
234 | 237 | } |
235 | 238 | |
236 | 239 | // Set defaults for sort (real_name) and start. (0) |
237 | - if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) |
|
238 | - $_REQUEST['sort'] = 'real_name'; |
|
240 | + if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) { |
|
241 | + $_REQUEST['sort'] = 'real_name'; |
|
242 | + } |
|
239 | 243 | |
240 | 244 | if (!is_numeric($_REQUEST['start'])) |
241 | 245 | { |
242 | - if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0) |
|
243 | - fatal_error('Hacker?', false); |
|
246 | + if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0) { |
|
247 | + fatal_error('Hacker?', false); |
|
248 | + } |
|
244 | 249 | |
245 | 250 | $_REQUEST['start'] = $match[0]; |
246 | 251 | |
@@ -259,16 +264,18 @@ discard block |
||
259 | 264 | } |
260 | 265 | |
261 | 266 | $context['letter_links'] = ''; |
262 | - for ($i = 97; $i < 123; $i++) |
|
263 | - $context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> '; |
|
267 | + for ($i = 97; $i < 123; $i++) { |
|
268 | + $context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> '; |
|
269 | + } |
|
264 | 270 | |
265 | 271 | // Sort out the column information. |
266 | 272 | foreach ($context['columns'] as $col => $column_details) |
267 | 273 | { |
268 | 274 | $context['columns'][$col]['href'] = $scripturl . '?action=mlist;sort=' . $col . ';start=0'; |
269 | 275 | |
270 | - if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) |
|
271 | - $context['columns'][$col]['href'] .= ';desc'; |
|
276 | + if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) { |
|
277 | + $context['columns'][$col]['href'] .= ';desc'; |
|
278 | + } |
|
272 | 279 | |
273 | 280 | $context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>'; |
274 | 281 | $context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col; |
@@ -317,8 +324,9 @@ discard block |
||
317 | 324 | elseif ($use_cache && $_REQUEST['sort'] === 'real_name') |
318 | 325 | { |
319 | 326 | $first_offset = floor(($memberlist_cache['num_members'] - $modSettings['defaultMaxMembers'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size; |
320 | - if ($first_offset < 0) |
|
321 | - $first_offset = 0; |
|
327 | + if ($first_offset < 0) { |
|
328 | + $first_offset = 0; |
|
329 | + } |
|
322 | 330 | $second_offset = ceil(($memberlist_cache['num_members'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size; |
323 | 331 | |
324 | 332 | $where = 'mem.real_name BETWEEN {string:real_name_low} AND {string:real_name_high}'; |
@@ -395,12 +403,13 @@ discard block |
||
395 | 403 | ) |
396 | 404 | ); |
397 | 405 | $context['custom_search_fields'] = array(); |
398 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
399 | - $context['custom_search_fields'][$row['col_name']] = array( |
|
406 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
407 | + $context['custom_search_fields'][$row['col_name']] = array( |
|
400 | 408 | 'colname' => $row['col_name'], |
401 | 409 | 'name' => $row['field_name'], |
402 | 410 | 'desc' => $row['field_desc'], |
403 | 411 | ); |
412 | + } |
|
404 | 413 | $smcFunc['db_free_result']($request); |
405 | 414 | |
406 | 415 | // They're searching.. |
@@ -413,23 +422,27 @@ discard block |
||
413 | 422 | $context['old_search_value'] = urlencode($_REQUEST['search']); |
414 | 423 | |
415 | 424 | // No fields? Use default... |
416 | - if (empty($_POST['fields'])) |
|
417 | - $_POST['fields'] = array('name'); |
|
425 | + if (empty($_POST['fields'])) { |
|
426 | + $_POST['fields'] = array('name'); |
|
427 | + } |
|
418 | 428 | |
419 | 429 | // Set defaults for how the results are sorted |
420 | - if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) |
|
421 | - $_REQUEST['sort'] = 'real_name'; |
|
430 | + if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) { |
|
431 | + $_REQUEST['sort'] = 'real_name'; |
|
432 | + } |
|
422 | 433 | |
423 | 434 | // Build the column link / sort information. |
424 | 435 | foreach ($context['columns'] as $col => $column_details) |
425 | 436 | { |
426 | 437 | $context['columns'][$col]['href'] = $scripturl . '?action=mlist;sa=search;start=0;sort=' . $col; |
427 | 438 | |
428 | - if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) |
|
429 | - $context['columns'][$col]['href'] .= ';desc'; |
|
439 | + if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) { |
|
440 | + $context['columns'][$col]['href'] .= ';desc'; |
|
441 | + } |
|
430 | 442 | |
431 | - if (isset($_POST['search']) && isset($_POST['fields'])) |
|
432 | - $context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']); |
|
443 | + if (isset($_POST['search']) && isset($_POST['fields'])) { |
|
444 | + $context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']); |
|
445 | + } |
|
433 | 446 | |
434 | 447 | $context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>'; |
435 | 448 | $context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col; |
@@ -452,8 +465,7 @@ discard block |
||
452 | 465 | { |
453 | 466 | $fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name'); |
454 | 467 | $search_fields[] = 'name'; |
455 | - } |
|
456 | - else |
|
468 | + } else |
|
457 | 469 | { |
458 | 470 | $fields = array(); |
459 | 471 | $search_fields = array(); |
@@ -478,9 +490,10 @@ discard block |
||
478 | 490 | $search_fields[] = 'email'; |
479 | 491 | } |
480 | 492 | |
481 | - if ($smcFunc['db_case_sensitive']) |
|
482 | - foreach ($fields as $key => $field) |
|
493 | + if ($smcFunc['db_case_sensitive']) { |
|
494 | + foreach ($fields as $key => $field) |
|
483 | 495 | $fields[$key] = 'LOWER(' . $field . ')'; |
496 | + } |
|
484 | 497 | |
485 | 498 | $customJoin = array(); |
486 | 499 | $customCount = 10; |
@@ -499,8 +512,9 @@ discard block |
||
499 | 512 | } |
500 | 513 | |
501 | 514 | // No search fields? That means you're trying to hack things |
502 | - if (empty($search_fields)) |
|
503 | - fatal_lang_error('invalid_search_string', false); |
|
515 | + if (empty($search_fields)) { |
|
516 | + fatal_lang_error('invalid_search_string', false); |
|
517 | + } |
|
504 | 518 | |
505 | 519 | $query = $_POST['search'] == '' ? '= {string:blank_string}' : ($smcFunc['db_case_sensitive'] ? 'LIKE LOWER({string:search})' : 'LIKE {string:search}'); |
506 | 520 | |
@@ -538,8 +552,7 @@ discard block |
||
538 | 552 | ); |
539 | 553 | printMemberListRows($request); |
540 | 554 | $smcFunc['db_free_result']($request); |
541 | - } |
|
542 | - else |
|
555 | + } else |
|
543 | 556 | { |
544 | 557 | // These are all the possible fields. |
545 | 558 | $context['search_fields'] = array( |
@@ -554,14 +567,14 @@ discard block |
||
554 | 567 | { |
555 | 568 | unset($context['search_fields']['email']); |
556 | 569 | $context['search_defaults'] = array('name'); |
557 | - } |
|
558 | - else |
|
570 | + } else |
|
559 | 571 | { |
560 | 572 | $context['search_defaults'] = array('name', 'email'); |
561 | 573 | } |
562 | 574 | |
563 | - foreach ($context['custom_search_fields'] as $field) |
|
564 | - $context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']); |
|
575 | + foreach ($context['custom_search_fields'] as $field) { |
|
576 | + $context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']); |
|
577 | + } |
|
565 | 578 | |
566 | 579 | $context['sub_template'] = 'search'; |
567 | 580 | $context['old_search'] = isset($_GET['search']) ? $_GET['search'] : (isset($_POST['search']) ? $smcFunc['htmlspecialchars']($_POST['search']) : ''); |
@@ -603,12 +616,14 @@ discard block |
||
603 | 616 | $smcFunc['db_free_result']($result); |
604 | 617 | |
605 | 618 | // Avoid division by zero... |
606 | - if ($most_posts == 0) |
|
607 | - $most_posts = 1; |
|
619 | + if ($most_posts == 0) { |
|
620 | + $most_posts = 1; |
|
621 | + } |
|
608 | 622 | |
609 | 623 | $members = array(); |
610 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
611 | - $members[] = $row['id_member']; |
|
624 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
625 | + $members[] = $row['id_member']; |
|
626 | + } |
|
612 | 627 | |
613 | 628 | // Load all the members for display. |
614 | 629 | loadMemberData($members); |
@@ -616,8 +631,9 @@ discard block |
||
616 | 631 | $context['members'] = array(); |
617 | 632 | foreach ($members as $member) |
618 | 633 | { |
619 | - if (!loadMemberContext($member)) |
|
620 | - continue; |
|
634 | + if (!loadMemberContext($member)) { |
|
635 | + continue; |
|
636 | + } |
|
621 | 637 | |
622 | 638 | $context['members'][$member] = $memberContext[$member]; |
623 | 639 | $context['members'][$member]['post_percent'] = round(($context['members'][$member]['real_posts'] * 100) / $most_posts); |
@@ -634,20 +650,21 @@ discard block |
||
634 | 650 | continue; |
635 | 651 | } |
636 | 652 | |
637 | - if ($column['bbc'] && !empty($context['members'][$member]['options'][$key])) |
|
638 | - $context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key])); |
|
639 | - |
|
640 | - elseif ($column['type'] == 'check') |
|
641 | - $context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes']; |
|
653 | + if ($column['bbc'] && !empty($context['members'][$member]['options'][$key])) { |
|
654 | + $context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key])); |
|
655 | + } elseif ($column['type'] == 'check') { |
|
656 | + $context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes']; |
|
657 | + } |
|
642 | 658 | |
643 | 659 | // Enclosing the user input within some other text? |
644 | - if (!empty($column['enclose'])) |
|
645 | - $context['members'][$member]['options'][$key] = strtr($column['enclose'], array( |
|
660 | + if (!empty($column['enclose'])) { |
|
661 | + $context['members'][$member]['options'][$key] = strtr($column['enclose'], array( |
|
646 | 662 | '{SCRIPTURL}' => $scripturl, |
647 | 663 | '{IMAGES_URL}' => $settings['images_url'], |
648 | 664 | '{DEFAULT_IMAGES_URL}' => $settings['default_images_url'], |
649 | 665 | '{INPUT}' => $context['members'][$member]['options'][$key], |
650 | 666 | )); |
667 | + } |
|
651 | 668 | } |
652 | 669 | } |
653 | 670 | } |
@@ -688,17 +705,17 @@ discard block |
||
688 | 705 | ); |
689 | 706 | |
690 | 707 | // Get the right sort method depending on the cust field type. |
691 | - if ($row['field_type'] != 'check') |
|
692 | - $cpf['columns'][$row['col_name']]['sort'] = array( |
|
708 | + if ($row['field_type'] != 'check') { |
|
709 | + $cpf['columns'][$row['col_name']]['sort'] = array( |
|
693 | 710 | 'down' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 ASC, COALESCE(t' . $row['col_name'] . '.value, "") DESC', |
694 | 711 | 'up' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 DESC, COALESCE(t' . $row['col_name'] . '.value, "") ASC' |
695 | 712 | ); |
696 | - |
|
697 | - else |
|
698 | - $cpf['columns'][$row['col_name']]['sort'] = array( |
|
713 | + } else { |
|
714 | + $cpf['columns'][$row['col_name']]['sort'] = array( |
|
699 | 715 | 'down' => 't' . $row['col_name'] . '.value DESC', |
700 | 716 | 'up' => 't' . $row['col_name'] . '.value ASC' |
701 | 717 | ); |
718 | + } |
|
702 | 719 | |
703 | 720 | $cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' . $row['col_name'] . ' ON (t' . $row['col_name'] . '.variable = {literal:' . $row['col_name'] . '} AND t' . $row['col_name'] . '.id_theme = 1 AND t' . $row['col_name'] . '.id_member = mem.id_member)'; |
704 | 721 | } |