Completed
Push — release-2.1 ( 9016ca...8bb38c )
by Colin
12:28 queued 03:14
created
Themes/default/Printpage.template.php 1 patch
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -144,11 +144,12 @@  discard block
 block discarded – undo
144 144
 				<div class="question">', $txt['poll_question'], ': <strong>', $context['poll']['question'], '</strong>';
145 145
 
146 146
 		$options = 1;
147
-		foreach ($context['poll']['options'] as $option)
148
-			echo '
147
+		foreach ($context['poll']['options'] as $option) {
148
+					echo '
149 149
 					<div class="', $option['voted_this'] ? 'voted' : '', '">', $txt['option'], ' ', $options++, ': <strong>', $option['option'], '</strong>
150 150
 						', $context['allow_poll_view'] ? $txt['votes'] . ': ' . $option['votes'] . '' : '', '
151 151
 					</div>';
152
+		}
152 153
 
153 154
 		echo '
154 155
 			</div>';
@@ -170,9 +171,10 @@  discard block
 block discarded – undo
170 171
 			echo '
171 172
 				<hr>';
172 173
 
173
-			foreach ($context['printattach'][$post['id_msg']] as $attach)
174
-				echo '
174
+			foreach ($context['printattach'][$post['id_msg']] as $attach) {
175
+							echo '
175 176
 					<img width="' . $attach['width'] . '" height="' . $attach['height'] . '" src="', $scripturl . '?action=dlattach;topic=' . $topic . '.0;attach=' . $attach['id_attach'] . '" alt="">';
177
+			}
176 178
 		}
177 179
 
178 180
 		echo '
@@ -207,12 +209,13 @@  discard block
 block discarded – undo
207 209
 		<div class="print_options">';
208 210
 
209 211
 	// Which option is set, text or text&images
210
-	if (isset($_REQUEST['images']))
211
-		echo '
212
+	if (isset($_REQUEST['images'])) {
213
+			echo '
212 214
 			<a href="', $url_text, '">', $txt['print_page_text'], '</a> | <strong><a href="', $url_images, '">', $txt['print_page_images'], '</a></strong>';
213
-	else
214
-		echo '
215
+	} else {
216
+			echo '
215 217
 			<strong><a href="', $url_text, '">', $txt['print_page_text'], '</a></strong> | <a href="', $url_images, '">', $txt['print_page_images'], '</a>';
218
+	}
216 219
 
217 220
 	echo '
218 221
 		</div><!-- .print_options -->';
Please login to merge, or discard this patch.
Themes/default/Likes.template.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 		<div class="windowbg">
32 32
 			<ul id="likes">';
33 33
 
34
-	foreach ($context['likers'] as $liker => $like_details)
35
-		echo '
34
+	foreach ($context['likers'] as $liker => $like_details) {
35
+			echo '
36 36
 				<li>
37 37
 					', $like_details['profile']['avatar']['image'], '
38 38
 					<span>
@@ -41,6 +41,7 @@  discard block
 block discarded – undo
41 41
 					</span>
42 42
 					<span class="floatright">', $like_details['time'], '</span>
43 43
 				</li>';
44
+	}
44 45
 
45 46
 	echo '
46 47
 			</ul>
@@ -61,11 +62,12 @@  discard block
 block discarded – undo
61 62
 	echo '
62 63
 	<ul class="floatleft">';
63 64
 
64
-	if (!empty($context['data']['can_like']))
65
-		echo '
65
+	if (!empty($context['data']['can_like'])) {
66
+			echo '
66 67
 		<li class="like_button" id="', $context['data']['type'], '_', $context['data']['id_content'], '_likes"', '>
67 68
 			<a href="', $scripturl, '?action=likes;ltype=', $context['data']['type'], ';sa=like;like=', $context['data']['id_content'], ';', $context['session_var'], '=', $context['session_id'], '" class="', $context['data']['type'], '_like"><span class="generic_icons ', $context['data']['already_liked'] ? 'unlike' : 'like', '"></span> ', $context['data']['already_liked'] ? $txt['unlike'] : $txt['like'], '</a>
68 69
 		</li>';
70
+	}
69 71
 
70 72
 	if (!empty($context['data']['count']))
