Completed
Push — release-2.1 ( 4c82a0...64d581 )
by Rick
09:29
created
Themes/default/Profile.template.php 1 patch
Spacing   +29 added lines, -30 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 	echo '
56 56
 		<div class="profile_user_avatar floatleft">
57
-			<a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['member']['avatar']['image'],'</a>
57
+			<a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['member']['avatar']['image'], '</a>
58 58
 		</div>
59 59
 		<div class="profile_user_info floatleft">
60 60
 			<span class="profile_username"><a href="', $scripturl, '?action=profile;u=', $context['user']['id'], '">', $context['user']['name'], '</a></span>
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 		echo '
330 330
 					<dt>', $txt['profile_warning_level'], ': </dt>
331 331
 					<dd>
332
-						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning') , '">', $context['member']['warning'], '%</a>';
332
+						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning'), '">', $context['member']['warning'], '%</a>';
333 333
 
334 334
 		// Can we provide information on what this means?
335 335
 		if (!empty($context['warning_status']))
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 		// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
348 348
 		if (!empty($context['activate_message']))
349 349
 			echo '
350
-					<dt class="clear"><span class="alert">', $context['activate_message'], '</span>&nbsp;(<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="'. $txt['profileConfirm'] .'"' : ''), '>', $context['activate_link_text'], '</a>)</dt>';
350
+					<dt class="clear"><span class="alert">', $context['activate_message'], '</span>&nbsp;(<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="' . $txt['profileConfirm'] . '"' : ''), '>', $context['activate_link_text'], '</a>)</dt>';
351 351
 
352 352
 		// If the current member is banned, show a message and possibly a link to the ban.
353 353
 		if (!empty($context['member']['bans']))
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 		foreach ($context['posts'] as $post)
474 474
 		{
475 475
 			echo '
476
-			<div class="', $post['css_class'] ,'">
476
+			<div class="', $post['css_class'], '">
477 477
 				<div class="counter">', $post['counter'], '</div>
478 478
 				<div class="topic_details">
479 479
 					<h5><strong><a href="', $scripturl, '?board=', $post['board']['id'], '.0">', $post['board']['name'], '</a> / <a href="', $scripturl, '?topic=', $post['topic'], '.', $post['start'], '#msg', $post['id'], '">', $post['subject'], '</a></strong></h5>
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 			// How about... even... remove it entirely?!
510 510
 			if ($post['can_delete'])
511 511
 				echo '
512
-						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
512
+						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
513 513
 
514 514
 			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
515 515
 				echo '
@@ -580,9 +580,9 @@  discard block
 block discarded – undo
580 580
 					<td>', $alert['time'], '</td>
581 581
 					<td>
582 582
 						<ul class="quickbuttons">
583
-							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=remove;aid=', $id ,';', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'] ,'</a></li>
584
-							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=', ($alert['is_read'] != 0 ? 'unread' : 'read') ,';aid=', $id ,';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons ', $alert['is_read'] != 0 ? 'unread_button' : 'read_button','"></span>', ($alert['is_read'] != 0 ? $txt['mark_unread'] : $txt['mark_read_short']),'</a></li>
585
-							<li><input type="checkbox" name="mark[', $id ,']" value="', $id ,'"></li>
583
+							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=remove;aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>
584
+							<li><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=showalerts;do=', ($alert['is_read'] != 0 ? 'unread' : 'read'), ';aid=', $id, ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons ', $alert['is_read'] != 0 ? 'unread_button' : 'read_button', '"></span>', ($alert['is_read'] != 0 ? $txt['mark_unread'] : $txt['mark_read_short']), '</a></li>
585
+							<li><input type="checkbox" name="mark[', $id, ']" value="', $id, '"></li>
586 586
 						</ul>
587 587
 					</td>
588 588
 				</tr>';
@@ -592,17 +592,17 @@  discard block
 block discarded – undo
592 592
 			</table>
593 593
 			<div class="pagesection">
594 594
 				<div class="floatleft">
595
-					', $context['pagination'] ,'
595
+					', $context['pagination'], '
596 596
 				</div>
597 597
 				<div class="floatright">
598
-					', $txt['check_all'] ,': <input type="checkbox" name="select_all" id="select_all">
598
+					', $txt['check_all'], ': <input type="checkbox" name="select_all" id="select_all">
599 599
 					<select name="mark_as">
600
-						<option value="read">', $txt['quick_mod_markread'] ,'</option>
601
-						<option value="unread">', $txt['quick_mod_markunread'] ,'</option>
602
-						<option value="remove">', $txt['quick_mod_remove'] ,'</option>
600
+						<option value="read">', $txt['quick_mod_markread'], '</option>
601
+						<option value="unread">', $txt['quick_mod_markunread'], '</option>
602
+						<option value="remove">', $txt['quick_mod_remove'], '</option>
603 603
 					</select>
604 604
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
605
-					<input type="submit" name="req" value="', $txt['quick_mod_go'] ,'" class="button_submit you_sure">
605
+					<input type="submit" name="req" value="', $txt['quick_mod_go'], '" class="button_submit you_sure">
606 606
 				</div>
607 607
 			</div>
608 608
 		</form>';
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 				<div class="floatright">
660 660
 					<ul class="quickbuttons">
661 661
 						<li><a href="', $scripturl, '?action=post;', (empty($draft['topic']['id']) ? 'board=' . $draft['board']['id'] : 'topic=' . $draft['topic']['id']), '.0;id_draft=', $draft['id_draft'], '"><span class="generic_icons reply_button"></span>', $txt['draft_edit'], '</a></li>
662
-						<li><a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=showdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
662
+						<li><a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=showdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
663 663
 					</ul>
664 664
 				</div>
665 665
 			</div>';
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
 	if (empty($context['buddies']))
716 716
 		echo '
717 717
 			<tr class="windowbg">
718
-				<td colspan="', allowedTo('moderate_forum') ? '10' : '9','"><strong>', $txt['no_buddies'], '</strong></td>
718
+				<td colspan="', allowedTo('moderate_forum') ? '10' : '9', '"><strong>', $txt['no_buddies'], '</strong></td>
719 719
 			</tr>';
720 720
 
721 721
 		// Now loop through each buddy showing info on each.
@@ -818,14 +818,14 @@  discard block
 block discarded – undo
818 818
 				<th scope="col">', $txt['email'], '</th>';
819 819
 
820 820
 	echo '
821
-				<th scope="col">', $txt['ignore_remove'] ,'</th>
821
+				<th scope="col">', $txt['ignore_remove'], '</th>
822 822
 			</tr>';
