@@ -11,8 +11,9 @@ discard block |
||
| 11 | 11 | * @version 2.1 Beta 4 |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | -if (!defined('SMF')) |
|
| 14 | +if (!defined('SMF')) { |
|
| 15 | 15 | die('No direct access...'); |
| 16 | +} |
|
| 16 | 17 | |
| 17 | 18 | /** |
| 18 | 19 | * View a summary. |
@@ -23,8 +24,9 @@ discard block |
||
| 23 | 24 | global $context, $memberContext, $txt, $modSettings, $user_profile, $sourcedir, $scripturl, $smcFunc; |
| 24 | 25 | |
| 25 | 26 | // Attempt to load the member's profile data. |
| 26 | - if (!loadMemberContext($memID) || !isset($memberContext[$memID])) |
|
| 27 | - fatal_lang_error('not_a_user', false, 404); |
|
| 27 | + if (!loadMemberContext($memID) || !isset($memberContext[$memID])) { |
|
| 28 | + fatal_lang_error('not_a_user', false, 404); |
|
| 29 | + } |
|
| 28 | 30 | |
| 29 | 31 | // Set up the stuff and load the user. |
| 30 | 32 | $context += array( |
@@ -49,19 +51,21 @@ discard block |
||
| 49 | 51 | |
| 50 | 52 | // See if they have broken any warning levels... |
| 51 | 53 | list ($modSettings['warning_enable'], $modSettings['user_limit']) = explode(',', $modSettings['warning_settings']); |
| 52 | - if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning']) |
|
| 53 | - $context['warning_status'] = $txt['profile_warning_is_muted']; |
|
| 54 | - elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning']) |
|
| 55 | - $context['warning_status'] = $txt['profile_warning_is_moderation']; |
|
| 56 | - elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning']) |
|
| 57 | - $context['warning_status'] = $txt['profile_warning_is_watch']; |
|
| 54 | + if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning']) { |
|
| 55 | + $context['warning_status'] = $txt['profile_warning_is_muted']; |
|
| 56 | + } elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning']) { |
|
| 57 | + $context['warning_status'] = $txt['profile_warning_is_moderation']; |
|
| 58 | + } elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning']) { |
|
| 59 | + $context['warning_status'] = $txt['profile_warning_is_watch']; |
|
| 60 | + } |
|
| 58 | 61 | |
| 59 | 62 | // They haven't even been registered for a full day!? |
| 60 | 63 | $days_registered = (int) ((time() - $user_profile[$memID]['date_registered']) / (3600 * 24)); |
| 61 | - if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1) |
|
| 62 | - $context['member']['posts_per_day'] = $txt['not_applicable']; |
|
| 63 | - else |
|
| 64 | - $context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3); |
|
| 64 | + if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1) { |
|
| 65 | + $context['member']['posts_per_day'] = $txt['not_applicable']; |
|
| 66 | + } else { |
|
| 67 | + $context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3); |
|
| 68 | + } |
|
| 65 | 69 | |
| 66 | 70 | // Set the age... |
| 67 | 71 | if (empty($context['member']['birth_date']) || substr($context['member']['birth_date'], 0, 4) < 1002) |
@@ -70,8 +74,7 @@ discard block |
||
| 70 | 74 | 'age' => $txt['not_applicable'], |
| 71 | 75 | 'today_is_birthday' => false |
| 72 | 76 | ); |
| 73 | - } |
|
| 74 | - else |
|
| 77 | + } else |
|
| 75 | 78 | { |
| 76 | 79 | list ($birth_year, $birth_month, $birth_day) = sscanf($context['member']['birth_date'], '%d-%d-%d'); |
| 77 | 80 | $datearray = getdate(forum_time()); |
@@ -84,15 +87,16 @@ discard block |
||
| 84 | 87 | if (allowedTo('moderate_forum')) |
| 85 | 88 | { |
| 86 | 89 | // Make sure it's a valid ip address; otherwise, don't bother... |
| 87 | - if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup'])) |
|
| 88 | - $context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']); |
|
| 89 | - else |
|
| 90 | - $context['member']['hostname'] = ''; |
|
| 90 | + if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup'])) { |
|
| 91 | + $context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']); |
|
| 92 | + } else { |
|
| 93 | + $context['member']['hostname'] = ''; |
|
| 94 | + } |
|
| 91 | 95 | |
| 92 | 96 | $context['can_see_ip'] = true; |
| 97 | + } else { |
|
| 98 | + $context['can_see_ip'] = false; |
|
| 93 | 99 | } |
| 94 | - else |
|
| 95 | - $context['can_see_ip'] = false; |
|
| 96 | 100 | |
| 97 | 101 | // Are they hidden? |
| 98 | 102 | $context['member']['is_hidden'] = empty($user_profile[$memID]['show_online']); |
@@ -103,8 +107,9 @@ discard block |
||
| 103 | 107 | include_once($sourcedir . '/Who.php'); |
| 104 | 108 | $action = determineActions($user_profile[$memID]['url']); |
| 105 | 109 | |
| 106 | - if ($action !== false) |
|
| 107 | - $context['member']['action'] = $action; |
|
| 110 | + if ($action !== false) { |
|
| 111 | + $context['member']['action'] = $action; |
|
| 112 | + } |
|
| 108 | 113 | } |
| 109 | 114 | |
| 110 | 115 | // If the user is awaiting activation, and the viewer has permission - setup some activation context messages. |
@@ -167,13 +172,15 @@ discard block |
||
| 167 | 172 | { |
| 168 | 173 | // Work out what restrictions we actually have. |
| 169 | 174 | $ban_restrictions = array(); |
| 170 | - foreach (array('access', 'register', 'login', 'post') as $type) |
|
| 171 | - if ($row['cannot_' . $type]) |
|
| 175 | + foreach (array('access', 'register', 'login', 'post') as $type) { |
|
| 176 | + if ($row['cannot_' . $type]) |
|
| 172 | 177 | $ban_restrictions[] = $txt['ban_type_' . $type]; |
| 178 | + } |
|
| 173 | 179 | |
| 174 | 180 | // No actual ban in place? |
| 175 | - if (empty($ban_restrictions)) |
|
| 176 | - continue; |
|
| 181 | + if (empty($ban_restrictions)) { |
|
| 182 | + continue; |
|
| 183 | + } |
|
| 177 | 184 | |
| 178 | 185 | // Prepare the link for context. |
| 179 | 186 | $ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>'); |
@@ -196,9 +203,10 @@ discard block |
||
| 196 | 203 | $context['print_custom_fields'] = array(); |
| 197 | 204 | |
| 198 | 205 | // Any custom profile fields? |
| 199 | - if (!empty($context['custom_fields'])) |
|
| 200 | - foreach ($context['custom_fields'] as $custom) |
|
| 206 | + if (!empty($context['custom_fields'])) { |
|
| 207 | + foreach ($context['custom_fields'] as $custom) |
|
| 201 | 208 | $context['print_custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom; |
| 209 | + } |
|
| 202 | 210 | |
| 203 | 211 | } |
| 204 | 212 | |
@@ -242,14 +250,16 @@ discard block |
||
| 242 | 250 | $row['extra'] = !empty($row['extra']) ? smf_json_decode($row['extra'], true) : array(); |
| 243 | 251 | $alerts[$id_alert] = $row; |
| 244 | 252 | |
| 245 | - if (!empty($row['sender_id'])) |
|
| 246 | - $senders[] = $row['sender_id']; |
|
| 253 | + if (!empty($row['sender_id'])) { |
|
| 254 | + $senders[] = $row['sender_id']; |
|
| 255 | + } |
|
| 247 | 256 | } |
| 248 | 257 | $smcFunc['db_free_result']($request); |
| 249 | 258 | |
| 250 | 259 | $senders = loadMemberData($senders); |
| 251 | - foreach ($senders as $member) |
|
| 252 | - loadMemberContext($member); |
|
| 260 | + foreach ($senders as $member) { |
|
| 261 | + loadMemberContext($member); |
|
| 262 | + } |
|
| 253 | 263 | |
| 254 | 264 | // Now go through and actually make with the text. |
| 255 | 265 | loadLanguage('Alerts'); |
@@ -263,12 +273,15 @@ discard block |
||
| 263 | 273 | $msgs = array(); |
| 264 | 274 | foreach ($alerts as $id_alert => $alert) |
| 265 | 275 | { |
| 266 | - if (isset($alert['extra']['board'])) |
|
| 267 | - $boards[$alert['extra']['board']] = $txt['board_na']; |
|
| 268 | - if (isset($alert['extra']['topic'])) |
|
| 269 | - $topics[$alert['extra']['topic']] = $txt['topic_na']; |
|
| 270 | - if ($alert['content_type'] == 'msg') |
|
| 271 | - $msgs[$alert['content_id']] = $txt['topic_na']; |
|
| 276 | + if (isset($alert['extra']['board'])) { |
|
| 277 | + $boards[$alert['extra']['board']] = $txt['board_na']; |
|
| 278 | + } |
|
| 279 | + if (isset($alert['extra']['topic'])) { |
|
| 280 | + $topics[$alert['extra']['topic']] = $txt['topic_na']; |
|
| 281 | + } |
|
| 282 | + if ($alert['content_type'] == 'msg') { |
|
| 283 | + $msgs[$alert['content_id']] = $txt['topic_na']; |
|
| 284 | + } |
|
| 272 | 285 | } |
| 273 | 286 | |
| 274 | 287 | // Having figured out what boards etc. there are, let's now get the names of them if we can see them. If not, there's already a fallback set up. |
@@ -283,8 +296,9 @@ discard block |
||
| 283 | 296 | 'boards' => array_keys($boards), |
| 284 | 297 | ) |
| 285 | 298 | ); |
| 286 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 287 | - $boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>'; |
|
| 299 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 300 | + $boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>'; |
|
| 301 | + } |
|
| 288 | 302 | } |
| 289 | 303 | if (!empty($topics)) |
| 290 | 304 | { |
@@ -299,8 +313,9 @@ discard block |
||
| 299 | 313 | 'topics' => array_keys($topics), |
| 300 | 314 | ) |
| 301 | 315 | ); |
| 302 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 303 | - $topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>'; |
|
| 316 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 317 | + $topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>'; |
|
| 318 | + } |
|
| 304 | 319 | } |
| 305 | 320 | if (!empty($msgs)) |
| 306 | 321 | { |
@@ -315,26 +330,33 @@ discard block |
||
| 315 | 330 | 'msgs' => array_keys($msgs), |
| 316 | 331 | ) |
| 317 | 332 | ); |
| 318 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 319 | - $msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>'; |
|
| 333 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 334 | + $msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>'; |
|
| 335 | + } |
|
| 320 | 336 | } |
| 321 | 337 | |
| 322 | 338 | // Now to go back through the alerts, reattach this extra information and then try to build the string out of it (if a hook didn't already) |
| 323 | 339 | foreach ($alerts as $id_alert => $alert) |
| 324 | 340 | { |
| 325 | - if (!empty($alert['text'])) |
|
| 326 | - continue; |
|
| 327 | - if (isset($alert['extra']['board'])) |
|
| 328 | - $alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']]; |
|
| 329 | - if (isset($alert['extra']['topic'])) |
|
| 330 | - $alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']]; |
|
| 331 | - if ($alert['content_type'] == 'msg') |
|
| 332 | - $alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']]; |
|
| 333 | - if ($alert['content_type'] == 'profile') |
|
| 334 | - $alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>'; |
|
| 335 | - |
|
| 336 | - if (!empty($memberContext[$alert['sender_id']])) |
|
| 337 | - $alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']]; |
|
| 341 | + if (!empty($alert['text'])) { |
|
| 342 | + continue; |
|
| 343 | + } |
|
| 344 | + if (isset($alert['extra']['board'])) { |
|
| 345 | + $alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']]; |
|
| 346 | + } |
|
| 347 | + if (isset($alert['extra']['topic'])) { |
|
| 348 | + $alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']]; |
|
| 349 | + } |
|
| 350 | + if ($alert['content_type'] == 'msg') { |
|
| 351 | + $alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']]; |
|
| 352 | + } |
|
| 353 | + if ($alert['content_type'] == 'profile') { |
|
| 354 | + $alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>'; |
|
| 355 | + } |
|
| 356 | + |
|
| 357 | + if (!empty($memberContext[$alert['sender_id']])) { |
|
| 358 | + $alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']]; |
|
| 359 | + } |
|
| 338 | 360 | |
| 339 | 361 | $string = 'alert_' . $alert['content_type'] . '_' . $alert['content_action']; |
| 340 | 362 | if (isset($txt[$string])) |
@@ -422,11 +444,11 @@ discard block |
||
| 422 | 444 | checkSession('request'); |
| 423 | 445 | |
| 424 | 446 | // Call it! |
| 425 | - if ($action == 'remove') |
|
| 426 | - alert_delete($toMark, $memID); |
|
| 427 | - |
|
| 428 | - else |
|
| 429 | - alert_mark($memID, $toMark, $action == 'read' ? 1 : 0); |
|
| 447 | + if ($action == 'remove') { |
|
| 448 | + alert_delete($toMark, $memID); |
|
| 449 | + } else { |
|
| 450 | + alert_mark($memID, $toMark, $action == 'read' ? 1 : 0); |
|
| 451 | + } |
|
| 430 | 452 | |
| 431 | 453 | // Set a nice update message. |
| 432 | 454 | $_SESSION['update_message'] = true; |
@@ -476,23 +498,27 @@ discard block |
||
| 476 | 498 | ); |
| 477 | 499 | |
| 478 | 500 | // Set the page title |
| 479 | - if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title)) |
|
| 480 | - $context['page_title'] = $txt['show' . $title[$_GET['sa']]]; |
|
| 481 | - else |
|
| 482 | - $context['page_title'] = $txt['showPosts']; |
|
| 501 | + if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title)) { |
|
| 502 | + $context['page_title'] = $txt['show' . $title[$_GET['sa']]]; |
|
| 503 | + } else { |
|
| 504 | + $context['page_title'] = $txt['showPosts']; |
|
| 505 | + } |
|
| 483 | 506 | |
| 484 | 507 | $context['page_title'] .= ' - ' . $user_profile[$memID]['real_name']; |
| 485 | 508 | |
| 486 | 509 | // Is the load average too high to allow searching just now? |
| 487 | - if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts']) |
|
| 488 | - fatal_lang_error('loadavg_show_posts_disabled', false); |
|
| 510 | + if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts']) { |
|
| 511 | + fatal_lang_error('loadavg_show_posts_disabled', false); |
|
| 512 | + } |
|
| 489 | 513 | |
| 490 | 514 | // If we're specifically dealing with attachments use that function! |
| 491 | - if (isset($_GET['sa']) && $_GET['sa'] == 'attach') |
|
| 492 | - return showAttachments($memID); |
|
| 515 | + if (isset($_GET['sa']) && $_GET['sa'] == 'attach') { |
|
| 516 | + return showAttachments($memID); |
|
| 517 | + } |
|
| 493 | 518 | // Instead, if we're dealing with unwatched topics (and the feature is enabled) use that other function. |
| 494 | - elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics') |
|
| 495 | - return showUnwatched($memID); |
|
| 519 | + elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics') { |
|
| 520 | + return showUnwatched($memID); |
|
| 521 | + } |
|
| 496 | 522 | |
| 497 | 523 | // Are we just viewing topics? |
| 498 | 524 | $context['is_topics'] = isset($_GET['sa']) && $_GET['sa'] == 'topics' ? true : false; |
@@ -515,27 +541,30 @@ discard block |
||
| 515 | 541 | $smcFunc['db_free_result']($request); |
| 516 | 542 | |
| 517 | 543 | // Trying to remove a message that doesn't exist. |
| 518 | - if (empty($info)) |
|
| 519 | - redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']); |
|
| 544 | + if (empty($info)) { |
|
| 545 | + redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']); |
|
| 546 | + } |
|
| 520 | 547 | |
| 521 | 548 | // We can be lazy, since removeMessage() will check the permissions for us. |
| 522 | 549 | require_once($sourcedir . '/RemoveTopic.php'); |
| 523 | 550 | removeMessage((int) $_GET['delete']); |
| 524 | 551 | |
| 525 | 552 | // Add it to the mod log. |
| 526 | - if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) |
|
| 527 | - logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3])); |
|
| 553 | + if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) { |
|
| 554 | + logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3])); |
|
| 555 | + } |
|
| 528 | 556 | |
| 529 | 557 | // Back to... where we are now ;). |
| 530 | 558 | redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']); |
| 531 | 559 | } |
| 532 | 560 | |
| 533 | 561 | // Default to 10. |
| 534 | - if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) |
|
| 535 | - $_REQUEST['viewscount'] = '10'; |
|
| 562 | + if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) { |
|
| 563 | + $_REQUEST['viewscount'] = '10'; |
|
| 564 | + } |
|
| 536 | 565 | |
| 537 | - if ($context['is_topics']) |
|
| 538 | - $request = $smcFunc['db_query']('', ' |
|
| 566 | + if ($context['is_topics']) { |
|
| 567 | + $request = $smcFunc['db_query']('', ' |
|
| 539 | 568 | SELECT COUNT(*) |
| 540 | 569 | FROM {db_prefix}topics AS t' . ($user_info['query_see_board'] == '1=1' ? '' : ' |
| 541 | 570 | INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board AND {query_see_board})') . ' |
@@ -548,8 +577,8 @@ discard block |
||
| 548 | 577 | 'board' => $board, |
| 549 | 578 | ) |
| 550 | 579 | ); |
| 551 | - else |
|
| 552 | - $request = $smcFunc['db_query']('', ' |
|
| 580 | + } else { |
|
| 581 | + $request = $smcFunc['db_query']('', ' |
|
| 553 | 582 | SELECT COUNT(*) |
| 554 | 583 | FROM {db_prefix}messages AS m' . ($user_info['query_see_board'] == '1=1' ? '' : ' |
| 555 | 584 | INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board AND {query_see_board})') . ' |
@@ -562,6 +591,7 @@ discard block |
||
| 562 | 591 | 'board' => $board, |
| 563 | 592 | ) |
| 564 | 593 | ); |
| 594 | + } |
|
| 565 | 595 | list ($msgCount) = $smcFunc['db_fetch_row']($request); |
| 566 | 596 | $smcFunc['db_free_result']($request); |
| 567 | 597 | |
@@ -582,10 +612,11 @@ discard block |
||
| 582 | 612 | |
| 583 | 613 | $range_limit = ''; |
| 584 | 614 | |
| 585 | - if ($context['is_topics']) |
|
| 586 | - $maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics']; |
|
| 587 | - else |
|
| 588 | - $maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages']; |
|
| 615 | + if ($context['is_topics']) { |
|
| 616 | + $maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics']; |
|
| 617 | + } else { |
|
| 618 | + $maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages']; |
|
| 619 | + } |
|
| 589 | 620 | |
| 590 | 621 | $maxIndex = $maxPerPage; |
| 591 | 622 | |
@@ -611,9 +642,9 @@ discard block |
||
| 611 | 642 | { |
| 612 | 643 | $margin *= 5; |
| 613 | 644 | $range_limit = $reverse ? 't.id_first_msg < ' . ($min_msg_member + $margin) : 't.id_first_msg > ' . ($max_msg_member - $margin); |
| 645 | + } else { |
|
| 646 | + $range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin); |
|
| 614 | 647 | } |
| 615 | - else |
|
| 616 | - $range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin); |
|
| 617 | 648 | } |
| 618 | 649 | |
| 619 | 650 | // Find this user's posts. The left join on categories somehow makes this faster, weird as it looks. |
@@ -645,8 +676,7 @@ discard block |
||
| 645 | 676 | 'max' => $maxIndex, |
| 646 | 677 | ) |
| 647 | 678 | ); |
| 648 | - } |
|
| 649 | - else |
|
| 679 | + } else |
|
| 650 | 680 | { |
| 651 | 681 | $request = $smcFunc['db_query']('', ' |
| 652 | 682 | SELECT |
@@ -675,8 +705,9 @@ discard block |
||
| 675 | 705 | } |
| 676 | 706 | |
| 677 | 707 | // Make sure we quit this loop. |
| 678 | - if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped) |
|
| 679 | - break; |
|
| 708 | + if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped) { |
|
| 709 | + break; |
|
| 710 | + } |
|
| 680 | 711 | $looped = true; |
| 681 | 712 | $range_limit = ''; |
| 682 | 713 | } |
@@ -720,19 +751,21 @@ discard block |
||
| 720 | 751 | 'css_class' => $row['approved'] ? 'windowbg' : 'approvebg', |
| 721 | 752 | ); |
| 722 | 753 | |
| 723 | - if ($user_info['id'] == $row['id_member_started']) |
|
| 724 | - $board_ids['own'][$row['id_board']][] = $counter; |
|
| 754 | + if ($user_info['id'] == $row['id_member_started']) { |
|
| 755 | + $board_ids['own'][$row['id_board']][] = $counter; |
|
| 756 | + } |
|
| 725 | 757 | $board_ids['any'][$row['id_board']][] = $counter; |
| 726 | 758 | } |
| 727 | 759 | $smcFunc['db_free_result']($request); |
| 728 | 760 | |
| 729 | 761 | // All posts were retrieved in reverse order, get them right again. |
| 730 | - if ($reverse) |
|
| 731 | - $context['posts'] = array_reverse($context['posts'], true); |
|
| 762 | + if ($reverse) { |
|
| 763 | + $context['posts'] = array_reverse($context['posts'], true); |
|
| 764 | + } |
|
| 732 | 765 | |
| 733 | 766 | // These are all the permissions that are different from board to board.. |
| 734 | - if ($context['is_topics']) |
|
| 735 | - $permissions = array( |
|
| 767 | + if ($context['is_topics']) { |
|
| 768 | + $permissions = array( |
|
| 736 | 769 | 'own' => array( |
| 737 | 770 | 'post_reply_own' => 'can_reply', |
| 738 | 771 | ), |
@@ -740,8 +773,8 @@ discard block |
||
| 740 | 773 | 'post_reply_any' => 'can_reply', |
| 741 | 774 | ) |
| 742 | 775 | ); |
| 743 | - else |
|
| 744 | - $permissions = array( |
|
| 776 | + } else { |
|
| 777 | + $permissions = array( |
|
| 745 | 778 | 'own' => array( |
| 746 | 779 | 'post_reply_own' => 'can_reply', |
| 747 | 780 | 'delete_own' => 'can_delete', |
@@ -751,6 +784,7 @@ discard block |
||
| 751 | 784 | 'delete_any' => 'can_delete', |
| 752 | 785 | ) |
| 753 | 786 | ); |
| 787 | + } |
|
| 754 | 788 | |
| 755 | 789 | // For every permission in the own/any lists... |
| 756 | 790 | foreach ($permissions as $type => $list) |
@@ -761,19 +795,22 @@ discard block |
||
| 761 | 795 | $boards = boardsAllowedTo($permission); |
| 762 | 796 | |
| 763 | 797 | // Hmm, they can do it on all boards, can they? |
| 764 | - if (!empty($boards) && $boards[0] == 0) |
|
| 765 | - $boards = array_keys($board_ids[$type]); |
|
| 798 | + if (!empty($boards) && $boards[0] == 0) { |
|
| 799 | + $boards = array_keys($board_ids[$type]); |
|
| 800 | + } |
|
| 766 | 801 | |
| 767 | 802 | // Now go through each board they can do the permission on. |
| 768 | 803 | foreach ($boards as $board_id) |
| 769 | 804 | { |
| 770 | 805 | // There aren't any posts displayed from this board. |
| 771 | - if (!isset($board_ids[$type][$board_id])) |
|
| 772 | - continue; |
|
| 806 | + if (!isset($board_ids[$type][$board_id])) { |
|
| 807 | + continue; |
|
| 808 | + } |
|
| 773 | 809 | |
| 774 | 810 | // Set the permission to true ;). |
| 775 | - foreach ($board_ids[$type][$board_id] as $counter) |
|
| 776 | - $context['posts'][$counter][$allowed] = true; |
|
| 811 | + foreach ($board_ids[$type][$board_id] as $counter) { |
|
| 812 | + $context['posts'][$counter][$allowed] = true; |
|
| 813 | + } |
|
| 777 | 814 | } |
| 778 | 815 | } |
| 779 | 816 | } |
@@ -804,8 +841,9 @@ discard block |
||
| 804 | 841 | $boardsAllowed = boardsAllowedTo('view_attachments'); |
| 805 | 842 | |
| 806 | 843 | // Make sure we can't actually see anything... |
| 807 | - if (empty($boardsAllowed)) |
|
| 808 | - $boardsAllowed = array(-1); |
|
| 844 | + if (empty($boardsAllowed)) { |
|
| 845 | + $boardsAllowed = array(-1); |
|
| 846 | + } |
|
| 809 | 847 | |
| 810 | 848 | require_once($sourcedir . '/Subs-List.php'); |
| 811 | 849 | |
@@ -956,8 +994,8 @@ discard block |
||
| 956 | 994 | ) |
| 957 | 995 | ); |
| 958 | 996 | $attachments = array(); |
| 959 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 960 | - $attachments[] = array( |
|
| 997 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 998 | + $attachments[] = array( |
|
| 961 | 999 | 'id' => $row['id_attach'], |
| 962 | 1000 | 'filename' => $row['filename'], |
| 963 | 1001 | 'downloads' => $row['downloads'], |
@@ -969,6 +1007,7 @@ discard block |
||
| 969 | 1007 | 'board_name' => $row['name'], |
| 970 | 1008 | 'approved' => $row['approved'], |
| 971 | 1009 | ); |
| 1010 | + } |
|
| 972 | 1011 | |
| 973 | 1012 | $smcFunc['db_free_result']($request); |
| 974 | 1013 | |
@@ -1023,8 +1062,9 @@ discard block |
||
| 1023 | 1062 | global $txt, $user_info, $scripturl, $modSettings, $context, $sourcedir; |
| 1024 | 1063 | |
| 1025 | 1064 | // Only the owner can see the list (if the function is enabled of course) |
| 1026 | - if ($user_info['id'] != $memID) |
|
| 1027 | - return; |
|
| 1065 | + if ($user_info['id'] != $memID) { |
|
| 1066 | + return; |
|
| 1067 | + } |
|
| 1028 | 1068 | |
| 1029 | 1069 | require_once($sourcedir . '/Subs-List.php'); |
| 1030 | 1070 | |
@@ -1170,8 +1210,9 @@ discard block |
||
| 1170 | 1210 | ); |
| 1171 | 1211 | |
| 1172 | 1212 | $topics = array(); |
| 1173 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1174 | - $topics[] = $row['id_topic']; |
|
| 1213 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1214 | + $topics[] = $row['id_topic']; |
|
| 1215 | + } |
|
| 1175 | 1216 | |
| 1176 | 1217 | $smcFunc['db_free_result']($request); |
| 1177 | 1218 | |
@@ -1191,8 +1232,9 @@ discard block |
||
| 1191 | 1232 | 'topics' => $topics, |
| 1192 | 1233 | ) |
| 1193 | 1234 | ); |
| 1194 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1195 | - $topicsInfo[] = $row; |
|
| 1235 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1236 | + $topicsInfo[] = $row; |
|
| 1237 | + } |
|
| 1196 | 1238 | $smcFunc['db_free_result']($request); |
| 1197 | 1239 | } |
| 1198 | 1240 | |
@@ -1240,8 +1282,9 @@ discard block |
||
| 1240 | 1282 | $context['page_title'] = $txt['statPanel_showStats'] . ' ' . $user_profile[$memID]['real_name']; |
| 1241 | 1283 | |
| 1242 | 1284 | // Is the load average too high to allow searching just now? |
| 1243 | - if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats']) |
|
| 1244 | - fatal_lang_error('loadavg_userstats_disabled', false); |
|
| 1285 | + if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats']) { |
|
| 1286 | + fatal_lang_error('loadavg_userstats_disabled', false); |
|
| 1287 | + } |
|
| 1245 | 1288 | |
| 1246 | 1289 | // General user statistics. |
| 1247 | 1290 | $timeDays = floor($user_profile[$memID]['total_time_logged_in'] / 86400); |
@@ -1399,11 +1442,13 @@ discard block |
||
| 1399 | 1442 | } |
| 1400 | 1443 | $smcFunc['db_free_result']($result); |
| 1401 | 1444 | |
| 1402 | - if ($maxPosts > 0) |
|
| 1403 | - for ($hour = 0; $hour < 24; $hour++) |
|
| 1445 | + if ($maxPosts > 0) { |
|
| 1446 | + for ($hour = 0; |
|
| 1447 | + } |
|
| 1448 | + $hour < 24; $hour++) |
|
| 1404 | 1449 | { |
| 1405 | - if (!isset($context['posts_by_time'][$hour])) |
|
| 1406 | - $context['posts_by_time'][$hour] = array( |
|
| 1450 | + if (!isset($context['posts_by_time'][$hour])) { |
|
| 1451 | + $context['posts_by_time'][$hour] = array( |
|
| 1407 | 1452 | 'hour' => $hour, |
| 1408 | 1453 | 'hour_format' => stripos($user_info['time_format'], '%p') === false ? $hour : date('g a', mktime($hour)), |
| 1409 | 1454 | 'posts' => 0, |
@@ -1411,7 +1456,7 @@ discard block |
||
| 1411 | 1456 | 'relative_percent' => 0, |
| 1412 | 1457 | 'is_last' => $hour == 23, |
| 1413 | 1458 | ); |
| 1414 | - else |
|
| 1459 | + } else |
|
| 1415 | 1460 | { |
| 1416 | 1461 | $context['posts_by_time'][$hour]['posts_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $realPosts); |
| 1417 | 1462 | $context['posts_by_time'][$hour]['relative_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $maxPosts); |
@@ -1444,8 +1489,9 @@ discard block |
||
| 1444 | 1489 | |
| 1445 | 1490 | foreach ($subActions as $sa => $action) |
| 1446 | 1491 | { |
| 1447 | - if (!allowedTo($action[2])) |
|
| 1448 | - unset($subActions[$sa]); |
|
| 1492 | + if (!allowedTo($action[2])) { |
|
| 1493 | + unset($subActions[$sa]); |
|
| 1494 | + } |
|
| 1449 | 1495 | } |
| 1450 | 1496 | |
| 1451 | 1497 | // Create the tabs for the template. |
@@ -1463,15 +1509,18 @@ discard block |
||
| 1463 | 1509 | ); |
| 1464 | 1510 | |
| 1465 | 1511 | // Moderation must be on to track edits. |
| 1466 | - if (empty($modSettings['userlog_enabled'])) |
|
| 1467 | - unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']); |
|
| 1512 | + if (empty($modSettings['userlog_enabled'])) { |
|
| 1513 | + unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']); |
|
| 1514 | + } |
|
| 1468 | 1515 | |
| 1469 | 1516 | // Group requests must be active to show it... |
| 1470 | - if (empty($modSettings['show_group_membership'])) |
|
| 1471 | - unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']); |
|
| 1517 | + if (empty($modSettings['show_group_membership'])) { |
|
| 1518 | + unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']); |
|
| 1519 | + } |
|
| 1472 | 1520 | |
| 1473 | - if (empty($subActions)) |
|
| 1474 | - fatal_lang_error('no_access', false); |
|
| 1521 | + if (empty($subActions)) { |
|
| 1522 | + fatal_lang_error('no_access', false); |
|
| 1523 | + } |
|
| 1475 | 1524 | |
| 1476 | 1525 | $keys = array_keys($subActions); |
| 1477 | 1526 | $default = array_shift($keys); |
@@ -1484,9 +1533,10 @@ discard block |
||
| 1484 | 1533 | $context['sub_template'] = $subActions[$context['tracking_area']][0]; |
| 1485 | 1534 | $call = call_helper($subActions[$context['tracking_area']][0], true); |
| 1486 | 1535 | |
| 1487 | - if (!empty($call)) |
|
| 1488 | - call_user_func($call, $memID); |
|
| 1489 | -} |
|
| 1536 | + if (!empty($call)) { |
|
| 1537 | + call_user_func($call, $memID); |
|
| 1538 | + } |
|
| 1539 | + } |
|
| 1490 | 1540 | |
| 1491 | 1541 | /** |
| 1492 | 1542 | * Handles tracking a user's activity |
@@ -1502,8 +1552,9 @@ discard block |
||
| 1502 | 1552 | isAllowedTo('moderate_forum'); |
| 1503 | 1553 | |
| 1504 | 1554 | $context['last_ip'] = $user_profile[$memID]['member_ip']; |
| 1505 | - if ($context['last_ip'] != $user_profile[$memID]['member_ip2']) |
|
| 1506 | - $context['last_ip2'] = $user_profile[$memID]['member_ip2']; |
|
| 1555 | + if ($context['last_ip'] != $user_profile[$memID]['member_ip2']) { |
|
| 1556 | + $context['last_ip2'] = $user_profile[$memID]['member_ip2']; |
|
| 1557 | + } |
|
| 1507 | 1558 | $context['member']['name'] = $user_profile[$memID]['real_name']; |
| 1508 | 1559 | |
| 1509 | 1560 | // Set the options for the list component. |
@@ -1669,8 +1720,9 @@ discard block |
||
| 1669 | 1720 | ) |
| 1670 | 1721 | ); |
| 1671 | 1722 | $message_members = array(); |
| 1672 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1673 | - $message_members[] = $row['id_member']; |
|
| 1723 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1724 | + $message_members[] = $row['id_member']; |
|
| 1725 | + } |
|
| 1674 | 1726 | $smcFunc['db_free_result']($request); |
| 1675 | 1727 | |
| 1676 | 1728 | // Fetch their names, cause of the GROUP BY doesn't like giving us that normally. |
@@ -1685,8 +1737,9 @@ discard block |
||
| 1685 | 1737 | 'ip_list' => $ips, |
| 1686 | 1738 | ) |
| 1687 | 1739 | ); |
| 1688 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1689 | - $context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>'; |
|
| 1740 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1741 | + $context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>'; |
|
| 1742 | + } |
|
| 1690 | 1743 | $smcFunc['db_free_result']($request); |
| 1691 | 1744 | } |
| 1692 | 1745 | |
@@ -1700,8 +1753,9 @@ discard block |
||
| 1700 | 1753 | 'ip_list' => $ips, |
| 1701 | 1754 | ) |
| 1702 | 1755 | ); |
| 1703 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1704 | - $context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>'; |
|
| 1756 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1757 | + $context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>'; |
|
| 1758 | + } |
|
| 1705 | 1759 | $smcFunc['db_free_result']($request); |
| 1706 | 1760 | } |
| 1707 | 1761 | } |
@@ -1761,8 +1815,8 @@ discard block |
||
| 1761 | 1815 | )) |
| 1762 | 1816 | ); |
| 1763 | 1817 | $error_messages = array(); |
| 1764 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1765 | - $error_messages[] = array( |
|
| 1818 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1819 | + $error_messages[] = array( |
|
| 1766 | 1820 | 'ip' => inet_dtop($row['ip']), |
| 1767 | 1821 | 'member_link' => $row['id_member'] > 0 ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>' : $row['display_name'], |
| 1768 | 1822 | 'message' => strtr($row['message'], array('<span class="remove">' => '', '</span>' => '')), |
@@ -1770,6 +1824,7 @@ discard block |
||
| 1770 | 1824 | 'time' => timeformat($row['log_time']), |
| 1771 | 1825 | 'timestamp' => forum_time(true, $row['log_time']), |
| 1772 | 1826 | ); |
| 1827 | + } |
|
| 1773 | 1828 | $smcFunc['db_free_result']($request); |
| 1774 | 1829 | |
| 1775 | 1830 | return $error_messages; |
@@ -1832,8 +1887,8 @@ discard block |
||
| 1832 | 1887 | )) |
| 1833 | 1888 | ); |
| 1834 | 1889 | $messages = array(); |
| 1835 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1836 | - $messages[] = array( |
|
| 1890 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1891 | + $messages[] = array( |
|
| 1837 | 1892 | 'ip' => inet_dtop($row['poster_ip']), |
| 1838 | 1893 | 'member_link' => empty($row['id_member']) ? $row['display_name'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>', |
| 1839 | 1894 | 'board' => array( |
@@ -1846,6 +1901,7 @@ discard block |
||
| 1846 | 1901 | 'time' => timeformat($row['poster_time']), |
| 1847 | 1902 | 'timestamp' => forum_time(true, $row['poster_time']) |
| 1848 | 1903 | ); |
| 1904 | + } |
|
| 1849 | 1905 | $smcFunc['db_free_result']($request); |
| 1850 | 1906 | |
| 1851 | 1907 | return $messages; |
@@ -1872,19 +1928,20 @@ discard block |
||
| 1872 | 1928 | $context['sub_template'] = 'trackIP'; |
| 1873 | 1929 | $context['page_title'] = $txt['profile']; |
| 1874 | 1930 | $context['base_url'] = $scripturl . '?action=trackip'; |
| 1875 | - } |
|
| 1876 | - else |
|
| 1931 | + } else |
|
| 1877 | 1932 | { |
| 1878 | 1933 | $context['ip'] = $user_profile[$memID]['member_ip']; |
| 1879 | 1934 | $context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID; |
| 1880 | 1935 | } |
| 1881 | 1936 | |
| 1882 | 1937 | // Searching? |
| 1883 | - if (isset($_REQUEST['searchip'])) |
|
| 1884 | - $context['ip'] = trim($_REQUEST['searchip']); |
|
| 1938 | + if (isset($_REQUEST['searchip'])) { |
|
| 1939 | + $context['ip'] = trim($_REQUEST['searchip']); |
|
| 1940 | + } |
|
| 1885 | 1941 | |
| 1886 | - if (isValidIP($context['ip']) === false) |
|
| 1887 | - fatal_lang_error('invalid_tracking_ip', false); |
|
| 1942 | + if (isValidIP($context['ip']) === false) { |
|
| 1943 | + fatal_lang_error('invalid_tracking_ip', false); |
|
| 1944 | + } |
|
| 1888 | 1945 | |
| 1889 | 1946 | //mysql didn't support like search with varbinary |
| 1890 | 1947 | //$ip_var = str_replace('*', '%', $context['ip']); |
@@ -1892,8 +1949,9 @@ discard block |
||
| 1892 | 1949 | $ip_var = $context['ip']; |
| 1893 | 1950 | $ip_string = '= {inet:ip_address}'; |
| 1894 | 1951 | |
| 1895 | - if (empty($context['tracking_area'])) |
|
| 1896 | - $context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip']; |
|
| 1952 | + if (empty($context['tracking_area'])) { |
|
| 1953 | + $context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip']; |
|
| 1954 | + } |
|
| 1897 | 1955 | |
| 1898 | 1956 | $request = $smcFunc['db_query']('', ' |
| 1899 | 1957 | SELECT id_member, real_name AS display_name, member_ip |
@@ -1904,8 +1962,9 @@ discard block |
||
| 1904 | 1962 | ) |
| 1905 | 1963 | ); |
| 1906 | 1964 | $context['ips'] = array(); |
| 1907 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1908 | - $context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>'; |
|
| 1965 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1966 | + $context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>'; |
|
| 1967 | + } |
|
| 1909 | 1968 | $smcFunc['db_free_result']($request); |
| 1910 | 1969 | |
| 1911 | 1970 | ksort($context['ips']); |
@@ -2134,8 +2193,9 @@ discard block |
||
| 2134 | 2193 | foreach ($context['whois_servers'] as $whois) |
| 2135 | 2194 | { |
| 2136 | 2195 | // Strip off the "decimal point" and anything following... |
| 2137 | - if (in_array((int) $context['ip'], $whois['range'])) |
|
| 2138 | - $context['auto_whois_server'] = $whois; |
|
| 2196 | + if (in_array((int) $context['ip'], $whois['range'])) { |
|
| 2197 | + $context['auto_whois_server'] = $whois; |
|
| 2198 | + } |
|
| 2139 | 2199 | } |
| 2140 | 2200 | } |
| 2141 | 2201 | } |
@@ -2152,10 +2212,11 @@ discard block |
||
| 2152 | 2212 | // Gonna want this for the list. |
| 2153 | 2213 | require_once($sourcedir . '/Subs-List.php'); |
| 2154 | 2214 | |
| 2155 | - if ($memID == 0) |
|
| 2156 | - $context['base_url'] = $scripturl . '?action=trackip'; |
|
| 2157 | - else |
|
| 2158 | - $context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID; |
|
| 2215 | + if ($memID == 0) { |
|
| 2216 | + $context['base_url'] = $scripturl . '?action=trackip'; |
|
| 2217 | + } else { |
|
| 2218 | + $context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID; |
|
| 2219 | + } |
|
| 2159 | 2220 | |
| 2160 | 2221 | // Start with the user messages. |
| 2161 | 2222 | $listOptions = array( |
@@ -2265,12 +2326,13 @@ discard block |
||
| 2265 | 2326 | ) |
| 2266 | 2327 | ); |
| 2267 | 2328 | $logins = array(); |
| 2268 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 2269 | - $logins[] = array( |
|
| 2329 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 2330 | + $logins[] = array( |
|
| 2270 | 2331 | 'time' => timeformat($row['time']), |
| 2271 | 2332 | 'ip' => inet_dtop($row['ip']), |
| 2272 | 2333 | 'ip2' => inet_dtop($row['ip2']), |
| 2273 | 2334 | ); |
| 2335 | + } |
|
| 2274 | 2336 | $smcFunc['db_free_result']($request); |
| 2275 | 2337 | |
| 2276 | 2338 | return $logins; |
@@ -2295,11 +2357,12 @@ discard block |
||
| 2295 | 2357 | ) |
| 2296 | 2358 | ); |
| 2297 | 2359 | $context['custom_field_titles'] = array(); |
| 2298 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 2299 | - $context['custom_field_titles']['customfield_' . $row['col_name']] = array( |
|
| 2360 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 2361 | + $context['custom_field_titles']['customfield_' . $row['col_name']] = array( |
|
| 2300 | 2362 | 'title' => $row['field_name'], |
| 2301 | 2363 | 'parse_bbc' => $row['bbc'], |
| 2302 | 2364 | ); |
| 2365 | + } |
|
| 2303 | 2366 | $smcFunc['db_free_result']($request); |
| 2304 | 2367 | |
| 2305 | 2368 | // Set the options for the error lists. |
@@ -2438,19 +2501,22 @@ discard block |
||
| 2438 | 2501 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 2439 | 2502 | { |
| 2440 | 2503 | $extra = smf_json_decode($row['extra'], true); |
| 2441 | - if (!empty($extra['applicator'])) |
|
| 2442 | - $members[] = $extra['applicator']; |
|
| 2504 | + if (!empty($extra['applicator'])) { |
|
| 2505 | + $members[] = $extra['applicator']; |
|
| 2506 | + } |
|
| 2443 | 2507 | |
| 2444 | 2508 | // Work out what the name of the action is. |
| 2445 | - if (isset($txt['trackEdit_action_' . $row['action']])) |
|
| 2446 | - $action_text = $txt['trackEdit_action_' . $row['action']]; |
|
| 2447 | - elseif (isset($txt[$row['action']])) |
|
| 2448 | - $action_text = $txt[$row['action']]; |
|
| 2509 | + if (isset($txt['trackEdit_action_' . $row['action']])) { |
|
| 2510 | + $action_text = $txt['trackEdit_action_' . $row['action']]; |
|
| 2511 | + } elseif (isset($txt[$row['action']])) { |
|
| 2512 | + $action_text = $txt[$row['action']]; |
|
| 2513 | + } |
|
| 2449 | 2514 | // Custom field? |
| 2450 | - elseif (isset($context['custom_field_titles'][$row['action']])) |
|
| 2451 | - $action_text = $context['custom_field_titles'][$row['action']]['title']; |
|
| 2452 | - else |
|
| 2453 | - $action_text = $row['action']; |
|
| 2515 | + elseif (isset($context['custom_field_titles'][$row['action']])) { |
|
| 2516 | + $action_text = $context['custom_field_titles'][$row['action']]['title']; |
|
| 2517 | + } else { |
|
| 2518 | + $action_text = $row['action']; |
|
| 2519 | + } |
|
| 2454 | 2520 | |
| 2455 | 2521 | // Parse BBC? |
| 2456 | 2522 | $parse_bbc = isset($context['custom_field_titles'][$row['action']]) && $context['custom_field_titles'][$row['action']]['parse_bbc'] ? true : false; |
@@ -2482,13 +2548,15 @@ discard block |
||
| 2482 | 2548 | ) |
| 2483 | 2549 | ); |
| 2484 | 2550 | $members = array(); |
| 2485 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 2486 | - $members[$row['id_member']] = $row['real_name']; |
|
| 2551 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 2552 | + $members[$row['id_member']] = $row['real_name']; |
|
| 2553 | + } |
|
| 2487 | 2554 | $smcFunc['db_free_result']($request); |
| 2488 | 2555 | |
| 2489 | - foreach ($edits as $key => $value) |
|
| 2490 | - if (isset($members[$value['id_member']])) |
|
| 2556 | + foreach ($edits as $key => $value) { |
|
| 2557 | + if (isset($members[$value['id_member']])) |
|
| 2491 | 2558 | $edits[$key]['member_link'] = '<a href="' . $scripturl . '?action=profile;u=' . $value['id_member'] . '">' . $members[$value['id_member']] . '</a>'; |
| 2559 | + } |
|
| 2492 | 2560 | } |
| 2493 | 2561 | |
| 2494 | 2562 | return $edits; |
@@ -2689,10 +2757,11 @@ discard block |
||
| 2689 | 2757 | $context['board'] = $board; |
| 2690 | 2758 | |
| 2691 | 2759 | // Determine which groups this user is in. |
| 2692 | - if (empty($user_profile[$memID]['additional_groups'])) |
|
| 2693 | - $curGroups = array(); |
|
| 2694 | - else |
|
| 2695 | - $curGroups = explode(',', $user_profile[$memID]['additional_groups']); |
|
| 2760 | + if (empty($user_profile[$memID]['additional_groups'])) { |
|
| 2761 | + $curGroups = array(); |
|
| 2762 | + } else { |
|
| 2763 | + $curGroups = explode(',', $user_profile[$memID]['additional_groups']); |
|
| 2764 | + } |
|
| 2696 | 2765 | $curGroups[] = $user_profile[$memID]['id_group']; |
| 2697 | 2766 | $curGroups[] = $user_profile[$memID]['id_post_group']; |
| 2698 | 2767 | |
@@ -2712,28 +2781,30 @@ discard block |
||
| 2712 | 2781 | $context['no_access_boards'] = array(); |
| 2713 | 2782 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 2714 | 2783 | { |
| 2715 | - if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod']) |
|
| 2716 | - $context['no_access_boards'][] = array( |
|
| 2784 | + if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod']) { |
|
| 2785 | + $context['no_access_boards'][] = array( |
|
| 2717 | 2786 | 'id' => $row['id_board'], |
| 2718 | 2787 | 'name' => $row['name'], |
| 2719 | 2788 | 'is_last' => false, |
| 2720 | 2789 | ); |
| 2721 | - elseif ($row['id_profile'] != 1 || $row['is_mod']) |
|
| 2722 | - $context['boards'][$row['id_board']] = array( |
|
| 2790 | + } elseif ($row['id_profile'] != 1 || $row['is_mod']) { |
|
| 2791 | + $context['boards'][$row['id_board']] = array( |
|
| 2723 | 2792 | 'id' => $row['id_board'], |
| 2724 | 2793 | 'name' => $row['name'], |
| 2725 | 2794 | 'selected' => $board == $row['id_board'], |
| 2726 | 2795 | 'profile' => $row['id_profile'], |
| 2727 | 2796 | 'profile_name' => $context['profiles'][$row['id_profile']]['name'], |
| 2728 | 2797 | ); |
| 2798 | + } |
|
| 2729 | 2799 | } |
| 2730 | 2800 | $smcFunc['db_free_result']($request); |
| 2731 | 2801 | |
| 2732 | 2802 | require_once($sourcedir . '/Subs-Boards.php'); |
| 2733 | 2803 | sortBoards($context['boards']); |
| 2734 | 2804 | |
| 2735 | - if (!empty($context['no_access_boards'])) |
|
| 2736 | - $context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true; |
|
| 2805 | + if (!empty($context['no_access_boards'])) { |
|
| 2806 | + $context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true; |
|
| 2807 | + } |
|
| 2737 | 2808 | |
| 2738 | 2809 | $context['member']['permissions'] = array( |
| 2739 | 2810 | 'general' => array(), |
@@ -2742,8 +2813,9 @@ discard block |
||
| 2742 | 2813 | |
| 2743 | 2814 | // If you're an admin we know you can do everything, we might as well leave. |
| 2744 | 2815 | $context['member']['has_all_permissions'] = in_array(1, $curGroups); |
| 2745 | - if ($context['member']['has_all_permissions']) |
|
| 2746 | - return; |
|
| 2816 | + if ($context['member']['has_all_permissions']) { |
|
| 2817 | + return; |
|
| 2818 | + } |
|
| 2747 | 2819 | |
| 2748 | 2820 | $denied = array(); |
| 2749 | 2821 | |
@@ -2762,21 +2834,24 @@ discard block |
||
| 2762 | 2834 | while ($row = $smcFunc['db_fetch_assoc']($result)) |
| 2763 | 2835 | { |
| 2764 | 2836 | // We don't know about this permission, it doesn't exist :P. |
| 2765 | - if (!isset($txt['permissionname_' . $row['permission']])) |
|
| 2766 | - continue; |
|
| 2837 | + if (!isset($txt['permissionname_' . $row['permission']])) { |
|
| 2838 | + continue; |
|
| 2839 | + } |
|
| 2767 | 2840 | |
| 2768 | - if (empty($row['add_deny'])) |
|
| 2769 | - $denied[] = $row['permission']; |
|
| 2841 | + if (empty($row['add_deny'])) { |
|
| 2842 | + $denied[] = $row['permission']; |
|
| 2843 | + } |
|
| 2770 | 2844 | |
| 2771 | 2845 | // Permissions that end with _own or _any consist of two parts. |
| 2772 | - if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) |
|
| 2773 | - $name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']]; |
|
| 2774 | - else |
|
| 2775 | - $name = $txt['permissionname_' . $row['permission']]; |
|
| 2846 | + if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) { |
|
| 2847 | + $name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']]; |
|
| 2848 | + } else { |
|
| 2849 | + $name = $txt['permissionname_' . $row['permission']]; |
|
| 2850 | + } |
|
| 2776 | 2851 | |
| 2777 | 2852 | // Add this permission if it doesn't exist yet. |
| 2778 | - if (!isset($context['member']['permissions']['general'][$row['permission']])) |
|
| 2779 | - $context['member']['permissions']['general'][$row['permission']] = array( |
|
| 2853 | + if (!isset($context['member']['permissions']['general'][$row['permission']])) { |
|
| 2854 | + $context['member']['permissions']['general'][$row['permission']] = array( |
|
| 2780 | 2855 | 'id' => $row['permission'], |
| 2781 | 2856 | 'groups' => array( |
| 2782 | 2857 | 'allowed' => array(), |
@@ -2786,6 +2861,7 @@ discard block |
||
| 2786 | 2861 | 'is_denied' => false, |
| 2787 | 2862 | 'is_global' => true, |
| 2788 | 2863 | ); |
| 2864 | + } |
|
| 2789 | 2865 | |
| 2790 | 2866 | // Add the membergroup to either the denied or the allowed groups. |
| 2791 | 2867 | $context['member']['permissions']['general'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name']; |
@@ -2819,18 +2895,20 @@ discard block |
||
| 2819 | 2895 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 2820 | 2896 | { |
| 2821 | 2897 | // We don't know about this permission, it doesn't exist :P. |
| 2822 | - if (!isset($txt['permissionname_' . $row['permission']])) |
|
| 2823 | - continue; |
|
| 2898 | + if (!isset($txt['permissionname_' . $row['permission']])) { |
|
| 2899 | + continue; |
|
| 2900 | + } |
|
| 2824 | 2901 | |
| 2825 | 2902 | // The name of the permission using the format 'permission name' - 'own/any topic/event/etc.'. |
| 2826 | - if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) |
|
| 2827 | - $name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']]; |
|
| 2828 | - else |
|
| 2829 | - $name = $txt['permissionname_' . $row['permission']]; |
|
| 2903 | + if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) { |
|
| 2904 | + $name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']]; |
|
| 2905 | + } else { |
|
| 2906 | + $name = $txt['permissionname_' . $row['permission']]; |
|
| 2907 | + } |
|
| 2830 | 2908 | |
| 2831 | 2909 | // Create the structure for this permission. |
| 2832 | - if (!isset($context['member']['permissions']['board'][$row['permission']])) |
|
| 2833 | - $context['member']['permissions']['board'][$row['permission']] = array( |
|
| 2910 | + if (!isset($context['member']['permissions']['board'][$row['permission']])) { |
|
| 2911 | + $context['member']['permissions']['board'][$row['permission']] = array( |
|
| 2834 | 2912 | 'id' => $row['permission'], |
| 2835 | 2913 | 'groups' => array( |
| 2836 | 2914 | 'allowed' => array(), |
@@ -2840,6 +2918,7 @@ discard block |
||
| 2840 | 2918 | 'is_denied' => false, |
| 2841 | 2919 | 'is_global' => empty($board), |
| 2842 | 2920 | ); |
| 2921 | + } |
|
| 2843 | 2922 | |
| 2844 | 2923 | $context['member']['permissions']['board'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][$row['id_group']] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name']; |
| 2845 | 2924 | |
@@ -2858,8 +2937,9 @@ discard block |
||
| 2858 | 2937 | global $modSettings, $context, $sourcedir, $txt, $scripturl; |
| 2859 | 2938 | |
| 2860 | 2939 | // Firstly, can we actually even be here? |
| 2861 | - if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum')) |
|
| 2862 | - fatal_lang_error('no_access', false); |
|
| 2940 | + if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum')) { |
|
| 2941 | + fatal_lang_error('no_access', false); |
|
| 2942 | + } |
|
| 2863 | 2943 | |
| 2864 | 2944 | // Make sure things which are disabled stay disabled. |
| 2865 | 2945 | $modSettings['warning_watch'] = !empty($modSettings['warning_watch']) ? $modSettings['warning_watch'] : 110; |
@@ -2946,9 +3026,10 @@ discard block |
||
| 2946 | 3026 | $modSettings['warning_mute'] => $txt['profile_warning_effect_own_muted'], |
| 2947 | 3027 | ); |
| 2948 | 3028 | $context['current_level'] = 0; |
| 2949 | - foreach ($context['level_effects'] as $limit => $dummy) |
|
| 2950 | - if ($context['member']['warning'] >= $limit) |
|
| 3029 | + foreach ($context['level_effects'] as $limit => $dummy) { |
|
| 3030 | + if ($context['member']['warning'] >= $limit) |
|
| 2951 | 3031 | $context['current_level'] = $limit; |
| 2952 | -} |
|
| 3032 | + } |
|
| 3033 | + } |
|
| 2953 | 3034 | |
| 2954 | 3035 | ?> |
| 2955 | 3036 | \ No newline at end of file |