71 73
 	{
Please login to merge, or discard this patch.
Themes/default/ManageBans.template.php 1 patch
Braces   +24 added lines, -16 removed lines patch added patch discarded remove patch
@@ -26,9 +26,10 @@  discard block
 block discarded – undo
26 26
 				</h3>
27 27
 			</div>';
28 28
 
29
-	if ($context['ban']['is_new'])
30
-		echo '
29
+	if ($context['ban']['is_new']) {
30
+			echo '
31 31
 			<div class="information noup">', $txt['ban_add_notes'], '</div>';
32
+	}
32 33
 
33 34
 	// If there were errors creating the ban, show them.
34 35
 	if (!empty($context['error_messages']))
@@ -38,9 +39,10 @@  discard block
 block discarded – undo
38 39
 				<strong>', $txt['ban_errors_detected'], '</strong>
39 40
 				<ul>';
40 41
 
41
-		foreach ($context['error_messages'] as $error)
42
-			echo '
42
+		foreach ($context['error_messages'] as $error) {
43
+					echo '
43 44
 					<li class="error">', $error, '</li>';
45
+		}
44 46
 
45 47
 		echo '
46 48
 				</ul>
@@ -57,8 +59,8 @@  discard block
 block discarded – undo
57 59
 						<input type="text" id="ban_name" name="ban_name" value="', $context['ban']['name'], '" size="45" maxlength="60">
58 60
 					</dd>';
59 61
 
60
-	if (isset($context['ban']['reason']))
61
-		echo '
62
+	if (isset($context['ban']['reason'])) {
63
+			echo '
62 64
 					<dt>
63 65
 						<strong><label for="reason">', $txt['ban_reason'], ':</label></strong><br>
64 66
 						<span class="smalltext">', $txt['ban_reason_desc'], '</span>
@@ -66,9 +68,10 @@  discard block
 block discarded – undo
66 68
 					<dd>
67 69
 						<textarea name="reason" id="reason" cols="40" rows="3">', $context['ban']['reason'], '</textarea>
68 70
 					</dd>';
71
+	}
69 72
 
70
-	if (isset($context['ban']['notes']))
71
-		echo '
73
+	if (isset($context['ban']['notes'])) {
74
+			echo '
72 75
 					<dt>
73 76
 						<strong><label for="ban_notes">', $txt['ban_notes'], ':</label></strong><br>
74 77
 						<span class="smalltext">', $txt['ban_notes_desc'], '</span>
@@ -76,6 +79,7 @@  discard block
 block discarded – undo
76 79
 					<dd>
77 80
 						<textarea name="notes" id="ban_notes" cols="40" rows="3">', $context['ban']['notes'], '</textarea>
78 81
 					</dd>';
82
+	}
79 83
 
80 84
 	echo '
81 85
 				</dl>
@@ -115,8 +119,8 @@  discard block
 block discarded – undo
115 119
 							<input type="text" name="main_ip" value="', $context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;">
116 120
 						</dd>';
117 121
 
118
-		if (empty($modSettings['disableHostnameLookup']))
119
-			echo '
122
+		if (empty($modSettings['disableHostnameLookup'])) {
123
+					echo '
120 124
 						<dt>
121 125
 							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"', !empty($context['ban_suggestions']['hostname']) ? ' checked' : '', '>
122 126
 							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -124,6 +128,7 @@  discard block
 block discarded – undo
124 128
 						<dd>
125 129
 							<input type="text" name="hostname" value="', $context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;">
126 130
 						</dd>';
131
+		}
127 132
 
128 133
 		echo '
129 134
 						<dt>
@@ -153,14 +158,15 @@  discard block
 block discarded – undo
153 158
 					<dl class="settings">';
154 159
 
155 160
 					$count = 0;
156
-					foreach ($ban_ips as $ip)
157
-						echo '
161
+					foreach ($ban_ips as $ip) {
162
+											echo '
158 163
 						<dt>
159 164
 							<input type="checkbox" id="suggestions_', $key, '_', $count, '" name="ban_suggestions[', $key, '][]"', !empty($context['ban_suggestions']['saved_triggers'][$key]) && in_array($ip, $context['ban_suggestions']['saved_triggers'][$key]) ? ' checked' : '', ' value="', $ip, '">
160 165
 						</dt>
161 166
 						<dd>
162 167
 							<label for="suggestions_', $key, '_', $count++, '">', $ip, '</label>
163 168
 						</dd>';
169
+					}
164 170
 
165 171
 					echo '
166 172
 					</dl>';
@@ -202,8 +208,8 @@  discard block
 block discarded – undo
202 208
 		addLoadEvent(fUpdateStatus);';
203 209
 
204 210
 	// Auto suggest only needed for adding new bans, not editing
205
-	if ($context['ban']['is_new'] && empty($_REQUEST['u']))
206
-		echo '
211
+	if ($context['ban']['is_new'] && empty($_REQUEST['u'])) {
212
+			echo '
207 213
 		var oAddMemberSuggest = new smc_AutoSuggest({
208 214
 			sSelf: \'oAddMemberSuggest\',
209 215
 			sSessionId: smf_session_id,
@@ -221,6 +227,7 @@  discard block
 block discarded – undo
221 227
 			return true;
222 228
 		}
223 229
 		oAddMemberSuggest.registerCallback(\'onBeforeUpdate\', \'onUpdateName\');';
230
+	}
224 231
 
225 232
 	echo '
226 233
 		function confirmBan(aForm)
@@ -269,8 +276,8 @@  discard block
 block discarded – undo
269 276
 							<input type="text" name="main_ip" value="', $context['ban_trigger']['ip']['value'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;">
270 277
 						</dd>';
271 278
 
272
-	if (empty($modSettings['disableHostnameLookup']))
273
-		echo '
279
+	if (empty($modSettings['disableHostnameLookup'])) {
280
+			echo '
274 281
 						<dt>
275 282
 							<input type="checkbox" name="ban_suggestions[]" id="hostname_check" value="hostname"', $context['ban_trigger']['hostname']['selected'] ? ' checked' : '', '>
276 283
 							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
@@ -278,6 +285,7 @@  discard block
 block discarded – undo
278 285
 						<dd>
279 286
 							<input type="text" name="hostname" value="', $context['ban_trigger']['hostname']['value'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;">
280 287
 						</dd>';
288
+	}
281 289
 
282 290
 	echo '
283 291
 						<dt>
Please login to merge, or discard this patch.
Themes/default/ManageScheduledTasks.template.php 1 patch
Braces   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -20,13 +20,12 @@  discard block
 block discarded – undo
20 20
 	// We completed some tasks?
21 21
 	if (!empty($context['tasks_were_run']))
22 22
 	{
23
-		if (empty($context['scheduled_errors']))
24
-			echo '
23
+		if (empty($context['scheduled_errors'])) {
24
+					echo '
25 25
 	<div class="infobox">
26 26
 		', $txt['scheduled_tasks_were_run'], '
27 27
 	</div>';
28
-
29
-		else
28
+		} else
30 29
 		{
31 30
 			echo '
32 31
 	<div class="errorbox" id="errors">
@@ -35,14 +34,15 @@  discard block
 block discarded – undo
35 34
 				<strong id="error_serious">', $txt['scheduled_tasks_were_run_errors'], '</strong>
36 35
 			</dt>';
37 36
 
38
-			foreach ($context['scheduled_errors'] as $task => $errors)
39
-				echo '
37
+			foreach ($context['scheduled_errors'] as $task => $errors) {
38
+							echo '
40 39
 			<dd class="error">
41 40
 				<strong>', isset($txt['scheduled_task_' . $task]) ? $txt['scheduled_task_' . $task] : $task, '</strong>
42 41
 				<ul>
43 42
 					<li>', implode('</li><li>', $errors), '</li>
44 43
 				</ul>
45 44
 			</dd>';
45
+			}
46 46
 
47 47
 			echo '
48 48
 		</dl>
Please login to merge, or discard this patch.
Themes/default/Post.template.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -417,8 +417,8 @@  discard block
 block discarded – undo
417 417
 									</div><!-- .attached_BBC -->
418 418
 									<div class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
419 419
 									<div class="attach-ui">
420
-										<a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a>
421
-										<a class="button upload">', $txt['upload'] ,'</a>
420
+										<a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a>
421
+										<a class="button upload">', $txt['upload'], '</a>
422 422
 									</div>
423 423
 								</div><!-- .attach-info -->
424 424
 							</div><!-- #au-template -->
@@ -433,10 +433,10 @@  discard block
 block discarded – undo
433 433
 							</dt>
434 434
 							<dd class="smalltext fallback">
435 435
 								<div id="attachUpload" class="descbox">
436
-									<h5>', $txt['attach_drop_zone'] ,'</h5>
437
-									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a>
438
-									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a>
439
-									<a class="button fileinput-button">', $txt['attach_add'] ,'</a>
436
+									<h5>', $txt['attach_drop_zone'], '</h5>
437
+									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a>
438
+									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a>
439
+									<a class="button fileinput-button">', $txt['attach_add'], '</a>
440 440
 									<div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
441 441
 									<div class="fallback">
442 442
 										<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
 	// Option to delete an event if user is editing one.
542 542
 	if ($context['make_event'] && !$context['event']['new'])
543 543
 		echo '
544
-						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
544
+						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">';
545 545
 
546 546
 	echo '
547 547
 					</span>
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
 			});';
796 796
 
797 797
 	echo '
798
-			var oEditorID = "', $context['post_box_name'] ,'";
798
+			var oEditorID = "', $context['post_box_name'], '";
799 799
 			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
800 800
 		</script>';
801 801
 
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
827 827
 			if ($context['can_quote'])
828 828
 				echo '
829 829
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
830
-						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>
830
+						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li>
831 831
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
832 832
 					</ul>';
833 833
 
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
911 911
 	<head>
912 912
 		<meta charset="', $context['character_set'], '">
913 913
 		<title>', $txt['spell_check'], '</title>
914
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
914
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
915 915
 		<style>
916 916
 			body, td {
917 917
 				font-size: small;
@@ -941,8 +941,8 @@  discard block
 block discarded – undo
941 941
 			var spell_formname = window.opener.spell_formname;
942 942
 			var spell_fieldname = window.opener.spell_fieldname;
943 943
 		</script>
944
-		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
945
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
944
+		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script>
945
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
946 946
 		<script>
947 947
 			', $context['spell_js'], '
948 948
 		</script>
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
986 986
 	<head>
987 987
 		<meta charset="', $context['character_set'], '">
988 988
 		<title>', $txt['retrieving_quote'], '</title>
989
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
989
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
990 990
 	</head>
991 991
 	<body>
992 992
 		', $txt['retrieving_quote'], '
Please login to merge, or discard this patch.
Braces   +105 added lines, -71 removed lines patch added patch discarded remove patch
@@ -22,24 +22,26 @@  discard block
 block discarded – undo
22 22
 		<script>';
23 23
 
24 24
 	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
25
-	if (isBrowser('is_firefox'))
26
-		echo '
25
+	if (isBrowser('is_firefox')) {
26
+			echo '
27 27
 			window.addEventListener("pageshow", reActivate, false);';
28
+	}
28 29
 
29 30
 	// Start with message icons - and any missing from this theme.
30 31
 	echo '
31 32
 			var icon_urls = {';
32 33
 
33
-	foreach ($context['icons'] as $icon)
34
-		echo '
34
+	foreach ($context['icons'] as $icon) {
35
+			echo '
35 36
 				\'', $icon['value'], '\': \'', $icon['url'], '\'', $icon['is_last'] ? '' : ',';
37
+	}
36 38
 
37 39
 	echo '
38 40
 			};';
39 41
 
40 42
 	// If this is a poll - use some javascript to ensure the user doesn't create a poll with illegal option combinations.
41
-	if ($context['make_poll'])
42
-		echo '
43
+	if ($context['make_poll']) {
44
+			echo '
43 45
 			var pollOptionNum = 0, pollTabIndex;
44 46
 			var pollOptionId = ', $context['last_choice_id'], ';
45 47
 			function addPollOption()
@@ -58,11 +60,13 @@  discard block
 block discarded – undo
58 60
 
59 61
 				setOuterHTML(document.getElementById(\'pollMoreOptions\'), ', JavaScriptEscape('<dt><label for="options-'), ' + pollOptionId + ', JavaScriptEscape('">' . $txt['option'] . ' '), ' + pollOptionNum + ', JavaScriptEscape('</label>:</dt><dd><input type="text" name="options['), ' + pollOptionId + ', JavaScriptEscape(']" id="options-'), ' + pollOptionId + ', JavaScriptEscape('" value="" size="80" maxlength="255" tabindex="'), ' + pollTabIndex + ', JavaScriptEscape('"></dd><p id="pollMoreOptions"></p>'), ');
60 62
 			}';
63
+	}
61 64
 
62 65
 	// If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here.
63
-	if ($context['make_event'])
64
-		echo '
66
+	if ($context['make_event']) {
67
+			echo '
65 68
 			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];';
69
+	}
66 70
 
67 71
 	// End of the javascript, start the form and display the link tree.
68 72
 	echo '
@@ -83,9 +87,10 @@  discard block
 block discarded – undo
83 87
 			</div>
84 88
 			<br>';
85 89
 
86
-	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board'])))
87
-		echo '
90
+	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board']))) {
91
+			echo '
88 92
 			<input type="hidden" name="eventid" value="', $context['event']['id'], '">';
93
+	}
89 94
 
90 95
 	// Start the main table.
91 96
 	echo '
@@ -110,26 +115,29 @@  discard block
 block discarded – undo
110 115
 					</div>';
111 116
 
112 117
 	// If this won't be approved let them know!
113
-	if (!$context['becomes_approved'])
114
-		echo '
118
+	if (!$context['becomes_approved']) {
119
+			echo '
115 120
 					<div class="noticebox">
116 121
 						<em>', $txt['wait_for_approval'], '</em>
117 122
 						<input type="hidden" name="not_approved" value="1">
118 123
 					</div>';
124
+	}
119 125
 
120 126
 	// If it's locked, show a message to warn the replier.
121
-	if (!empty($context['locked']))
122
-	echo '
127
+	if (!empty($context['locked'])) {
128
+		echo '
123 129
 					<div class="errorbox">
124 130
 						', $txt['topic_locked_no_reply'], '
125 131
 					</div>';
132
+	}
126 133
 
127
-	if (!empty($modSettings['drafts_post_enabled']))
128
-		echo '
134
+	if (!empty($modSettings['drafts_post_enabled'])) {
135
+			echo '
129 136
 					<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
130 137
 						sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
131 138
 						', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
132 139
 					</div>';
140
+	}
133 141
 
134 142
 	// The post header... important stuff
135 143
 	echo '
@@ -139,14 +147,15 @@  discard block
 block discarded – undo
139 147
 	// Mod & theme authors can use the 'integrate_post_end' hook to modify or add to these (see Post.php)
140 148
 	if (!empty($context['posting_fields']) && is_array($context['posting_fields']))
141 149
 	{
142
-		foreach ($context['posting_fields'] as $pfid => $pf)
143
-			echo '
150
+		foreach ($context['posting_fields'] as $pfid => $pf) {
151
+					echo '
144 152
 						<dt class="clear', !is_numeric($pfid) ? ' pf_' . $pfid : '', '">
145 153
 							', $pf['dt'], '
146 154
 						</dt>
147 155
 						<dd', !is_numeric($pfid) ? ' class="pf_' . $pfid . '"' : '', '>
148 156
 							', preg_replace('~<(input|select|textarea|button|area|a|object)\b~', '<$1 tabindex="' . $context['tabindex']++ . '"', $pf['dd']), '
149 157
 						</dd>';
158
+		}
150 159
 	}
151 160
 
152 161
 	echo '
@@ -180,9 +189,10 @@  discard block
 block discarded – undo
180 189
 				echo '
181 190
 										<optgroup label="', $category['name'], '">';
182 191
 
183
-				foreach ($category['boards'] as $board)
184
-					echo '
192
+				foreach ($category['boards'] as $board) {
193
+									echo '
185 194
 											<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
195
+				}
186 196
 				echo '
187 197
 										</optgroup>';
188 198
 			}
@@ -218,9 +228,10 @@  discard block
 block discarded – undo
218 228
 									<span class="label">', $txt['calendar_timezone'], '</span>
219 229
 									<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
220 230
 
221
-		foreach ($context['all_timezones'] as $tz => $tzname)
222
-			echo '
231
+		foreach ($context['all_timezones'] as $tz => $tzname) {
232
+					echo '
223 233
 										<option', is_numeric($tz) ? ' value="" disabled' : ' value="' . $tz . '"', $tz === $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
234
+		}
224 235
 
225 236
 		echo '
226 237
 									</select>
@@ -249,14 +260,15 @@  discard block
 block discarded – undo
249 260
 								</dd>';
250 261
 
251 262
 		// Loop through all the choices and print them out.
252
-		foreach ($context['choices'] as $choice)
253
-			echo '
263
+		foreach ($context['choices'] as $choice) {
264
+					echo '
254 265
 								<dt>
255 266
 									<label for="options-', $choice['id'], '">', $txt['option'], ' ', $choice['number'], '</label>:
256 267
 								</dt>
257 268
 								<dd>
258 269
 									<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="255">
259 270
 								</dd>';
271
+		}
260 272
 
261 273
 		echo '
262 274
 								<p id="pollMoreOptions"></p>
@@ -286,14 +298,15 @@  discard block
 block discarded – undo
286 298
 									<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '>
287 299
 								</dd>';
288 300
 
289
-		if ($context['poll_options']['guest_vote_enabled'])
290
-			echo '
301
+		if ($context['poll_options']['guest_vote_enabled']) {
302
+					echo '
291 303
 								<dt>
292 304
 									<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
293 305
 								</dt>
294 306
 								<dd>
295 307
 									<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll_options']['guest_vote']) ? ' checked' : '', '>
296 308
 								</dd>';
309
+		}
297 310
 
298 311
 		echo '
299 312
 								<dt>
@@ -314,8 +327,8 @@  discard block
 block discarded – undo
314 327
 					', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
315 328
 
316 329
 	// If we're editing and displaying edit details, show a box where they can say why
317
-	if (isset($context['editing']) && $modSettings['show_modify'])
318
-		echo '
330
+	if (isset($context['editing']) && $modSettings['show_modify']) {
331
+			echo '
319 332
 					<dl>
320 333
 						<dt class="clear">
321 334
 							<span id="caption_edit_reason">', $txt['reason_for_edit'], ':</span>
@@ -324,20 +337,23 @@  discard block
 block discarded – undo
324 337
 							<input type="text" name="modify_reason"', isset($context['last_modified_reason']) ? ' value="' . $context['last_modified_reason'] . '"' : '', ' tabindex="', $context['tabindex']++, '" size="80" maxlength="80">
325 338
 						</dd>
326 339
 					</dl>';
340
+	}
327 341
 
328 342
 	// If this message has been edited in the past - display when it was.
329
-	if (isset($context['last_modified']))
330
-		echo '
343
+	if (isset($context['last_modified'])) {
344
+			echo '
331 345
 					<div class="padding smalltext">
332 346
 						', $context['last_modified_text'], '
333 347
 					</div>';
348
+	}
334 349
 
335 350
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
336
-	if (!empty($modSettings['additional_options_collapsable']))
337
-		echo '
351
+	if (!empty($modSettings['additional_options_collapsable'])) {
352
+			echo '
338 353
 					<div id="postAdditionalOptionsHeader">
339 354
 						<strong><a href="#" id="postMoreExpandLink"> ', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong>
340 355
 					</div>';
356
+	}
341 357
 
342 358
 	echo '
343 359
 					<div id="postAdditionalOptions">';
@@ -370,19 +386,21 @@  discard block
 block discarded – undo
370 386
 								', $txt['uncheck_unwatchd_attach'], ':
371 387
 							</dd>';
372 388
 
373
-		foreach ($context['current_attachments'] as $attachment)
374
-			echo '
389
+		foreach ($context['current_attachments'] as $attachment) {
390
+					echo '
375 391
 							<dd class="smalltext">
376 392
 								<label for="attachment_', $attachment['attachID'], '"><input type="checkbox" id="attachment_', $attachment['attachID'], '" name="attach_del[]" value="', $attachment['attachID'], '"', empty($attachment['unchecked']) ? ' checked' : '', '> ', $attachment['name'], (empty($attachment['approved']) ? ' (' . $txt['awaiting_approval'] . ')' : ''),
377 393
 								!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1024) / 1024), 0)) : '', '</label>
