Completed
Pull Request — release-2.1 (#4375)
by Colin
08:21
created
Themes/default/Xml.template.php 1 patch
Braces   +50 added lines, -37 removed lines patch added patch discarded remove patch
@@ -73,10 +73,10 @@  discard block
 block discarded – undo
73 73
 		<subject is_first="', $context['message']['first_in_topic'] ? '1' : '0', '"><![CDATA[', cleanXml($context['message']['subject']), ']]></subject>
74 74
 		<body><![CDATA[', $context['message']['body'], ']]></body>
75 75
 		<success><![CDATA[', $txt['quick_modify_message'], ']]></success>';
76
-	}
77
-	else
78
-		echo '
76
+	} else {
77
+			echo '
79 78
 		<error in_subject="', $context['message']['error_in_subject'] ? '1' : '0', '" in_body="', cleanXml($context['message']['error_in_body']) ? '1' : '0', '"><![CDATA[', implode('<br />', $context['message']['errors']), ']]></error>';
79
+	}
80 80
 	echo '
81 81
 	</message>
82 82
 </smf>';
@@ -101,13 +101,14 @@  discard block
 block discarded – undo
101 101
 		echo '
102 102
 		<modified><![CDATA[', empty($modified) ? '' : cleanXml('&#171; <em>' . $modified . '</em>&#187;'), ']]></modified>';
103 103
 
104
-		if (!empty($context['message']['subject']))
105
-			echo '
104
+		if (!empty($context['message']['subject'])) {
105
+					echo '
106 106
 		<subject><![CDATA[', cleanXml($context['message']['subject']), ']]></subject>';
107
-	}
108
-	else
109
-		echo '
107
+		}
108
+	} else {
109
+			echo '
110 110
 		<error in_subject="', $context['message']['error_in_subject'] ? '1' : '0', '"><![CDATA[', cleanXml(implode('<br />', $context['message']['errors'])), ']]></error>';
111
+	}
111 112
 	echo '
112 113
 	</message>
113 114
 </smf>';
@@ -128,10 +129,11 @@  discard block
 block discarded – undo
128 129
 	</preview>
129 130
 	<errors serious="', empty($context['error_type']) || $context['error_type'] != 'serious' ? '0' : '1', '" topic_locked="', $context['locked'] ? '1' : '0', '">';
130 131
 
131
-	if (!empty($context['post_error']))
132
-		foreach ($context['post_error'] as $message)
132
+	if (!empty($context['post_error'])) {
133
+			foreach ($context['post_error'] as $message)
133 134
 			echo '
134 135
 		<error><![CDATA[', cleanXml($message), ']]></error>';
136
+	}
135 137
 
136 138
 	echo '
137 139
 		<caption name="guestname" class="', isset($context['post_error']['long_name']) || isset($context['post_error']['no_name']) || isset($context['post_error']['bad_name']) ? 'error' : '', '" />
@@ -148,14 +150,15 @@  discard block
 block discarded – undo
148 150
 		echo '
149 151
 	<new_posts>';
150 152
 
151
-		foreach ($context['previous_posts'] as $post)
152
-			echo '
153
+		foreach ($context['previous_posts'] as $post) {
154
+					echo '
153 155
 		<post id="', $post['id'], '">
154 156
 			<time><![CDATA[', $post['time'], ']]></time>
155 157
 			<poster><![CDATA[', cleanXml($post['poster']), ']]></poster>
156 158
 			<message><![CDATA[', cleanXml($post['message']), ']]></message>
157 159
 			<is_ignored>', $post['is_ignored'] ? '1' : '0', '</is_ignored>
158 160
 		</post>';
161
+		}
159 162
 
160 163
 		echo '
161 164
 	</new_posts>';
@@ -181,10 +184,11 @@  discard block
 block discarded – undo
181 184
 	</preview>
182 185
 	<errors serious="', empty($context['error_type']) || $context['error_type'] != 'serious' ? '0' : '1', '">';
183 186
 
184
-	if (!empty($context['post_error']['messages']))
185
-		foreach ($context['post_error']['messages'] as $message)
187
+	if (!empty($context['post_error']['messages'])) {
188
+			foreach ($context['post_error']['messages'] as $message)
186 189
 			echo '
187 190
 		<error><![CDATA[', cleanXml($message), ']]></error>';
191
+	}
188 192
 
189 193
 	echo '
190 194
 		<caption name="to" class="', isset($context['post_error']['no_to']) ? 'error' : '', '" />
@@ -214,10 +218,11 @@  discard block
 block discarded – undo
214 218
 	</preview>
215 219
 	<errors serious="', empty($context['error_type']) || $context['error_type'] != 'serious' ? '0' : '1', '">';
216 220
 
217
-	if (!empty($context['post_error']['messages']))
218
-		foreach ($context['post_error']['messages'] as $message)
221
+	if (!empty($context['post_error']['messages'])) {
222
+			foreach ($context['post_error']['messages'] as $message)
219 223
 			echo '
220 224
 		<error><![CDATA[', cleanXml($message), ']]></error>';
225
+	}
221 226
 
222 227
 	echo '
223 228
 	</errors>';