823 823
 
824 824
 	// If they don't have anyone on their ignore list, don't list it!
825 825
 	if (empty($context['ignore_list']))
826 826
 		echo '
827 827
 			<tr class="windowbg">
828
-				<td colspan="', allowedTo('moderate_forum') ? '4' : '3','"><strong>', $txt['no_ignore'], '</strong></td>
828
+				<td colspan="', allowedTo('moderate_forum') ? '4' : '3', '"><strong>', $txt['no_ignore'], '</strong></td>
829 829
 			</tr>';
830 830
 
831 831
 	// Now loop through each buddy showing info on each.
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
 	else
1064 1064
 	{
1065 1065
 		echo '
1066
-		<div class="information">',$txt['showPermissions_help'],'</div>
1066
+		<div class="information">',$txt['showPermissions_help'], '</div>
1067 1067
 		<div id="permissions" class="flow_hidden">';
1068 1068
 
1069 1069
 		if (!empty($context['no_access_boards']))
@@ -1110,7 +1110,7 @@  discard block
 block discarded – undo
1110 1110
 
1111 1111
 				if ($permission['is_denied'])
1112 1112
 					echo '
1113
-									<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']),'</span>';
1113
+									<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']), '</span>';
1114 1114
 				else
1115 1115
 					echo '
1116 1116
 									', $txt['showPermissions_given'], ':&nbsp;', implode(', ', $permission['groups']['allowed']);
@@ -1896,7 +1896,7 @@  discard block
 block discarded – undo
1896 1896
 		{
1897 1897
 			echo '
1898 1898
 				<tr class="windowbg">
1899
-					<td>', $txt['alert_' . $alert_id], isset($alert_details['help']) ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $alert_details['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help floatright"><span class="generic_icons help" title="'. $txt['help'].'"></span></a>' : '', '</td>';
1899
+					<td>', $txt['alert_' . $alert_id], isset($alert_details['help']) ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $alert_details['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help floatright"><span class="generic_icons help" title="' . $txt['help'] . '"></span></a>' : '', '</td>';
1900 1900
 
1901 1901
 			foreach ($context['alert_bits'] as $type => $bitmask)
1902 1902
 			{
@@ -2078,7 +2078,7 @@  discard block
 block discarded – undo
2078 2078
 						<a href="', $scripturl, '?action=profile;save;u=', $context['id_member'], ';area=groupmembership;', $context['session_var'], '=', $context['session_id'], ';gid=', $group['id'], ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '" class="button floatright">', $txt['join_group'], '</a>';
2079 2079
 				elseif ($group['type'] == 2 && $group['pending'])
2080 2080
 					echo '
2081
-						<span class="floatright">', $txt['approval_pending'],'</span>';
2081
+						<span class="floatright">', $txt['approval_pending'], '</span>';
2082 2082
 				elseif ($group['type'] == 2)
2083 2083
 					echo '
2084 2084
 						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=groupmembership;request=', $group['id'], '" class="button floatright">', $txt['request_group'], '</a>';
@@ -2382,7 +2382,7 @@  discard block
 block discarded – undo
2382 2382
 			<div id="box_preview"', !empty($context['warning_data']['body_preview']) ? '' : ' style="display:none"', '>
2383 2383
 				<dl class="settings">
2384 2384
 					<dt>
2385
-						<strong>', $txt['preview'] , '</strong>
2385
+						<strong>', $txt['preview'], '</strong>
2386 2386
 					</dt>
2387 2387
 					<dd id="body_preview">
2388 2388
 						', !empty($context['warning_data']['body_preview']) ? $context['warning_data']['body_preview'] : '', '
@@ -2801,7 +2801,7 @@  discard block
 block discarded – undo
2801 2801
 								', !empty($context['member']['avatar']['allow_server_stored']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_server_stored" value="server_stored"' . ($context['member']['avatar']['choice'] == 'server_stored' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_server_stored"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['choose_avatar_gallery'] . '</label><br />' : '', '
2802 2802
 								', !empty($context['member']['avatar']['allow_external']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_external" value="external"' . ($context['member']['avatar']['choice'] == 'external' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_external"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['my_own_pic'] . '</label><br />' : '', '
2803 2803
 								', !empty($context['member']['avatar']['allow_upload']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_upload" value="upload"' . ($context['member']['avatar']['choice'] == 'upload' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_upload"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['avatar_will_upload'] . '</label><br />' : '', '
2804
-								', !empty($context['member']['avatar']['allow_gravatar']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"'. ($context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_gravatar"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['use_gravatar'] . '</label>' : '', '
2804
+								', !empty($context['member']['avatar']['allow_gravatar']) ? '<input type="radio" onclick="swap_avatar(this); return true;" name="avatar_choice" id="avatar_choice_gravatar" value="gravatar"' . ($context['member']['avatar']['choice'] == 'gravatar' ? ' checked="checked"' : '') . ' class="input_radio" /><label for="avatar_choice_gravatar"' . (isset($context['modify_error']['bad_avatar']) ? ' class="error"' : '') . '>' . $txt['use_gravatar'] . '</label>' : '', '
2805 2805
 							</dt>
2806 2806
 							<dd>';
2807 2807
 
@@ -2968,7 +2968,7 @@  discard block
 block discarded – undo
2968 2968
 	echo '
2969 2969
 							<dt>
2970 2970
 								<strong><label for="easyformat">', $txt['time_format'], ':</label></strong><br>
2971
-								<a href="', $scripturl, '?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a>
2971
+								<a href="', $scripturl, '?action=helpadmin;help=time_format" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>
2972 2972
 								<span class="smalltext">&nbsp;<label for="time_format">', $txt['date_format'], '</label></span>
2973 2973
 							</dt>
2974 2974
 							<dd>
@@ -3034,8 +3034,7 @@  discard block
 block discarded – undo
3034 3034
 							<div class="roundframe">
3035 3035
 								<div>
3036 3036
 		', !empty($context['tfa_backup']) ? '
3037
-									<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' :
3038
-			($modSettings['tfa_mode'] == 2 ? '
3037
+									<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : ($modSettings['tfa_mode'] == 2 ? '
3039 3038
 									<div class="smalltext"><strong>' . $txt['tfa_forced_desc'] . '</strong></div>' : ''), '
3040 3039
 									<div class="smalltext">', $txt['tfa_desc'], '</div>
3041 3040
 									<div id="basicinfo" style="width: 60%">
@@ -3043,7 +3042,7 @@  discard block
 block discarded – undo
3043 3042
 											<div class="title_top">
3044 3043
 												<strong>', $txt['tfa_step1'], '</strong><br />
3045 3044
 												', !empty($context['tfa_pass_error']) ? '<div class="error smalltext">' . $txt['tfa_pass_invalid'] . '</div>' : '', '
3046
-												<input type="password" name="passwd" style="width: 200px;"', !empty($context['tfa_pass_error']) ? ' class="error"' : '', !empty($context['tfa_pass_value']) ? ' value="' . $context['tfa_pass_value'] . '"' : '' ,'>
3045
+												<input type="password" name="passwd" style="width: 200px;"', !empty($context['tfa_pass_error']) ? ' class="error"' : '', !empty($context['tfa_pass_value']) ? ' value="' . $context['tfa_pass_value'] . '"' : '', '>
3047 3046
 											</div>
3048 3047
 											<div class="title_top">
3049 3048
 												<strong>', $txt['tfa_step2'], '</strong>
@@ -3051,9 +3050,9 @@  discard block
 block discarded – undo
3051 3050
 												<div class="tfacode">', $context['tfa_secret'], '</div>
3052 3051
 											</div>
3053 3052
 											<div class="title_top">
3054
-												<strong>', $txt['tfa_step3'] , '</strong><br />
3053
+												<strong>', $txt['tfa_step3'], '</strong><br />
3055 3054
 												', !empty($context['tfa_error']) ? '<div class="error smalltext">' . $txt['tfa_code_invalid'] . '</div>' : '', '
3056
-												<input type="text" name="tfa_code" style="width: 200px;"', !empty($context['tfa_error']) ? ' class="error"' : '', !empty($context['tfa_value']) ? ' value="' . $context['tfa_value'] . '"' : '' ,'>
3055
+												<input type="text" name="tfa_code" style="width: 200px;"', !empty($context['tfa_error']) ? ' class="error"' : '', !empty($context['tfa_value']) ? ' value="' . $context['tfa_value'] . '"' : '', '>
3057 3056
 												<input type="submit" name="save" value="', $txt['tfa_enable'], '" class="button_submit" style="float: none;" />
3058 3057
 											</div>
3059 3058
 											<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '" />
Please login to merge, or discard this patch.
Themes/default/GenericMenu.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		<a class="menu_icon mobile_generic_menu_', $context['cur_menu_id'], '"></a>
53 53
 		<div id="mobile_generic_menu_', $context['cur_menu_id'], '" class="popup_container">
54 54
 			<div class="popup_window description">
55
-				<div class="popup_heading">', $txt['mobile_user_menu'],'
55
+				<div class="popup_heading">', $txt['mobile_user_menu'], '
56 56
 				<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
57 57
 				', template_generic_menu($menu_context), '
58 58
 			</div>
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 		</script>';
68 68
 }
69 69
 
70
-function template_generic_menu (&$menu_context)
70
+function template_generic_menu(&$menu_context)
71 71
 {
72 72
 	global $context;
73 73
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	foreach ($menu_context['sections'] as $section)
82 82
 	{
83 83
 		echo '
84
-						<li ', !empty($section['areas']) ? 'class="subsections"' : '', '><a class="', !empty($section['selected']) ? 'active ' : '', '" href="', $section['url'], $menu_context['extra_parameters'], '">', $section['title'] , '</a>
84
+						<li ', !empty($section['areas']) ? 'class="subsections"' : '', '><a class="', !empty($section['selected']) ? 'active ' : '', '" href="', $section['url'], $menu_context['extra_parameters'], '">', $section['title'], '</a>
85 85
 							<ul>';
86 86
 
87 87
 		// For every area of this section show a link to that area (bold if it's currently selected.)
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 				echo '<img src="', $settings['images_url'], '/icons/', !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'], '" alt="" class="icon">';
221 221
 
222 222
 			if (!empty($selected_tab['help']) || !empty($tab_context['help']))
223
-				echo '<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a>';
223
+				echo '<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>';
224 224
 
225 225
 			echo $tab_context['title'];
226 226
 		}
Please login to merge, or discard this patch.
Themes/default/Reports.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
 	<head>
149 149
 		<meta charset="', $context['character_set'], '">
150 150
 		<title>', $context['page_title'], '</title>
151
-		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/report.css', $modSettings['browser_cache'] ,'">
151
+		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/report.css', $modSettings['browser_cache'], '">
152 152
 	</head>
153 153
 	<body>';
154 154
 }
Please login to merge, or discard this patch.
Themes/default/PersonalMessage.template.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 
232 232
 			foreach ($message['custom_fields']['above_member'] as $custom)
233 233
 				echo '
234
-					<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
234
+					<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
235 235
 
236 236
 			echo '
237 237
 				</ul>
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 		if (!empty($message['custom_fields']['below_avatar']))
269 269
 			foreach ($message['custom_fields']['below_avatar'] as $custom)
270 270
 				echo '
271
-				<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
271
+				<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
272 272
 
273 273
 			if (!$message['member']['is_guest'])
274 274
 				echo '
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 
311 311
 					foreach ($message['custom_fields']['icons'] as $custom)
312 312
 						echo '
313
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
313
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
314 314
 
315 315
 					echo '
316 316
 					</ol>
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
 				if (!empty($message['custom_fields']['standard']))
369 369
 					foreach ($message['custom_fields']['standard'] as $custom)
370 370
 						echo '
371
-				<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
371
+				<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
372 372
 
373 373
 				// Are we showing the warning status?
374 374
 				if ($message['member']['can_see_warning'])
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 				if (!empty($message['custom_fields']['bottom_poster']))
380 380
 					foreach ($message['custom_fields']['bottom_poster'] as $custom)
381 381
 						echo '
382
-				<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
382
+				<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
383 383
 			}
384 384
 
385 385
 			// Done with the information about the poster... on to the post itself.
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 
479 479
 				foreach ($message['custom_fields']['above_signature'] as $custom)
480 480
 					echo '
481
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
481
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
482 482
 
483 483
 				echo '
484 484
 						</ul>
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 
500 500
 				foreach ($message['custom_fields']['below_signature'] as $custom)
501 501
 					echo '
502
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
502
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
503 503
 
504 504
 				echo '
505 505
 						</ul>
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
 	while ($message = $context['get_pmessage']('subject'))
632 632
 	{
633 633
 		echo '
634
-		<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','">
634
+		<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '">
635 635
 			<td class="table_icon">
636 636
 			<script>
637 637
 				currentLabels[', $message['id'], '] = {';
@@ -903,12 +903,12 @@  discard block
 block discarded – undo
903 903
 					// You can only reply if they are not a guest...
904 904
 					if (!$message['member']['is_guest'])
905 905
 						echo '
906
-							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
907
-							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
906
+							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button, '</a>', $context['menu_separator'], '
907
+							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button, '</a> ', $context['menu_separator'];
908 908
 					// This is for "forwarding" - even if the member is gone.
909 909
 					else
910 910
 						echo '
911
-							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
911
+							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button, '</a>', $context['menu_separator'];
912 912
 				}
913 913
 
914 914
 				echo '
@@ -1008,7 +1008,7 @@  discard block
 block discarded – undo
1008 1008
 			<div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty($context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors">
1009 1009
 				<dl>
1010 1010
 					<dt>
1011
-						<strong id="error_serious">', $txt['error_while_submitting'] , '</strong>
1011
+						<strong id="error_serious">', $txt['error_while_submitting'], '</strong>
1012 1012
 					</dt>
1013 1013
 					<dd class="error" id="error_list">
1014 1014
 						', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), '
@@ -1064,7 +1064,7 @@  discard block
 block discarded – undo
1064 1064
 					<span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span>
1065 1065
 				</dt>
1066 1066
 				<dd id="pm_subject">
1067
-					<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : ' class="input_text"', '/>
1067
+					<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : ' class="input_text"', '/>
1068 1068
 				</dd>
1069 1069
 			</dl><hr>';
1070 1070
 
@@ -1427,7 +1427,7 @@  discard block
 block discarded – undo
1427 1427
 		echo '
1428 1428
 		<div class="padding">
1429 1429
 			<input type="submit" name="save" value="', $txt['save'], '" class="button_submit">
1430
-			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button_submit you_sure">
1430
+			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button_submit you_sure">
1431 1431
 		</div>';
1432 1432
 
1433 1433
 	echo '
@@ -1591,7 +1591,7 @@  discard block
 block discarded – undo
1591 1591
 	if (!empty($context['rules']))
1592 1592
 		echo '
1593 1593
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
1594
-			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button_submit smalltext you_sure">';
1594
+			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button_submit smalltext you_sure">';
1595 1595
 
1596 1596
 	echo '
1597 1597
 		</div>
@@ -1832,9 +1832,9 @@  discard block
 block discarded – undo
1832 1832
 
1833 1833
 		echo '
1834 1834
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
1835
-					<option value="">', $txt['pm_rule_sel_action'] , ':</option>
1836
-					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option>
1837
-					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option>
1835
+					<option value="">', $txt['pm_rule_sel_action'], ':</option>
1836
+					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option>
1837
+					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option>
1838 1838
 				</select>
1839 1839
 				<span id="labdiv', $k, '">
1840 1840
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
@@ -1951,7 +1951,7 @@  discard block
 block discarded – undo
1951 1951
 					</div>
1952 1952
 					<ul class="quickbuttons">
1953 1953
 						<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;id_draft=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons modifybutton"></span>', $txt['draft_edit'], '</a></li>
1954
-						<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
1954
+						<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
1955 1955
 					</ul>
1956 1956
 				</div>';
1957 1957
 		}
Please login to merge, or discard this patch.
Themes/default/Display.template.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	echo '
40 40
 		<div id="display_head" class="information">
41 41
 			<h2 class="display_title"><span id="top_subject">', $context['subject'], '</span>', ($context['is_locked']) ? ' <span class="generic_icons lock"></span>' : '', ($context['is_sticky']) ? ' <span class="generic_icons sticky"></span>' : '', '</h2>
42
-			<p>',$txt['started_by'],' ', $context['topic_poster_name'],', ', $context['topic_started_time'],'</p>';
42
+			<p>',$txt['started_by'], ' ', $context['topic_poster_name'], ', ', $context['topic_started_time'], '</p>';
43 43
 
44 44
 	// Next - Prev
45 45
 	echo '
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 			<div id="poll">
75 75
 				<div class="cat_bar">
76 76
 					<h3 class="catbg">
77
-						<span class="generic_icons poll"></span>', $context['poll']['is_locked'] ? '<span class="generic_icons lock"></span>' : '' ,' ', $context['poll']['question'], '
77
+						<span class="generic_icons poll"></span>', $context['poll']['is_locked'] ? '<span class="generic_icons lock"></span>' : '', ' ', $context['poll']['question'], '
78 78
 					</h3>
79 79
 				</div>
80 80
 				<div class="windowbg noup">
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
 	// Mobile action - moderation buttons (top)
189 189
 	echo '
190 190
 			<div class="mobile_buttons floatright">
191
-				<a class="button mobile_act">', $txt['mobile_action'],'</a>
192
-				', ($context['can_moderate_forum'] || $context['user']['is_mod']) ? '<a class="button mobile_mod">'. $txt['mobile_moderation'].'</a>' : '','
191
+				<a class="button mobile_act">', $txt['mobile_action'], '</a>
192
+				', ($context['can_moderate_forum'] || $context['user']['is_mod']) ? '<a class="button mobile_mod">' . $txt['mobile_moderation'] . '</a>' : '', '
193 193
 			</div>';
194 194
 
195 195
 	// Show the topic information - icon, subject, etc.
@@ -213,8 +213,8 @@  discard block
 block discarded – undo
213 213
 	// Mobile action - moderation buttons (bottom)
214 214
 	echo '
215 215
 			<div class="mobile_buttons floatright">
216
-				<a class="button mobile_act">', $txt['mobile_action'],'</a>
217
-				', ($context['can_moderate_forum'] || $context['user']['is_mod']) ? '<a class="button mobile_mod">'. $txt['mobile_moderation'].'</a>' : '','
216
+				<a class="button mobile_act">', $txt['mobile_action'], '</a>
217
+				', ($context['can_moderate_forum'] || $context['user']['is_mod']) ? '<a class="button mobile_mod">' . $txt['mobile_moderation'] . '</a>' : '', '
218 218
 			</div>';
219 219
 
220 220
 	// Show the page index... "Pages: [1]".
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	echo '
249 249
 			<div id="mobile_action" class="popup_container">
250 250
 				<div class="popup_window description">
251
-					<div class="popup_heading">', $txt['mobile_action'],'
251
+					<div class="popup_heading">', $txt['mobile_action'], '
252 252
 					<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
253 253
 					', template_button_strip($context['normal_buttons']), '
254 254
 				</div>
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 		echo '
260 260
 			<div id="mobile_moderation" class="popup_container">
261 261
 				<div class="popup_window description">
262
-					<div class="popup_heading">', $txt['mobile_moderation'],'
262
+					<div class="popup_heading">', $txt['mobile_moderation'], '
263 263
 					<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
264 264
 					<div id="moderationbuttons_mobile">
265 265
 						', template_button_strip($context['mod_buttons'], 'bottom', array('id' => 'moderationbuttons_strip_mobile')), '
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 							sTemplateBodyNormal: ', JavaScriptEscape('%body%'), ',
348 348
 							sTemplateSubjectNormal: ', JavaScriptEscape('<a href="' . $scripturl . '?topic=' . $context['current_topic'] . '.msg%msg_id%#msg%msg_id%" rel="nofollow">%subject%</a>'), ',
349 349
 							sTemplateTopSubject: ', JavaScriptEscape('%subject%'), ',
350
-							sTemplateReasonEdit: ', JavaScriptEscape($txt['reason_for_edit'] .': <input type="text" name="modify_reason" value="%modify_reason%" size="80" maxlength="80" tabindex="' . $context['tabindex']++ . '" class="input_text quickModifyMargin">'), ',
350
+							sTemplateReasonEdit: ', JavaScriptEscape($txt['reason_for_edit'] . ': <input type="text" name="modify_reason" value="%modify_reason%" size="80" maxlength="80" tabindex="' . $context['tabindex']++ . '" class="input_text quickModifyMargin">'), ',
351 351
 							sTemplateReasonNormal: ', JavaScriptEscape('%modify_text'), ',
352 352
 							sErrorBorderStyle: ', JavaScriptEscape('1px solid red'), ($context['can_reply']) ? ',
353 353
 							sFormRemoveAccessKeys: \'postmodify\'' : '', '
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
420 420
 
421 421
 	// Show the message anchor and a "new" anchor if this message is new.
422 422
 	echo '
423
-				<div class="', $message['css_class'] ,'">', $message['id'] != $context['first_message'] ? '
423
+				<div class="', $message['css_class'], '">', $message['id'] != $context['first_message'] ? '
424 424
 					<a id="msg' . $message['id'] . '"></a>' . ($message['first_new'] ? '<a id="new"></a>' : '') : '', '
425 425
 					<div class="post_wrapper">';
426 426
 
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 
438 438
 		foreach ($message['custom_fields']['above_member'] as $custom)
439 439
 			echo '
440
-									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
440
+									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
441 441
 
442 442
 		echo '
443 443
 								</ul>
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 	if (!empty($message['custom_fields']['below_avatar']))
474 474
 		foreach ($message['custom_fields']['below_avatar'] as $custom)
475 475
 			echo '
476
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
476
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
477 477
 
478 478
 	// Show the post group icons, but not for guests.
479 479
 	if (!$message['member']['is_guest'])
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 
519 519
 			foreach ($message['custom_fields']['icons'] as $custom)
520 520
 				echo '
521
-										<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
521
+										<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
522 522
 
523 523
 			echo '
524 524
 									</ol>
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
 		if (!empty($message['custom_fields']['standard']))
557 557
 			foreach ($message['custom_fields']['standard'] as $custom)
558 558
 				echo '
559
-								<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
559
+								<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
560 560
 
561 561
 	}
562 562
 	// Otherwise, show the guest's email.
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
 	if (!empty($message['custom_fields']['bottom_poster']))
595 595
 		foreach ($message['custom_fields']['bottom_poster'] as $custom)
596 596
 			echo '
597
-									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
597
+									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
598 598
 
599 599
 	// Poster info ends.
600 600
 	echo '
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 			$base .= (isset($txt[$base . $count])) ? $count : 'n';
782 782
 
783 783
 			echo '
784
-									<li class="like_count smalltext">', sprintf($txt[$base], $scripturl . '?action=likes;sa=view;ltype=msg;like=' . $message['id'] .';'. $context['session_var'] .'='. $context['session_id'], comma_format($count)), '</li>';
784
+									<li class="like_count smalltext">', sprintf($txt[$base], $scripturl . '?action=likes;sa=view;ltype=msg;like=' . $message['id'] . ';' . $context['session_var'] . '=' . $context['session_id'], comma_format($count)), '</li>';
785 785
 		}
786 786
 
787 787
 		echo '
@@ -798,7 +798,7 @@  discard block
 block discarded – undo
798 798
 		if ($context['can_quote'])
799 799
 			echo '
800 800
 									<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" onclick="return oQuickReply.quote(', $message['id'], ');"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>
801
-									<li style="display:none;" id="quoteSelected_', $message['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>';
801
+									<li style="display:none;" id="quoteSelected_', $message['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li>';
802 802
 
803 803
 		// Can the user modify the contents of this post? Show the modify inline image.
804 804
 		if ($message['can_modify'])
@@ -820,10 +820,10 @@  discard block
 block discarded – undo
820 820
 		// How about... even... remove it entirely?!
821 821
 		if ($context['can_delete'] && ($context['topic_first_message'] == $message['id']))
822 822
 			echo '
823
-											<li><a href="', $scripturl, '?action=removetopic2;topic=', $context['current_topic'], '.', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['are_sure_remove_topic'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove_topic'],'</a></li>';
823
+											<li><a href="', $scripturl, '?action=removetopic2;topic=', $context['current_topic'], '.', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['are_sure_remove_topic'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove_topic'], '</a></li>';
824 824
 		elseif ($message['can_remove'] && ($context['topic_first_message'] != $message['id']))
825 825
 			echo '
826
-											<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message_question'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
826
+											<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message_question'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
827 827
 
828 828
 		// What about splitting it off the rest of the topic?
829 829
 		if ($context['can_split'] && !empty($context['real_num_replies']))
@@ -881,7 +881,7 @@  discard block
 block discarded – undo
881 881
 
882 882
 		foreach ($message['custom_fields']['above_signature'] as $custom)
883 883
 			echo '
884
-									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
884
+									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
885 885
 
886 886
 		echo '
887 887
 								</ul>
@@ -903,7 +903,7 @@  discard block
 block discarded – undo
903 903
 
904 904
 		foreach ($message['custom_fields']['below_signature'] as $custom)
905 905
 			echo '
906
-									<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
906
+									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
907 907
 
908 908
 		echo '
909 909
 								</ul>
@@ -1004,7 +1004,7 @@  discard block
 block discarded – undo
1004 1004
 	echo '
1005 1005
 				<br class="clear_right">
1006 1006
 				<span id="post_confirm_buttons">
1007
-					', template_control_richedit_buttons($context['post_box_name']) ,'
1007
+					', template_control_richedit_buttons($context['post_box_name']), '
1008 1008
 				</span>';
1009 1009
 		echo '
1010 1010
 					</form>
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
1047 1047
 						sJumpAnchor: "quickreply",
1048 1048
 						bIsFull: true
1049 1049
 					});
1050
-					var oEditorID = "', $context['post_box_name'] ,'";
1050
+					var oEditorID = "', $context['post_box_name'], '";
1051 1051
 					var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
1052 1052
 					var oJumpAnchor = "quickreply";
1053 1053
 				</script>';
Please login to merge, or discard this patch.
Themes/default/index.template.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
 	// Show right to left, the language code, and the character set for ease of translating.
87 87
 	echo '<!DOCTYPE html>
88
-	<html', $context['right_to_left'] ? ' dir="rtl"' : '', !empty($txt['lang_locale']) ? ' lang="' . str_replace("_", "-", substr($txt['lang_locale'], 0, strcspn($txt['lang_locale'], "."))) . '"' : '' , '>
88
+	<html', $context['right_to_left'] ? ' dir="rtl"' : '', !empty($txt['lang_locale']) ? ' lang="' . str_replace("_", "-", substr($txt['lang_locale'], 0, strcspn($txt['lang_locale'], "."))) . '"' : '', '>
89 89
 <head>
90 90
 	<meta charset="', $context['character_set'], '">';
91 91
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 		// Thirdly, alerts
211 211
 		echo '
212 212
 			<li>
213
-				<a href="', $scripturl, '?action=profile;area=showalerts;u=', $context['user']['id'] ,'"', !empty($context['self_alerts']) ? ' class="active"' : '', ' id="alerts_menu_top">', $txt['alerts'], !empty($context['user']['alerts']) ? ' <span class="amt">' . $context['user']['alerts'] . '</span>' : '', '</a>
213
+				<a href="', $scripturl, '?action=profile;area=showalerts;u=', $context['user']['id'], '"', !empty($context['self_alerts']) ? ' class="active"' : '', ' id="alerts_menu_top">', $txt['alerts'], !empty($context['user']['alerts']) ? ' <span class="amt">' . $context['user']['alerts'] . '</span>' : '', '</a>
214 214
 				<div id="alerts_menu" class="top_menu scrollable"></div>
215 215
 			</li>';
216 216
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 				<a class="menu_icon mobile_user_menu"></a>
328 328
 				<div id="mobile_user_menu" class="popup_container">
329 329
 					<div class="popup_window description">
330
-						<div class="popup_heading">', $txt['mobile_user_menu'],'
330
+						<div class="popup_heading">', $txt['mobile_user_menu'], '
331 331
 						<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
332 332
 						', template_menu(), '
333 333
 					</div>
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 	// There is now a global "Go to top" link at the right.
375 375
 		echo '
376 376
 		<ul>
377
-			<li class="floatright"><a href="', $scripturl, '?action=help">', $txt['help'], '</a> ', (!empty($modSettings['requireAgreement'])) ? '| <a href="'. $scripturl. '?action=help;sa=rules">'. $txt['terms_and_rules']. '</a>' : '', ' | <a href="#top_section">', $txt['go_up'], ' &#9650;</a></li>
377
+			<li class="floatright"><a href="', $scripturl, '?action=help">', $txt['help'], '</a> ', (!empty($modSettings['requireAgreement'])) ? '| <a href="' . $scripturl . '?action=help;sa=rules">' . $txt['terms_and_rules'] . '</a>' : '', ' | <a href="#top_section">', $txt['go_up'], ' &#9650;</a></li>
378 378
 			<li class="copyright">', theme_copyright(), '</li>
379 379
 		</ul>';
380 380
 
@@ -479,9 +479,9 @@  discard block
 block discarded – undo
479 479
 	foreach ($context['menu_buttons'] as $act => $button)
480 480
 	{
481 481
 		echo '
482
-						<li class="button_', $act, '', !empty($button['sub_buttons']) ? ' subsections"' :'"', '>
482
+						<li class="button_', $act, '', !empty($button['sub_buttons']) ? ' subsections"' : '"', '>
483 483
 							<a', $button['active_button'] ? ' class="active"' : '', ' href="', $button['href'], '"', isset($button['target']) ? ' target="' . $button['target'] . '"' : '', '>
484
-								', $button['icon'],'<span class="textmenu">', $button['title'], '</span>
484
+								', $button['icon'], '<span class="textmenu">', $button['title'], '</span>
485 485
 							</a>';
486 486
 
487 487
 		if (!empty($button['sub_buttons']))
@@ -492,8 +492,8 @@  discard block
 block discarded – undo
492 492
 			foreach ($button['sub_buttons'] as $childbutton)
493 493
 			{
494 494
 				echo '
495
-								<li', !empty($childbutton['sub_buttons']) ? ' class="subsections"' :'', '>
496
-									<a href="', $childbutton['href'], '"' , isset($childbutton['target']) ? ' target="' . $childbutton['target'] . '"' : '', '>
495
+								<li', !empty($childbutton['sub_buttons']) ? ' class="subsections"' : '', '>
496
+									<a href="', $childbutton['href'], '"', isset($childbutton['target']) ? ' target="' . $childbutton['target'] . '"' : '', '>
497 497
 										', $childbutton['title'], '
498 498
 									</a>';
499 499
 				// 3rd level menus :)
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
 					foreach ($childbutton['sub_buttons'] as $grandchildbutton)
506 506
 						echo '
507 507
 										<li>
508
-											<a href="', $grandchildbutton['href'], '"' , isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
508
+											<a href="', $grandchildbutton['href'], '"', isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
509 509
 												', $grandchildbutton['title'], '
510 510
 											</a>
511 511
 										</li>';
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
 				$value['id'] = $key;
554 554
 
555 555
 			$button = '
556
-				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' '. $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="'. $value['url'] .'"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a>';
556
+				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a>';
557 557
 
558 558
 			if (!empty($value['sub_buttons']))
559 559
 			{
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 		return;
588 588
 
589 589
 	echo '
590
-		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"': ''), '>
590
+		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '>
591 591
 			',implode('', $buttons), '
592 592
 		</div>';
593 593
 }
Please login to merge, or discard this patch.
Themes/default/Errors.template.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	echo '
65 65
 			<div class="cat_bar">
66 66
 				<h3 class="catbg">
67
-					<a href="', $scripturl, '?action=helpadmin;help=error_log" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a> ', $txt['errlog'], '
67
+					<a href="', $scripturl, '?action=helpadmin;help=error_log" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a> ', $txt['errlog'], '
68 68
 				</h3>
69 69
 			</div>
70 70
 			<div class="pagesection">
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 					', $context['page_index'], '
73 73
 				</div>
74 74
 				<div class="floatright">
75
-					<input type="submit" name="removeSelection" value="', $txt['remove_selection'] ,'" data-confirm="', $txt['remove_selection_confirm'] ,'" class="button_submit you_sure">
76
-					<input type="submit" name="delall" value="', ($context['has_filter'] ? $txt['remove_filtered_results'] : $txt['remove_all']) ,'" data-confirm="', ($context['has_filter'] ? $txt['remove_filtered_results_confirm'] : $txt['sure_about_errorlog_remove']) ,'" class="button_submit you_sure">
75
+					<input type="submit" name="removeSelection" value="', $txt['remove_selection'], '" data-confirm="', $txt['remove_selection_confirm'], '" class="button_submit you_sure">
76
+					<input type="submit" name="delall" value="', ($context['has_filter'] ? $txt['remove_filtered_results'] : $txt['remove_all']), '" data-confirm="', ($context['has_filter'] ? $txt['remove_filtered_results_confirm'] : $txt['sure_about_errorlog_remove']), '" class="button_submit you_sure">
77 77
 				</div>
78 78
 			</div>
79 79
 			<table class="table_grid" id="error_log">
@@ -184,8 +184,8 @@  discard block
 block discarded – undo
184 184
 					', $context['page_index'], '
185 185
 				</div>
186 186
 				<div class="floatright">
187
-					<input type="submit" name="removeSelection" value="', $txt['remove_selection'] ,'" data-confirm="', $txt['remove_selection_confirm'] ,'" class="button_submit you_sure">
188
-					<input type="submit" name="delall" value="', ($context['has_filter'] ? $txt['remove_filtered_results'] : $txt['remove_all']) ,'" data-confirm="', ($context['has_filter'] ? $txt['remove_filtered_results_confirm'] : $txt['sure_about_errorlog_remove']) ,'" class="button_submit you_sure">
187
+					<input type="submit" name="removeSelection" value="', $txt['remove_selection'], '" data-confirm="', $txt['remove_selection_confirm'], '" class="button_submit you_sure">
188
+					<input type="submit" name="delall" value="', ($context['has_filter'] ? $txt['remove_filtered_results'] : $txt['remove_all']), '" data-confirm="', ($context['has_filter'] ? $txt['remove_filtered_results_confirm'] : $txt['sure_about_errorlog_remove']), '" class="button_submit you_sure">
189 189
 				</div>
190 190
 			</div>
191 191
 			<br>';
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 	<head>
216 216
 		<meta charset="', $context['character_set'], '">
217 217
 		<title>', $context['file_data']['file'], '</title>
218
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
218
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
219 219
 	</head>
220 220
 	<body>
221 221
 		<table class="errorfile_table">';
@@ -225,8 +225,8 @@  discard block
 block discarded – undo
225 225
 		$is_target = $line_num == $context['file_data']['target'];
226 226
 		echo '
227 227
 			<tr>
228
-				<td class="righttext', $is_target ? ' current">==&gt;' : '">', $line_num , ':</td>
229
-				<td style="white-space: nowrap;', $is_target ? ' border: 1px solid black;border-width: 1px 1px 1px 0;':'','">', $line, '</td>
228
+				<td class="righttext', $is_target ? ' current">==&gt;' : '">', $line_num, ':</td>
229
+				<td style="white-space: nowrap;', $is_target ? ' border: 1px solid black;border-width: 1px 1px 1px 0;' : '', '">', $line, '</td>
230 230
 			</tr>';
231 231
 	}
232 232
 	echo '
Please login to merge, or discard this patch.
Themes/default/BoardIndex.template.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
 		foreach ($context['news_lines'] as $news)
35 35
 		{
36 36
 			echo '
37
-			<li>', $news,'</li>';
37
+			<li>', $news, '</li>';
38 38
 		}
39 39
 
40 40
 		echo '
41 41
 		</ul>
42 42
 		<script>
43 43
 			jQuery("#smf_slider").slippry({
44
-				pause: ', $settings['newsfader_time'],',
44
+				pause: ', $settings['newsfader_time'], ',
45 45
 				adaptiveHeight: 0,
46 46
 				captions: 0,
47 47
 				controls: 0,
@@ -78,14 +78,14 @@  discard block
 block discarded – undo
78 78
 		// If this category even can collapse, show a link to collapse it.
79 79
 		if ($category['can_collapse'])
80 80
 			echo '
81
-					<span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', ' floatright" data-collapsed="', (int) $category['is_collapsed'], '" title="', !$category['is_collapsed'] ? $txt['hide_category'] : $txt['show_category'] ,'" style="display: none;"></span>';
81
+					<span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', ' floatright" data-collapsed="', (int) $category['is_collapsed'], '" title="', !$category['is_collapsed'] ? $txt['hide_category'] : $txt['show_category'], '" style="display: none;"></span>';
82 82
 
83 83
 		echo '
84 84
 					', $category['link'], '
85 85
 				</h3>', !empty($category['description']) ? '
86 86
 				<div class="desc">' . $category['description'] . '</div>' : '', '
87 87
 			</div>
88
-			<div id="category_', $category['id'], '_boards" ', (!empty($category['css_class']) ? ('class="'. $category['css_class'] .'"') : '') ,'>';
88
+			<div id="category_', $category['id'], '_boards" ', (!empty($category['css_class']) ? ('class="' . $category['css_class'] . '"') : ''), '>';
89 89
 
90 90
 			/* Each board in each category's boards has:
91 91
 			new (is it new?), id, name, description, moderators (see below), link_moderators (just a list.),
@@ -94,14 +94,14 @@  discard block
 block discarded – undo
94 94
 			foreach ($category['boards'] as $board)
95 95
 			{
96 96
 				echo '
97
-				<div id="board_', $board['id'], '" class="up_contain ', (!empty($board['css_class']) ? $board['css_class'] : '') ,'">
97
+				<div id="board_', $board['id'], '" class="up_contain ', (!empty($board['css_class']) ? $board['css_class'] : ''), '">
98 98
 					<div class="board_icon">
99 99
 						<a href="', ($board['is_redirect'] || $context['user']['is_guest'] ? $board['href'] : $scripturl . '?action=unread;board=' . $board['id'] . '.0;children'), '" class="board_', $board['board_class'], '"', !empty($board['board_tooltip']) ? ' title="' . $board['board_tooltip'] . '"' : '', '></a>
100 100
 					</div>
101 101
 					<div class="info">
102 102
 						<a class="subject mobile_subject" href="', $board['href'], '" id="b', $board['id'], '">
103 103
 							', $board['name'], '
104
-							<p class="board_description mobile_display">', $board['description'] , '</p>
104
+							<p class="board_description mobile_display">', $board['description'], '</p>
105 105
 						</a>';
106 106
 
107 107
 				// Has it outstanding posts for approval?
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 						<a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link">(!)</a>';
111 111
 
112 112
 				echo '
113
-						<p class="board_description">', $board['description'] , '</p>';
113
+						<p class="board_description">', $board['description'], '</p>';
114 114
 
115 115
 				// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
116 116
 				if (!empty($board['link_moderators']))
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 						', $board['is_redirect'] ? '' : '<br> ' . comma_format($board['topics']) . ' ' . $txt['board_topics'], '
126 126
 						</p>
127 127
 					</div>
128
-					<div class="lastpost ',!empty($board['last_post']['id']) ? 'lpr_border' : 'hidden','">';
128
+					<div class="lastpost ',!empty($board['last_post']['id']) ? 'lpr_border' : 'hidden', '">';
129 129
 
130 130
 				if (!empty($board['last_post']['id']))
131 131
 					echo '
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 				</h4>
375 375
 			</div>
376 376
 			<p class="inline">
377
-				', $context['common_stats']['boardindex_total_posts'], '', !empty($settings['show_latest_member']) ? ' - '. $txt['latest_member'] . ': <strong> ' . $context['common_stats']['latest_member']['link'] . '</strong>' : '', '<br>
377
+				', $context['common_stats']['boardindex_total_posts'], '', !empty($settings['show_latest_member']) ? ' - ' . $txt['latest_member'] . ': <strong> ' . $context['common_stats']['latest_member']['link'] . '</strong>' : '', '<br>
378 378
 				', (!empty($context['latest_post']) ? $txt['latest_post'] . ': <strong>&quot;' . $context['latest_post']['link'] . '&quot;</strong>  (' . $context['latest_post']['time'] . ')<br>' : ''), '
379 379
 				<a href="', $scripturl, '?action=recent">', $txt['recent_view'], '</a>
380 380
 			</p>';
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 		// Showing membergroups?
423 423
 		if (!empty($settings['show_group_key']) && !empty($context['membergroups']))
424 424
 			echo '
425
-				<span class="membergroups">' . implode(',&nbsp;', $context['membergroups']). '</span>';
425
+				<span class="membergroups">' . implode(',&nbsp;', $context['membergroups']) . '</span>';
426 426
 	}
427 427
 
428 428
 	echo '
Please login to merge, or discard this patch.
Themes/default/MessageIndex.template.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 					<div class="info">
45 45
 						<a class="subject mobile_subject" href="', $board['href'], '" id="b', $board['id'], '">
46 46
 							', $board['name'], '
47
-							<p class="board_description mobile_display">', $board['description'] , '</p>
47
+							<p class="board_description mobile_display">', $board['description'], '</p>
48 48
 						</a>';
49 49
 
50 50
 			// Has it outstanding posts for approval?
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 						<a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link">(!)</a>';
54 54
 
55 55
 			echo '
56
-						<p class="board_description">', $board['description'] , '</p>';
56
+						<p class="board_description">', $board['description'], '</p>';
57 57
 
58 58
 			// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
59 59
 			if (!empty($board['moderators']) || !empty($board['moderator_groups']))
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	// Mobile action buttons (top)
120 120
 	echo '
121 121
 		<div class="mobile_buttons floatright">
122
-			<a class="button mobile_act">', $txt['mobile_action'],'</a>
122
+			<a class="button mobile_act">', $txt['mobile_action'], '</a>
123 123
 		</div>';
124 124
 
125 125
 		echo '
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 					<img src="', $topic['first_post']['icon_url'], '" alt="">
220 220
 					', $topic['is_posted_in'] ? '<img class="posted" src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="">' : '', '
221 221
 				</div>
222
-					<div class="info', !empty($context['can_quick_mod']) ? '' : ' info_block','">
222
+					<div class="info', !empty($context['can_quick_mod']) ? '' : ' info_block', '">
223 223
 						<div ', (!empty($topic['quick_mod']['modify']) ? 'id="topic_' . $topic['first_post']['id'] . '"  ondblclick="oQuickModifyTopic.modify_topic(\'' . $topic['id'] . '\', \'' . $topic['first_post']['id'] . '\');"' : ''), '>';
224 224
 
225 225
 			// Now we handle the icons
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 								</span>
252 252
 							</div>
253 253
 							<p class="floatleft">', $txt['started_by'], ' ', $topic['first_post']['member']['link'], '</p>
254
-							', !empty($topic['pages']) ? '<span id="pages'. $topic['first_post']['id']. '" class="topic_pages">&nbsp;'. $topic['pages']. '</span>' : '','
254
+							', !empty($topic['pages']) ? '<span id="pages' . $topic['first_post']['id'] . '" class="topic_pages">&nbsp;' . $topic['pages'] . '</span>' : '', '
255 255
 							<br class="clear">
256 256
 						</div>
257 257
 					</div>
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 			foreach ($context['qmod_actions'] as $qmod_action)
306 306
 				if ($context['can_' . $qmod_action])
307 307
 					echo '
308
-						<option value="' . $qmod_action . '">' . $txt['quick_mod_'  . $qmod_action] . '</option>';
308
+						<option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>';
309 309
 
310 310
 			echo '
311 311
 					</select>';
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 	// Mobile action buttons (bottom)
333 333
 	echo '
334 334
 		<div class="mobile_buttons floatright">
335
-			<a class="button mobile_act">', $txt['mobile_action'],'</a>
335
+			<a class="button mobile_act">', $txt['mobile_action'], '</a>
336 336
 		</div>';
337 337
 
338 338
 		echo '
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	echo '
383 383
 			<div id="mobile_action" class="popup_container">
384 384
 				<div class="popup_window description">
385
-					<div class="popup_heading">', $txt['mobile_action'],'
385
+					<div class="popup_heading">', $txt['mobile_action'], '
386 386
 					<a href="javascript:void(0);" class="generic_icons hide_popup"></a></div>
387 387
 					', template_button_strip($context['normal_buttons']), '
388 388
 				</div>
Please login to merge, or discard this patch.