378 394
 							</dd>';
395
+		}
379 396
 
380 397
 		echo '
381 398
 						</dl>';
382 399
 
383
-		if (!empty($context['files_in_session_warning']))
384
-			echo '
400
+		if (!empty($context['files_in_session_warning'])) {
401
+					echo '
385 402
 						<div class="smalltext">', $context['files_in_session_warning'], '</div>';
403
+		}
386 404
 	}
387 405
 
388 406
 	// Is the user allowed to post any additional ones? If so give them the boxes to do it!
@@ -443,8 +461,8 @@  discard block
 block discarded – undo
443 461
 								', empty($modSettings['attachmentSizeLimit']) ? '' : ('<input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1024 . '">');
444 462
 
445 463
 		// Show more boxes if they aren't approaching that limit.
446
-		if ($context['num_allowed_attachments'] > 1)
447
-			echo '
464
+		if ($context['num_allowed_attachments'] > 1) {
465
+					echo '
448 466
 										<script>
449 467
 											var allowed_attachments = ', $context['num_allowed_attachments'], ';
450 468
 											var current_attachment = 1;
@@ -464,6 +482,7 @@  discard block
 block discarded – undo
464 482
 										<a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')</a>
465 483
 									</div><!-- .fallback -->
466 484
 								</div><!-- #attachUpload -->';
485
+		}
467 486
 