@@ -233,20 +238,23 @@  discard block
 block discarded – undo
233 238
 {
234 239
 	global $context, $modSettings;
235 240
 
236
-	if (empty($context['yearly']))
237
-		return;
241
+	if (empty($context['yearly'])) {
242
+			return;
243
+	}
238 244
 
239 245
 	echo '<', '?xml version="1.0" encoding="', $context['character_set'], '"?', '>
240 246
 <smf>';
241
-	foreach ($context['yearly'] as $year)
242
-		foreach ($year['months'] as $month)
247
+	foreach ($context['yearly'] as $year) {
248
+			foreach ($year['months'] as $month)
243 249
 		{
244 250
 			echo '
245 251
 	<month id="', $month['date']['year'], $month['date']['month'], '">';
252
+	}
246 253
 
247
-			foreach ($month['days'] as $day)
248
-				echo '
254
+			foreach ($month['days'] as $day) {
255
+							echo '
249 256
 		<day date="', $day['year'], '-', $day['month'], '-', $day['day'], '" new_topics="', $day['new_topics'], '" new_posts="', $day['new_posts'], '" new_members="', $day['new_members'], '" most_members_online="', $day['most_members_online'], '"', empty($modSettings['hitStats']) ? '' : ' hits="' . $day['hits'] . '"', ' />';
257
+			}
250 258
 
251 259
 			echo '
252 260
 	</month>';
@@ -269,17 +277,18 @@  discard block
 block discarded – undo
269 277
 	<pageIndex section="selected" startFrom="', $context['selected']['start'], '"><![CDATA[', $context['selected']['page_index'], ']]></pageIndex>';
270 278
 	foreach ($context['changes'] as $change)
271 279
 	{
272
-		if ($change['type'] == 'remove')
273
-			echo '
280
+		if ($change['type'] == 'remove') {
281
+					echo '
274 282
 	<change id="', $change['id'], '" curAction="remove" section="', $change['section'], '" />';
275
-		else
276
-			echo '
283
+		} else {
284
+					echo '
277 285
 	<change id="', $change['id'], '" curAction="insert" section="', $change['section'], '">
278 286
 		<subject><![CDATA[', cleanXml($change['insert_value']['subject']), ']]></subject>
279 287
 		<time><![CDATA[', cleanXml($change['insert_value']['time']), ']]></time>
280 288
 		<body><![CDATA[', cleanXml($change['insert_value']['body']), ']]></body>
281 289
 		<poster><![CDATA[', cleanXml($change['insert_value']['poster']), ']]></poster>
282 290
 	</change>';
291
+		}
283 292
 	}
284 293
 	echo '
285 294
 </smf>';
@@ -310,10 +319,10 @@  discard block
 block discarded – undo
310 319
 	echo '<', '?xml version="1.0" encoding="', $context['character_set'], '"?', '>
311 320
 <smf>';
312 321
 
313
-	if (empty($context['topics']))
314
-		echo '
322
+	if (empty($context['topics'])) {
323
+			echo '
315 324
 		<noresults>', $txt['search_no_results'], '</noresults>';
316
-	else
325
+	} else
317 326
 	{
318 327
 		echo '
319 328
 		<results>';
@@ -382,9 +391,10 @@  discard block
 block discarded – undo
382 391
 		echo '
383 392
 	<item type="category" id="', $category['id'], '"><![CDATA[', cleanXml($category['name']), ']]></item>';
384 393
 
385
-		foreach ($category['boards'] as $board)
386
-			echo '
394
+		foreach ($category['boards'] as $board) {
395
+					echo '
387 396
 	<item type="board" id="', $board['id'], '" childlevel="', $board['child_level'], '"><![CDATA[', cleanXml($board['name']), ']]></item>';
397
+		}
388 398
 	}
389 399
 	echo '
390 400
 </smf>';
@@ -400,9 +410,10 @@  discard block
 block discarded – undo
400 410
 	echo '<', '?xml version="1.0" encoding="', $context['character_set'], '"?', '>
401 411
 <smf>';
402 412
 
403
-	foreach ($context['icons'] as $icon)
404
-		echo '
413
+	foreach ($context['icons'] as $icon) {
414
+			echo '
405 415
 	<icon value="', $icon['value'], '" url="', $icon['url'], '"><![CDATA[', cleanXml($icon['name']), ']]></icon>';
416
+	}
406 417
 
407 418
 	echo '
408 419
 </smf>';
@@ -452,16 +463,18 @@  discard block
 block discarded – undo
452 463
 	foreach ($xml_data as $key => $data)
453 464
 	{
454 465
 		// A group?
455
-		if (is_array($data) && isset($data['identifier']))
456
-			template_generic_xml_recursive($data['children'], $key, $data['identifier'], $level);
466
+		if (is_array($data) && isset($data['identifier'])) {
467
+					template_generic_xml_recursive($data['children'], $key, $data['identifier'], $level);
468
+		}
457 469
 		// An item...
458 470
 		elseif (is_array($data) && isset($data['value']))
459 471
 		{
460 472
 			echo "\n", str_repeat("\t", $level), '<', $child_ident;
461 473
 
462
-			if (!empty($data['attributes']))
463
-				foreach ($data['attributes'] as $k => $v)
474
+			if (!empty($data['attributes'])) {
475
+							foreach ($data['attributes'] as $k => $v)
464 476
 					echo ' ' . $k . '="' . $v . '"';
477
+			}
465 478
 			echo '><![CDATA[', cleanXml($data['value']), ']]></', $child_ident, '>';
466 479
 		}
467 480
 
Please login to merge, or discard this patch.
Themes/default/Recent.template.php 1 patch
Braces   +77 added lines, -54 removed lines patch added patch discarded remove patch
@@ -26,9 +26,10 @@  discard block
 block discarded – undo
26 26
 		</div>
27 27
 		<div class="pagesection">', $context['page_index'], '</div>';
28 28
 
29
-	if (empty($context['posts']))
30
-		echo '
29
+	if (empty($context['posts'])) {
30
+			echo '
31 31
 		<div class="windowbg">', $txt['no_messages'], '</div>';
32
+	}
32 33
 
33 34
 	foreach ($context['posts'] as $post)
34 35
 	{
@@ -41,28 +42,33 @@  discard block
 block discarded – undo
41 42
 			</div>
42 43
 			<div class="list_posts">', $post['message'], '</div>';
43 44
 
44
-		if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
45
-			echo '
45
+		if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
46
+					echo '
46 47
 			<ul class="quickbuttons">';
48
+		}
47 49
 
48 50
 		// If they *can* reply?
49
-		if ($post['can_reply'])
50
-			echo '
51
+		if ($post['can_reply']) {
52
+					echo '
51 53
 				<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
54
+		}
52 55
 
53 56
 		// If they *can* quote?
54
-		if ($post['can_quote'])
55
-			echo '
57
+		if ($post['can_quote']) {
58
+					echo '
56 59
 				<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
60
+		}
57 61
 
58 62
 		// How about... even... remove it entirely?!
59
-		if ($post['can_delete'])
60
-			echo '
63
+		if ($post['can_delete']) {
64
+					echo '
61 65
 				<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';recent;', $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>';
66
+		}
62 67
 
63
-		if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
64
-			echo '
68
+		if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
69
+					echo '
65 70
 			</ul>';
71
+		}
66 72
 
67 73
 		echo '
68 74
 		</div><!-- $post[css_class] -->';
@@ -84,12 +90,13 @@  discard block
 block discarded – undo
84 90
 	echo '
85 91
 	<div id="recent" class="main_content">';
86 92
 
87
-	if ($context['showCheckboxes'])
88
-		echo '
93
+	if ($context['showCheckboxes']) {
94
+			echo '
89 95
 		<form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="quickModForm" id="quickModForm">
90 96
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
91 97
 			<input type="hidden" name="qaction" value="markread">
92 98
 			<input type="hidden" name="redirect_url" value="action=unread', (!empty($context['showing_all_topics']) ? ';all' : ''), $context['querystring_board_limits'], '">';
99
+	}
93 100
 
94 101
 	if (!empty($context['topics']))
95 102
 	{
@@ -118,11 +125,12 @@  discard block
 block discarded – undo
118 125
 					</div>';
119 126
 
120 127
 		// Show a "select all" box for quick moderation?
121
-		if ($context['showCheckboxes'])
122
-			echo '
128
+		if ($context['showCheckboxes']) {
129
+					echo '
123 130
 					<div class="moderation">
124 131
 						<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">
125 132
 					</div>';
133
+		}
126 134
 
127 135
 		echo '
128 136
 				</div><!-- #topic_header -->
@@ -142,17 +150,20 @@  discard block
 block discarded – undo
142 150
 			echo '
143 151
 							<div class="icons floatright">';
144 152
 
145
-			if ($topic['is_locked'])
146
-				echo '
153
+			if ($topic['is_locked']) {
154
+							echo '
147 155
 								<span class="generic_icons lock"></span>';
156
+			}
148 157
 
149
-			if ($topic['is_sticky'])
150
-				echo '
158
+			if ($topic['is_sticky']) {
159
+							echo '
151 160
 								<span class="generic_icons sticky"></span>';
161
+			}
152 162
 
153
-			if ($topic['is_poll'])
154
-				echo '
163
+			if ($topic['is_poll']) {
164
+							echo '
155 165
 								<span class="generic_icons poll"></span>';
166
+			}
156 167
 
157 168
 			echo '
158 169
 							</div>';
@@ -178,19 +189,21 @@  discard block
 block discarded – undo
178 189
 							', sprintf($txt['last_post_topic'], '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', $topic['last_post']['member']['link']), '
179 190
 						</div>';
180 191
 
181
-			if ($context['showCheckboxes'])
182
-				echo '
192
+			if ($context['showCheckboxes']) {
193
+							echo '
183 194
 						<div class="moderation">
184 195
 							<input type="checkbox" name="topics[]" value="', $topic['id'], '">
185 196
 						</div>';
197
+			}
186 198
 
187 199
 			echo '
188 200
 					</div><!-- $topic[css_class] -->';
189 201
 		}
190 202
 
191
-		if (empty($context['topics']))
192
-			echo '
203
+		if (empty($context['topics'])) {
204
+					echo '
193 205
 					<div style="display: none;"></div>';
206
+		}
194 207
 
195 208
 		echo '
196 209
 				</div><!-- #topic_container -->
@@ -205,25 +218,27 @@  discard block
 block discarded – undo
205 218
 					', $context['page_index'], '
206 219
 				</div>
207 220
 			</div>';
208
-	}
209
-	else
210
-		echo '
221
+	} else {
222
+			echo '
211 223
 			<div class="cat_bar">
212 224
 				<h3 class="catbg centertext">
213 225
 					', $context['showing_all_topics'] ? $txt['topic_alert_none'] : $txt['unread_topics_visit_none'], '
214 226
 				</h3>
215 227
 			</div>';
228
+	}
216 229
 
