Passed
Pull Request — release-2.1 (#6140)
by Mert
03:48
created
Sources/ReportedContent.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -93,14 +93,14 @@  discard block
 block discarded – undo
93 93
 				),
94 94
 				'ignore' => array(
95 95
 					'label' => $report['ignore'] ? $txt['mc_reportedp_unignore'] : $txt['mc_reportedp_ignore'],
96
-					'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;ignore='.(int)!$report['ignore'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-ignore_token_var'].'='.$context['mod-report-ignore_token'],
96
+					'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;ignore=' . (int) !$report['ignore'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-ignore_token_var'] . '=' . $context['mod-report-ignore_token'],
97 97
 					'javascript' => !$report['ignore'] ? ' data-confirm="' . $txt['mc_reportedp_ignore_confirm'] . '"' : '',
98 98
 					'class' => 'you_sure',
99 99
 					'icon' => 'ignore'
100 100
 				),
101 101
 				'close' => array(
102 102
 					'label' => $context['view_closed'] ? $txt['mc_reportedp_open'] : $txt['mc_reportedp_close'],
103
-					'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;closed='.(int)!$report['closed'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-closed_token_var'].'='.$context['mod-report-closed_token'],
103
+					'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;closed=' . (int) !$report['closed'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-closed_token_var'] . '=' . $context['mod-report-closed_token'],
104 104
 					'icon' => $context['view_closed'] ? 'folder' : 'close',
105 105
 				),
106 106
 			);
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
109 109
 			if ($context['report_type'] == 'posts')
110 110
 				$context['reports'][$key]['quickbuttons']['delete'] = array(
111 111
 					'label' => $txt['mc_reportedp_delete'],
112
-					'href' => $scripturl.'?action=deletemsg;topic='.$report['topic']['id'].'.0;msg='.$report['topic']['id_msg'].';modcenter;'.$context['session_var'].'='.$context['session_id'],
113
-					'javascript' => 'data-confirm="'.$txt['mc_reportedp_delete_confirm'].'"',
112
+					'href' => $scripturl . '?action=deletemsg;topic=' . $report['topic']['id'] . '.0;msg=' . $report['topic']['id_msg'] . ';modcenter;' . $context['session_var'] . '=' . $context['session_id'],
113
+					'javascript' => 'data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '"',
114 114
 					'class' => 'you_sure',
115 115
 					'icon' => 'delete',
116 116
 					'show' => !$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards']))
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 
119 119
 			// Ban reported member/post author link
120 120
 			if ($context['report_type'] == 'members')
121
-				$ban_link = $scripturl.'?action=admin;area=ban;sa=add;u='.$report['user']['id'].';'.$context['session_var'].'='.$context['session_id'];
121
+				$ban_link = $scripturl . '?action=admin;area=ban;sa=add;u=' . $report['user']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'];
122 122
 			else
123
-				$ban_link = $scripturl.'?action=admin;area=ban;sa=add'.(!empty($report['author']['id']) ? ';u='.$report['author']['id'] : ';msg='.$report['topic']['id_msg']).';'.$context['session_var'].'='.$context['session_id'];
123
+				$ban_link = $scripturl . '?action=admin;area=ban;sa=add' . (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']) . ';' . $context['session_var'] . '=' . $context['session_id'];
124 124
 
125 125
 			$context['reports'][$key]['quickbuttons'] += array(
126 126
 				'ban' => array(
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 					'show' => !$report['closed'] && !empty($context['report_manage_bans']) && ($context['report_type'] == 'posts' || $context['report_type'] == 'members' && !empty($report['user']['id']))
131 131
 				),
132 132
 				'quickmod' => array(
133
-					'content' => '<input type="checkbox" name="close[]" value="'.$report['id'].'">',
133
+					'content' => '<input type="checkbox" name="close[]" value="' . $report['id'] . '">',
134 134
 					'show' => !$context['view_closed']
135 135
 				)
136 136
 			);
Please login to merge, or discard this patch.
Sources/Drafts.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -644,13 +644,13 @@  discard block
 block discarded – undo
644 644
 			'quickbuttons' => array(
645 645
 				'edit' => array(
646 646
 					'label' => $txt['draft_edit'],
647
-					'href' => $scripturl.'?action=post;'.(empty($row['id_topic']) ? 'board='.$row['id_board'] : 'topic='.$row['id_topic']).'.0;id_draft='.$row['id_draft'],
647
+					'href' => $scripturl . '?action=post;' . (empty($row['id_topic']) ? 'board=' . $row['id_board'] : 'topic=' . $row['id_topic']) . '.0;id_draft=' . $row['id_draft'],
648 648
 					'icon' => 'modify_button'
649 649
 				),
650 650
 				'delete' => array(
651 651
 					'label' => $txt['draft_delete'],
652
-					'href' => $scripturl.'?action=profile;u='.$context['member']['id'].';area=showdrafts;delete='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'],
653
-					'javascript' => 'data-confirm="'.$txt['draft_remove'].'"',
652
+					'href' => $scripturl . '?action=profile;u=' . $context['member']['id'] . ';area=showdrafts;delete=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'],
653
+					'javascript' => 'data-confirm="' . $txt['draft_remove'] . '"',
654 654
 					'class' => 'you_sure',
655 655
 					'icon' => 'remove_button'
656 656
 				),
@@ -837,13 +837,13 @@  discard block
 block discarded – undo
837 837
 			'quickbuttons' => array(
838 838
 				'edit' => array(
839 839
 					'label' => $txt['draft_edit'],
840
-					'href' => $scripturl.'?action=pm;sa=showpmdrafts;id_draft='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'],
840
+					'href' => $scripturl . '?action=pm;sa=showpmdrafts;id_draft=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'],
841 841
 					'icon' => 'modify_button'
842 842
 				),
843 843
 				'delete' => array(
844 844
 					'label' => $txt['draft_delete'],
845
-					'href' => $scripturl.'?action=pm;sa=showpmdrafts;delete='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'],
846
-					'javascript' => 'data-confirm="'.$txt['draft_remove'].'?"',
845
+					'href' => $scripturl . '?action=pm;sa=showpmdrafts;delete=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'],
846
+					'javascript' => 'data-confirm="' . $txt['draft_remove'] . '?"',
847 847
 					'class' => 'you_sure',
848 848
 					'icon' => 'remove_button'
849 849
 				),
Please login to merge, or discard this patch.
Sources/Display.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1655,14 +1655,14 @@  discard block
 block discarded – undo
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
 block discarded – undo
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'],
Please login to merge, or discard this patch.