468 487
 		echo '
469 488
 							</dd>';
@@ -475,21 +494,25 @@  discard block
 block discarded – undo
475 494
 							<dd class="smalltext">';
476 495
 
477 496
 		// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
478
-		if (!empty($modSettings['attachmentCheckExtensions']))
479
-			echo '
497
+		if (!empty($modSettings['attachmentCheckExtensions'])) {
498
+					echo '
480 499
 								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br>';
500
+		}
481 501
 
482
-		if (!empty($context['attachment_restrictions']))
483
-			echo '
502
+		if (!empty($context['attachment_restrictions'])) {
503
+					echo '
484 504
 								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br>';
505
+		}
485 506
 
486
-		if ($context['num_allowed_attachments'] == 0)
487
-			echo '
507
+		if ($context['num_allowed_attachments'] == 0) {
508
+					echo '
488 509
 								', $txt['attach_limit_nag'], '<br>';
510
+		}
489 511
 
490
-		if (!$context['can_post_attachment_unapproved'])
491
-			echo '
512
+		if (!$context['can_post_attachment_unapproved']) {
513
+					echo '
492 514
 								<span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br>';
515
+		}
493 516
 
494 517
 		echo '
495 518
 							</dd>
@@ -513,24 +536,26 @@  discard block
 block discarded – undo
513 536
 							<dt><strong>', $txt['subject'], '</strong></dt>
514 537
 							<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
515 538
 
516
-		foreach ($context['drafts'] as $draft)
517
-			echo '
539
+		foreach ($context['drafts'] as $draft) {
540
+					echo '
518 541
 							<dt>', $draft['link'], '</dt>
519 542
 							<dd>', $draft['poster_time'], '</dd>';
543
+		}
520 544
 		echo '
521 545
 						</dl>
522 546
 					</div>';
523 547
 	}
524 548
 
525 549
 	// Is visual verification enabled?
526
-	if ($context['require_verification'])
527
-		echo '
550
+	if ($context['require_verification']) {
551
+			echo '
528 552
 					<div class="post_verification">
529 553
 						<span', !empty($context['post_error']['need_qr_verification']) ? ' class="error"' : '', '>
530 554
 							<strong>', $txt['verification'], ':</strong>
531 555
 						</span>
532 556
 						', template_control_verification($context['visual_verification_id'], 'all'), '
533 557
 					</div>';
558
+	}
534 559
 
535 560
 	// Finally, the submit buttons.
536 561
 	echo '
@@ -539,9 +564,10 @@  discard block
 block discarded – undo
539 564
 						', template_control_richedit_buttons($context['post_box_name']);
540 565
 
541 566
 	// Option to delete an event if user is editing one.
542
-	if ($context['make_event'] && !$context['event']['new'])
543
-		echo '
567
+	if ($context['make_event'] && !$context['event']['new']) {
568
+			echo '
544 569
 						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
570
+	}
545 571
 
546 572
 	echo '
547 573
 					</span>
@@ -550,9 +576,10 @@  discard block
 block discarded – undo
550 576
 			<br class="clear">';
551 577
 
552 578
 	// Assuming this isn't a new topic pass across the last message id.
553
-	if (isset($context['topic_last_message']))
554
-		echo '
579
+	if (isset($context['topic_last_message'])) {
580
+			echo '
555 581
 			<input type="hidden" name="last_msg" value="', $context['topic_last_message'], '">';
582
+	}
556 583
 
557 584
 	echo '
558 585
 			<input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '">
@@ -695,9 +722,10 @@  discard block
 block discarded – undo
695 722
 
696 723
 						newPostsHTML += \'<div class="windowbg\' + (++reply_counter % 2 == 0 ? \'2\' : \'\') + \'"><div id="msg\' + newPosts[i].getAttribute("id") + \'"><div class="floatleft"><h5>', $txt['posted_by'], ': \' + newPosts[i].getElementsByTagName("poster")[0].firstChild.nodeValue + \'</h5><span class="smalltext">&#171;&nbsp;<strong>', $txt['on'], ':</strong> \' + newPosts[i].getElementsByTagName("time")[0].firstChild.nodeValue + \'&nbsp;&#187;</span> <span class="new_posts" id="image_new_\' + newPosts[i].getAttribute("id") + \'">', $txt['new'], '</span></div>\';';
697 724
 
698
-	if ($context['can_quote'])
699
-		echo '
725
+	if ($context['can_quote']) {
726
+			echo '
700 727
 						newPostsHTML += \'<ul class="quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');" class="quote_button"><span>', $txt['quote'], '</span><\' + \'/a></li></ul>\';';
728
+	}
701 729
 
702 730
 	echo '
