@@ -15,8 +15,9 @@ discard block |
||
15 | 15 | * @version 2.1 Beta 4 |
16 | 16 | */ |
17 | 17 | |
18 | -if (!defined('SMF')) |
|
18 | +if (!defined('SMF')) { |
|
19 | 19 | die('No direct access...'); |
20 | +} |
|
20 | 21 | |
21 | 22 | /** |
22 | 23 | * This helps organize things... |
@@ -37,13 +38,14 @@ discard block |
||
37 | 38 | |
38 | 39 | loadLanguage('PersonalMessage+Drafts'); |
39 | 40 | |
40 | - if (!isset($_REQUEST['xml'])) |
|
41 | - loadTemplate('PersonalMessage'); |
|
41 | + if (!isset($_REQUEST['xml'])) { |
|
42 | + loadTemplate('PersonalMessage'); |
|
43 | + } |
|
42 | 44 | |
43 | 45 | // Load up the members maximum message capacity. |
44 | - if ($user_info['is_admin']) |
|
45 | - $context['message_limit'] = 0; |
|
46 | - elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null) |
|
46 | + if ($user_info['is_admin']) { |
|
47 | + $context['message_limit'] = 0; |
|
48 | + } elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null) |
|
47 | 49 | { |
48 | 50 | // @todo Why do we do this? It seems like if they have any limit we should use it. |
49 | 51 | $request = $smcFunc['db_query']('', ' |
@@ -78,8 +80,9 @@ discard block |
||
78 | 80 | } |
79 | 81 | |
80 | 82 | // a previous message was sent successfully? show a small indication. |
81 | - if (isset($_GET['done']) && ($_GET['done'] == 'sent')) |
|
82 | - $context['pm_sent'] = true; |
|
83 | + if (isset($_GET['done']) && ($_GET['done'] == 'sent')) { |
|
84 | + $context['pm_sent'] = true; |
|
85 | + } |
|
83 | 86 | |
84 | 87 | $context['labels'] = array(); |
85 | 88 | |
@@ -210,11 +213,11 @@ discard block |
||
210 | 213 | { |
211 | 214 | $_REQUEST['sa'] = ''; |
212 | 215 | MessageFolder(); |
213 | - } |
|
214 | - else |
|
216 | + } else |
|
215 | 217 | { |
216 | - if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup') |
|
217 | - messageIndexBar($_REQUEST['sa']); |
|
218 | + if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup') { |
|
219 | + messageIndexBar($_REQUEST['sa']); |
|
220 | + } |
|
218 | 221 | |
219 | 222 | call_helper($subActions[$_REQUEST['sa']]); |
220 | 223 | } |
@@ -297,15 +300,16 @@ discard block |
||
297 | 300 | ); |
298 | 301 | |
299 | 302 | // Handle labels. |
300 | - if (empty($context['currently_using_labels'])) |
|
301 | - unset($pm_areas['labels']); |
|
302 | - else |
|
303 | + if (empty($context['currently_using_labels'])) { |
|
304 | + unset($pm_areas['labels']); |
|
305 | + } else |
|
303 | 306 | { |
304 | 307 | // Note we send labels by id as it will have less problems in the querystring. |
305 | 308 | foreach ($context['labels'] as $label) |
306 | 309 | { |
307 | - if ($label['id'] == -1) |
|
308 | - continue; |
|
310 | + if ($label['id'] == -1) { |
|
311 | + continue; |
|
312 | + } |
|
309 | 313 | |
310 | 314 | // Count the amount of unread items in labels. |
311 | 315 | $pm_areas['labels']['amt'] += $label['unread_messages']; |
@@ -356,8 +360,9 @@ discard block |
||
356 | 360 | unset($pm_areas); |
357 | 361 | |
358 | 362 | // No menu means no access. |
359 | - if (!$pm_include_data && (!$user_info['is_guest'] || validateSession())) |
|
360 | - fatal_lang_error('no_access', false); |
|
363 | + if (!$pm_include_data && (!$user_info['is_guest'] || validateSession())) { |
|
364 | + fatal_lang_error('no_access', false); |
|
365 | + } |
|
361 | 366 | |
362 | 367 | // Make a note of the Unique ID for this menu. |
363 | 368 | $context['pm_menu_id'] = $context['max_menu_id']; |
@@ -368,9 +373,10 @@ discard block |
||
368 | 373 | $context['menu_item_selected'] = $current_area; |
369 | 374 | |
370 | 375 | // Set the template for this area and add the profile layer. |
371 | - if (!isset($_REQUEST['xml'])) |
|
372 | - $context['template_layers'][] = 'pm'; |
|
373 | -} |
|
376 | + if (!isset($_REQUEST['xml'])) { |
|
377 | + $context['template_layers'][] = 'pm'; |
|
378 | + } |
|
379 | + } |
|
374 | 380 | |
375 | 381 | /** |
376 | 382 | * The popup for when we ask for the popup from the user. |
@@ -402,8 +408,9 @@ discard block |
||
402 | 408 | ) |
403 | 409 | ); |
404 | 410 | $pms = array(); |
405 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
406 | - $pms[] = $row[0]; |
|
411 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
412 | + $pms[] = $row[0]; |
|
413 | + } |
|
407 | 414 | $smcFunc['db_free_result']($request); |
408 | 415 | |
409 | 416 | if (!empty($pms)) |
@@ -431,8 +438,9 @@ discard block |
||
431 | 438 | ); |
432 | 439 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
433 | 440 | { |
434 | - if (!empty($row['id_member_from'])) |
|
435 | - $senders[] = $row['id_member_from']; |
|
441 | + if (!empty($row['id_member_from'])) { |
|
442 | + $senders[] = $row['id_member_from']; |
|
443 | + } |
|
436 | 444 | |
437 | 445 | $row['replied_to_you'] = $row['id_pm'] != $row['id_pm_head']; |
438 | 446 | $row['time'] = timeformat($row['timestamp']); |
@@ -442,13 +450,15 @@ discard block |
||
442 | 450 | $smcFunc['db_free_result']($request); |
443 | 451 | |
444 | 452 | $senders = loadMemberData($senders); |
445 | - foreach ($senders as $member) |
|
446 | - loadMemberContext($member); |
|
453 | + foreach ($senders as $member) { |
|
454 | + loadMemberContext($member); |
|
455 | + } |
|
447 | 456 | |
448 | 457 | // Having loaded everyone, attach them to the PMs. |
449 | - foreach ($context['unread_pms'] as $id_pm => $details) |
|
450 | - if (!empty($memberContext[$details['id_member_from']])) |
|
458 | + foreach ($context['unread_pms'] as $id_pm => $details) { |
|
459 | + if (!empty($memberContext[$details['id_member_from']])) |
|
451 | 460 | $context['unread_pms'][$id_pm]['member'] = &$memberContext[$details['id_member_from']]; |
461 | + } |
|
452 | 462 | } |
453 | 463 | } |
454 | 464 | |
@@ -468,12 +478,13 @@ discard block |
||
468 | 478 | } |
469 | 479 | |
470 | 480 | // Make sure the starting location is valid. |
471 | - if (isset($_GET['start']) && $_GET['start'] != 'new') |
|
472 | - $_GET['start'] = (int) $_GET['start']; |
|
473 | - elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first'])) |
|
474 | - $_GET['start'] = 0; |
|
475 | - else |
|
476 | - $_GET['start'] = 'new'; |
|
481 | + if (isset($_GET['start']) && $_GET['start'] != 'new') { |
|
482 | + $_GET['start'] = (int) $_GET['start']; |
|
483 | + } elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first'])) { |
|
484 | + $_GET['start'] = 0; |
|
485 | + } else { |
|
486 | + $_GET['start'] = 'new'; |
|
487 | + } |
|
477 | 488 | |
478 | 489 | // Set up some basic theme stuff. |
479 | 490 | $context['from_or_to'] = $context['folder'] != 'sent' ? 'from' : 'to'; |
@@ -487,9 +498,10 @@ discard block |
||
487 | 498 | list ($sig_limits, $sig_bbc) = explode(':', $modSettings['signature_settings']); |
488 | 499 | $sig_limits = explode(',', $sig_limits); |
489 | 500 | |
490 | - if (!empty($sig_limits[5]) || !empty($sig_limits[6])) |
|
491 | - addInlineCss(' |
|
501 | + if (!empty($sig_limits[5]) || !empty($sig_limits[6])) { |
|
502 | + addInlineCss(' |
|
492 | 503 | .signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}'); |
504 | + } |
|
493 | 505 | } |
494 | 506 | |
495 | 507 | $labelJoin = ''; |
@@ -501,8 +513,7 @@ discard block |
||
501 | 513 | { |
502 | 514 | $labelQuery = ' |
503 | 515 | AND pmr.in_inbox = 1'; |
504 | - } |
|
505 | - elseif ($context['folder'] != 'sent') |
|
516 | + } elseif ($context['folder'] != 'sent') |
|
506 | 517 | { |
507 | 518 | $labelJoin = ' |
508 | 519 | INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pmr.id_pm)'; |
@@ -544,22 +555,24 @@ discard block |
||
544 | 555 | $txt['delete_all'] = str_replace('PMBOX', $pmbox, $txt['delete_all']); |
545 | 556 | |
546 | 557 | // Now, build the link tree! |
547 | - if ($context['current_label_id'] == -1) |
|
548 | - $context['linktree'][] = array( |
|
558 | + if ($context['current_label_id'] == -1) { |
|
559 | + $context['linktree'][] = array( |
|
549 | 560 | 'url' => $scripturl . '?action=pm;f=' . $context['folder'], |
550 | 561 | 'name' => $pmbox |
551 | 562 | ); |
563 | + } |
|
552 | 564 | |
553 | 565 | // Build it further for a label. |
554 | - if ($context['current_label_id'] != -1) |
|
555 | - $context['linktree'][] = array( |
|
566 | + if ($context['current_label_id'] != -1) { |
|
567 | + $context['linktree'][] = array( |
|
556 | 568 | 'url' => $scripturl . '?action=pm;f=' . $context['folder'] . ';l=' . $context['current_label_id'], |
557 | 569 | 'name' => $txt['pm_current_label'] . ': ' . $context['current_label'] |
558 | 570 | ); |
571 | + } |
|
559 | 572 | |
560 | 573 | // Figure out how many messages there are. |
561 | - if ($context['folder'] == 'sent') |
|
562 | - $request = $smcFunc['db_query']('', ' |
|
574 | + if ($context['folder'] == 'sent') { |
|
575 | + $request = $smcFunc['db_query']('', ' |
|
563 | 576 | SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ') |
564 | 577 | FROM {db_prefix}personal_messages AS pm |
565 | 578 | WHERE pm.id_member_from = {int:current_member} |
@@ -569,8 +582,8 @@ discard block |
||
569 | 582 | 'not_deleted' => 0, |
570 | 583 | ) |
571 | 584 | ); |
572 | - else |
|
573 | - $request = $smcFunc['db_query']('', ' |
|
585 | + } else { |
|
586 | + $request = $smcFunc['db_query']('', ' |
|
574 | 587 | SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ') |
575 | 588 | FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? ' |
576 | 589 | INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . ' |
@@ -581,6 +594,7 @@ discard block |
||
581 | 594 | 'not_deleted' => 0, |
582 | 595 | ) |
583 | 596 | ); |
597 | + } |
|
584 | 598 | list ($max_messages) = $smcFunc['db_fetch_row']($request); |
585 | 599 | $smcFunc['db_free_result']($request); |
586 | 600 | |
@@ -589,10 +603,11 @@ discard block |
||
589 | 603 | $maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages']; |
590 | 604 | |
591 | 605 | // Start on the last page. |
592 | - if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages) |
|
593 | - $_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage); |
|
594 | - elseif ($_GET['start'] < 0) |
|
595 | - $_GET['start'] = 0; |
|
606 | + if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages) { |
|
607 | + $_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage); |
|
608 | + } elseif ($_GET['start'] < 0) { |
|
609 | + $_GET['start'] = 0; |
|
610 | + } |
|
596 | 611 | |
597 | 612 | // ... but wait - what if we want to start from a specific message? |
598 | 613 | if (isset($_GET['pmid'])) |
@@ -600,19 +615,21 @@ discard block |
||
600 | 615 | $pmID = (int) $_GET['pmid']; |
601 | 616 | |
602 | 617 | // Make sure you have access to this PM. |
603 | - if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) |
|
604 | - fatal_lang_error('no_access', false); |
|
618 | + if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) { |
|
619 | + fatal_lang_error('no_access', false); |
|
620 | + } |
|
605 | 621 | |
606 | 622 | $context['current_pm'] = $pmID; |
607 | 623 | |
608 | 624 | // With only one page of PM's we're gonna want page 1. |
609 | - if ($max_messages <= $maxPerPage) |
|
610 | - $_GET['start'] = 0; |
|
625 | + if ($max_messages <= $maxPerPage) { |
|
626 | + $_GET['start'] = 0; |
|
627 | + } |
|
611 | 628 | // If we pass kstart we assume we're in the right place. |
612 | 629 | elseif (!isset($_GET['kstart'])) |
613 | 630 | { |
614 | - if ($context['folder'] == 'sent') |
|
615 | - $request = $smcFunc['db_query']('', ' |
|
631 | + if ($context['folder'] == 'sent') { |
|
632 | + $request = $smcFunc['db_query']('', ' |
|
616 | 633 | SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ') |
617 | 634 | FROM {db_prefix}personal_messages |
618 | 635 | WHERE id_member_from = {int:current_member} |
@@ -624,8 +641,8 @@ discard block |
||
624 | 641 | 'id_pm' => $pmID, |
625 | 642 | ) |
626 | 643 | ); |
627 | - else |
|
628 | - $request = $smcFunc['db_query']('', ' |
|
644 | + } else { |
|
645 | + $request = $smcFunc['db_query']('', ' |
|
629 | 646 | SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ') |
630 | 647 | FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? ' |
631 | 648 | INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . ' |
@@ -638,6 +655,7 @@ discard block |
||
638 | 655 | 'id_pm' => $pmID, |
639 | 656 | ) |
640 | 657 | ); |
658 | + } |
|
641 | 659 | |
642 | 660 | list ($_GET['start']) = $smcFunc['db_fetch_row']($request); |
643 | 661 | $smcFunc['db_free_result']($request); |
@@ -652,8 +670,9 @@ discard block |
||
652 | 670 | { |
653 | 671 | $pmsg = (int) $_GET['pmsg']; |
654 | 672 | |
655 | - if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) |
|
656 | - fatal_lang_error('no_access', false); |
|
673 | + if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) { |
|
674 | + fatal_lang_error('no_access', false); |
|
675 | + } |
|
657 | 676 | } |
658 | 677 | |
659 | 678 | // Set up the page index. |
@@ -747,8 +766,9 @@ discard block |
||
747 | 766 | { |
748 | 767 | if (!isset($recipients[$row['id_pm']])) |
749 | 768 | { |
750 | - if (isset($row['id_member_from'])) |
|
751 | - $posters[$row['id_pm']] = $row['id_member_from']; |
|
769 | + if (isset($row['id_member_from'])) { |
|
770 | + $posters[$row['id_pm']] = $row['id_member_from']; |
|
771 | + } |
|
752 | 772 | $pms[$row['id_pm']] = $row['id_pm']; |
753 | 773 | $recipients[$row['id_pm']] = array( |
754 | 774 | 'to' => array(), |
@@ -757,29 +777,33 @@ discard block |
||
757 | 777 | } |
758 | 778 | |
759 | 779 | // Keep track of the last message so we know what the head is without another query! |
760 | - if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm'])) |
|
761 | - $lastData = array( |
|
780 | + if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm'])) { |
|
781 | + $lastData = array( |
|
762 | 782 | 'id' => $row['id_pm'], |
763 | 783 | 'head' => $row['id_pm_head'], |
764 | 784 | ); |
785 | + } |
|
765 | 786 | } |
766 | 787 | $smcFunc['db_free_result']($request); |
767 | 788 | |
768 | 789 | // Make sure that we have been given a correct head pm id! |
769 | - if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id']) |
|
770 | - fatal_lang_error('no_access', false); |
|
790 | + if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id']) { |
|
791 | + fatal_lang_error('no_access', false); |
|
792 | + } |
|
771 | 793 | |
772 | 794 | if (!empty($pms)) |
773 | 795 | { |
774 | 796 | // Select the correct current message. |
775 | - if (empty($pmID)) |
|
776 | - $context['current_pm'] = $lastData['id']; |
|
797 | + if (empty($pmID)) { |
|
798 | + $context['current_pm'] = $lastData['id']; |
|
799 | + } |
|
777 | 800 | |
778 | 801 | // This is a list of the pm's that are used for "full" display. |
779 | - if ($context['display_mode'] == 0) |
|
780 | - $display_pms = $pms; |
|
781 | - else |
|
782 | - $display_pms = array($context['current_pm']); |
|
802 | + if ($context['display_mode'] == 0) { |
|
803 | + $display_pms = $pms; |
|
804 | + } else { |
|
805 | + $display_pms = array($context['current_pm']); |
|
806 | + } |
|
783 | 807 | |
784 | 808 | // At this point we know the main id_pm's. But - if we are looking at conversations we need the others! |
785 | 809 | if ($context['display_mode'] == 2) |
@@ -801,16 +825,18 @@ discard block |
||
801 | 825 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
802 | 826 | { |
803 | 827 | // This is, frankly, a joke. We will put in a workaround for people sending to themselves - yawn! |
804 | - if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1) |
|
805 | - continue; |
|
806 | - elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1) |
|
807 | - continue; |
|
828 | + if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1) { |
|
829 | + continue; |
|
830 | + } elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1) { |
|
831 | + continue; |
|
832 | + } |
|
808 | 833 | |
809 | - if (!isset($recipients[$row['id_pm']])) |
|
810 | - $recipients[$row['id_pm']] = array( |
|
834 | + if (!isset($recipients[$row['id_pm']])) { |
|
835 | + $recipients[$row['id_pm']] = array( |
|
811 | 836 | 'to' => array(), |
812 | 837 | 'bcc' => array() |
813 | 838 | ); |
839 | + } |
|
814 | 840 | $display_pms[] = $row['id_pm']; |
815 | 841 | $posters[$row['id_pm']] = $row['id_member_from']; |
816 | 842 | } |
@@ -861,8 +887,9 @@ discard block |
||
861 | 887 | while ($row2 = $smcFunc['db_fetch_assoc']($request2)) |
862 | 888 | { |
863 | 889 | $l_id = $row2['id_label']; |
864 | - if (isset($context['labels'][$l_id])) |
|
865 | - $context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']); |
|
890 | + if (isset($context['labels'][$l_id])) { |
|
891 | + $context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']); |
|
892 | + } |
|
866 | 893 | } |
867 | 894 | |
868 | 895 | $smcFunc['db_free_result']($request2); |
@@ -879,9 +906,10 @@ discard block |
||
879 | 906 | // Make sure we don't load unnecessary data. |
880 | 907 | if ($context['display_mode'] == 1) |
881 | 908 | { |
882 | - foreach ($posters as $k => $v) |
|
883 | - if (!in_array($k, $display_pms)) |
|
909 | + foreach ($posters as $k => $v) { |
|
910 | + if (!in_array($k, $display_pms)) |
|
884 | 911 | unset($posters[$k]); |
912 | + } |
|
885 | 913 | } |
886 | 914 | |
887 | 915 | // Load any users.... |
@@ -892,8 +920,9 @@ discard block |
||
892 | 920 | { |
893 | 921 | // Get the order right. |
894 | 922 | $orderBy = array(); |
895 | - foreach (array_reverse($pms) as $pm) |
|
896 | - $orderBy[] = 'pm.id_pm = ' . $pm; |
|
923 | + foreach (array_reverse($pms) as $pm) { |
|
924 | + $orderBy[] = 'pm.id_pm = ' . $pm; |
|
925 | + } |
|
897 | 926 | |
898 | 927 | // Seperate query for these bits! |
899 | 928 | $subjects_request = $smcFunc['db_query']('', ' |
@@ -939,9 +968,9 @@ discard block |
||
939 | 968 | // Allow mods to add additional buttons here |
940 | 969 | call_integration_hook('integrate_conversation_buttons'); |
941 | 970 | } |
971 | + } else { |
|
972 | + $messages_request = false; |
|
942 | 973 | } |
943 | - else |
|
944 | - $messages_request = false; |
|
945 | 974 | |
946 | 975 | $context['can_send_pm'] = allowedTo('pm_send'); |
947 | 976 | $context['can_send_email'] = allowedTo('moderate_forum'); |
@@ -952,11 +981,13 @@ discard block |
||
952 | 981 | if ($context['folder'] != 'sent' && !empty($context['labels'][(int) $context['current_label_id']]['unread_messages'])) |
953 | 982 | { |
954 | 983 | // If the display mode is "old sk00l" do them all... |
955 | - if ($context['display_mode'] == 0) |
|
956 | - markMessages(null, $context['current_label_id']); |
|
984 | + if ($context['display_mode'] == 0) { |
|
985 | + markMessages(null, $context['current_label_id']); |
|
986 | + } |
|
957 | 987 | // Otherwise do just the current one! |
958 | - elseif (!empty($context['current_pm'])) |
|
959 | - markMessages($display_pms, $context['current_label_id']); |
|
988 | + elseif (!empty($context['current_pm'])) { |
|
989 | + markMessages($display_pms, $context['current_label_id']); |
|
990 | + } |
|
960 | 991 | } |
961 | 992 | } |
962 | 993 | |
@@ -974,8 +1005,9 @@ discard block |
||
974 | 1005 | |
975 | 1006 | // Count the current message number.... |
976 | 1007 | static $counter = null; |
977 | - if ($counter === null || $reset) |
|
978 | - $counter = $context['start']; |
|
1008 | + if ($counter === null || $reset) { |
|
1009 | + $counter = $context['start']; |
|
1010 | + } |
|
979 | 1011 | |
980 | 1012 | static $temp_pm_selected = null; |
981 | 1013 | if ($temp_pm_selected === null) |
@@ -1020,19 +1052,22 @@ discard block |
||
1020 | 1052 | } |
1021 | 1053 | |
1022 | 1054 | // Bail if it's false, ie. no messages. |
1023 | - if ($messages_request == false) |
|
1024 | - return false; |
|
1055 | + if ($messages_request == false) { |
|
1056 | + return false; |
|
1057 | + } |
|
1025 | 1058 | |
1026 | 1059 | // Reset the data? |
1027 | - if ($reset == true) |
|
1028 | - return @$smcFunc['db_data_seek']($messages_request, 0); |
|
1060 | + if ($reset == true) { |
|
1061 | + return @$smcFunc['db_data_seek']($messages_request, 0); |
|
1062 | + } |
|
1029 | 1063 | |
1030 | 1064 | // Get the next one... bail if anything goes wrong. |
1031 | 1065 | $message = $smcFunc['db_fetch_assoc']($messages_request); |
1032 | 1066 | if (!$message) |
1033 | 1067 | { |
1034 | - if ($type != 'subject') |
|
1035 | - $smcFunc['db_free_result']($messages_request); |
|
1068 | + if ($type != 'subject') { |
|
1069 | + $smcFunc['db_free_result']($messages_request); |
|
1070 | + } |
|
1036 | 1071 | |
1037 | 1072 | return false; |
1038 | 1073 | } |
@@ -1052,8 +1087,7 @@ discard block |
||
1052 | 1087 | $memberContext[$message['id_member_from']]['email'] = ''; |
1053 | 1088 | $memberContext[$message['id_member_from']]['show_email'] = false; |
1054 | 1089 | $memberContext[$message['id_member_from']]['is_guest'] = true; |
1055 | - } |
|
1056 | - else |
|
1090 | + } else |
|
1057 | 1091 | { |
1058 | 1092 | $memberContext[$message['id_member_from']]['can_view_profile'] = allowedTo('profile_view') || ($message['id_member_from'] == $user_info['id'] && !$user_info['is_guest']); |
1059 | 1093 | $memberContext[$message['id_member_from']]['can_see_warning'] = !isset($context['disabled_fields']['warning_status']) && $memberContext[$message['id_member_from']]['warning_status'] && ($context['user']['can_mod'] || (!empty($modSettings['warning_show']) && ($modSettings['warning_show'] > 1 || $message['id_member_from'] == $user_info['id']))); |
@@ -1094,9 +1128,10 @@ discard block |
||
1094 | 1128 | $counter++; |
1095 | 1129 | |
1096 | 1130 | // Any custom profile fields? |
1097 | - if (!empty($memberContext[$message['id_member_from']]['custom_fields'])) |
|
1098 | - foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom) |
|
1131 | + if (!empty($memberContext[$message['id_member_from']]['custom_fields'])) { |
|
1132 | + foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom) |
|
1099 | 1133 | $output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom; |
1134 | + } |
|
1100 | 1135 | |
1101 | 1136 | call_integration_hook('integrate_prepare_pm_context', array(&$output, &$message, $counter)); |
1102 | 1137 | |
@@ -1120,22 +1155,28 @@ discard block |
||
1120 | 1155 | $context['search_params'][$k] = $v; |
1121 | 1156 | } |
1122 | 1157 | } |
1123 | - if (isset($_REQUEST['search'])) |
|
1124 | - $context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']); |
|
1158 | + if (isset($_REQUEST['search'])) { |
|
1159 | + $context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']); |
|
1160 | + } |
|
1125 | 1161 | |
1126 | - if (isset($context['search_params']['search'])) |
|
1127 | - $context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']); |
|
1128 | - if (isset($context['search_params']['userspec'])) |
|
1129 | - $context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']); |
|
1162 | + if (isset($context['search_params']['search'])) { |
|
1163 | + $context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']); |
|
1164 | + } |
|
1165 | + if (isset($context['search_params']['userspec'])) { |
|
1166 | + $context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']); |
|
1167 | + } |
|
1130 | 1168 | |
1131 | - if (!empty($context['search_params']['searchtype'])) |
|
1132 | - $context['search_params']['searchtype'] = 2; |
|
1169 | + if (!empty($context['search_params']['searchtype'])) { |
|
1170 | + $context['search_params']['searchtype'] = 2; |
|
1171 | + } |
|
1133 | 1172 | |
1134 | - if (!empty($context['search_params']['minage'])) |
|
1135 | - $context['search_params']['minage'] = (int) $context['search_params']['minage']; |
|
1173 | + if (!empty($context['search_params']['minage'])) { |
|
1174 | + $context['search_params']['minage'] = (int) $context['search_params']['minage']; |
|
1175 | + } |
|
1136 | 1176 | |
1137 | - if (!empty($context['search_params']['maxage'])) |
|
1138 | - $context['search_params']['maxage'] = (int) $context['search_params']['maxage']; |
|
1177 | + if (!empty($context['search_params']['maxage'])) { |
|
1178 | + $context['search_params']['maxage'] = (int) $context['search_params']['maxage']; |
|
1179 | + } |
|
1139 | 1180 | |
1140 | 1181 | $context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']); |
1141 | 1182 | $context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']); |
@@ -1162,8 +1203,9 @@ discard block |
||
1162 | 1203 | $context['search_errors']['messages'] = array(); |
1163 | 1204 | foreach ($context['search_errors'] as $search_error => $dummy) |
1164 | 1205 | { |
1165 | - if ($search_error == 'messages') |
|
1166 | - continue; |
|
1206 | + if ($search_error == 'messages') { |
|
1207 | + continue; |
|
1208 | + } |
|
1167 | 1209 | |
1168 | 1210 | $context['search_errors']['messages'][] = $txt['error_' . $search_error]; |
1169 | 1211 | } |
@@ -1185,8 +1227,9 @@ discard block |
||
1185 | 1227 | global $scripturl, $modSettings, $user_info, $context, $txt; |
1186 | 1228 | global $memberContext, $smcFunc; |
1187 | 1229 | |
1188 | - if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) |
|
1189 | - fatal_lang_error('loadavg_search_disabled', false); |
|
1230 | + if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) { |
|
1231 | + fatal_lang_error('loadavg_search_disabled', false); |
|
1232 | + } |
|
1190 | 1233 | |
1191 | 1234 | /** |
1192 | 1235 | * @todo For the moment force the folder to the inbox. |
@@ -1215,35 +1258,40 @@ discard block |
||
1215 | 1258 | $context['start'] = isset($_GET['start']) ? (int) $_GET['start'] : 0; |
1216 | 1259 | |
1217 | 1260 | // Store whether simple search was used (needed if the user wants to do another query). |
1218 | - if (!isset($search_params['advanced'])) |
|
1219 | - $search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1; |
|
1261 | + if (!isset($search_params['advanced'])) { |
|
1262 | + $search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1; |
|
1263 | + } |
|
1220 | 1264 | |
1221 | 1265 | // 1 => 'allwords' (default, don't set as param) / 2 => 'anywords'. |
1222 | - if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) |
|
1223 | - $search_params['searchtype'] = 2; |
|
1266 | + if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) { |
|
1267 | + $search_params['searchtype'] = 2; |
|
1268 | + } |
|
1224 | 1269 | |
1225 | 1270 | // Minimum age of messages. Default to zero (don't set param in that case). |
1226 | - if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) |
|
1227 | - $search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage']; |
|
1271 | + if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) { |
|
1272 | + $search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage']; |
|
1273 | + } |
|
1228 | 1274 | |
1229 | 1275 | // Maximum age of messages. Default to infinite (9999 days: param not set). |
1230 | - if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] != 9999)) |
|
1231 | - $search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage']; |
|
1276 | + if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] != 9999)) { |
|
1277 | + $search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage']; |
|
1278 | + } |
|
1232 | 1279 | |
1233 | 1280 | $search_params['subject_only'] = !empty($search_params['subject_only']) || !empty($_REQUEST['subject_only']); |
1234 | 1281 | $search_params['show_complete'] = !empty($search_params['show_complete']) || !empty($_REQUEST['show_complete']); |
1235 | 1282 | |
1236 | 1283 | // Default the user name to a wildcard matching every user (*). |
1237 | - if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) |
|
1238 | - $search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec']; |
|
1284 | + if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) { |
|
1285 | + $search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec']; |
|
1286 | + } |
|
1239 | 1287 | |
1240 | 1288 | // This will be full of all kinds of parameters! |
1241 | 1289 | $searchq_parameters = array(); |
1242 | 1290 | |
1243 | 1291 | // If there's no specific user, then don't mention it in the main query. |
1244 | - if (empty($search_params['userspec'])) |
|
1245 | - $userQuery = ''; |
|
1246 | - else |
|
1292 | + if (empty($search_params['userspec'])) { |
|
1293 | + $userQuery = ''; |
|
1294 | + } else |
|
1247 | 1295 | { |
1248 | 1296 | $userString = strtr($smcFunc['htmlspecialchars']($search_params['userspec'], ENT_QUOTES), array('"' => '"')); |
1249 | 1297 | $userString = strtr($userString, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_')); |
@@ -1255,8 +1303,9 @@ discard block |
||
1255 | 1303 | { |
1256 | 1304 | $possible_users[$k] = trim($possible_users[$k]); |
1257 | 1305 | |
1258 | - if (strlen($possible_users[$k]) == 0) |
|
1259 | - unset($possible_users[$k]); |
|
1306 | + if (strlen($possible_users[$k]) == 0) { |
|
1307 | + unset($possible_users[$k]); |
|
1308 | + } |
|
1260 | 1309 | } |
1261 | 1310 | |
1262 | 1311 | if (!empty($possible_users)) |
@@ -1268,8 +1317,9 @@ discard block |
||
1268 | 1317 | { |
1269 | 1318 | $where_params['name_' . $k] = $v; |
1270 | 1319 | $where_clause[] = '{raw:real_name} LIKE {string:name_' . $k . '}'; |
1271 | - if (!isset($where_params['real_name'])) |
|
1272 | - $where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name'; |
|
1320 | + if (!isset($where_params['real_name'])) { |
|
1321 | + $where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name'; |
|
1322 | + } |
|
1273 | 1323 | } |
1274 | 1324 | |
1275 | 1325 | // Who matches those criteria? |
@@ -1282,28 +1332,28 @@ discard block |
||
1282 | 1332 | ); |
1283 | 1333 | |
1284 | 1334 | // Simply do nothing if there're too many members matching the criteria. |
1285 | - if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch) |
|
1286 | - $userQuery = ''; |
|
1287 | - elseif ($smcFunc['db_num_rows']($request) == 0) |
|
1335 | + if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch) { |
|
1336 | + $userQuery = ''; |
|
1337 | + } elseif ($smcFunc['db_num_rows']($request) == 0) |
|
1288 | 1338 | { |
1289 | 1339 | $userQuery = 'AND pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})'; |
1290 | 1340 | $searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\''; |
1291 | 1341 | $searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name'; |
1292 | - } |
|
1293 | - else |
|
1342 | + } else |
|
1294 | 1343 | { |
1295 | 1344 | $memberlist = array(); |
1296 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1297 | - $memberlist[] = $row['id_member']; |
|
1345 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1346 | + $memberlist[] = $row['id_member']; |
|
1347 | + } |
|
1298 | 1348 | $userQuery = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})))'; |
1299 | 1349 | $searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\''; |
1300 | 1350 | $searchq_parameters['member_list'] = $memberlist; |
1301 | 1351 | $searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name'; |
1302 | 1352 | } |
1303 | 1353 | $smcFunc['db_free_result']($request); |
1354 | + } else { |
|
1355 | + $userQuery = ''; |
|
1304 | 1356 | } |
1305 | - else |
|
1306 | - $userQuery = ''; |
|
1307 | 1357 | } |
1308 | 1358 | |
1309 | 1359 | // Setup the sorting variables... |
@@ -1311,8 +1361,9 @@ discard block |
||
1311 | 1361 | $sort_columns = array( |
1312 | 1362 | 'pm.id_pm', |
1313 | 1363 | ); |
1314 | - if (empty($search_params['sort']) && !empty($_REQUEST['sort'])) |
|
1315 | - list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, ''); |
|
1364 | + if (empty($search_params['sort']) && !empty($_REQUEST['sort'])) { |
|
1365 | + list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, ''); |
|
1366 | + } |
|
1316 | 1367 | $search_params['sort'] = !empty($search_params['sort']) && in_array($search_params['sort'], $sort_columns) ? $search_params['sort'] : 'pm.id_pm'; |
1317 | 1368 | $search_params['sort_dir'] = !empty($search_params['sort_dir']) && $search_params['sort_dir'] == 'asc' ? 'asc' : 'desc'; |
1318 | 1369 | |
@@ -1322,24 +1373,27 @@ discard block |
||
1322 | 1373 | if ($context['folder'] == 'inbox' && !empty($search_params['advanced']) && $context['currently_using_labels']) |
1323 | 1374 | { |
1324 | 1375 | // Came here from pagination? Put them back into $_REQUEST for sanitization. |
1325 | - if (isset($search_params['labels'])) |
|
1326 | - $_REQUEST['searchlabel'] = explode(',', $search_params['labels']); |
|
1376 | + if (isset($search_params['labels'])) { |
|
1377 | + $_REQUEST['searchlabel'] = explode(',', $search_params['labels']); |
|
1378 | + } |
|
1327 | 1379 | |
1328 | 1380 | // Assuming we have some labels - make them all integers. |
1329 | 1381 | if (!empty($_REQUEST['searchlabel']) && is_array($_REQUEST['searchlabel'])) |
1330 | 1382 | { |
1331 | - foreach ($_REQUEST['searchlabel'] as $key => $id) |
|
1332 | - $_REQUEST['searchlabel'][$key] = (int) $id; |
|
1383 | + foreach ($_REQUEST['searchlabel'] as $key => $id) { |
|
1384 | + $_REQUEST['searchlabel'][$key] = (int) $id; |
|
1385 | + } |
|
1386 | + } else { |
|
1387 | + $_REQUEST['searchlabel'] = array(); |
|
1333 | 1388 | } |
1334 | - else |
|
1335 | - $_REQUEST['searchlabel'] = array(); |
|
1336 | 1389 | |
1337 | 1390 | // Now that everything is cleaned up a bit, make the labels a param. |
1338 | 1391 | $search_params['labels'] = implode(',', $_REQUEST['searchlabel']); |
1339 | 1392 | |
1340 | 1393 | // No labels selected? That must be an error! |
1341 | - if (empty($_REQUEST['searchlabel'])) |
|
1342 | - $context['search_errors']['no_labels_selected'] = true; |
|
1394 | + if (empty($_REQUEST['searchlabel'])) { |
|
1395 | + $context['search_errors']['no_labels_selected'] = true; |
|
1396 | + } |
|
1343 | 1397 | // Otherwise prepare the query! |
1344 | 1398 | elseif (count($_REQUEST['searchlabel']) != count($context['labels'])) |
1345 | 1399 | { |
@@ -1362,8 +1416,7 @@ discard block |
||
1362 | 1416 | // Not searching the inbox - PM must be labeled |
1363 | 1417 | $labelQuery = ' AND pml.id_label IN ({array_int:labels})'; |
1364 | 1418 | $labelJoin = ' INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)'; |
1365 | - } |
|
1366 | - else |
|
1419 | + } else |
|
1367 | 1420 | { |
1368 | 1421 | // Searching the inbox - PM doesn't have to be labeled |
1369 | 1422 | $labelQuery = ' AND (' . substr($labelQuery, 5) . ' OR pml.id_label IN ({array_int:labels}))'; |
@@ -1378,8 +1431,9 @@ discard block |
||
1378 | 1431 | // What are we actually searching for? |
1379 | 1432 | $search_params['search'] = !empty($search_params['search']) ? $search_params['search'] : (isset($_REQUEST['search']) ? $_REQUEST['search'] : ''); |
1380 | 1433 | // If we ain't got nothing - we should error! |
1381 | - if (!isset($search_params['search']) || $search_params['search'] == '') |
|
1382 | - $context['search_errors']['invalid_search_string'] = true; |
|
1434 | + if (!isset($search_params['search']) || $search_params['search'] == '') { |
|
1435 | + $context['search_errors']['invalid_search_string'] = true; |
|
1436 | + } |
|
1383 | 1437 | |
1384 | 1438 | // Extract phrase parts first (e.g. some words "this is a phrase" some more words.) |
1385 | 1439 | preg_match_all('~(?:^|\s)([-]?)"([^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), $search_params['search'], $matches, PREG_PATTERN_ORDER); |
@@ -1392,12 +1446,14 @@ discard block |
||
1392 | 1446 | $excludedWords = array(); |
1393 | 1447 | |
1394 | 1448 | // .. first, we check for things like -"some words", but not "-some words". |
1395 | - foreach ($matches[1] as $index => $word) |
|
1396 | - if ($word == '-') |
|
1449 | + foreach ($matches[1] as $index => $word) { |
|
1450 | + if ($word == '-') |
|
1397 | 1451 | { |
1398 | 1452 | $word = $smcFunc['strtolower'](trim($searchArray[$index])); |
1399 | - if (strlen($word) > 0) |
|
1400 | - $excludedWords[] = $word; |
|
1453 | + } |
|
1454 | + if (strlen($word) > 0) { |
|
1455 | + $excludedWords[] = $word; |
|
1456 | + } |
|
1401 | 1457 | unset($searchArray[$index]); |
1402 | 1458 | } |
1403 | 1459 | |
@@ -1407,8 +1463,9 @@ discard block |
||
1407 | 1463 | if (strpos(trim($word), '-') === 0) |
1408 | 1464 | { |
1409 | 1465 | $word = substr($smcFunc['strtolower']($word), 1); |
1410 | - if (strlen($word) > 0) |
|
1411 | - $excludedWords[] = $word; |
|
1466 | + if (strlen($word) > 0) { |
|
1467 | + $excludedWords[] = $word; |
|
1468 | + } |
|
1412 | 1469 | unset($tempSearch[$index]); |
1413 | 1470 | } |
1414 | 1471 | } |
@@ -1419,9 +1476,9 @@ discard block |
||
1419 | 1476 | foreach ($searchArray as $index => $value) |
1420 | 1477 | { |
1421 | 1478 | $searchArray[$index] = $smcFunc['strtolower'](trim($value)); |
1422 | - if ($searchArray[$index] == '') |
|
1423 | - unset($searchArray[$index]); |
|
1424 | - else |
|
1479 | + if ($searchArray[$index] == '') { |
|
1480 | + unset($searchArray[$index]); |
|
1481 | + } else |
|
1425 | 1482 | { |
1426 | 1483 | // Sort out entities first. |
1427 | 1484 | $searchArray[$index] = $smcFunc['htmlspecialchars']($searchArray[$index]); |
@@ -1431,27 +1488,32 @@ discard block |
||
1431 | 1488 | |
1432 | 1489 | // Create an array of replacements for highlighting. |
1433 | 1490 | $context['mark'] = array(); |
1434 | - foreach ($searchArray as $word) |
|
1435 | - $context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>'; |
|
1491 | + foreach ($searchArray as $word) { |
|
1492 | + $context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>'; |
|
1493 | + } |
|
1436 | 1494 | |
1437 | 1495 | // This contains *everything* |
1438 | 1496 | $searchWords = array_merge($searchArray, $excludedWords); |
1439 | 1497 | |
1440 | 1498 | // Make sure at least one word is being searched for. |
1441 | - if (empty($searchArray)) |
|
1442 | - $context['search_errors']['invalid_search_string'] = true; |
|
1499 | + if (empty($searchArray)) { |
|
1500 | + $context['search_errors']['invalid_search_string'] = true; |
|
1501 | + } |
|
1443 | 1502 | |
1444 | 1503 | // Sort out the search query so the user can edit it - if they want. |
1445 | 1504 | $context['search_params'] = $search_params; |
1446 | - if (isset($context['search_params']['search'])) |
|
1447 | - $context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']); |
|
1448 | - if (isset($context['search_params']['userspec'])) |
|
1449 | - $context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']); |
|
1505 | + if (isset($context['search_params']['search'])) { |
|
1506 | + $context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']); |
|
1507 | + } |
|
1508 | + if (isset($context['search_params']['userspec'])) { |
|
1509 | + $context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']); |
|
1510 | + } |
|
1450 | 1511 | |
1451 | 1512 | // Now we have all the parameters, combine them together for pagination and the like... |
1452 | 1513 | $context['params'] = array(); |
1453 | - foreach ($search_params as $k => $v) |
|
1454 | - $context['params'][] = $k . '|\'|' . $v; |
|
1514 | + foreach ($search_params as $k => $v) { |
|
1515 | + $context['params'][] = $k . '|\'|' . $v; |
|
1516 | + } |
|
1455 | 1517 | $context['params'] = base64_encode(implode('|"|', $context['params'])); |
1456 | 1518 | |
1457 | 1519 | // Compile the subject query part. |
@@ -1459,26 +1521,31 @@ discard block |
||
1459 | 1521 | |
1460 | 1522 | foreach ($searchWords as $index => $word) |
1461 | 1523 | { |
1462 | - if ($word == '') |
|
1463 | - continue; |
|
1524 | + if ($word == '') { |
|
1525 | + continue; |
|
1526 | + } |
|
1464 | 1527 | |
1465 | - if ($search_params['subject_only']) |
|
1466 | - $andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}'; |
|
1467 | - else |
|
1468 | - $andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})'; |
|
1528 | + if ($search_params['subject_only']) { |
|
1529 | + $andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}'; |
|
1530 | + } else { |
|
1531 | + $andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})'; |
|
1532 | + } |
|
1469 | 1533 | $searchq_parameters['search_' . $index] = '%' . strtr($word, array('_' => '\\_', '%' => '\\%')) . '%'; |
1470 | 1534 | } |
1471 | 1535 | |
1472 | 1536 | $searchQuery = ' 1=1'; |
1473 | - if (!empty($andQueryParts)) |
|
1474 | - $searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts); |
|
1537 | + if (!empty($andQueryParts)) { |
|
1538 | + $searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts); |
|
1539 | + } |
|
1475 | 1540 | |
1476 | 1541 | // Age limits? |
1477 | 1542 | $timeQuery = ''; |
1478 | - if (!empty($search_params['minage'])) |
|
1479 | - $timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400); |
|
1480 | - if (!empty($search_params['maxage'])) |
|
1481 | - $timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400); |
|
1543 | + if (!empty($search_params['minage'])) { |
|
1544 | + $timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400); |
|
1545 | + } |
|
1546 | + if (!empty($search_params['maxage'])) { |
|
1547 | + $timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400); |
|
1548 | + } |
|
1482 | 1549 | |
1483 | 1550 | // If we have errors - return back to the first screen... |
1484 | 1551 | if (!empty($context['search_errors'])) |
@@ -1564,8 +1631,9 @@ discard block |
||
1564 | 1631 | ) |
1565 | 1632 | ); |
1566 | 1633 | $real_pm_ids = array(); |
1567 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1568 | - $real_pm_ids[$row['id_pm_head']] = $row['id_pm']; |
|
1634 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1635 | + $real_pm_ids[$row['id_pm_head']] = $row['id_pm']; |
|
1636 | + } |
|
1569 | 1637 | $smcFunc['db_free_result']($request); |
1570 | 1638 | } |
1571 | 1639 | |
@@ -1595,8 +1663,9 @@ discard block |
||
1595 | 1663 | ); |
1596 | 1664 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
1597 | 1665 | { |
1598 | - if ($context['folder'] == 'sent' || empty($row['bcc'])) |
|
1599 | - $recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>'; |
|
1666 | + if ($context['folder'] == 'sent' || empty($row['bcc'])) { |
|
1667 | + $recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>'; |
|
1668 | + } |
|
1600 | 1669 | |
1601 | 1670 | if ($row['id_member_to'] == $user_info['id'] && $context['folder'] != 'sent') |
1602 | 1671 | { |
@@ -1617,12 +1686,14 @@ discard block |
||
1617 | 1686 | while ($row2 = $smcFunc['db_fetch_assoc']($request2)) |
1618 | 1687 | { |
1619 | 1688 | $l_id = $row2['id_label']; |
1620 | - if (isset($context['labels'][$l_id])) |
|
1621 | - $context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']); |
|
1689 | + if (isset($context['labels'][$l_id])) { |
|
1690 | + $context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']); |
|
1691 | + } |
|
1622 | 1692 | |
1623 | 1693 | // Here we find the first label on a message - for linking to posts in results |
1624 | - if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1) |
|
1625 | - $context['first_label'][$row['id_pm']] = $l_id; |
|
1694 | + if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1) { |
|
1695 | + $context['first_label'][$row['id_pm']] = $l_id; |
|
1696 | + } |
|
1626 | 1697 | } |
1627 | 1698 | |
1628 | 1699 | $smcFunc['db_free_result']($request2); |
@@ -1749,8 +1820,9 @@ discard block |
||
1749 | 1820 | list ($postCount) = $smcFunc['db_fetch_row']($request); |
1750 | 1821 | $smcFunc['db_free_result']($request); |
1751 | 1822 | |
1752 | - if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour']) |
|
1753 | - fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour'])); |
|
1823 | + if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour']) { |
|
1824 | + fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour'])); |
|
1825 | + } |
|
1754 | 1826 | } |
1755 | 1827 | |
1756 | 1828 | // Quoting/Replying to a message? |
@@ -1759,8 +1831,9 @@ discard block |
||
1759 | 1831 | $pmsg = (int) $_REQUEST['pmsg']; |
1760 | 1832 | |
1761 | 1833 | // Make sure this is yours. |
1762 | - if (!isAccessiblePM($pmsg)) |
|
1763 | - fatal_lang_error('no_access', false); |
|
1834 | + if (!isAccessiblePM($pmsg)) { |
|
1835 | + fatal_lang_error('no_access', false); |
|
1836 | + } |
|
1764 | 1837 | |
1765 | 1838 | // Work out whether this is one you've received? |
1766 | 1839 | $request = $smcFunc['db_query']('', ' |
@@ -1797,8 +1870,9 @@ discard block |
||
1797 | 1870 | 'id_pm' => $pmsg, |
1798 | 1871 | ) |
1799 | 1872 | ); |
1800 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
1801 | - fatal_lang_error('pm_not_yours', false); |
|
1873 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
1874 | + fatal_lang_error('pm_not_yours', false); |
|
1875 | + } |
|
1802 | 1876 | $row_quoted = $smcFunc['db_fetch_assoc']($request); |
1803 | 1877 | $smcFunc['db_free_result']($request); |
1804 | 1878 | |
@@ -1809,9 +1883,9 @@ discard block |
||
1809 | 1883 | // Add 'Re: ' to it.... |
1810 | 1884 | if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix'))) |
1811 | 1885 | { |
1812 | - if ($language === $user_info['language']) |
|
1813 | - $context['response_prefix'] = $txt['response_prefix']; |
|
1814 | - else |
|
1886 | + if ($language === $user_info['language']) { |
|
1887 | + $context['response_prefix'] = $txt['response_prefix']; |
|
1888 | + } else |
|
1815 | 1889 | { |
1816 | 1890 | loadLanguage('index', $language, false); |
1817 | 1891 | $context['response_prefix'] = $txt['response_prefix']; |
@@ -1820,22 +1894,25 @@ discard block |
||
1820 | 1894 | cache_put_data('response_prefix', $context['response_prefix'], 600); |
1821 | 1895 | } |
1822 | 1896 | $form_subject = $row_quoted['subject']; |
1823 | - if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) |
|
1824 | - $form_subject = $context['response_prefix'] . $form_subject; |
|
1897 | + if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) { |
|
1898 | + $form_subject = $context['response_prefix'] . $form_subject; |
|
1899 | + } |
|
1825 | 1900 | |
1826 | 1901 | if (isset($_REQUEST['quote'])) |
1827 | 1902 | { |
1828 | 1903 | // Remove any nested quotes and <br>... |
1829 | 1904 | $form_message = preg_replace('~<br ?/?' . '>~i', "\n", $row_quoted['body']); |
1830 | - if (!empty($modSettings['removeNestedQuotes'])) |
|
1831 | - $form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message); |
|
1832 | - if (empty($row_quoted['id_member'])) |
|
1833 | - $form_message = '[quote author="' . $row_quoted['real_name'] . '"]' . "\n" . $form_message . "\n" . '[/quote]'; |
|
1834 | - else |
|
1835 | - $form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]'; |
|
1905 | + if (!empty($modSettings['removeNestedQuotes'])) { |
|
1906 | + $form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message); |
|
1907 | + } |
|
1908 | + if (empty($row_quoted['id_member'])) { |
|
1909 | + $form_message = '[quote author="' . $row_quoted['real_name'] . '"]' . "\n" . $form_message . "\n" . '[/quote]'; |
|
1910 | + } else { |
|
1911 | + $form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]'; |
|
1912 | + } |
|
1913 | + } else { |
|
1914 | + $form_message = ''; |
|
1836 | 1915 | } |
1837 | - else |
|
1838 | - $form_message = ''; |
|
1839 | 1916 | |
1840 | 1917 | // Do the BBC thang on the message. |
1841 | 1918 | $row_quoted['body'] = parse_bbc($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']); |
@@ -1856,8 +1933,7 @@ discard block |
||
1856 | 1933 | 'timestamp' => forum_time(true, $row_quoted['msgtime']), |
1857 | 1934 | 'body' => $row_quoted['body'] |
1858 | 1935 | ); |
1859 | - } |
|
1860 | - else |
|
1936 | + } else |
|
1861 | 1937 | { |
1862 | 1938 | $context['quoted_message'] = false; |
1863 | 1939 | $form_subject = ''; |
@@ -1876,11 +1952,12 @@ discard block |
||
1876 | 1952 | if ($_REQUEST['u'] == 'all' && isset($row_quoted)) |
1877 | 1953 | { |
1878 | 1954 | // Firstly, to reply to all we clearly already have $row_quoted - so have the original member from. |
1879 | - if ($row_quoted['id_member'] != $user_info['id']) |
|
1880 | - $context['recipients']['to'][] = array( |
|
1955 | + if ($row_quoted['id_member'] != $user_info['id']) { |
|
1956 | + $context['recipients']['to'][] = array( |
|
1881 | 1957 | 'id' => $row_quoted['id_member'], |
1882 | 1958 | 'name' => $smcFunc['htmlspecialchars']($row_quoted['real_name']), |
1883 | 1959 | ); |
1960 | + } |
|
1884 | 1961 | |
1885 | 1962 | // Now to get the others. |
1886 | 1963 | $request = $smcFunc['db_query']('', ' |
@@ -1896,18 +1973,19 @@ discard block |
||
1896 | 1973 | 'not_bcc' => 0, |
1897 | 1974 | ) |
1898 | 1975 | ); |
1899 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1900 | - $context['recipients']['to'][] = array( |
|
1976 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
1977 | + $context['recipients']['to'][] = array( |
|
1901 | 1978 | 'id' => $row['id_member'], |
1902 | 1979 | 'name' => $row['real_name'], |
1903 | 1980 | ); |
1981 | + } |
|
1904 | 1982 | $smcFunc['db_free_result']($request); |
1905 | - } |
|
1906 | - else |
|
1983 | + } else |
|
1907 | 1984 | { |
1908 | 1985 | $_REQUEST['u'] = explode(',', $_REQUEST['u']); |
1909 | - foreach ($_REQUEST['u'] as $key => $uID) |
|
1910 | - $_REQUEST['u'][$key] = (int) $uID; |
|
1986 | + foreach ($_REQUEST['u'] as $key => $uID) { |
|
1987 | + $_REQUEST['u'][$key] = (int) $uID; |
|
1988 | + } |
|
1911 | 1989 | |
1912 | 1990 | $_REQUEST['u'] = array_unique($_REQUEST['u']); |
1913 | 1991 | |
@@ -1921,22 +1999,24 @@ discard block |
||
1921 | 1999 | 'limit' => count($_REQUEST['u']), |
1922 | 2000 | ) |
1923 | 2001 | ); |
1924 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
1925 | - $context['recipients']['to'][] = array( |
|
2002 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
2003 | + $context['recipients']['to'][] = array( |
|
1926 | 2004 | 'id' => $row['id_member'], |
1927 | 2005 | 'name' => $row['real_name'], |
1928 | 2006 | ); |
2007 | + } |
|
1929 | 2008 | $smcFunc['db_free_result']($request); |
1930 | 2009 | } |
1931 | 2010 | |
1932 | 2011 | // Get a literal name list in case the user has JavaScript disabled. |
1933 | 2012 | $names = array(); |
1934 | - foreach ($context['recipients']['to'] as $to) |
|
1935 | - $names[] = $to['name']; |
|
2013 | + foreach ($context['recipients']['to'] as $to) { |
|
2014 | + $names[] = $to['name']; |
|
2015 | + } |
|
1936 | 2016 | $context['to_value'] = empty($names) ? '' : '"' . implode('", "', $names) . '"'; |
2017 | + } else { |
|
2018 | + $context['to_value'] = ''; |
|
1937 | 2019 | } |
1938 | - else |
|
1939 | - $context['to_value'] = ''; |
|
1940 | 2020 | |
1941 | 2021 | // Set the defaults... |
1942 | 2022 | $context['subject'] = $form_subject; |
@@ -2006,8 +2086,9 @@ discard block |
||
2006 | 2086 | |
2007 | 2087 | // validate with loadMemberData() |
2008 | 2088 | $memberResult = loadMemberData($user_info['id'], false); |
2009 | - if (!$memberResult) |
|
2010 | - fatal_lang_error('not_a_user', false); |
|
2089 | + if (!$memberResult) { |
|
2090 | + fatal_lang_error('not_a_user', false); |
|
2091 | + } |
|
2011 | 2092 | list ($memID) = $memberResult; |
2012 | 2093 | |
2013 | 2094 | // drafts is where the functions reside |
@@ -2033,9 +2114,9 @@ discard block |
||
2033 | 2114 | $context['sub_template'] = 'send'; |
2034 | 2115 | loadJavaScriptFile('PersonalMessage.js', array('defer' => false, 'minimize' => true), 'smf_pms'); |
2035 | 2116 | loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest'); |
2117 | + } else { |
|
2118 | + $context['sub_template'] = 'pm'; |
|
2036 | 2119 | } |
2037 | - else |
|
2038 | - $context['sub_template'] = 'pm'; |
|
2039 | 2120 | |
2040 | 2121 | $context['page_title'] = $txt['send_message']; |
2041 | 2122 | |
@@ -2096,10 +2177,11 @@ discard block |
||
2096 | 2177 | ); |
2097 | 2178 | if ($smcFunc['db_num_rows']($request) == 0) |
2098 | 2179 | { |
2099 | - if (!isset($_REQUEST['xml'])) |
|
2100 | - fatal_lang_error('pm_not_yours', false); |
|
2101 | - else |
|
2102 | - $error_types[] = 'pm_not_yours'; |
|
2180 | + if (!isset($_REQUEST['xml'])) { |
|
2181 | + fatal_lang_error('pm_not_yours', false); |
|
2182 | + } else { |
|
2183 | + $error_types[] = 'pm_not_yours'; |
|
2184 | + } |
|
2103 | 2185 | } |
2104 | 2186 | $row_quoted = $smcFunc['db_fetch_assoc']($request); |
2105 | 2187 | $smcFunc['db_free_result']($request); |
@@ -2146,14 +2228,16 @@ discard block |
||
2146 | 2228 | $context['post_error'][$error_type] = true; |
2147 | 2229 | if (isset($txt['error_' . $error_type])) |
2148 | 2230 | { |
2149 | - if ($error_type == 'long_message') |
|
2150 | - $txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']); |
|
2231 | + if ($error_type == 'long_message') { |
|
2232 | + $txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']); |
|
2233 | + } |
|
2151 | 2234 | $context['post_error']['messages'][] = $txt['error_' . $error_type]; |
2152 | 2235 | } |
2153 | 2236 | |
2154 | 2237 | // If it's not a minor error flag it as such. |
2155 | - if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject'))) |
|
2156 | - $context['error_type'] = 'serious'; |
|
2238 | + if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject'))) { |
|
2239 | + $context['error_type'] = 'serious'; |
|
2240 | + } |
|
2157 | 2241 | } |
2158 | 2242 | |
2159 | 2243 | // We need to load the editor once more. |
@@ -2211,8 +2295,9 @@ discard block |
||
2211 | 2295 | require_once($sourcedir . '/Subs-Auth.php'); |
2212 | 2296 | |
2213 | 2297 | // PM Drafts enabled and needed? |
2214 | - if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft']))) |
|
2215 | - require_once($sourcedir . '/Drafts.php'); |
|
2298 | + if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft']))) { |
|
2299 | + require_once($sourcedir . '/Drafts.php'); |
|
2300 | + } |
|
2216 | 2301 | |
2217 | 2302 | loadLanguage('PersonalMessage', '', false); |
2218 | 2303 | |
@@ -2242,24 +2327,27 @@ discard block |
||
2242 | 2327 | |
2243 | 2328 | if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour']) |
2244 | 2329 | { |
2245 | - if (!isset($_REQUEST['xml'])) |
|
2246 | - fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour'])); |
|
2247 | - else |
|
2248 | - $post_errors[] = 'pm_too_many_per_hour'; |
|
2330 | + if (!isset($_REQUEST['xml'])) { |
|
2331 | + fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour'])); |
|
2332 | + } else { |
|
2333 | + $post_errors[] = 'pm_too_many_per_hour'; |
|
2334 | + } |
|
2249 | 2335 | } |
2250 | 2336 | } |
2251 | 2337 | |
2252 | 2338 | // If your session timed out, show an error, but do allow to re-submit. |
2253 | - if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '') |
|
2254 | - $post_errors[] = 'session_timeout'; |
|
2339 | + if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '') { |
|
2340 | + $post_errors[] = 'session_timeout'; |
|
2341 | + } |
|
2255 | 2342 | |
2256 | 2343 | $_REQUEST['subject'] = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : ''; |
2257 | 2344 | $_REQUEST['to'] = empty($_POST['to']) ? (empty($_GET['to']) ? '' : $_GET['to']) : $_POST['to']; |
2258 | 2345 | $_REQUEST['bcc'] = empty($_POST['bcc']) ? (empty($_GET['bcc']) ? '' : $_GET['bcc']) : $_POST['bcc']; |
2259 | 2346 | |
2260 | 2347 | // Route the input from the 'u' parameter to the 'to'-list. |
2261 | - if (!empty($_POST['u'])) |
|
2262 | - $_POST['recipient_to'] = explode(',', $_POST['u']); |
|
2348 | + if (!empty($_POST['u'])) { |
|
2349 | + $_POST['recipient_to'] = explode(',', $_POST['u']); |
|
2350 | + } |
|
2263 | 2351 | |
2264 | 2352 | // Construct the list of recipients. |
2265 | 2353 | $recipientList = array(); |
@@ -2271,8 +2359,9 @@ discard block |
||
2271 | 2359 | $recipientList[$recipientType] = array(); |
2272 | 2360 | if (!empty($_POST['recipient_' . $recipientType]) && is_array($_POST['recipient_' . $recipientType])) |
2273 | 2361 | { |
2274 | - foreach ($_POST['recipient_' . $recipientType] as $recipient) |
|
2275 | - $recipientList[$recipientType][] = (int) $recipient; |
|
2362 | + foreach ($_POST['recipient_' . $recipientType] as $recipient) { |
|
2363 | + $recipientList[$recipientType][] = (int) $recipient; |
|
2364 | + } |
|
2276 | 2365 | } |
2277 | 2366 | |
2278 | 2367 | // Are there also literal names set? |
@@ -2286,10 +2375,11 @@ discard block |
||
2286 | 2375 | |
2287 | 2376 | foreach ($namedRecipientList[$recipientType] as $index => $recipient) |
2288 | 2377 | { |
2289 | - if (strlen(trim($recipient)) > 0) |
|
2290 | - $namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient))); |
|
2291 | - else |
|
2292 | - unset($namedRecipientList[$recipientType][$index]); |
|
2378 | + if (strlen(trim($recipient)) > 0) { |
|
2379 | + $namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient))); |
|
2380 | + } else { |
|
2381 | + unset($namedRecipientList[$recipientType][$index]); |
|
2382 | + } |
|
2293 | 2383 | } |
2294 | 2384 | |
2295 | 2385 | if (!empty($namedRecipientList[$recipientType])) |
@@ -2319,8 +2409,9 @@ discard block |
||
2319 | 2409 | } |
2320 | 2410 | |
2321 | 2411 | // Selected a recipient to be deleted? Remove them now. |
2322 | - if (!empty($_POST['delete_recipient'])) |
|
2323 | - $recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient'])); |
|
2412 | + if (!empty($_POST['delete_recipient'])) { |
|
2413 | + $recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient'])); |
|
2414 | + } |
|
2324 | 2415 | |
2325 | 2416 | // Make sure we don't include the same name twice |
2326 | 2417 | $recipientList[$recipientType] = array_unique($recipientList[$recipientType]); |
@@ -2330,8 +2421,9 @@ discard block |
||
2330 | 2421 | $is_recipient_change = !empty($_POST['delete_recipient']) || !empty($_POST['to_submit']) || !empty($_POST['bcc_submit']); |
2331 | 2422 | |
2332 | 2423 | // Check if there's at least one recipient. |
2333 | - if (empty($recipientList['to']) && empty($recipientList['bcc'])) |
|
2334 | - $post_errors[] = 'no_to'; |
|
2424 | + if (empty($recipientList['to']) && empty($recipientList['bcc'])) { |
|
2425 | + $post_errors[] = 'no_to'; |
|
2426 | + } |
|
2335 | 2427 | |
2336 | 2428 | // Make sure that we remove the members who did get it from the screen. |
2337 | 2429 | if (!$is_recipient_change) |
@@ -2345,28 +2437,31 @@ discard block |
||
2345 | 2437 | // Since we already have a post error, remove the previous one. |
2346 | 2438 | $post_errors = array_diff($post_errors, array('no_to')); |
2347 | 2439 | |
2348 | - foreach ($namesNotFound[$recipientType] as $name) |
|
2349 | - $context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name); |
|
2440 | + foreach ($namesNotFound[$recipientType] as $name) { |
|
2441 | + $context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name); |
|
2442 | + } |
|
2350 | 2443 | } |
2351 | 2444 | } |
2352 | 2445 | } |
2353 | 2446 | |
2354 | 2447 | // Did they make any mistakes? |
2355 | - if ($_REQUEST['subject'] == '') |
|
2356 | - $post_errors[] = 'no_subject'; |
|
2357 | - if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '') |
|
2358 | - $post_errors[] = 'no_message'; |
|
2359 | - elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength']) |
|
2360 | - $post_errors[] = 'long_message'; |
|
2361 | - else |
|
2448 | + if ($_REQUEST['subject'] == '') { |
|
2449 | + $post_errors[] = 'no_subject'; |
|
2450 | + } |
|
2451 | + if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '') { |
|
2452 | + $post_errors[] = 'no_message'; |
|
2453 | + } elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength']) { |
|
2454 | + $post_errors[] = 'long_message'; |
|
2455 | + } else |
|
2362 | 2456 | { |
2363 | 2457 | // Preparse the message. |
2364 | 2458 | $message = $_REQUEST['message']; |
2365 | 2459 | preparsecode($message); |
2366 | 2460 | |
2367 | 2461 | // Make sure there's still some content left without the tags. |
2368 | - if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false)) |
|
2369 | - $post_errors[] = 'no_message'; |
|
2462 | + if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false)) { |
|
2463 | + $post_errors[] = 'no_message'; |
|
2464 | + } |
|
2370 | 2465 | } |
2371 | 2466 | |
2372 | 2467 | // Wrong verification code? |
@@ -2378,13 +2473,15 @@ discard block |
||
2378 | 2473 | ); |
2379 | 2474 | $context['require_verification'] = create_control_verification($verificationOptions, true); |
2380 | 2475 | |
2381 | - if (is_array($context['require_verification'])) |
|
2382 | - $post_errors = array_merge($post_errors, $context['require_verification']); |
|
2476 | + if (is_array($context['require_verification'])) { |
|
2477 | + $post_errors = array_merge($post_errors, $context['require_verification']); |
|
2478 | + } |
|
2383 | 2479 | } |
2384 | 2480 | |
2385 | 2481 | // If they did, give a chance to make ammends. |
2386 | - if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml'])) |
|
2387 | - return messagePostError($post_errors, $namedRecipientList, $recipientList); |
|
2482 | + if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml'])) { |
|
2483 | + return messagePostError($post_errors, $namedRecipientList, $recipientList); |
|
2484 | + } |
|
2388 | 2485 | |
2389 | 2486 | // Want to take a second glance before you send? |
2390 | 2487 | if (isset($_REQUEST['preview'])) |
@@ -2415,8 +2512,9 @@ discard block |
||
2415 | 2512 | foreach ($namesNotFound as $recipientType => $names) |
2416 | 2513 | { |
2417 | 2514 | $post_errors[] = 'bad_' . $recipientType; |
2418 | - foreach ($names as $name) |
|
2419 | - $context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name); |
|
2515 | + foreach ($names as $name) { |
|
2516 | + $context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name); |
|
2517 | + } |
|
2420 | 2518 | } |
2421 | 2519 | |
2422 | 2520 | return messagePostError(array(), $namedRecipientList, $recipientList); |
@@ -2446,13 +2544,14 @@ discard block |
||
2446 | 2544 | checkSubmitOnce('check'); |
2447 | 2545 | |
2448 | 2546 | // Do the actual sending of the PM. |
2449 | - if (!empty($recipientList['to']) || !empty($recipientList['bcc'])) |
|
2450 | - $context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0); |
|
2451 | - else |
|
2452 | - $context['send_log'] = array( |
|
2547 | + if (!empty($recipientList['to']) || !empty($recipientList['bcc'])) { |
|
2548 | + $context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0); |
|
2549 | + } else { |
|
2550 | + $context['send_log'] = array( |
|
2453 | 2551 | 'sent' => array(), |
2454 | 2552 | 'failed' => array() |
2455 | 2553 | ); |
2554 | + } |
|
2456 | 2555 | |
2457 | 2556 | // Mark the message as "replied to". |
2458 | 2557 | if (!empty($context['send_log']['sent']) && !empty($_REQUEST['replied_to']) && isset($_REQUEST['f']) && $_REQUEST['f'] == 'inbox') |
@@ -2470,11 +2569,12 @@ discard block |
||
2470 | 2569 | } |
2471 | 2570 | |
2472 | 2571 | // If one or more of the recipient were invalid, go back to the post screen with the failed usernames. |
2473 | - if (!empty($context['send_log']['failed'])) |
|
2474 | - return messagePostError($post_errors, $namesNotFound, array( |
|
2572 | + if (!empty($context['send_log']['failed'])) { |
|
2573 | + return messagePostError($post_errors, $namesNotFound, array( |
|
2475 | 2574 | 'to' => array_intersect($recipientList['to'], $context['send_log']['failed']), |
2476 | 2575 | 'bcc' => array_intersect($recipientList['bcc'], $context['send_log']['failed']) |
2477 | 2576 | )); |
2577 | + } |
|
2478 | 2578 | |
2479 | 2579 | // Message sent successfully? |
2480 | 2580 | if (!empty($context['send_log']) && empty($context['send_log']['failed'])) |
@@ -2482,8 +2582,9 @@ discard block |
||
2482 | 2582 | $context['current_label_redirect'] = $context['current_label_redirect'] . ';done=sent'; |
2483 | 2583 | |
2484 | 2584 | // If we had a PM draft for this one, then its time to remove it since it was just sent |
2485 | - if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft'])) |
|
2486 | - DeleteDraft($_POST['id_pm_draft']); |
|
2585 | + if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft'])) { |
|
2586 | + DeleteDraft($_POST['id_pm_draft']); |
|
2587 | + } |
|
2487 | 2588 | } |
2488 | 2589 | |
2489 | 2590 | // Go back to the where they sent from, if possible... |
@@ -2498,24 +2599,28 @@ discard block |
||
2498 | 2599 | |
2499 | 2600 | checkSession('request'); |
2500 | 2601 | |
2501 | - if (isset($_REQUEST['del_selected'])) |
|
2502 | - $_REQUEST['pm_action'] = 'delete'; |
|
2602 | + if (isset($_REQUEST['del_selected'])) { |
|
2603 | + $_REQUEST['pm_action'] = 'delete'; |
|
2604 | + } |
|
2503 | 2605 | |
2504 | 2606 | if (isset($_REQUEST['pm_action']) && $_REQUEST['pm_action'] != '' && !empty($_REQUEST['pms']) && is_array($_REQUEST['pms'])) |
2505 | 2607 | { |
2506 | - foreach ($_REQUEST['pms'] as $pm) |
|
2507 | - $_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action']; |
|
2608 | + foreach ($_REQUEST['pms'] as $pm) { |
|
2609 | + $_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action']; |
|
2610 | + } |
|
2508 | 2611 | } |
2509 | 2612 | |
2510 | - if (empty($_REQUEST['pm_actions'])) |
|
2511 | - redirectexit($context['current_label_redirect']); |
|
2613 | + if (empty($_REQUEST['pm_actions'])) { |
|
2614 | + redirectexit($context['current_label_redirect']); |
|
2615 | + } |
|
2512 | 2616 | |
2513 | 2617 | // If we are in conversation, we may need to apply this to every message in the conversation. |
2514 | 2618 | if ($context['display_mode'] == 2 && isset($_REQUEST['conversation'])) |
2515 | 2619 | { |
2516 | 2620 | $id_pms = array(); |
2517 | - foreach ($_REQUEST['pm_actions'] as $pm => $dummy) |
|
2518 | - $id_pms[] = (int) $pm; |
|
2621 | + foreach ($_REQUEST['pm_actions'] as $pm => $dummy) { |
|
2622 | + $id_pms[] = (int) $pm; |
|
2623 | + } |
|
2519 | 2624 | |
2520 | 2625 | $request = $smcFunc['db_query']('', ' |
2521 | 2626 | SELECT id_pm_head, id_pm |
@@ -2526,8 +2631,9 @@ discard block |
||
2526 | 2631 | ) |
2527 | 2632 | ); |
2528 | 2633 | $pm_heads = array(); |
2529 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
2530 | - $pm_heads[$row['id_pm_head']] = $row['id_pm']; |
|
2634 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
2635 | + $pm_heads[$row['id_pm_head']] = $row['id_pm']; |
|
2636 | + } |
|
2531 | 2637 | $smcFunc['db_free_result']($request); |
2532 | 2638 | |
2533 | 2639 | $request = $smcFunc['db_query']('', ' |
@@ -2541,8 +2647,9 @@ discard block |
||
2541 | 2647 | // Copy the action from the single to PM to the others. |
2542 | 2648 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
2543 | 2649 | { |
2544 | - if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]])) |
|
2545 | - $_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]]; |
|
2650 | + if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]])) { |
|
2651 | + $_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]]; |
|
2652 | + } |
|
2546 | 2653 | } |
2547 | 2654 | $smcFunc['db_free_result']($request); |
2548 | 2655 | } |
@@ -2553,22 +2660,21 @@ discard block |
||
2553 | 2660 | $labels = array(); |
2554 | 2661 | foreach ($_REQUEST['pm_actions'] as $pm => $action) |
2555 | 2662 | { |
2556 | - if ($action === 'delete') |
|
2557 | - $to_delete[] = (int) $pm; |
|
2558 | - else |
|
2663 | + if ($action === 'delete') { |
|
2664 | + $to_delete[] = (int) $pm; |
|
2665 | + } else |
|
2559 | 2666 | { |
2560 | 2667 | if (substr($action, 0, 4) == 'add_') |
2561 | 2668 | { |
2562 | 2669 | $type = 'add'; |
2563 | 2670 | $action = substr($action, 4); |
2564 | - } |
|
2565 | - elseif (substr($action, 0, 4) == 'rem_') |
|
2671 | + } elseif (substr($action, 0, 4) == 'rem_') |
|
2566 | 2672 | { |
2567 | 2673 | $type = 'rem'; |
2568 | 2674 | $action = substr($action, 4); |
2675 | + } else { |
|
2676 | + $type = 'unk'; |
|
2569 | 2677 | } |
2570 | - else |
|
2571 | - $type = 'unk'; |
|
2572 | 2678 | |
2573 | 2679 | if ($action == '-1' || (int) $action > 0) |
2574 | 2680 | { |
@@ -2579,8 +2685,9 @@ discard block |
||
2579 | 2685 | } |
2580 | 2686 | |
2581 | 2687 | // Deleting, it looks like? |
2582 | - if (!empty($to_delete)) |
|
2583 | - deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']); |
|
2688 | + if (!empty($to_delete)) { |
|
2689 | + deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']); |
|
2690 | + } |
|
2584 | 2691 | |
2585 | 2692 | // Are we labeling anything? |
2586 | 2693 | if (!empty($to_label) && $context['folder'] == 'inbox') |
@@ -2646,8 +2753,7 @@ discard block |
||
2646 | 2753 | } |
2647 | 2754 | |
2648 | 2755 | $smcFunc['db_free_result']($request2); |
2649 | - } |
|
2650 | - elseif ($type == 'rem') |
|
2756 | + } elseif ($type == 'rem') |
|
2651 | 2757 | { |
2652 | 2758 | // If we're removing from the inbox, see if we have at least one other label. |
2653 | 2759 | // This query is faster than the one above |
@@ -2679,21 +2785,25 @@ discard block |
||
2679 | 2785 | if ($to_label[$row['id_pm']] != '-1') |
2680 | 2786 | { |
2681 | 2787 | // If this label is in the list and we're not adding it, remove it |
2682 | - if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add') |
|
2683 | - unset($labels[$to_label[$row['id_pm']]]); |
|
2684 | - else if ($type !== 'rem') |
|
2685 | - $labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']]; |
|
2788 | + if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add') { |
|
2789 | + unset($labels[$to_label[$row['id_pm']]]); |
|
2790 | + } else if ($type !== 'rem') { |
|
2791 | + $labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']]; |
|
2792 | + } |
|
2686 | 2793 | } |
2687 | 2794 | |
2688 | 2795 | // Removing all labels or just removing the inbox label |
2689 | - if ($type == 'rem' && empty($labels)) |
|
2690 | - $in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0); |
|
2796 | + if ($type == 'rem' && empty($labels)) { |
|
2797 | + $in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0); |
|
2798 | + } |
|
2691 | 2799 | // Adding new labels, but removing inbox and applying new ones |
2692 | - elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels)) |
|
2693 | - $in_inbox = 0; |
|
2800 | + elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels)) { |
|
2801 | + $in_inbox = 0; |
|
2802 | + } |
|
2694 | 2803 | // Just adding it to the inbox |
2695 | - else |
|
2696 | - $in_inbox = 1; |
|
2804 | + else { |
|
2805 | + $in_inbox = 1; |
|
2806 | + } |
|
2697 | 2807 | |
2698 | 2808 | // Are we adding it to or removing it from the inbox? |
2699 | 2809 | if ($in_inbox != $row['in_inbox']) |
@@ -2735,8 +2845,9 @@ discard block |
||
2735 | 2845 | if (!empty($labels_to_apply)) |
2736 | 2846 | { |
2737 | 2847 | $inserts = array(); |
2738 | - foreach ($labels_to_apply as $label) |
|
2739 | - $inserts[] = array($row['id_pm'], $label); |
|
2848 | + foreach ($labels_to_apply as $label) { |
|
2849 | + $inserts[] = array($row['id_pm'], $label); |
|
2850 | + } |
|
2740 | 2851 | |
2741 | 2852 | $smcFunc['db_insert']('', |
2742 | 2853 | '{db_prefix}pm_labeled_messages', |
@@ -2780,11 +2891,13 @@ discard block |
||
2780 | 2891 | checkSession('get'); |
2781 | 2892 | |
2782 | 2893 | // If all then delete all messages the user has. |
2783 | - if ($_REQUEST['f'] == 'all') |
|
2784 | - deleteMessages(null, null); |
|
2894 | + if ($_REQUEST['f'] == 'all') { |
|
2895 | + deleteMessages(null, null); |
|
2896 | + } |
|
2785 | 2897 | // Otherwise just the selected folder. |
2786 | - else |
|
2787 | - deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent'); |
|
2898 | + else { |
|
2899 | + deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent'); |
|
2900 | + } |
|
2788 | 2901 | |
2789 | 2902 | // Done... all gone. |
2790 | 2903 | redirectexit($context['current_label_redirect']); |
@@ -2821,8 +2934,9 @@ discard block |
||
2821 | 2934 | 'msgtime' => $deleteTime, |
2822 | 2935 | ) |
2823 | 2936 | ); |
2824 | - while ($row = $smcFunc['db_fetch_row']($request)) |
|
2825 | - $toDelete[] = $row[0]; |
|
2937 | + while ($row = $smcFunc['db_fetch_row']($request)) { |
|
2938 | + $toDelete[] = $row[0]; |
|
2939 | + } |
|
2826 | 2940 | $smcFunc['db_free_result']($request); |
2827 | 2941 | |
2828 | 2942 | // Select all messages in their inbox older than $deleteTime. |
@@ -2839,8 +2953,9 @@ discard block |
||
2839 | 2953 | 'msgtime' => $deleteTime, |
2840 | 2954 | ) |
2841 | 2955 | ); |
2842 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
2843 | - $toDelete[] = $row['id_pm']; |
|
2956 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
2957 | + $toDelete[] = $row['id_pm']; |
|
2958 | + } |
|
2844 | 2959 | $smcFunc['db_free_result']($request); |
2845 | 2960 | |
2846 | 2961 | // Delete the actual messages. |
@@ -2871,26 +2986,29 @@ discard block |
||
2871 | 2986 | { |
2872 | 2987 | global $user_info, $smcFunc; |
2873 | 2988 | |
2874 | - if ($owner === null) |
|
2875 | - $owner = array($user_info['id']); |
|
2876 | - elseif (empty($owner)) |
|
2877 | - return; |
|
2878 | - elseif (!is_array($owner)) |
|
2879 | - $owner = array($owner); |
|
2989 | + if ($owner === null) { |
|
2990 | + $owner = array($user_info['id']); |
|
2991 | + } elseif (empty($owner)) { |
|
2992 | + return; |
|
2993 | + } elseif (!is_array($owner)) { |
|
2994 | + $owner = array($owner); |
|
2995 | + } |
|
2880 | 2996 | |
2881 | 2997 | if ($personal_messages !== null) |
2882 | 2998 | { |
2883 | - if (empty($personal_messages) || !is_array($personal_messages)) |
|
2884 | - return; |
|
2999 | + if (empty($personal_messages) || !is_array($personal_messages)) { |
|
3000 | + return; |
|
3001 | + } |
|
2885 | 3002 | |
2886 | - foreach ($personal_messages as $index => $delete_id) |
|
2887 | - $personal_messages[$index] = (int) $delete_id; |
|
3003 | + foreach ($personal_messages as $index => $delete_id) { |
|
3004 | + $personal_messages[$index] = (int) $delete_id; |
|
3005 | + } |
|
2888 | 3006 | |
2889 | 3007 | $where = ' |
2890 | 3008 | AND id_pm IN ({array_int:pm_list})'; |
3009 | + } else { |
|
3010 | + $where = ''; |
|
2891 | 3011 | } |
2892 | - else |
|
2893 | - $where = ''; |
|
2894 | 3012 | |
2895 | 3013 | if ($folder == 'sent' || $folder === null) |
2896 | 3014 | { |
@@ -2925,17 +3043,19 @@ discard block |
||
2925 | 3043 | // ...And update the statistics accordingly - now including unread messages!. |
2926 | 3044 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
2927 | 3045 | { |
2928 | - if ($row['is_read']) |
|
2929 | - updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'])); |
|
2930 | - else |
|
2931 | - updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages'])); |
|
3046 | + if ($row['is_read']) { |
|
3047 | + updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'])); |
|
3048 | + } else { |
|
3049 | + updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages'])); |
|
3050 | + } |
|
2932 | 3051 | |
2933 | 3052 | // If this is the current member we need to make their message count correct. |
2934 | 3053 | if ($user_info['id'] == $row['id_member']) |
2935 | 3054 | { |
2936 | 3055 | $user_info['messages'] -= $row['num_deleted_messages']; |
2937 | - if (!($row['is_read'])) |
|
2938 | - $user_info['unread_messages'] -= $row['num_deleted_messages']; |
|
3056 | + if (!($row['is_read'])) { |
|
3057 | + $user_info['unread_messages'] -= $row['num_deleted_messages']; |
|
3058 | + } |
|
2939 | 3059 | } |
2940 | 3060 | } |
2941 | 3061 | $smcFunc['db_free_result']($request); |
@@ -3003,8 +3123,9 @@ discard block |
||
3003 | 3123 | ) |
3004 | 3124 | ); |
3005 | 3125 | $remove_pms = array(); |
3006 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
3007 | - $remove_pms[] = $row['sender']; |
|
3126 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
3127 | + $remove_pms[] = $row['sender']; |
|
3128 | + } |
|
3008 | 3129 | $smcFunc['db_free_result']($request); |
3009 | 3130 | |
3010 | 3131 | if (!empty($remove_pms)) |
@@ -3049,8 +3170,9 @@ discard block |
||
3049 | 3170 | { |
3050 | 3171 | global $user_info, $context, $smcFunc; |
3051 | 3172 | |
3052 | - if ($owner === null) |
|
3053 | - $owner = $user_info['id']; |
|
3173 | + if ($owner === null) { |
|
3174 | + $owner = $user_info['id']; |
|
3175 | + } |
|
3054 | 3176 | |
3055 | 3177 | $in_inbox = ''; |
3056 | 3178 | |
@@ -3074,8 +3196,7 @@ discard block |
||
3074 | 3196 | } |
3075 | 3197 | |
3076 | 3198 | $smcFunc['db_free_result']($get_messages); |
3077 | - } |
|
3078 | - elseif ($label = '-1') |
|
3199 | + } elseif ($label = '-1') |
|
3079 | 3200 | { |
3080 | 3201 | // Marking all PMs in your inbox read |
3081 | 3202 | $in_inbox = ' |
@@ -3100,8 +3221,9 @@ discard block |
||
3100 | 3221 | { |
3101 | 3222 | if ($owner == $user_info['id']) |
3102 | 3223 | { |
3103 | - foreach ($context['labels'] as $label) |
|
3104 | - $context['labels'][(int) $label['id']]['unread_messages'] = 0; |
|
3224 | + foreach ($context['labels'] as $label) { |
|
3225 | + $context['labels'][(int) $label['id']]['unread_messages'] = 0; |
|
3226 | + } |
|
3105 | 3227 | } |
3106 | 3228 | |
3107 | 3229 | $result = $smcFunc['db_query']('', ' |
@@ -3121,8 +3243,9 @@ discard block |
||
3121 | 3243 | { |
3122 | 3244 | $total_unread += $row['num']; |
3123 | 3245 | |
3124 | - if ($owner != $user_info['id'] || empty($row['id_pm'])) |
|
3125 | - continue; |
|
3246 | + if ($owner != $user_info['id'] || empty($row['id_pm'])) { |
|
3247 | + continue; |
|
3248 | + } |
|
3126 | 3249 | |
3127 | 3250 | $this_labels = array(); |
3128 | 3251 | |
@@ -3146,11 +3269,13 @@ discard block |
||
3146 | 3269 | |
3147 | 3270 | $smcFunc['db_free_result']($result2); |
3148 | 3271 | |
3149 | - foreach ($this_labels as $this_label) |
|
3150 | - $context['labels'][$this_label]['unread_messages'] += $row['num']; |
|
3272 | + foreach ($this_labels as $this_label) { |
|
3273 | + $context['labels'][$this_label]['unread_messages'] += $row['num']; |
|
3274 | + } |
|
3151 | 3275 | |
3152 | - if ($row['in_inbox'] == 1) |
|
3153 | - $context['labels'][-1]['unread_messages'] += $row['num']; |
|
3276 | + if ($row['in_inbox'] == 1) { |
|
3277 | + $context['labels'][-1]['unread_messages'] += $row['num']; |
|
3278 | + } |
|
3154 | 3279 | } |
3155 | 3280 | $smcFunc['db_free_result']($result); |
3156 | 3281 | |
@@ -3159,8 +3284,9 @@ discard block |
||
3159 | 3284 | updateMemberData($owner, array('unread_messages' => $total_unread)); |
3160 | 3285 | |
3161 | 3286 | // If it was for the current member, reflect this in the $user_info array too. |
3162 | - if ($owner == $user_info['id']) |
|
3163 | - $user_info['unread_messages'] = $total_unread; |
|
3287 | + if ($owner == $user_info['id']) { |
|
3288 | + $user_info['unread_messages'] = $total_unread; |
|
3289 | + } |
|
3164 | 3290 | } |
3165 | 3291 | } |
3166 | 3292 | |
@@ -3188,8 +3314,9 @@ discard block |
||
3188 | 3314 | // Add all existing labels to the array to save, slashing them as necessary... |
3189 | 3315 | foreach ($context['labels'] as $label) |
3190 | 3316 | { |
3191 | - if ($label['id'] != -1) |
|
3192 | - $the_labels[$label['id']] = $label['name']; |
|
3317 | + if ($label['id'] != -1) { |
|
3318 | + $the_labels[$label['id']] = $label['name']; |
|
3319 | + } |
|
3193 | 3320 | } |
3194 | 3321 | |
3195 | 3322 | if (isset($_POST[$context['session_var']])) |
@@ -3208,8 +3335,9 @@ discard block |
||
3208 | 3335 | { |
3209 | 3336 | $_POST['label'] = strtr($smcFunc['htmlspecialchars'](trim($_POST['label'])), array(',' => ',')); |
3210 | 3337 | |
3211 | - if ($smcFunc['strlen']($_POST['label']) > 30) |
|
3212 | - $_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30); |
|
3338 | + if ($smcFunc['strlen']($_POST['label']) > 30) { |
|
3339 | + $_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30); |
|
3340 | + } |
|
3213 | 3341 | if ($_POST['label'] != '') |
3214 | 3342 | { |
3215 | 3343 | $the_labels[] = $_POST['label']; |
@@ -3230,23 +3358,24 @@ discard block |
||
3230 | 3358 | { |
3231 | 3359 | foreach ($the_labels as $id => $name) |
3232 | 3360 | { |
3233 | - if ($id == -1) |
|
3234 | - continue; |
|
3235 | - elseif (isset($_POST['label_name'][$id])) |
|
3361 | + if ($id == -1) { |
|
3362 | + continue; |
|
3363 | + } elseif (isset($_POST['label_name'][$id])) |
|
3236 | 3364 | { |
3237 | 3365 | $_POST['label_name'][$id] = trim(strtr($smcFunc['htmlspecialchars']($_POST['label_name'][$id]), array(',' => ','))); |
3238 | 3366 | |
3239 | - if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30) |
|
3240 | - $_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30); |
|
3367 | + if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30) { |
|
3368 | + $_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30); |
|
3369 | + } |
|
3241 | 3370 | if ($_POST['label_name'][$id] != '') |
3242 | 3371 | { |
3243 | 3372 | // Changing the name of this label? |
3244 | - if ($the_labels[$id] != $_POST['label_name'][$id]) |
|
3245 | - $label_updates[$id] = $_POST['label_name'][$id]; |
|
3373 | + if ($the_labels[$id] != $_POST['label_name'][$id]) { |
|
3374 | + $label_updates[$id] = $_POST['label_name'][$id]; |
|
3375 | + } |
|
3246 | 3376 | |
3247 | 3377 | $the_labels[(int) $id] = $_POST['label_name'][$id]; |
3248 | - } |
|
3249 | - else |
|
3378 | + } else |
|
3250 | 3379 | { |
3251 | 3380 | unset($the_labels[(int) $id]); |
3252 | 3381 | $labels_to_remove[] = $id; |
@@ -3260,8 +3389,9 @@ discard block |
||
3260 | 3389 | if (!empty($labels_to_add)) |
3261 | 3390 | { |
3262 | 3391 | $inserts = array(); |
3263 | - foreach ($labels_to_add AS $label) |
|
3264 | - $inserts[] = array($user_info['id'], $label); |
|
3392 | + foreach ($labels_to_add AS $label) { |
|
3393 | + $inserts[] = array($user_info['id'], $label); |
|
3394 | + } |
|
3265 | 3395 | |
3266 | 3396 | $smcFunc['db_insert']('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array()); |
3267 | 3397 | } |
@@ -3351,8 +3481,9 @@ discard block |
||
3351 | 3481 | // Each action... |
3352 | 3482 | foreach ($rule['actions'] as $k2 => $action) |
3353 | 3483 | { |
3354 | - if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove)) |
|
3355 | - continue; |
|
3484 | + if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove)) { |
|
3485 | + continue; |
|
3486 | + } |
|
3356 | 3487 | |
3357 | 3488 | $rule_changes[] = $rule['id']; |
3358 | 3489 | |
@@ -3367,8 +3498,8 @@ discard block |
||
3367 | 3498 | { |
3368 | 3499 | $rule_changes = array_unique($rule_changes); |
3369 | 3500 | // Update/delete as appropriate. |
3370 | - foreach ($rule_changes as $k => $id) |
|
3371 | - if (!empty($context['rules'][$id]['actions'])) |
|
3501 | + foreach ($rule_changes as $k => $id) { |
|
3502 | + if (!empty($context['rules'][$id]['actions'])) |
|
3372 | 3503 | { |
3373 | 3504 | $smcFunc['db_query']('', ' |
3374 | 3505 | UPDATE {db_prefix}pm_rules |
@@ -3381,12 +3512,13 @@ discard block |
||
3381 | 3512 | 'actions' => $smcFunc['json_encode']($context['rules'][$id]['actions']), |
3382 | 3513 | ) |
3383 | 3514 | ); |
3515 | + } |
|
3384 | 3516 | unset($rule_changes[$k]); |
3385 | 3517 | } |
3386 | 3518 | |
3387 | 3519 | // Anything left here means it's lost all actions... |
3388 | - if (!empty($rule_changes)) |
|
3389 | - $smcFunc['db_query']('', ' |
|
3520 | + if (!empty($rule_changes)) { |
|
3521 | + $smcFunc['db_query']('', ' |
|
3390 | 3522 | DELETE FROM {db_prefix}pm_rules |
3391 | 3523 | WHERE id_rule IN ({array_int:rule_list}) |
3392 | 3524 | AND id_member = {int:current_member}', |
@@ -3395,6 +3527,7 @@ discard block |
||
3395 | 3527 | 'rule_list' => $rule_changes, |
3396 | 3528 | ) |
3397 | 3529 | ); |
3530 | + } |
|
3398 | 3531 | } |
3399 | 3532 | |
3400 | 3533 | // Make sure we're not caching this! |
@@ -3464,8 +3597,9 @@ discard block |
||
3464 | 3597 | // Save the fields. |
3465 | 3598 | saveProfileFields(); |
3466 | 3599 | |
3467 | - if (!empty($profile_vars)) |
|
3468 | - updateMemberData($user_info['id'], $profile_vars); |
|
3600 | + if (!empty($profile_vars)) { |
|
3601 | + updateMemberData($user_info['id'], $profile_vars); |
|
3602 | + } |
|
3469 | 3603 | } |
3470 | 3604 | |
3471 | 3605 | setupProfileContext( |
@@ -3490,13 +3624,15 @@ discard block |
||
3490 | 3624 | global $user_info, $language, $modSettings, $smcFunc; |
3491 | 3625 | |
3492 | 3626 | // Check that this feature is even enabled! |
3493 | - if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg'])) |
|
3494 | - fatal_lang_error('no_access', false); |
|
3627 | + if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg'])) { |
|
3628 | + fatal_lang_error('no_access', false); |
|
3629 | + } |
|
3495 | 3630 | |
3496 | 3631 | $pmsg = (int) $_REQUEST['pmsg']; |
3497 | 3632 | |
3498 | - if (!isAccessiblePM($pmsg, 'inbox')) |
|
3499 | - fatal_lang_error('no_access', false); |
|
3633 | + if (!isAccessiblePM($pmsg, 'inbox')) { |
|
3634 | + fatal_lang_error('no_access', false); |
|
3635 | + } |
|
3500 | 3636 | |
3501 | 3637 | $context['pm_id'] = $pmsg; |
3502 | 3638 | $context['page_title'] = $txt['pm_report_title']; |
@@ -3518,8 +3654,9 @@ discard block |
||
3518 | 3654 | ) |
3519 | 3655 | ); |
3520 | 3656 | $context['admins'] = array(); |
3521 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
3522 | - $context['admins'][$row['id_member']] = $row['real_name']; |
|
3657 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
3658 | + $context['admins'][$row['id_member']] = $row['real_name']; |
|
3659 | + } |
|
3523 | 3660 | $smcFunc['db_free_result']($request); |
3524 | 3661 | |
3525 | 3662 | // How many admins in total? |
@@ -3548,8 +3685,9 @@ discard block |
||
3548 | 3685 | ) |
3549 | 3686 | ); |
3550 | 3687 | // Can only be a hacker here! |
3551 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
3552 | - fatal_lang_error('no_access', false); |
|
3688 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
3689 | + fatal_lang_error('no_access', false); |
|
3690 | + } |
|
3553 | 3691 | list ($subject, $body, $time, $memberFromID, $memberFromName) = $smcFunc['db_fetch_row']($request); |
3554 | 3692 | $smcFunc['db_free_result']($request); |
3555 | 3693 | |
@@ -3573,15 +3711,17 @@ discard block |
||
3573 | 3711 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
3574 | 3712 | { |
3575 | 3713 | // If it's hidden still don't reveal their names - privacy after all ;) |
3576 | - if ($row['bcc']) |
|
3577 | - $hidden_recipients++; |
|
3578 | - else |
|
3579 | - $recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]'; |
|
3714 | + if ($row['bcc']) { |
|
3715 | + $hidden_recipients++; |
|
3716 | + } else { |
|
3717 | + $recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]'; |
|
3718 | + } |
|
3580 | 3719 | } |
3581 | 3720 | $smcFunc['db_free_result']($request); |
3582 | 3721 | |
3583 | - if ($hidden_recipients) |
|
3584 | - $recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients); |
|
3722 | + if ($hidden_recipients) { |
|
3723 | + $recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients); |
|
3724 | + } |
|
3585 | 3725 | |
3586 | 3726 | // Now let's get out and loop through the admins. |
3587 | 3727 | $request = $smcFunc['db_query']('', ' |
@@ -3597,8 +3737,9 @@ discard block |
||
3597 | 3737 | ); |
3598 | 3738 | |
3599 | 3739 | // Maybe we shouldn't advertise this? |
3600 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
3601 | - fatal_lang_error('no_access', false); |
|
3740 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
3741 | + fatal_lang_error('no_access', false); |
|
3742 | + } |
|
3602 | 3743 | |
3603 | 3744 | $memberFromName = un_htmlspecialchars($memberFromName); |
3604 | 3745 | |
@@ -3617,8 +3758,9 @@ discard block |
||
3617 | 3758 | // Make the body. |
3618 | 3759 | $report_body = str_replace(array('{REPORTER}', '{SENDER}'), array(un_htmlspecialchars($user_info['name']), $memberFromName), $txt['pm_report_pm_user_sent']); |
3619 | 3760 | $report_body .= "\n" . '[b]' . $_POST['reason'] . '[/b]' . "\n\n"; |
3620 | - if (!empty($recipients)) |
|
3621 | - $report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n"; |
|
3761 | + if (!empty($recipients)) { |
|
3762 | + $report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n"; |
|
3763 | + } |
|
3622 | 3764 | $report_body .= $txt['pm_report_pm_unedited_below'] . "\n" . '[quote author=' . (empty($memberFromID) ? '"' . $memberFromName . '"' : $memberFromName . ' link=action=profile;u=' . $memberFromID . ' date=' . $time) . ']' . "\n" . un_htmlspecialchars($body) . '[/quote]'; |
3623 | 3765 | |
3624 | 3766 | // Plonk it in the array ;) |
@@ -3638,12 +3780,14 @@ discard block |
||
3638 | 3780 | $smcFunc['db_free_result']($request); |
3639 | 3781 | |
3640 | 3782 | // Send a different email for each language. |
3641 | - foreach ($messagesToSend as $lang => $message) |
|
3642 | - sendpm($message['recipients'], $message['subject'], $message['body']); |
|
3783 | + foreach ($messagesToSend as $lang => $message) { |
|
3784 | + sendpm($message['recipients'], $message['subject'], $message['body']); |
|
3785 | + } |
|
3643 | 3786 | |
3644 | 3787 | // Give the user their own language back! |
3645 | - if (!empty($modSettings['userLanguage'])) |
|
3646 | - loadLanguage('PersonalMessage', '', false); |
|
3788 | + if (!empty($modSettings['userLanguage'])) { |
|
3789 | + loadLanguage('PersonalMessage', '', false); |
|
3790 | + } |
|
3647 | 3791 | |
3648 | 3792 | // Leave them with a template. |
3649 | 3793 | $context['sub_template'] = 'report_message_complete'; |
@@ -3689,8 +3833,9 @@ discard block |
||
3689 | 3833 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
3690 | 3834 | { |
3691 | 3835 | // Hide hidden groups! |
3692 | - if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) |
|
3693 | - continue; |
|
3836 | + if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) { |
|
3837 | + continue; |
|
3838 | + } |
|
3694 | 3839 | |
3695 | 3840 | $context['groups'][$row['id_group']] = $row['group_name']; |
3696 | 3841 | } |
@@ -3716,9 +3861,10 @@ discard block |
||
3716 | 3861 | $context['rule'] = $context['rules'][$context['rid']]; |
3717 | 3862 | $members = array(); |
3718 | 3863 | // Need to get member names! |
3719 | - foreach ($context['rule']['criteria'] as $k => $criteria) |
|
3720 | - if ($criteria['t'] == 'mid' && !empty($criteria['v'])) |
|
3864 | + foreach ($context['rule']['criteria'] as $k => $criteria) { |
|
3865 | + if ($criteria['t'] == 'mid' && !empty($criteria['v'])) |
|
3721 | 3866 | $members[(int) $criteria['v']] = $k; |
3867 | + } |
|
3722 | 3868 | |
3723 | 3869 | if (!empty($members)) |
3724 | 3870 | { |
@@ -3730,19 +3876,20 @@ discard block |
||
3730 | 3876 | 'member_list' => array_keys($members), |
3731 | 3877 | ) |
3732 | 3878 | ); |
3733 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
3734 | - $context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name']; |
|
3879 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
3880 | + $context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name']; |
|
3881 | + } |
|
3735 | 3882 | $smcFunc['db_free_result']($request); |
3736 | 3883 | } |
3737 | - } |
|
3738 | - else |
|
3739 | - $context['rule'] = array( |
|
3884 | + } else { |
|
3885 | + $context['rule'] = array( |
|
3740 | 3886 | 'id' => '', |
3741 | 3887 | 'name' => '', |
3742 | 3888 | 'criteria' => array(), |
3743 | 3889 | 'actions' => array(), |
3744 | 3890 | 'logic' => 'and', |
3745 | 3891 | ); |
3892 | + } |
|
3746 | 3893 | } |
3747 | 3894 | // Saving? |
3748 | 3895 | elseif (isset($_GET['save'])) |
@@ -3752,22 +3899,25 @@ discard block |
||
3752 | 3899 | |
3753 | 3900 | // Name is easy! |
3754 | 3901 | $ruleName = $smcFunc['htmlspecialchars'](trim($_POST['rule_name'])); |
3755 | - if (empty($ruleName)) |
|
3756 | - fatal_lang_error('pm_rule_no_name', false); |
|
3902 | + if (empty($ruleName)) { |
|
3903 | + fatal_lang_error('pm_rule_no_name', false); |
|
3904 | + } |
|
3757 | 3905 | |
3758 | 3906 | // Sanity check... |
3759 | - if (empty($_POST['ruletype']) || empty($_POST['acttype'])) |
|
3760 | - fatal_lang_error('pm_rule_no_criteria', false); |
|
3907 | + if (empty($_POST['ruletype']) || empty($_POST['acttype'])) { |
|
3908 | + fatal_lang_error('pm_rule_no_criteria', false); |
|
3909 | + } |
|
3761 | 3910 | |
3762 | 3911 | // Let's do the criteria first - it's also hardest! |
3763 | 3912 | $criteria = array(); |
3764 | 3913 | foreach ($_POST['ruletype'] as $ind => $type) |
3765 | 3914 | { |
3766 | 3915 | // Check everything is here... |
3767 | - if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]]))) |
|
3768 | - continue; |
|
3769 | - elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind])) |
|
3770 | - continue; |
|
3916 | + if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]]))) { |
|
3917 | + continue; |
|
3918 | + } elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind])) { |
|
3919 | + continue; |
|
3920 | + } |
|
3771 | 3921 | |
3772 | 3922 | // Members need to be found. |
3773 | 3923 | if ($type == 'mid') |
@@ -3791,13 +3941,13 @@ discard block |
||
3791 | 3941 | $smcFunc['db_free_result']($request); |
3792 | 3942 | |
3793 | 3943 | $criteria[] = array('t' => 'mid', 'v' => $memID); |
3944 | + } elseif ($type == 'bud') { |
|
3945 | + $criteria[] = array('t' => 'bud', 'v' => 1); |
|
3946 | + } elseif ($type == 'gid') { |
|
3947 | + $criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]); |
|
3948 | + } elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '') { |
|
3949 | + $criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind]))); |
|
3794 | 3950 | } |
3795 | - elseif ($type == 'bud') |
|
3796 | - $criteria[] = array('t' => 'bud', 'v' => 1); |
|
3797 | - elseif ($type == 'gid') |
|
3798 | - $criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]); |
|
3799 | - elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '') |
|
3800 | - $criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind]))); |
|
3801 | 3951 | } |
3802 | 3952 | |
3803 | 3953 | // Also do the actions! |
@@ -3807,26 +3957,29 @@ discard block |
||
3807 | 3957 | foreach ($_POST['acttype'] as $ind => $type) |
3808 | 3958 | { |
3809 | 3959 | // Picking a valid label? |
3810 | - if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]]))) |
|
3811 | - continue; |
|
3960 | + if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]]))) { |
|
3961 | + continue; |
|
3962 | + } |
|
3812 | 3963 | |
3813 | 3964 | // Record what we're doing. |
3814 | - if ($type == 'del') |
|
3815 | - $doDelete = 1; |
|
3816 | - elseif ($type == 'lab') |
|
3817 | - $actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]); |
|
3965 | + if ($type == 'del') { |
|
3966 | + $doDelete = 1; |
|
3967 | + } elseif ($type == 'lab') { |
|
3968 | + $actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]); |
|
3969 | + } |
|
3818 | 3970 | } |
3819 | 3971 | |
3820 | - if (empty($criteria) || (empty($actions) && !$doDelete)) |
|
3821 | - fatal_lang_error('pm_rule_no_criteria', false); |
|
3972 | + if (empty($criteria) || (empty($actions) && !$doDelete)) { |
|
3973 | + fatal_lang_error('pm_rule_no_criteria', false); |
|
3974 | + } |
|
3822 | 3975 | |
3823 | 3976 | // What are we storing? |
3824 | 3977 | $criteria = $smcFunc['json_encode']($criteria); |
3825 | 3978 | $actions = $smcFunc['json_encode']($actions); |
3826 | 3979 | |
3827 | 3980 | // Create the rule? |
3828 | - if (empty($context['rid'])) |
|
3829 | - $smcFunc['db_insert']('', |
|
3981 | + if (empty($context['rid'])) { |
|
3982 | + $smcFunc['db_insert']('', |
|
3830 | 3983 | '{db_prefix}pm_rules', |
3831 | 3984 | array( |
3832 | 3985 | 'id_member' => 'int', 'rule_name' => 'string', 'criteria' => 'string', 'actions' => 'string', |
@@ -3837,8 +3990,8 @@ discard block |
||
3837 | 3990 | ), |
3838 | 3991 | array('id_rule') |
3839 | 3992 | ); |
3840 | - else |
|
3841 | - $smcFunc['db_query']('', ' |
|
3993 | + } else { |
|
3994 | + $smcFunc['db_query']('', ' |
|
3842 | 3995 | UPDATE {db_prefix}pm_rules |
3843 | 3996 | SET rule_name = {string:rule_name}, criteria = {string:criteria}, actions = {string:actions}, |
3844 | 3997 | delete_pm = {int:delete_pm}, is_or = {int:is_or} |
@@ -3854,6 +4007,7 @@ discard block |
||
3854 | 4007 | 'actions' => $actions, |
3855 | 4008 | ) |
3856 | 4009 | ); |
4010 | + } |
|
3857 | 4011 | |
3858 | 4012 | redirectexit('action=pm;sa=manrules'); |
3859 | 4013 | } |
@@ -3862,11 +4016,12 @@ discard block |
||
3862 | 4016 | { |
3863 | 4017 | checkSession(); |
3864 | 4018 | $toDelete = array(); |
3865 | - foreach ($_POST['delrule'] as $k => $v) |
|
3866 | - $toDelete[] = (int) $k; |
|
4019 | + foreach ($_POST['delrule'] as $k => $v) { |
|
4020 | + $toDelete[] = (int) $k; |
|
4021 | + } |
|
3867 | 4022 | |
3868 | - if (!empty($toDelete)) |
|
3869 | - $smcFunc['db_query']('', ' |
|
4023 | + if (!empty($toDelete)) { |
|
4024 | + $smcFunc['db_query']('', ' |
|
3870 | 4025 | DELETE FROM {db_prefix}pm_rules |
3871 | 4026 | WHERE id_rule IN ({array_int:delete_list}) |
3872 | 4027 | AND id_member = {int:current_member}', |
@@ -3875,6 +4030,7 @@ discard block |
||
3875 | 4030 | 'delete_list' => $toDelete, |
3876 | 4031 | ) |
3877 | 4032 | ); |
4033 | + } |
|
3878 | 4034 | |
3879 | 4035 | redirectexit('action=pm;sa=manrules'); |
3880 | 4036 | } |
@@ -3893,8 +4049,9 @@ discard block |
||
3893 | 4049 | loadRules(); |
3894 | 4050 | |
3895 | 4051 | // No rules? |
3896 | - if (empty($context['rules'])) |
|
3897 | - return; |
|
4052 | + if (empty($context['rules'])) { |
|
4053 | + return; |
|
4054 | + } |
|
3898 | 4055 | |
3899 | 4056 | // Just unread ones? |
3900 | 4057 | $ruleQuery = $all_messages ? '' : ' AND pmr.is_new = 1'; |
@@ -3924,8 +4081,9 @@ discard block |
||
3924 | 4081 | // Loop through all the criteria hoping to make a match. |
3925 | 4082 | foreach ($rule['criteria'] as $criterium) |
3926 | 4083 | { |
3927 | - if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false)) |
|
3928 | - $match = true; |
|
4084 | + if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false)) { |
|
4085 | + $match = true; |
|
4086 | + } |
|
3929 | 4087 | // If we're adding and one criteria don't match then we stop! |
3930 | 4088 | elseif ($rule['logic'] == 'and') |
3931 | 4089 | { |
@@ -3937,17 +4095,18 @@ discard block |
||
3937 | 4095 | // If we have a match the rule must be true - act! |
3938 | 4096 | if ($match) |
3939 | 4097 | { |
3940 | - if ($rule['delete']) |
|
3941 | - $actions['deletes'][] = $row['id_pm']; |
|
3942 | - else |
|
4098 | + if ($rule['delete']) { |
|
4099 | + $actions['deletes'][] = $row['id_pm']; |
|
4100 | + } else |
|
3943 | 4101 | { |
3944 | 4102 | foreach ($rule['actions'] as $ruleAction) |
3945 | 4103 | { |
3946 | 4104 | if ($ruleAction['t'] == 'lab') |
3947 | 4105 | { |
3948 | 4106 | // Get a basic pot started! |
3949 | - if (!isset($actions['labels'][$row['id_pm']])) |
|
3950 | - $actions['labels'][$row['id_pm']] = array(); |
|
4107 | + if (!isset($actions['labels'][$row['id_pm']])) { |
|
4108 | + $actions['labels'][$row['id_pm']] = array(); |
|
4109 | + } |
|
3951 | 4110 | $actions['labels'][$row['id_pm']][] = $ruleAction['v']; |
3952 | 4111 | } |
3953 | 4112 | } |
@@ -3958,8 +4117,9 @@ discard block |
||
3958 | 4117 | $smcFunc['db_free_result']($request); |
3959 | 4118 | |
3960 | 4119 | // Deletes are easy! |
3961 | - if (!empty($actions['deletes'])) |
|
3962 | - deleteMessages($actions['deletes']); |
|
4120 | + if (!empty($actions['deletes'])) { |
|
4121 | + deleteMessages($actions['deletes']); |
|
4122 | + } |
|
3963 | 4123 | |
3964 | 4124 | // Relabel? |
3965 | 4125 | if (!empty($actions['labels'])) |
@@ -3986,8 +4146,7 @@ discard block |
||
3986 | 4146 | 'current_member' => $user_info['id'], |
3987 | 4147 | ) |
3988 | 4148 | ); |
3989 | - } |
|
3990 | - else |
|
4149 | + } else |
|
3991 | 4150 | { |
3992 | 4151 | $realLabels[] = $label['id']; |
3993 | 4152 | } |
@@ -3996,8 +4155,9 @@ discard block |
||
3996 | 4155 | |
3997 | 4156 | $inserts = array(); |
3998 | 4157 | // Now we insert the label info |
3999 | - foreach ($realLabels as $a_label) |
|
4000 | - $inserts[] = array($pm, $a_label); |
|
4158 | + foreach ($realLabels as $a_label) { |
|
4159 | + $inserts[] = array($pm, $a_label); |
|
4160 | + } |
|
4001 | 4161 | |
4002 | 4162 | $smcFunc['db_insert']('ignore', |
4003 | 4163 | '{db_prefix}pm_labeled_messages', |
@@ -4018,8 +4178,9 @@ discard block |
||
4018 | 4178 | { |
4019 | 4179 | global $user_info, $context, $smcFunc; |
4020 | 4180 | |
4021 | - if (isset($context['rules']) && !$reload) |
|
4022 | - return; |
|
4181 | + if (isset($context['rules']) && !$reload) { |
|
4182 | + return; |
|
4183 | + } |
|
4023 | 4184 | |
4024 | 4185 | $request = $smcFunc['db_query']('', ' |
4025 | 4186 | SELECT |
@@ -4043,8 +4204,9 @@ discard block |
||
4043 | 4204 | 'logic' => $row['is_or'] ? 'or' : 'and', |
4044 | 4205 | ); |
4045 | 4206 | |
4046 | - if ($row['delete_pm']) |
|
4047 | - $context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1); |
|
4207 | + if ($row['delete_pm']) { |
|
4208 | + $context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1); |
|
4209 | + } |
|
4048 | 4210 | } |
4049 | 4211 | $smcFunc['db_free_result']($request); |
4050 | 4212 | } |