@@ -1655,14 +1655,14 @@ discard block |
||
1655 | 1655 | $output['quickbuttons'] = array( |
1656 | 1656 | 'quote' => array( |
1657 | 1657 | 'label' => $txt['quote_action'], |
1658 | - 'href' => $scripturl.'?action=post;quote='.$output['id'].';topic='.$context['current_topic'], '.'.$context['start'].';last_msg='.$context['topic_last_message'], |
|
1659 | - 'javascript' => 'onclick="return oQuickReply.quote('.$output['id'].');"', |
|
1658 | + 'href' => $scripturl . '?action=post;quote=' . $output['id'] . ';topic=' . $context['current_topic'], '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], |
|
1659 | + 'javascript' => 'onclick="return oQuickReply.quote(' . $output['id'] . ');"', |
|
1660 | 1660 | 'icon' => 'quote', |
1661 | 1661 | 'show' => $context['can_quote'] |
1662 | 1662 | ), |
1663 | 1663 | 'quote_selected' => array( |
1664 | 1664 | 'label' => $txt['quote_selected_action'], |
1665 | - 'id' => 'quoteSelected_'. $output['id'], |
|
1665 | + 'id' => 'quoteSelected_' . $output['id'], |
|
1666 | 1666 | 'href' => 'javascript:void(0)', |
1667 | 1667 | 'custom' => 'style="display:none"', |
1668 | 1668 | 'icon' => 'quote_selected', |
@@ -1671,73 +1671,73 @@ discard block |
||
1671 | 1671 | 'quick_edit' => array( |
1672 | 1672 | 'label' => $txt['quick_edit'], |
1673 | 1673 | 'class' => 'quick_edit', |
1674 | - 'id' =>' modify_button_'. $output['id'], |
|
1675 | - 'custom' => 'onclick="oQuickModify.modifyMsg(\''.$output['id'].'\', \''.!empty($modSettings['toggle_subject']).'\')"', |
|
1674 | + 'id' =>' modify_button_' . $output['id'], |
|
1675 | + 'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty($modSettings['toggle_subject']) . '\')"', |
|
1676 | 1676 | 'icon' => 'quick_edit_button', |
1677 | 1677 | 'show' => $output['can_modify'] |
1678 | 1678 | ), |
1679 | 1679 | 'more' => array( |
1680 | 1680 | 'modify' => array( |
1681 | 1681 | 'label' => $txt['modify'], |
1682 | - 'href' => $scripturl.'?action=post;msg='.$output['id'].';topic='.$context['current_topic'].'.'.$context['start'], |
|
1682 | + 'href' => $scripturl . '?action=post;msg=' . $output['id'] . ';topic=' . $context['current_topic'] . '.' . $context['start'], |
|
1683 | 1683 | 'icon' => 'modify_button', |
1684 | 1684 | 'show' => $output['can_modify'] |
1685 | 1685 | ), |
1686 | 1686 | 'remove_topic' => array( |
1687 | 1687 | 'label' => $txt['remove_topic'], |
1688 | - 'href' => $scripturl.'?action=removetopic2;topic='.$context['current_topic'].'.'.$context['start'].';'.$context['session_var'].'='.$context['session_id'], |
|
1689 | - 'javascript' => 'data-confirm="'.$txt['are_sure_remove_topic'].'"', |
|
1688 | + 'href' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
1689 | + 'javascript' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', |
|
1690 | 1690 | 'class' => 'you_sure', |
1691 | 1691 | 'icon' => 'remove_button', |
1692 | 1692 | 'show' => $context['can_delete'] && ($context['topic_first_message'] == $output['id']) |
1693 | 1693 | ), |
1694 | 1694 | 'remove' => array( |
1695 | 1695 | 'label' => $txt['remove'], |
1696 | - 'href' => $scripturl.'?action=deletemsg;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'], |
|
1697 | - 'javascript' => 'data-confirm="'.$txt['remove_message_question'].'"', |
|
1696 | + 'href' => $scripturl . '?action=deletemsg;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
1697 | + 'javascript' => 'data-confirm="' . $txt['remove_message_question'] . '"', |
|
1698 | 1698 | 'class' => 'you_sure', |
1699 | 1699 | 'icon' => 'remove_button', |
1700 | 1700 | 'show' => $output['can_remove'] && ($context['topic_first_message'] != $output['id']) |
1701 | 1701 | ), |
1702 | 1702 | 'split' => array( |
1703 | 1703 | 'label' => $txt['split'], |
1704 | - 'href' => $scripturl.'?action=splittopics;topic='.$context['current_topic'].'.0;at='.$output['id'], |
|
1704 | + 'href' => $scripturl . '?action=splittopics;topic=' . $context['current_topic'] . '.0;at=' . $output['id'], |
|
1705 | 1705 | 'icon' => 'split_button', |
1706 | 1706 | 'show' => $context['can_split'] && !empty($context['real_num_replies']) |
1707 | 1707 | ), |
1708 | 1708 | 'report' => array( |
1709 | 1709 | 'label' => $txt['report_to_mod'], |
1710 | - 'href' => $scripturl.'?action=reporttm;topic='.$context['current_topic'].'.'.$output['counter'].';msg='.$output['id'], |
|
1710 | + 'href' => $scripturl . '?action=reporttm;topic=' . $context['current_topic'] . '.' . $output['counter'] . ';msg=' . $output['id'], |
|
1711 | 1711 | 'icon' => 'error', |
1712 | 1712 | 'show' => $context['can_report_moderator'] |
1713 | 1713 | ), |
1714 | 1714 | 'warn' => array( |
1715 | 1715 | 'label' => $txt['issue_warning'], |
1716 | - 'href' => $scripturl.'?action=profile;area=issuewarning;u='.$output['member']['id'].';msg='.$output['id'], |
|
1716 | + 'href' => $scripturl . '?action=profile;area=issuewarning;u=' . $output['member']['id'] . ';msg=' . $output['id'], |
|
1717 | 1717 | 'icon' => 'warn_button', |
1718 | 1718 | 'show' => $context['can_issue_warning'] && !$output['is_message_author'] && !$output['member']['is_guest'] |
1719 | 1719 | ), |
1720 | 1720 | 'restore' => array( |
1721 | 1721 | 'label' => $txt['restore_message'], |
1722 | - 'href' => $scripturl.'?action=restoretopic;msgs='.$output['id'].';'.$context['session_var'].'='.$context['session_id'], |
|
1722 | + 'href' => $scripturl . '?action=restoretopic;msgs=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
1723 | 1723 | 'icon' => 'restore_button', |
1724 | 1724 | 'show' => $context['can_restore_msg'] |
1725 | 1725 | ), |
1726 | 1726 | 'approve' => array( |
1727 | 1727 | 'label' => $txt['approve'], |
1728 | - 'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'], |
|
1728 | + 'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
1729 | 1729 | 'icon' => 'approve_button', |
1730 | 1730 | 'show' => $output['can_approve'] |
1731 | 1731 | ), |
1732 | 1732 | 'unapprove' => array( |
1733 | 1733 | 'label' => $txt['unapprove'], |
1734 | - 'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'], |
|
1734 | + 'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
|
1735 | 1735 | 'icon' => 'unapprove_button', |
1736 | 1736 | 'show' => $output['can_unapprove'] |
1737 | 1737 | ), |
1738 | 1738 | ), |
1739 | 1739 | 'quickmod' => array( |
1740 | - 'id' => 'in_topic_mod_check_'. $output['id'], |
|
1740 | + 'id' => 'in_topic_mod_check_' . $output['id'], |
|
1741 | 1741 | 'custom' => 'style="display: none;"', |
1742 | 1742 | 'content' => '', |
1743 | 1743 | 'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $output['can_remove'], |
@@ -1721,7 +1721,7 @@ discard block |
||
1721 | 1721 | { |
1722 | 1722 | // Avoid double separators and empty titled sections |
1723 | 1723 | $empty_section = true; |
1724 | - for ($j=$i+1; $j < count($context['theme_options']); $j++) |
|
1724 | + for ($j = $i + 1; $j < count($context['theme_options']); $j++) |
|
1725 | 1725 | { |
1726 | 1726 | // Found another separator, so we're done |
1727 | 1727 | if (!is_array($context['theme_options'][$j])) |
@@ -2700,8 +2700,7 @@ discard block |
||
2700 | 2700 | foreach ($context['post_errors'] as $error) |
2701 | 2701 | { |
2702 | 2702 | $text_key_error = $error == 'password_short' ? |
2703 | - printf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) : |
|
2704 | - $txt['profile_error_' . $error]; |
|
2703 | + printf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) : $txt['profile_error_' . $error]; |
|
2705 | 2704 | |
2706 | 2705 | echo ' |
2707 | 2706 | <li>', isset($txt['profile_error_' . $error]) ? $text_key_error : $error, '</li>'; |
@@ -163,7 +163,8 @@ |
||
163 | 163 | else |
164 | 164 | $context['help_text'] = $_GET['help']; |
165 | 165 | |
166 | - switch ($_GET['help']) { |
|
166 | + switch ($_GET['help']) |
|
167 | + { |
|
167 | 168 | case 'cal_short_months': |
168 | 169 | $context['help_text'] = sprintf($context['help_text'], $txt['months_short'][1], $txt['months_titles'][1]); |
169 | 170 | break; |