703 731
 						newPostsHTML += \'<br class="clear">\';
@@ -740,8 +768,8 @@  discard block
 block discarded – undo
740 768
 			}';
741 769
 
742 770
 	// Code for showing and hiding additional options.
743
-	if (!empty($modSettings['additional_options_collapsable']))
744
-		echo '
771
+	if (!empty($modSettings['additional_options_collapsable'])) {
772
+			echo '
745 773
 			var oSwapAdditionalOptions = new smc_Toggle({
746 774
 				bToggleEnabled: true,
747 775
 				bCurrentlyCollapsed: ', $context['show_additional_options'] ? 'false' : 'true', ',
@@ -769,10 +797,11 @@  discard block
 block discarded – undo
769 797
 					}
770 798
 				]
771 799
 			});';
800
+	}
772 801
 
773 802
 	// Code for showing and hiding drafts
774
-	if (!empty($context['drafts']))
775
-		echo '
803
+	if (!empty($context['drafts'])) {
804
+			echo '
776 805
 			var oSwapDraftOptions = new smc_Toggle({
777 806
 				bToggleEnabled: true,
778 807
 				bCurrentlyCollapsed: true,
@@ -794,6 +823,7 @@  discard block
 block discarded – undo
794 823
 					}
795 824
 				]
796 825
 			});';
826
+	}
797 827
 
798 828
 	echo '
799 829
 			var oEditorID = "', $context['post_box_name'] ,'";
@@ -814,8 +844,9 @@  discard block
 block discarded – undo
814 844
 		foreach ($context['previous_posts'] as $post)