217
-	if ($context['showCheckboxes'])
218
-		echo '
230
+	if ($context['showCheckboxes']) {
231
+			echo '
219 232
 		</form>';
233
+	}
220 234
 
221 235
 	echo '
222 236
 	</div><!-- #recent -->';
223 237
 
224
-	if (empty($context['no_topic_listing']))
225
-		template_topic_legend();
226
-}
238
+	if (empty($context['no_topic_listing'])) {
239
+			template_topic_legend();
240
+	}
241
+	}
227 242
 
228 243
 /**
229 244
  * Template for showing unread replies (eg new replies to topics you've posted in)
@@ -235,12 +250,13 @@  discard block
 block discarded – undo
235 250
 	echo '
236 251
 	<div id="recent">';
237 252
 
238
-	if ($context['showCheckboxes'])
239
-		echo '
253
+	if ($context['showCheckboxes']) {
254
+			echo '
240 255
 		<form action="', $scripturl, '?action=quickmod" method="post" accept-charset="', $context['character_set'], '" name="quickModForm" id="quickModForm">
241 256
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
242 257
 			<input type="hidden" name="qaction" value="markread">
243 258
 			<input type="hidden" name="redirect_url" value="action=unreadreplies', (!empty($context['showing_all_topics']) ? ';all' : ''), $context['querystring_board_limits'], '">';
259
+	}
244 260
 
245 261
 	if (!empty($context['topics']))
246 262
 	{
@@ -269,11 +285,12 @@  discard block
 block discarded – undo
269 285
 					</div>';
270 286
 
271 287
 		// Show a "select all" box for quick moderation?
272
-		if ($context['showCheckboxes'])
273
-			echo '
288
+		if ($context['showCheckboxes']) {
289
+					echo '
274 290
 					<div class="moderation">
275 291
 						<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">
276 292
 					</div>';
293
+		}
277 294
 
278 295
 		echo '
279 296
 				</div><!-- #topic_header -->
@@ -293,17 +310,20 @@  discard block
 block discarded – undo
293 310
 			echo '
294 311
 							<div class="icons floatright">';
295 312
 
296
-			if ($topic['is_locked'])
297
-				echo '
313
+			if ($topic['is_locked']) {
314
+							echo '
298 315
 								<span class="generic_icons lock"></span>';
316
+			}
299 317
 
300
-			if ($topic['is_sticky'])
301
-				echo '
318
+			if ($topic['is_sticky']) {
319
+							echo '
302 320
 								<span class="generic_icons sticky"></span>';
321
+			}
303 322
 
304
-			if ($topic['is_poll'])
305
-				echo '
323
+			if ($topic['is_poll']) {
324
+							echo '
306 325
 								<span class="generic_icons poll"></span>';
326
+			}
307 327
 
308 328
 			echo '
309 329
 							</div>';
@@ -329,11 +349,12 @@  discard block
 block discarded – undo
329 349
 							', sprintf($txt['last_post_topic'], '<a href="' . $topic['last_post']['href'] . '">' . $topic['last_post']['time'] . '</a>', $topic['last_post']['member']['link']), '
330 350
 						</div>';
331 351
 
332
-			if ($context['showCheckboxes'])
333
-				echo '
352
+			if ($context['showCheckboxes']) {
353
+							echo '
334 354
 						<div class="moderation">
335 355
 							<input type="checkbox" name="topics[]" value="', $topic['id'], '">
336 356
 						</div>';
357
+			}
337 358
 
338 359
 			echo '
339 360
 					</div><!-- $topic[css_class] -->';
@@ -350,24 +371,26 @@  discard block
 block discarded – undo
350 371
 					', $context['page_index'], '
351 372
 				</div>
352 373
 			</div>';
353
-	}
354
-	else
355
-		echo '
374
+	} else {
375
+			echo '
356 376
 			<div class="cat_bar">
357 377
 				<h3 class="catbg centertext">
358 378
 					', $context['showing_all_topics'] ? $txt['topic_alert_none'] : $txt['unread_topics_visit_none'], '
359 379
 				</h3>
360 380
 			</div>';
381
+	}
361 382
 
362
-	if ($context['showCheckboxes'])
363
-		echo '
383
+	if ($context['showCheckboxes']) {
384
+			echo '
364 385
 		</form>';
386
+	}
365 387
 
366 388
 	echo '
367 389
 	</div><!-- #recent -->';
368 390
 
369
-	if (empty($context['no_topic_listing']))
370
-		template_topic_legend();
371
-}
391
+	if (empty($context['no_topic_listing'])) {
392
+			template_topic_legend();
393
+	}
394
+	}
372 395
 
373 396
 ?>
374 397
\ No newline at end of file
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/ModerationCenter.template.php 1 patch
Braces   +59 added lines, -41 removed lines patch added patch discarded remove patch
@@ -55,18 +55,20 @@  discard block
 block discarded – undo
55 55
 			<div class="modbox">
56 56
 				<ul>';
57 57
 
58
-	foreach ($context['group_requests'] as $request)
59
-		echo '
58
+	foreach ($context['group_requests'] as $request) {
59
+			echo '
60 60
 					<li class="smalltext">
61 61
 						<a href="', $request['request_href'], '">', $request['group']['name'], '</a> ', $txt['mc_groupr_by'], ' ', $request['member']['link'], '
62 62
 					</li>';
63
+	}
63 64
 
64 65
 	// Don't have any watched users right now?
65
-	if (empty($context['group_requests']))
66
-		echo '
66
+	if (empty($context['group_requests'])) {
67
+			echo '
67 68
 					<li>
68 69
 						<strong class="smalltext">', $txt['mc_group_requests_none'], '</strong>
69 70
 					</li>';
71
+	}
70 72
 
71 73
 	echo '
72 74
 				</ul>
@@ -124,18 +126,20 @@  discard block
 block discarded – undo
124 126
 			<div class="modbox">
125 127
 				<ul>';
126 128
 
127
-	foreach ($context['watched_users'] as $user)
128
-		echo '
129
+	foreach ($context['watched_users'] as $user) {
130
+			echo '
129 131
 					<li>
130 132
 						<span class="smalltext">', sprintf(!empty($user['last_login']) ? $txt['mc_seen'] : $txt['mc_seen_never'], $user['link'], $user['last_login']), '</span>
131 133
 					</li>';
134
+	}
132 135
 
133 136
 	// Don't have any watched users right now?
134
-	if (empty($context['watched_users']))
135
-		echo '
137
+	if (empty($context['watched_users'])) {
138
+			echo '
136 139
 					<li>
137 140
 						<strong class="smalltext">', $txt['mc_watched_users_none'], '</strong>
138 141
 					</li>';
142
+	}
139 143
 
140 144
 	echo '
141 145
 				</ul>
@@ -193,18 +197,20 @@  discard block
 block discarded – undo
193 197
 			<div class="modbox">
194 198
 				<ul>';
195 199
 
196
-	foreach ($context['reported_posts'] as $post)
197
-		echo '
200
+	foreach ($context['reported_posts'] as $post) {
201
+			echo '
198 202
 					<li>
199 203
 						<span class="smalltext">', sprintf($txt['mc_post_report'], $post['report_link'], $post['author']['link']), '</span>
200 204
 					</li>';
205
+	}
201 206
 
202 207
 	// Don't have any watched users right now?
203
-	if (empty($context['reported_posts']))
204
-		echo '
208
+	if (empty($context['reported_posts'])) {
209
+			echo '
205 210
 					<li>
206 211
 						<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
207 212
 					</li>';
213
+	}
208 214
 
209 215
 	echo '
210 216
 				</ul>
@@ -262,18 +268,20 @@  discard block
 block discarded – undo
262 268
 			<div class="modbox">
263 269
 				<ul>';
264 270
 
265
-	foreach ($context['reported_users'] as $user)
266
-		echo '
271
+	foreach ($context['reported_users'] as $user) {
272
+			echo '
267 273
 					<li>
268 274
 						<span class="smalltext">', $user['user']['link'], '</span>
269 275
 					</li>';
276
+	}
270 277
 
271 278
 	// Don't have any watched users right now?
272
-	if (empty($context['reported_users']))
273
-		echo '
279
+	if (empty($context['reported_users'])) {
280
+			echo '
274 281
 					<li>
275 282
 						<strong class="smalltext">', $txt['mc_reported_users_none'], '</strong>
276 283
 					</li>';
284
+	}
277 285
 
278 286
 	echo '
279 287
 				</ul>
@@ -321,11 +329,12 @@  discard block
 block discarded – undo
321 329
 	global $context, $txt, $scripturl;
322 330
 
323 331
 	// Let them know the action was a success.
324
-	if (!empty($context['report_post_action']))
325
-		echo '
332
+	if (!empty($context['report_post_action'])) {
333
+			echo '
326 334
 		<div class="infobox">
327 335
 			', $txt['report_action_' . $context['report_post_action']], '
328 336
 		</div>';
337
+	}
329 338
 
330 339
 	echo '
331 340
 		<div class="modnotes">
@@ -342,11 +351,12 @@  discard block
 block discarded – undo
342 351
 						<ul class="moderation_notes">';
343 352
 
344 353
 		// Cycle through the notes.
345
-		foreach ($context['notes'] as $note)
346
-			echo '
354
+		foreach ($context['notes'] as $note) {
355
+					echo '
347 356
 							<li class="smalltext">
348 357
 								', ($note['can_delete'] ? '<a href="' . $note['delete_href'] . ';' . $context['mod-modnote-del_token_var'] . '=' . $context['mod-modnote-del_token'] . '" data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '" class="you_sure"><span class="generic_icons delete"></span></a>' : ''), $note['time'], ' <strong>', $note['author']['link'], ':</strong> ', $note['text'], '
349 358
 							</li>';
359
+		}
350 360
 
351 361
 		echo '
352 362
 						</ul>
@@ -388,18 +398,19 @@  discard block
 block discarded – undo
388 398
 	$remove_button = create_button('delete', 'remove_message', 'remove');
389 399
 
390 400
 	// No posts?
391
-	if (empty($context['unapproved_items']))
392
-		echo '
401
+	if (empty($context['unapproved_items'])) {
402
+			echo '
393 403
 			<div class="windowbg2">
394 404
 				<p class="centertext">
395 405
 					', $txt['mc_unapproved_' . $context['current_view'] . '_none_found'], '
396 406
 				</p>
397 407
 			</div>';
398
-	else
399
-		echo '
408
+	} else {
409
+			echo '
400 410
 			<div class="pagesection floatleft">
401 411
 				', $context['page_index'], '
402 412
 			</div>';
413
+	}
403 414
 
404 415
 	foreach ($context['unapproved_items'] as $item)
405 416
 	{
@@ -418,14 +429,16 @@  discard block
 block discarded – undo
418 429
 				<span class="floatright">
419 430
 					<a href="', $scripturl, '?action=moderate;area=postmod;sa=', $context['current_view'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';approve=', $item['id'], '">', $approve_button, '</a>';
420 431
 
421
-		if ($item['can_delete'])
422
-			echo '
432
+		if ($item['can_delete']) {
433
+					echo '
423 434
 					', $context['menu_separator'], '
424 435
 					<a href="', $scripturl, '?action=moderate;area=postmod;sa=', $context['current_view'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';delete=', $item['id'], '">', $remove_button, '</a>';
436
+		}
425 437
 
426
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
427
-			echo '
438
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
439
+					echo '
428 440
 					<input type="checkbox" name="item[]" value="', $item['id'], '" checked> ';
441
+		}
429 442
 
430 443
 		echo '
431 444
 				</span>
@@ -435,8 +448,8 @@  discard block
 block discarded – undo
435 448
 	echo '
436 449
 			<div class="pagesection">';
437 450
 
438
-	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
439
-		echo '
451
+	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
452
+			echo '
440 453
 				<div class="floatright">
441 454
 					<select name="do" onchange="if (this.value != 0 &amp;&amp; confirm(\'', $txt['mc_unapproved_sure'], '\')) submit();">
442 455
 						<option value="0">', $txt['with_selected'], ':</option>
@@ -448,12 +461,14 @@  discard block
 block discarded – undo
448 461
 						<input type="submit" name="mc_go" value="', $txt['go'], '" class="button">
449 462
 					</noscript>
450 463
 				</div>';
464
+	}
451 465
 
452
-	if (!empty($context['unapproved_items']))
453
-		echo '
466
+	if (!empty($context['unapproved_items'])) {
467
+			echo '
454 468
 				<div class="floatleft">
455 469
 					<div class="pagelinks">', $context['page_index'], '</div>
456 470
 				</div>';
471
+	}
457 472
 
458 473
 	echo '
459 474
 			</div><!-- .pagesection -->
@@ -473,8 +488,9 @@  discard block
 block discarded – undo
473 488
 	global $scripturl, $context, $txt, $delete_button;
474 489
 
475 490
 	// We'll have a delete please bob.
476
-	if (empty($delete_button))
477
-		$delete_button = create_button('delete', 'remove_message', 'remove', 'class="centericon"');
491
+	if (empty($delete_button)) {
492
+			$delete_button = create_button('delete', 'remove_message', 'remove', 'class="centericon"');
493
+	}
478 494
 
479 495
 	$output_html = '
480 496
 					<div>
@@ -483,10 +499,11 @@  discard block
 block discarded – undo
483 499
 						</div>
484 500
 						<div class="floatright">';
485 501
 
486
-	if ($post['can_delete'])
487
-		$output_html .= '
502
+	if ($post['can_delete']) {
503
+			$output_html .= '
488 504
 							<a href="' . $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" data-confirm="' . $txt['mc_watched_users_delete_post'] . '" class="you_sure">' . $delete_button . '</a>
489 505
 							<input type="checkbox" name="delete[]" value="' . $post['id'] . '">';
506
+	}
490 507
 
491 508
 	$output_html .= '
492 509
 						</div>
@@ -529,12 +546,12 @@  discard block
 block discarded – undo
529 546
 				<input type="submit" name="save" value="', $txt['save'], '" class="button">
530 547
 			</div>
531 548
 		</form>';
532
-	}
533
-	else
534
-		echo '
549
+	} else {
550
+			echo '
535 551
 		<div class="windowbg">
536 552
 			<div class="centertext">', $txt['mc_no_settings'], '</div>
537 553
 		</div>';
554
+	}
538 555
 
539 556
 	echo '
540 557
 	</div><!-- #modcenter -->';
@@ -630,13 +647,14 @@  discard block
 block discarded – undo
630 647
 					</dd>
631 648
 				</dl>';
632 649
 
633
-	if ($context['template_data']['can_edit_personal'])
634
-		echo '
650
+	if ($context['template_data']['can_edit_personal']) {
651
+			echo '
635 652
 				<input type="checkbox" name="make_personal" id="make_personal"', $context['template_data']['personal'] ? ' checked' : '', '>
636 653
 					<label for="make_personal">
637 654
 						<strong>', $txt['mc_warning_template_personal'], '</strong>
638 655
 					</label><br>
639 656
 					<span class="smalltext">', $txt['mc_warning_template_personal_desc'], '</span><br>';
657
+	}
640 658
 
641 659
 	echo '
642 660
 				<hr>
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/ManageLanguages.template.php 1 patch
Braces   +24 added lines, -16 removed lines patch added patch discarded remove patch
@@ -36,11 +36,12 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	// An error?
39
-	if (!empty($context['error_message']))
40
-		echo '
39
+	if (!empty($context['error_message'])) {
40
+			echo '
41 41
 	<div class="errorbox">
42 42
 		', $context['error_message'], '
43 43
 	</div>';
44
+	}
44 45
 
45 46
 	// Provide something of an introduction...
46 47
 	echo '
@@ -67,11 +68,12 @@  discard block
 block discarded – undo
67 68
 	// If the files are not writable, we might!
68 69
 	if (!empty($context['still_not_writable']))
69 70
 	{
70
-		if (!empty($context['package_ftp']['error']))
71
-			echo '
71
+		if (!empty($context['package_ftp']['error'])) {
72
+					echo '
72 73
 			<div class="errorbox">
73 74
 				', $context['package_ftp']['error'], '
74 75
 			</div>';
76
+		}
75 77
 
76 78
 		echo '
77 79
 			<div class="cat_bar">
@@ -150,11 +152,12 @@  discard block
 block discarded – undo
150 152
 			</div>';
151 153
 
152 154
 	// Not writable? Oops, show an error for ya.
153
-	if (!empty($context['lang_file_not_writable_message']))
154
-		echo '
155
+	if (!empty($context['lang_file_not_writable_message'])) {
156
+			echo '
155 157
 			<div class="errorbox">
156 158
 				', $context['lang_file_not_writable_message'], '
157 159
 			</div>';
160
+	}
158 161
 
159 162
 	// Show the language entries
160 163
 	echo '
@@ -199,9 +202,10 @@  discard block
 block discarded – undo
199 202
 				<input type="submit" name="save_main" value="', $txt['save'], '"', $context['lang_file_not_writable_message'] || !empty($context['file_entries']) ? ' disabled' : '', ' class="button">';
200 203
 
201 204
 	// Allow deleting entries. English can't be deleted though.
202
-	if ($context['lang_id'] != 'english')
203
-		echo '
205
+	if ($context['lang_id'] != 'english') {
206
+			echo '
204 207
 				<input type="submit" name="delete_main" value="', $txt['delete'], '"', $context['lang_file_not_writable_message'] || !empty($context['file_entries']) ? ' disabled' : '', ' onclick="confirm(\'', $txt['languages_delete_confirm'], '\');" class="button">';
208
+	}
205 209
 
206 210
 	echo '
207 211
 			</div><!-- .windowbg -->
@@ -223,9 +227,10 @@  discard block
 block discarded – undo
223 227
 		echo '
224 228
 					<optgroup label="', $theme['name'], '">';
225 229
 
226
-		foreach ($theme['files'] as $file)
227
-			echo '
230
+		foreach ($theme['files'] as $file) {
231
+					echo '
228 232
 						<option value="', $id_theme, '+', $file['id'], '"', $file['selected'] ? ' selected' : '', '> =&gt; ', $file['name'], '</option>';
233
+		}
229 234
 
230 235
 		echo '
231 236
 					</optgroup>';
@@ -240,11 +245,12 @@  discard block
 block discarded – undo
240 245
 			<br class="clear">';
241 246
 
242 247
 	// Is it not writable? Show an error.
243
-	if (!empty($context['entries_not_writable_message']))
244
-		echo '
248
+	if (!empty($context['entries_not_writable_message'])) {
249
+			echo '
245 250
 			<div class="errorbox">
246 251
 				', $context['entries_not_writable_message'], '
247 252
 			</div>';
253
+	}
248 254
 
249 255
 	// Already have some file entries?
250 256
 	if (!empty($context['file_entries']))
@@ -283,8 +289,8 @@  discard block
 block discarded – undo
283 289
 		}
284 290
 
285 291
 		// Odd number?
286
-		if (!empty($cached))
287
-			echo '
292
+		if (!empty($cached)) {
293
+					echo '
288 294
 
289 295
 					<dt>
290 296
 						<span class="smalltext">', $cached['key'], '</span>
@@ -297,6 +303,7 @@  discard block
 block discarded – undo
297 303
 					</dt>
298 304
 					<dd>
299 305
 					</dd>';
306
+		}
300 307
 
301 308
 		echo '
302 309
 				</dl>
@@ -331,12 +338,13 @@  discard block
 block discarded – undo
331 338
 					<input type="text" name="smf_add" size="40" value="', !empty($context['smf_search_term']) ? $context['smf_search_term'] : '', '">';
332 339
 
333 340
 	// Do we have some errors? Too bad. Display a little error box.
334
-	if (!empty($context['smf_error']))
335
-		echo '
341
+	if (!empty($context['smf_error'])) {
342
+			echo '
336 343
 					<div>
337 344
 						<br>
338 345
 						<p class="errorbox">', $txt['add_language_error_' . $context['smf_error']], '</p>
339 346
 					</div>';
347
+	}
340 348
 
341 349
 	echo '
342 350
 				</fieldset>
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 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', '">
@@ -694,9 +721,10 @@  discard block
 block discarded – undo
694 721
 
695 722
 						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>\';';
696 723
 
697
-	if ($context['can_quote'])
698
-		echo '
724
+	if ($context['can_quote']) {
725
+			echo '
699 726
 						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>\';';
727
+	}
700 728
 
701 729
 	echo '
702 730
 						newPostsHTML += \'<br class="clear">\';
@@ -739,8 +767,8 @@  discard block
 block discarded – undo
739 767
 			}';
740 768
 
741 769
 	// Code for showing and hiding additional options.
742
-	if (!empty($modSettings['additional_options_collapsable']))
743
-		echo '
770
+	if (!empty($modSettings['additional_options_collapsable'])) {
771
+			echo '
744 772
 			var oSwapAdditionalOptions = new smc_Toggle({
745 773
 				bToggleEnabled: true,
746 774
 				bCurrentlyCollapsed: ', $context['show_additional_options'] ? 'false' : 'true', ',
@@ -768,10 +796,11 @@  discard block
 block discarded – undo
768 796
 					}
769 797
 				]
770 798
 			});';
799
+	}
771 800
 
772 801
 	// Code for showing and hiding drafts
773
-	if (!empty($context['drafts']))
774
-		echo '
802
+	if (!empty($context['drafts'])) {
803
+			echo '
775 804
 			var oSwapDraftOptions = new smc_Toggle({
776 805
 				bToggleEnabled: true,
777 806
 				bCurrentlyCollapsed: true,
@@ -793,6 +822,7 @@  discard block
 block discarded – undo
793 822
 					}
794 823
 				]
795 824
 			});';
825
+	}
796 826
 
797 827
 	echo '
798 828
 			var oEditorID = "', $context['post_box_name'] ,'";
@@ -813,8 +843,9 @@  discard block
 block discarded – undo
813 843
 		foreach ($context['previous_posts'] as $post)
814 844
 		{
815 845
 			$ignoring = false;
816
-			if (!empty($post['is_ignored']))
817
-				$ignored_posts[] = $ignoring = $post['id'];
846
+			if (!empty($post['is_ignored'])) {
847
+							$ignored_posts[] = $ignoring = $post['id'];
848
+			}
818 849
 
819 850
 			echo '
820 851
 			<div class="windowbg">
@@ -824,22 +855,24 @@  discard block
 block discarded – undo
824 855
 					</h5>
825 856
 					&nbsp;-&nbsp;', $post['time'];
826 857
 
827
-			if ($context['can_quote'])
828
-				echo '
858
+			if ($context['can_quote']) {
859
+							echo '
829 860
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
830 861
 						<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 862
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
832 863
 					</ul>';
864
+			}
833 865
 
834 866
 			echo '
835 867
 					<br class="clear">';
836 868
 
837
-			if ($ignoring)
838
-				echo '
869
+			if ($ignoring) {
870
+							echo '
839 871
 					<div id="msg_', $post['id'], '_ignored_prompt" class="smalltext">
840 872
 						', $txt['ignoring_user'], '
841 873
 						<a href="#" id="msg_', $post['id'], '_ignored_link" style="display: none;">', $txt['show_ignore_user_post'], '</a>
842 874
 					</div>';
875
+			}
843 876
 
844 877
 			echo '
845 878
 					<div class="list_posts smalltext" id="msg_', $post['id'], '_body" data-msgid="', $post['id'], '">', $post['message'], '</div>
@@ -993,10 +1026,10 @@  discard block
 block discarded – undo
993 1026
 		<div id="temporary_posting_area" style="display: none;"></div>
994 1027
 		<script>';
995 1028
 
996
-	if ($context['close_window'])
997
-		echo '
1029
+	if ($context['close_window']) {
1030
+			echo '
998 1031
 			window.close();';
999
-	else
1032
+	} else
1000 1033
 	{
1001 1034
 		// Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;)
1002 1035
 		echo '
@@ -1050,11 +1083,12 @@  discard block
 block discarded – undo
1050 1083
 				</p>
1051 1084
 				<ul>';
1052 1085
 
1053
-	foreach ($context['groups'] as $group)
1054
-		echo '
1086
+	foreach ($context['groups'] as $group) {
1087
+			echo '
1055 1088
 					<li>
1056 1089
 						<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>
1057 1090
 					</li>';
1091
+	}
1058 1092
 
1059 1093
 	echo '
1060 1094
 					<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.