815 845
 		{
816 846
 			$ignoring = false;
817
-			if (!empty($post['is_ignored']))
818
-				$ignored_posts[] = $ignoring = $post['id'];
847
+			if (!empty($post['is_ignored'])) {
848
+							$ignored_posts[] = $ignoring = $post['id'];
849
+			}
819 850
 
820 851
 			echo '
821 852
 			<div class="windowbg">
@@ -825,22 +856,24 @@  discard block
 block discarded – undo
825 856
 					</h5>
826 857
 					&nbsp;-&nbsp;', $post['time'];
827 858
 
828
-			if ($context['can_quote'])
829
-				echo '
859
+			if ($context['can_quote']) {
860
+							echo '
830 861
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
831 862
 						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>
832 863
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
833 864
 					</ul>';
865
+			}
834 866
 
835 867
 			echo '
836 868
 					<br class="clear">';
837 869
 
838
-			if ($ignoring)
839
-				echo '
870
+			if ($ignoring) {
871
+							echo '
840 872
 					<div id="msg_', $post['id'], '_ignored_prompt" class="smalltext">
841 873
 						', $txt['ignoring_user'], '
842 874
 						<a href="#" id="msg_', $post['id'], '_ignored_link" style="display: none;">', $txt['show_ignore_user_post'], '</a>
843 875
 					</div>';
876
+			}
844 877
 
845 878
 			echo '
846 879
 					<div class="list_posts smalltext" id="msg_', $post['id'], '_body" data-msgid="', $post['id'], '">', $post['message'], '</div>
@@ -995,10 +1028,10 @@  discard block
 block discarded – undo
995 1028
 		<div id="temporary_posting_area" style="display: none;"></div>
996 1029
 		<script>';
997 1030
 
998
-	if ($context['close_window'])
999
-		echo '
1031
+	if ($context['close_window']) {
1032
+			echo '
1000 1033
 			window.close();';
1001
-	else
1034
+	} else
1002 1035
 	{
1003 1036
 		// Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;)
1004 1037
 		echo '
@@ -1052,11 +1085,12 @@  discard block
 block discarded – undo
1052 1085
 				</p>
1053 1086
 				<ul>';
1054 1087
 
1055
-	foreach ($context['groups'] as $group)
1056
-		echo '
1088
+	foreach ($context['groups'] as $group) {
1089
+			echo '
1057 1090
 					<li>
1058 1091
 						<label for="who_', $group['id'], '"><input type="checkbox" name="who[', $group['id'], ']" id="who_', $group['id'], '" value="', $group['id'], '" checked> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em>
1059 1092
 					</li>';
1093
+	}
1060 1094
 
1061 1095
 	echo '
1062 1096
 					<li>
Please login to merge, or discard this patch.
Themes/default/ManageSmileys.template.php 1 patch
Braces   +58 added lines, -44 removed lines patch added patch discarded remove patch
@@ -41,11 +41,12 @@  discard block
 block discarded – undo
41 41
 			</div>';
42 42
 
43 43
 	// If this is an existing set, and there are still un-added smileys - offer an import opportunity.
44
-	if (!empty($context['current_set']['can_import']))
45
-		echo '
44
+	if (!empty($context['current_set']['can_import'])) {
45
+			echo '
46 46
 			<div class="information">
47 47
 				', $context['current_set']['can_import'] == 1 ? sprintf($txt['smiley_set_import_single'], $context['current_set']['import_url']) : sprintf($txt['smiley_set_import_multiple'], $context['current_set']['can_import'], $context['current_set']['import_url']), '
48 48
 			</div>';
49
+	}
49 50
 
50 51
 	echo '
51 52
 			<div class="windowbg2 noup">
@@ -62,20 +63,20 @@  discard block
 block discarded – undo
62 63
 					<dd>
63 64
 						', $modSettings['smileys_url'], '/';
64 65
 
65
-	if ($context['current_set']['id'] == 'default')
66
-		echo '<strong>default</strong><input type="hidden" name="smiley_sets_path" id="smiley_sets_path" value="default">';
67
-
68
-	elseif (empty($context['smiley_set_dirs']))
69
-		echo '
66
+	if ($context['current_set']['id'] == 'default') {
67
+			echo '<strong>default</strong><input type="hidden" name="smiley_sets_path" id="smiley_sets_path" value="default">';
68
+	} elseif (empty($context['smiley_set_dirs'])) {
69
+			echo '
70 70
 						<input type="text" name="smiley_sets_path" id="smiley_sets_path" value="', $context['current_set']['path'], '"> ';
71
-	else
71
+	} else
72 72
 	{
73 73
 		echo '
74 74
 						<select name="smiley_sets_path" id="smiley_sets_path">';
75 75
 
76
-		foreach ($context['smiley_set_dirs'] as $smiley_set_dir)
77
-			echo '
76
+		foreach ($context['smiley_set_dirs'] as $smiley_set_dir) {
77
+					echo '
78 78
 							<option value="', $smiley_set_dir['id'], '"', $smiley_set_dir['current'] ? ' selected' : '', $smiley_set_dir['selectable'] ? '' : ' disabled', '>', $smiley_set_dir['id'], '</option>';
79
+		}
79 80
 		echo '
80 81
 						</select> ';
81 82
 	}
@@ -90,14 +91,15 @@  discard block
 block discarded – undo
90 91
 					</dd>';
91 92
 
92 93
 	// If this is a new smiley set they have the option to import smileys already in the directory.
93
-	if ($context['current_set']['is_new'] && !empty($modSettings['smiley_enable']))
94
-		echo '
94
+	if ($context['current_set']['is_new'] && !empty($modSettings['smiley_enable'])) {
95
+			echo '
95 96
 					<dt>
96 97
 						<strong><label for="smiley_sets_import">', $txt['smiley_set_import_directory'], '</label>: </strong>
97 98
 					</dt>
98 99
 					<dd>
99 100
 						<input type="checkbox" name="smiley_sets_import" id="smiley_sets_import" value="1">
100 101
 					</dd>';
102
+	}
101 103
 
102 104
 	echo '
103 105
 				</dl>
@@ -131,9 +133,10 @@  discard block
 block discarded – undo
131 133
 					<dd>
132 134
 						<img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $context['current_smiley']['filename'], '" id="preview" alt=""> (', $txt['smiley_preview_using'], ': <select name="set" onchange="updatePreview();">';
133 135
 
134
-	foreach ($context['smiley_sets'] as $smiley_set)
135
-		echo '
136
+	foreach ($context['smiley_sets'] as $smiley_set) {
137
+			echo '
136 138
 						<option value="', $smiley_set['path'], '"', $context['selected_set'] == $smiley_set['path'] ? ' selected' : '', '>', $smiley_set['name'], '</option>';
139
+	}
137 140
 
138 141
 	echo '
139 142
 						</select>)
@@ -149,17 +152,18 @@  discard block
 block discarded – undo
149 152
 					</dt>
150 153
 					<dd>';
151 154
 
152
-	if (empty($context['filenames']))
153
-		echo '
155
+	if (empty($context['filenames'])) {
156
+			echo '
154 157
 						<input type="text" name="smiley_filename" id="smiley_filename" value="', $context['current_smiley']['filename'], '">';
155
-	else
158
+	} else
156 159
 	{
157 160
 		echo '
158 161
 						<select name="smiley_filename" id="smiley_filename" onchange="updatePreview();">';
159 162
 
160
-		foreach ($context['filenames'] as $filename)
161
-			echo '
163
+		foreach ($context['filenames'] as $filename) {
164
+					echo '
162 165
 							<option value="', $filename['id'], '"', $filename['selected'] ? ' selected' : '', '>', $filename['id'], '</option>';
166
+		}
163 167
 		echo '
164 168
 						</select>';
165 169
 	}
@@ -228,9 +232,10 @@  discard block
 block discarded – undo
228 232
 						<dd>
229 233
 							', $txt['smiley_preview_using'], ': <select name="set" onchange="updatePreview();selectMethod(\'existing\');">';
230 234
 
231
-	foreach ($context['smiley_sets'] as $smiley_set)
232
-		echo '
235
+	foreach ($context['smiley_sets'] as $smiley_set) {
236
+			echo '
233 237
 								<option value="', $smiley_set['path'], '"', $context['selected_set'] == $smiley_set['path'] ? ' selected' : '', '>', $smiley_set['name'], '</option>';
238
+	}
234 239
 
235 240
 	echo '
236 241
 							</select>
@@ -240,17 +245,18 @@  discard block
 block discarded – undo
240 245
 						</dt>
241 246
 						<dd>';
242 247
 
243
-	if (empty($context['filenames']))
244
-		echo '
248
+	if (empty($context['filenames'])) {
249
+			echo '
245 250
 							<input type="text" name="smiley_filename" id="smiley_filename" value="', $context['current_smiley']['filename'], '" onchange="selectMethod(\'existing\');">';
246
-	else
251
+	} else
247 252
 	{
248 253
 		echo '
249 254
 							<select name="smiley_filename" id="smiley_filename" onchange="updatePreview();selectMethod(\'existing\');">';
250 255
 
251
-		foreach ($context['filenames'] as $filename)
252
-			echo '
256
+		foreach ($context['filenames'] as $filename) {
257
+					echo '
253 258
 								<option value="', $filename['id'], '"', $filename['selected'] ? ' selected' : '', '>', $filename['id'], '</option>';
259
+		}
254 260
 		echo '
255 261
 							</select>';
256 262
 	}
@@ -279,14 +285,15 @@  discard block
 block discarded – undo
279 285
 
280 286
 				<dl id="uploadMore" style="display: none;" class="settings">';
281 287
 
282
-	foreach ($context['smiley_sets'] as $smiley_set)
283
-		echo '
288
+	foreach ($context['smiley_sets'] as $smiley_set) {
289
+			echo '
284 290
 					<dt>
285 291
 						', sprintf($txt['smileys_add_upload_for'], '<strong>' . $smiley_set['name'] . '</strong>'), ':
286 292
 					</dt>
287 293
 					<dd>
288 294
 						<input type="file" name="individual_', $smiley_set['name'], '" onchange="selectMethod(\'upload\');">
289 295
 					</dd>';
296
+	}
290 297
 
291 298
 	echo '
292 299
 				</dl>
@@ -357,27 +364,30 @@  discard block
 block discarded – undo
357 364
 
358 365
 		foreach ($location['rows'] as $row)
359 366
 		{
360
-			if (!empty($context['move_smiley']))
361
-				echo '
367
+			if (!empty($context['move_smiley'])) {
368
+							echo '
362 369
 				<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';row=', $row[0]['row'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
370
+			}
363 371
 
364 372
 			foreach ($row as $smiley)
365 373
 			{
366
-				if (empty($context['move_smiley']))
367
-					echo '
374
+				if (empty($context['move_smiley'])) {
375
+									echo '
368 376
 				<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;move=', $smiley['id'], '"><img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" alt="', $smiley['description'], '"></a>';
369
-				else
370
-					echo '
377
+				} else {
378
+									echo '
371 379
 				<img src="', $modSettings['smileys_url'], '/', $modSettings['smiley_sets_default'], '/', $smiley['filename'], '" alt="', $smiley['description'], '" ', $smiley['selected'] ? 'class="selected_item"' : '', '>
372 380
 				<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';after=', $smiley['id'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '" title="', $txt['smileys_move_here'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
381
+				}
373 382
 			}
374 383
 
375 384
 			echo '
376 385
 				<br>';
377 386
 		}
378
-		if (!empty($context['move_smiley']))
379
-			echo '
387
+		if (!empty($context['move_smiley'])) {
388
+					echo '
380 389
 				<a href="', $scripturl, '?action=admin;area=smileys;sa=setorder;location=', $location['id'], ';source=', $context['move_smiley'], ';row=', $location['last_row'], ';reorder=1;', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons select_below" title="', $txt['smileys_move_here'], '"></span></a>';
390
+		}
381 391
 		echo '
382 392
 			</div><!-- .windowbg2 -->
383 393
 			<input type="hidden" name="reorder" value="1">
@@ -414,14 +424,15 @@  discard block
 block discarded – undo
414 424
 			<div class="windowbg2">
415 425
 				<dl class="settings">';
416 426
 
417
-	if (!$context['new_icon'])
418
-		echo '
427
+	if (!$context['new_icon']) {
428
+			echo '
419 429
 					<dt>
420 430
 						<strong>', $txt['smiley_preview'], ': </strong>
421 431
 					</dt>
422 432
 					<dd>
423 433
 						<img src="', $context['icon']['image_url'], '" alt="', $context['icon']['title'], '">
424 434
 					</dd>';
435
+	}
425 436
 
426 437
 	echo '
427 438
 					<dt>
@@ -448,9 +459,10 @@  discard block
 block discarded – undo
448 459
 		echo '
449 460
 							<optgroup label="', $category['name'], '">';
450 461
 
451
-		foreach ($category['boards'] as $board)
452
-			echo '
462
+		foreach ($category['boards'] as $board) {
463
+					echo '
453 464
 								<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
465
+		}
454 466
 
455 467
 		echo '
456 468
 							</optgroup>';
@@ -467,19 +479,21 @@  discard block
 block discarded – undo
467 479
 							<option value="0"', empty($context['icon']['after']) ? ' selected' : '', '>', $txt['icons_location_first_icon'], '</option>';
468 480
 
469 481
 	// Print the list of all the icons it can be put after...
470
-	foreach ($context['icons'] as $id => $data)
471
-		if (empty($context['icon']['id']) || $id != $context['icon']['id'])
482
+	foreach ($context['icons'] as $id => $data) {
483
+			if (empty($context['icon']['id']) || $id != $context['icon']['id'])
472 484
 			echo '
473 485
 							<option value="', $id, '"', !empty($context['icon']['after']) && $id == $context['icon']['after'] ? ' selected' : '', '>', $txt['icons_location_after'], ': ', $data['title'], '</option>';
486
+	}
474 487
 
475 488
 	echo '
476 489
 						</select>
477 490
 					</dd>
478 491
 				</dl>';
479 492
 
480
-	if (!$context['new_icon'])
481
-		echo '
493
+	if (!$context['new_icon']) {
494
+			echo '
482 495
 				<input type="hidden" name="icon" value="', $context['icon']['id'], '">';
496
+	}
483 497
 
484 498
 	echo '
485 499
 				<input type="submit" name="icons_save" value="', $txt['smileys_save'], '" class="button">
Please login to merge, or discard this patch.
Themes/default/ReportToMod.template.php 1 patch
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -62,16 +62,17 @@
 block discarded – undo
62 62
 				<div id="error_box" class="errorbox">
63 63
 					<ul id="error_list">';
64 64
 
65
-		foreach ($context['post_errors'] as $key => $error)
66
-			echo '
65
+		foreach ($context['post_errors'] as $key => $error) {
66
+					echo '
67 67
 						<li id="error_', $key, '" class="error">', $error, '</li>';
68
+		}
68 69
 
69 70
 		echo '
70 71
 					</ul>';
71
-	}
72
-	else
73
-		echo '
72
+	} else {
73
+			echo '
74 74
 				<div style="display:none" id="error_box" class="errorbox">';
75
+	}
75 76
 
76 77
 	echo '
77 78
 				</div>';
Please login to merge, or discard this patch.
Themes/default/Who.template.php 1 patch
Braces   +45 added lines, -31 removed lines patch added patch discarded remove patch
@@ -31,9 +31,10 @@  discard block
 block discarded – undo
31 31
 						', $txt['who_show1'], '
32 32
 						<select name="show_top" onchange="document.forms.whoFilter.show.value = this.value; document.forms.whoFilter.submit();">';
33 33
 
34
-	foreach ($context['show_methods'] as $value => $label)
35
-		echo '
34
+	foreach ($context['show_methods'] as $value => $label) {
35
+			echo '
36 36
 							<option value="', $value, '" ', $value == $context['show_by'] ? ' selected' : '', '>', $label, '</option>';
37
+	}
37 38
 	echo '
38 39
 						</select>
39 40
 						<noscript>
@@ -58,20 +59,22 @@  discard block
 block discarded – undo
58 59
 							<td>';
59 60
 
60 61
 		// Guests can't be messaged.
61
-		if (!$member['is_guest'])
62
-			echo '
62
+		if (!$member['is_guest']) {
63
+					echo '
63 64
 								<span class="contact_info floatright">
64 65
 									', $context['can_send_pm'] ? '<a href="' . $member['online']['href'] . '" title="' . $member['online']['text'] . '">' : '', $settings['use_image_buttons'] ? '<span class="' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $member['online']['text'] . '"></span>' : $member['online']['label'], $context['can_send_pm'] ? '</a>' : '', '
65 66
 								</span>';
67
+		}
66 68
 
67 69
 		echo '
68 70
 								<span class="member', $member['is_hidden'] ? ' hidden' : '', '">
69 71
 									', $member['is_guest'] ? $member['name'] : '<a href="' . $member['href'] . '" title="' . $txt['profile_of'] . ' ' . $member['name'] . '"' . (empty($member['color']) ? '' : ' style="color: ' . $member['color'] . '"') . '>' . $member['name'] . '</a>', '
70 72
 								</span>';
71 73
 
72
-		if (!empty($member['ip']))
73
-			echo '
74
+		if (!empty($member['ip'])) {
75
+					echo '
74 76
 								(<a href="' . $scripturl . '?action=', ($member['is_guest'] ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $member['id']), ';searchip=' . $member['ip'] . '">' . $member['ip'] . '</a>)';
77
+		}
75 78
 
76 79
 		echo '
77 80
 							</td>
@@ -81,13 +84,14 @@  discard block
 block discarded – undo
81 84
 	}
82 85
 
83 86
 	// No members?
84
-	if (empty($context['members']))
85
-		echo '
87
+	if (empty($context['members'])) {
88
+			echo '
86 89
 						<tr class="windowbg">
87 90
 							<td colspan="3">
88 91
 							', $txt['who_no_online_' . ($context['show_by'] == 'guests' || $context['show_by'] == 'spiders' ? $context['show_by'] : 'members')], '
89 92
 							</td>
90 93
 						</tr>';
94
+	}
91 95
 
92 96
 	echo '
93 97
 					</tbody>
@@ -98,9 +102,10 @@  discard block
 block discarded – undo
98 102
 						', $txt['who_show1'], '
99 103
 						<select name="show" onchange="document.forms.whoFilter.submit();">';
100 104
 
101
-	foreach ($context['show_methods'] as $value => $label)
102
-		echo '
105
+	foreach ($context['show_methods'] as $value => $label) {
106
+			echo '
103 107
 							<option value="', $value, '" ', $value == $context['show_by'] ? ' selected' : '', '>', $label, '</option>';
108
+	}
104 109
 	echo '
105 110
 						</select>
106 111
 						<noscript>
@@ -129,17 +134,19 @@  discard block
 block discarded – undo
129 134
 
130 135
 	foreach ($context['credits'] as $section)
131 136
 	{
132
-		if (isset($section['pretext']))
133
-			echo '
137
+		if (isset($section['pretext'])) {
138
+					echo '
134 139
 		<div class="windowbg noup">
135 140
 			<p>', $section['pretext'], '</p>
136 141
 		</div>';
142
+		}
137 143
 
138
-		if (isset($section['title']))
139
-			echo '
144
+		if (isset($section['title'])) {
145
+					echo '
140 146
 		<div class="cat_bar">
141 147
 			<h3 class="catbg">', $section['title'], '</h3>
142 148
 		</div>';
149
+		}
143 150
 
144 151
 		echo '
145 152
 		<div class="windowbg2 noup">
@@ -147,17 +154,18 @@  discard block
 block discarded – undo
147 154
 
148 155
 		foreach ($section['groups'] as $group)
149 156
 		{
150
-			if (isset($group['title']))
151
-				echo '
157
+			if (isset($group['title'])) {
158
+							echo '
152 159
 				<dt>
153 160
 					<strong>', $group['title'], '</strong>
154 161
 				</dt>
155 162
 				<dd>';
163
+			}
156 164
 
157 165
 			// Try to make this read nicely.
158
-			if (count($group['members']) <= 2)
159
-				echo implode(' ' . $txt['credits_and'] . ' ', $group['members']);
160
-			else
166
+			if (count($group['members']) <= 2) {
167
+							echo implode(' ' . $txt['credits_and'] . ' ', $group['members']);
168
+			} else
161 169
 			{
162 170
 				$last_peep = array_pop($group['members']);
163 171
 				echo implode(', ', $group['members']), ' ', $txt['credits_and'], ' ', $last_peep;
@@ -170,9 +178,10 @@  discard block
 block discarded – undo
170 178
 		echo '
171 179
 			</dl>';
172 180
 
173
-		if (isset($section['posttext']))
174
-			echo '
181
+		if (isset($section['posttext'])) {
182
+					echo '
175 183
 				<p class="posttext">', $section['posttext'], '</p>';
184
+		}
176 185
 
177 186
 		echo '
178 187
 		</div>';
@@ -187,26 +196,29 @@  discard block
 block discarded – undo
187 196
 		</div>
188 197
 		<div class="windowbg noup">';
189 198
 
190
-		if (!empty($context['credits_software_graphics']['graphics']))
191
-			echo '
199
+		if (!empty($context['credits_software_graphics']['graphics'])) {
200
+					echo '
192 201
 			<dl>
193 202
 				<dt><strong>', $txt['credits_graphics'], '</strong></dt>
194 203
 				<dd>', implode('</dd><dd>', $context['credits_software_graphics']['graphics']), '</dd>
195 204
 			</dl>';
205
+		}
196 206
 
197
-		if (!empty($context['credits_software_graphics']['software']))
198
-			echo '
207
+		if (!empty($context['credits_software_graphics']['software'])) {
208
+					echo '
199 209
 			<dl>
200 210
 				<dt><strong>', $txt['credits_software'], '</strong></dt>
201 211
 				<dd>', implode('</dd><dd>', $context['credits_software_graphics']['software']), '</dd>
202 212
 			</dl>';
213
+		}
203 214
 
204
-		if (!empty($context['credits_software_graphics']['fonts']))
205
-			echo '
215
+		if (!empty($context['credits_software_graphics']['fonts'])) {
216
+					echo '
206 217
 			<dl>
207 218
 				<dt><strong>', $txt['credits_fonts'], '</strong></dt>
208 219
 				<dd>', implode('</dd><dd>', $context['credits_software_graphics']['fonts']), '</dd>
209 220
 			</dl>';
221
+		}
210 222
 		echo '
211 223
 		</div>';
212 224
 	}
@@ -222,14 +234,16 @@  discard block
 block discarded – undo
222 234
 			<ul>';
223 235
 
224 236
 		// Display the credits.
225
-		if (!empty($context['credits_modifications']))
226
-			echo '
237
+		if (!empty($context['credits_modifications'])) {
238
+					echo '
227 239
 				<li>', implode('</li><li>', $context['credits_modifications']), '</li>';
240
+		}
228 241
 
229 242
 		// Legacy.
230
-		if (!empty($context['copyrights']['mods']))
231
-			echo '
243
+		if (!empty($context['copyrights']['mods'])) {
244
+					echo '
232 245
 				<li>', implode('</li><li>', $context['copyrights']['mods']), '</li>';
246
+		}
233 247
 
234 248
 		echo '
235 249
 			</ul>
Please login to merge, or discard this patch.
Themes/default/ManageAttachments.template.php 1 patch
Braces   +29 added lines, -20 removed lines patch added patch discarded remove patch
@@ -121,9 +121,10 @@  discard block
 block discarded – undo
121 121
 		<h3 class="catbg">', $txt['attachment_transfer'], '</h3>
122 122
 	</div>';
123 123
 
124
-	if (!empty($context['results']))
125
-		echo '
124
+	if (!empty($context['results'])) {
125
+			echo '
126 126
 	<div class="noticebox">', $context['results'], '</div>';
127
+	}
127 128
 
128 129
 	echo '
129 130
 	<div class="windowbg2 noup">
@@ -135,9 +136,10 @@  discard block
 block discarded – undo
135 136
 					<select name="from">
136 137
 						<option value="0">', $txt['attachment_transfer_select'], '</option>';
137 138
 
138
-	foreach ($context['attach_dirs'] as $id => $dir)
139
-		echo '
139
+	foreach ($context['attach_dirs'] as $id => $dir) {
140
+			echo '
140 141
 						<option value="', $id, '">', $dir, '</option>';
142
+	}
141 143
 
142 144
 	echo '
143 145
 					</select>
@@ -148,13 +150,14 @@  discard block
 block discarded – undo
148 150
 						<option value="0">', $txt['attachment_transfer_auto_select'], '</option>
149 151
 						<option value="-1">', $txt['attachment_transfer_forum_root'], '</option>';
150 152
 
151
-	if (!empty($context['base_dirs']))
152
-		foreach ($context['base_dirs'] as $id => $dir)
153
+	if (!empty($context['base_dirs'])) {
154
+			foreach ($context['base_dirs'] as $id => $dir)
153 155
 			echo '
154 156
 						<option value="', $id, '">', $dir, '</option>';
155
-	else
156
-			echo '
157
+	} else {
158
+				echo '
157 159
 						<option value="0" disabled>', $txt['attachment_transfer_no_base'], '</option>';
160
+	}
158 161
 
159 162
 	echo '
160 163
 					</select>
@@ -164,18 +167,20 @@  discard block
 block discarded – undo
164 167
 					<select name="to">
165 168
 						<option value="0">', $txt['attachment_transfer_select'], '</option>';
166 169
 
167
-	foreach ($context['attach_dirs'] as $id => $dir)
168
-		echo '
170
+	foreach ($context['attach_dirs'] as $id => $dir) {
171
+			echo '
169 172
 						<option value="', $id, '">', $dir, '</option>';
173
+	}
170 174
 
171 175
 	echo '
172 176
 					</select>
173 177
 				</dd>';
174 178
 
175
-	if (!empty($modSettings['attachmentDirFileLimit']))
176
-		echo '
179
+	if (!empty($modSettings['attachmentDirFileLimit'])) {
180
+			echo '
177 181
 				<dt>', $txt['attachment_transfer_empty'], '</dt>
178 182
 				<dd><input type="checkbox" name="empty_it"', $context['checked'] ? ' checked' : '', '></dd>';
183
+	}
179 184
 
180 185
 	echo '
181 186
 			</dl>
@@ -211,8 +216,8 @@  discard block
 block discarded – undo
211 216
 	global $context, $txt, $scripturl;
212 217
 
213 218
 	// If we've completed just let them know!
214
-	if ($context['completed'])
215
-		echo '
219
+	if ($context['completed']) {
220
+			echo '
216 221
 	<div id="manage_attachments">
217 222
 		<div class="cat_bar">
218 223
 			<h3 class="catbg">', $txt['repair_attachments_complete'], '</h3>
@@ -221,10 +226,11 @@  discard block
 block discarded – undo
221 226
 			', $txt['repair_attachments_complete_desc'], '
222 227
 		</div>
223 228
 	</div>';
229
+	}
224 230
 
225 231
 	// What about if no errors were even found?
226
-	elseif (!$context['errors_found'])
227
-		echo '
232
+	elseif (!$context['errors_found']) {
233
+			echo '
228 234
 	<div id="manage_attachments">
229 235
 		<div class="cat_bar">
230 236
 			<h3 class="catbg">', $txt['repair_attachments_complete'], '</h3>
@@ -233,6 +239,7 @@  discard block
 block discarded – undo
233 239
 			', $txt['repair_attachments_no_errors'], '
234 240
 		</div>
235 241
 	</div>';
242
+	}
236 243
 
237 244
 	// Otherwise, I'm sad to say, we have a problem!
238 245
 	else
@@ -247,11 +254,12 @@  discard block
 block discarded – undo
247 254
 				<p>', $txt['repair_attachments_error_desc'], '</p>';
248 255
 
249 256
 		// Loop through each error reporting the status
250
-		foreach ($context['repair_errors'] as $error => $number)
251
-			if (!empty($number))
257
+		foreach ($context['repair_errors'] as $error => $number) {
258
+					if (!empty($number))
252 259
 				echo '
253 260
 				<input type="checkbox" name="to_fix[]" id="', $error, '" value="', $error, '">
254 261
 				<label for="', $error, '">', sprintf($txt['attach_repair_' . $error], $number), '</label><br>';
262
+		}
255 263
 
256 264
 		echo '
257 265
 				<br>
@@ -270,8 +278,9 @@  discard block
 block discarded – undo
270 278
 {
271 279
 	global $modSettings;
272 280
 
273
-	if (!empty($modSettings['attachment_basedirectories']))
274
-		template_show_list('base_paths');
281
+	if (!empty($modSettings['attachment_basedirectories'])) {
282
+			template_show_list('base_paths');
283
+	}
275 284
 
276 285
 	template_show_list('attach_paths');
277 286
 }
Please login to merge, or discard this patch.