Completed
Pull Request — release-2.1 (#4398)
by Colin
07:12
created
Themes/default/Poll.template.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
46 46
 				<h3 class="catbg">', $context['page_title'], '</h3>
47 47
 			</div>';
48 48
 
49
-	if (!empty($context['poll_error']['messages']))
50
-		echo '
49
+	if (!empty($context['poll_error']['messages'])) {
50
+			echo '
51 51
 			<div class="errorbox">
52 52
 				<dl class="poll_error">
53 53
 					<dt>
@@ -58,6 +58,7 @@  discard block
 block discarded – undo
58 58
 					</dt>
59 59
 				</dl>
60 60
 			</div>';
61
+	}
61 62
 
62 63
 	echo '
63 64
 			<div>
@@ -79,8 +80,9 @@  discard block
 block discarded – undo
79 80
 								<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" size="80" maxlength="255">';
80 81
 
81 82
 		// Does this option have a vote count yet, or is it new?
82
-		if ($choice['votes'] != -1)
83
-			echo ' (', $choice['votes'], ' ', $txt['votes'], ')';
83
+		if ($choice['votes'] != -1) {
84
+					echo ' (', $choice['votes'], ' ', $txt['votes'], ')';
85
+		}
84 86
 
85 87
 		echo '
86 88
 							</dd>';
@@ -118,14 +120,15 @@  discard block
 block discarded – undo
118 120
 								<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '>
119 121
 							</dd>';
120 122
 
121
-		if ($context['poll']['guest_vote_allowed'])
122
-			echo '
123
+		if ($context['poll']['guest_vote_allowed']) {
124
+					echo '
123 125
 							<dt>
124 126
 								<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
125 127
 							</dt>
126 128
 							<dd>
127 129
 								<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll']['guest_vote']) ? ' checked' : '', '>
128 130
 							</dd>';
131
+		}
129 132
 	}
130 133
 
131 134
 	echo '
@@ -141,12 +144,13 @@  discard block
 block discarded – undo
141 144
 					</fieldset>';
142 145
 
143 146
 	// If this is an edit, we can allow them to reset the vote counts.
144
-	if ($context['is_edit'])
145
-		echo '
147
+	if ($context['is_edit']) {
148
+			echo '
146 149
 					<fieldset id="poll_reset">
147 150
 						<legend>', $txt['reset_votes'], '</legend>
148 151
 						<input type="checkbox" name="resetVoteCount" value="on"> ' . $txt['reset_votes_check'] . '
149 152
 					</fieldset>';
153
+	}
150 154
 	echo '
151 155
 					<input type="submit" name="post" value="', $txt['save'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
152 156
 				</div><!-- .roundframe -->
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
@@ -422,8 +422,8 @@  discard block
 block discarded – undo
422 422
 									</div><!-- .attached_BBC -->
423 423
 									<div class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
424 424
 									<div class="attach-ui">
425
-										<a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a>
426
-										<a class="button upload">', $txt['upload'] ,'</a>
425
+										<a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a>
426
+										<a class="button upload">', $txt['upload'], '</a>
427 427
 									</div>
428 428
 								</div><!-- .attach-info -->
429 429
 							</div><!-- #au-template -->
@@ -441,10 +441,10 @@  discard block
 block discarded – undo
441 441
 							</dt>
442 442
 							<dd class="smalltext fallback">
443 443
 								<div id="attachUpload" class="descbox">
444
-									<h5>', $txt['attach_drop_zone'] ,'</h5>
445
-									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a>
446
-									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a>
447
-									<a class="button fileinput-button">', $txt['attach_add'] ,'</a>
444
+									<h5>', $txt['attach_drop_zone'], '</h5>
445
+									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a>
446
+									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a>
447
+									<a class="button fileinput-button">', $txt['attach_add'], '</a>
448 448
 									<div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
449 449
 									<div class="fallback">
450 450
 										<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 	// Option to delete an event if user is editing one.
553 553
 	if ($context['make_event'] && !$context['event']['new'])
554 554
 		echo '
555
-						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
555
+						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">';
556 556
 
557 557
 	echo '
558 558
 					</span>
@@ -806,7 +806,7 @@  discard block
 block discarded – undo
806 806
 			});';
807 807
 
808 808
 	echo '
809
-			var oEditorID = "', $context['post_box_name'] ,'";
809
+			var oEditorID = "', $context['post_box_name'], '";
810 810
 			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
811 811
 		</script>';
812 812
 
@@ -838,7 +838,7 @@  discard block
 block discarded – undo
838 838
 			{
839 839
 				echo '
840 840
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
841
-						<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>
841
+						<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>
842 842
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
843 843
 					</ul>';
844 844
 			}
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
 	<head>
926 926
 		<meta charset="', $context['character_set'], '">
927 927
 		<title>', $txt['spell_check'], '</title>
928
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
928
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
929 929
 		<style>
930 930
 			body, td {
931 931
 				font-size: small;
@@ -955,8 +955,8 @@  discard block
 block discarded – undo
955 955
 			var spell_formname = window.opener.spell_formname;
956 956
 			var spell_fieldname = window.opener.spell_fieldname;
957 957
 		</script>
958
-		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
959
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
958
+		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script>
959
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
960 960
 		<script>
961 961
 			', $context['spell_js'], '
962 962
 		</script>
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 	<head>
1001 1001
 		<meta charset="', $context['character_set'], '">
1002 1002
 		<title>', $txt['retrieving_quote'], '</title>
1003
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
1003
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
1004 1004
 	</head>
1005 1005
 	<body>
1006 1006
 		', $txt['retrieving_quote'], '
Please login to merge, or discard this patch.
Braces   +89 added lines, -61 removed lines patch added patch discarded remove patch
@@ -22,23 +22,25 @@  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
 	echo '
37 39
 			};';
38 40
 
39 41
 	// If this is a poll - use some javascript to ensure the user doesn't create a poll with illegal option combinations.
40
-	if ($context['make_poll'])
41
-		echo '
42
+	if ($context['make_poll']) {
43
+			echo '
42 44
 			var pollOptionNum = 0, pollTabIndex;
43 45
 			var pollOptionId = ', $context['last_choice_id'], ';
44 46
 			function addPollOption()
@@ -57,11 +59,13 @@  discard block
 block discarded – undo
57 59
 
58 60
 				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>'), ');
59 61
 			}';
62
+	}
60 63
 
61 64
 	// If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here.
62
-	if ($context['make_event'])
63
-		echo '
65
+	if ($context['make_event']) {
66
+			echo '
64 67
 			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];';
68
+	}
65 69
 
66 70
 	// End of the javascript, start the form and display the link tree.
67 71
 	echo '
@@ -82,9 +86,10 @@  discard block
 block discarded – undo
82 86
 			</div>
83 87
 			<br>';
84 88
 
85
-	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board'])))
86
-		echo '
89
+	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board']))) {
90
+			echo '
87 91
 			<input type="hidden" name="eventid" value="', $context['event']['id'], '">';
92
+	}
88 93
 
89 94
 	// Start the main table.
90 95
 	echo '
@@ -119,18 +124,20 @@  discard block
 block discarded – undo
119 124
 	}
120 125
 
121 126
 	// If it's locked, show a message to warn the replier.
122
-	if (!empty($context['locked']))
123
-	echo '
127
+	if (!empty($context['locked'])) {
128
+		echo '
124 129
 					<div class="errorbox">
125 130
 						', $txt['topic_locked_no_reply'], '
126 131
 					</div>';
132
+	}
127 133
 
128
-	if (!empty($modSettings['drafts_post_enabled']))
129
-		echo '
134
+	if (!empty($modSettings['drafts_post_enabled'])) {
135
+			echo '
130 136
 					<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
131 137
 						sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
132 138
 						', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
133 139
 					</div>';
140
+	}
134 141
 
135 142
 	// The post header... important stuff
136 143
 	echo '
@@ -183,9 +190,10 @@  discard block
 block discarded – undo
183 190
 				echo '
184 191
 										<optgroup label="', $category['name'], '">';
185 192
 
186
-				foreach ($category['boards'] as $board)
187
-					echo '
193
+				foreach ($category['boards'] as $board) {
194
+									echo '
188 195
 											<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '&nbsp;</option>';
196
+				}
189 197
 				echo '
190 198
 										</optgroup>';
191 199
 			}
@@ -221,9 +229,10 @@  discard block
 block discarded – undo
221 229
 									<span class="label">', $txt['calendar_timezone'], '</span>
222 230
 									<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
223 231
 
224
-		foreach ($context['all_timezones'] as $tz => $tzname)
225
-			echo '
232
+		foreach ($context['all_timezones'] as $tz => $tzname) {
233
+					echo '
226 234
 										<option value="', $tz, '"', $tz == $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
235
+		}
227 236
 
228 237
 		echo '
229 238
 									</select>
@@ -291,14 +300,15 @@  discard block
 block discarded – undo
291 300
 									<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '>
292 301
 								</dd>';
293 302
 
294
-		if ($context['poll_options']['guest_vote_enabled'])
295
-			echo '
303
+		if ($context['poll_options']['guest_vote_enabled']) {
304
+					echo '
296 305
 								<dt>
297 306
 									<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
298 307
 								</dt>
299 308
 								<dd>
300 309
 									<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll_options']['guest_vote']) ? ' checked' : '', '>
301 310
 								</dd>';
311
+		}
302 312
 
303 313
 		echo '
304 314
 								<dt>
@@ -319,8 +329,8 @@  discard block
 block discarded – undo
319 329
 					', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
320 330
 
321 331
 	// If we're editing and displaying edit details, show a box where they can say why
322
-	if (isset($context['editing']) && $modSettings['show_modify'])
323
-		echo '
332
+	if (isset($context['editing']) && $modSettings['show_modify']) {
333
+			echo '
324 334
 					<dl>
325 335
 						<dt class="clear">
326 336
 							<span id="caption_edit_reason">', $txt['reason_for_edit'], ':</span>
@@ -329,20 +339,23 @@  discard block
 block discarded – undo
329 339
 							<input type="text" name="modify_reason"', isset($context['last_modified_reason']) ? ' value="' . $context['last_modified_reason'] . '"' : '', ' tabindex="', $context['tabindex']++, '" size="80" maxlength="80">
330 340
 						</dd>
331 341
 					</dl>';
342
+	}
332 343
 
333 344
 	// If this message has been edited in the past - display when it was.
334
-	if (isset($context['last_modified']))
335
-		echo '
345
+	if (isset($context['last_modified'])) {
346
+			echo '
336 347
 					<div class="padding smalltext">
337 348
 						', $context['last_modified_text'], '
338 349
 					</div>';
350
+	}
339 351
 
340 352
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
341
-	if (!empty($modSettings['additional_options_collapsable']))
342
-		echo '
353
+	if (!empty($modSettings['additional_options_collapsable'])) {
354
+			echo '
343 355
 					<div id="postAdditionalOptionsHeader">
344 356
 						<strong><a href="#" id="postMoreExpandLink"> ', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong>
345 357
 					</div>';
358
+	}
346 359
 
347 360
 	echo '
348 361
 					<div id="postAdditionalOptions">';
@@ -375,19 +388,21 @@  discard block
 block discarded – undo
375 388
 								', $txt['uncheck_unwatchd_attach'], ':
376 389
 							</dd>';
377 390
 
378
-		foreach ($context['current_attachments'] as $attachment)
379
-			echo '
391
+		foreach ($context['current_attachments'] as $attachment) {
392
+					echo '
380 393
 							<dd class="smalltext">
381 394
 								<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'] . ')' : ''),
382 395
 								!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1024) / 1024), 0)) : '', '</label>
383 396
 							</dd>';
397
+		}
384 398
 
385 399
 		echo '
386 400
 						</dl>';
387 401
 
388
-		if (!empty($context['files_in_session_warning']))
389
-			echo '
402
+		if (!empty($context['files_in_session_warning'])) {
403
+					echo '
390 404
 						<div class="smalltext">', $context['files_in_session_warning'], '</div>';
405
+		}
391 406
 	}
392 407
 
393 408
 	// Is the user allowed to post any additional ones? If so give them the boxes to do it!
@@ -451,8 +466,8 @@  discard block
 block discarded – undo
451 466
 								', empty($modSettings['attachmentSizeLimit']) ? '' : ('<input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1024 . '">');
452 467
 
453 468
 		// Show more boxes if they aren't approaching that limit.
454
-		if ($context['num_allowed_attachments'] > 1)
455
-			echo '
469
+		if ($context['num_allowed_attachments'] > 1) {
470
+					echo '
456 471
 										<script>
457 472
 											var allowed_attachments = ', $context['num_allowed_attachments'], ';
458 473
 											var current_attachment = 1;
@@ -473,9 +488,10 @@  discard block
 block discarded – undo
473 488
 									</div><!-- .fallback -->
474 489
 								</div><!-- #attachUpload -->
475 490
 							</dd>';
476
-		else
477
-			echo '
491
+		} else {
492
+					echo '
478 493
 							</dd>';
494
+		}
479 495
 
480 496
 		// Add any template changes for an alternative upload system here.
481 497
 		call_integration_hook('integrate_upload_template');
@@ -484,21 +500,25 @@  discard block
 block discarded – undo
484 500
 							<dd class="smalltext">';
485 501
 
486 502
 		// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
487
-		if (!empty($modSettings['attachmentCheckExtensions']))
488
-			echo '
503
+		if (!empty($modSettings['attachmentCheckExtensions'])) {
504
+					echo '
489 505
 								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br>';
506
+		}
490 507
 
491
-		if (!empty($context['attachment_restrictions']))
492
-			echo '
508
+		if (!empty($context['attachment_restrictions'])) {
509
+					echo '
493 510
 								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br>';
511
+		}
494 512
 
495
-		if ($context['num_allowed_attachments'] == 0)
496
-			echo '
513
+		if ($context['num_allowed_attachments'] == 0) {
514
+					echo '
497 515
 								', $txt['attach_limit_nag'], '<br>';
516
+		}
498 517
 
499
-		if (!$context['can_post_attachment_unapproved'])
500
-			echo '
518
+		if (!$context['can_post_attachment_unapproved']) {
519
+					echo '
501 520
 								<span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br>';
521
+		}
502 522
 
503 523
 		echo '
504 524
 							</dd>
@@ -522,10 +542,11 @@  discard block
 block discarded – undo
522 542
 							<dt><strong>', $txt['subject'], '</strong></dt>
523 543
 							<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
524 544
 
525
-		foreach ($context['drafts'] as $draft)
526
-			echo '
545
+		foreach ($context['drafts'] as $draft) {
546
+					echo '
527 547
 							<dt>', $draft['link'], '</dt>
528 548
 							<dd>', $draft['poster_time'], '</dd>';
549
+		}
529 550
 		echo '
530 551
 						</dl>
531 552
 					</div>';
@@ -550,9 +571,10 @@  discard block
 block discarded – undo
550 571
 						', template_control_richedit_buttons($context['post_box_name']);
551 572
 
552 573
 	// Option to delete an event if user is editing one.
553
-	if ($context['make_event'] && !$context['event']['new'])
554
-		echo '
574
+	if ($context['make_event'] && !$context['event']['new']) {
575
+			echo '
555 576
 						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
577
+	}
556 578
 
557 579
 	echo '
558 580
 					</span>
@@ -561,9 +583,10 @@  discard block
 block discarded – undo
561 583
 			<br class="clear">';
562 584
 
563 585
 	// Assuming this isn't a new topic pass across the last message id.
564
-	if (isset($context['topic_last_message']))
565
-		echo '
586
+	if (isset($context['topic_last_message'])) {
587
+			echo '
566 588
 			<input type="hidden" name="last_msg" value="', $context['topic_last_message'], '">';
589
+	}
567 590
 
568 591
 	echo '
569 592
 			<input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '">
@@ -705,9 +728,10 @@  discard block
 block discarded – undo
705 728
 
706 729
 						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>\';';
707 730
 
708
-	if ($context['can_quote'])
709
-		echo '
731
+	if ($context['can_quote']) {
732
+			echo '
710 733
 						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>\';';
734
+	}
711 735
 
712 736
 	echo '
713 737
 						newPostsHTML += \'<br class="clear">\';
@@ -750,8 +774,8 @@  discard block
 block discarded – undo
750 774
 			}';
751 775
 
752 776
 	// Code for showing and hiding additional options.
753
-	if (!empty($modSettings['additional_options_collapsable']))
754
-		echo '
777
+	if (!empty($modSettings['additional_options_collapsable'])) {
778
+			echo '
755 779
 			var oSwapAdditionalOptions = new smc_Toggle({
756 780
 				bToggleEnabled: true,
757 781
 				bCurrentlyCollapsed: ', $context['show_additional_options'] ? 'false' : 'true', ',
@@ -779,10 +803,11 @@  discard block
 block discarded – undo
779 803
 					}
780 804
 				]
781 805
 			});';
806
+	}
782 807
 
783 808
 	// Code for showing and hiding drafts
784
-	if (!empty($context['drafts']))
785
-		echo '
809
+	if (!empty($context['drafts'])) {
810
+			echo '
786 811
 			var oSwapDraftOptions = new smc_Toggle({
787 812
 				bToggleEnabled: true,
788 813
 				bCurrentlyCollapsed: true,
@@ -804,6 +829,7 @@  discard block
 block discarded – undo
804 829
 					}
805 830
 				]
806 831
 			});';
832
+	}
807 833
 
808 834
 	echo '
809 835
 			var oEditorID = "', $context['post_box_name'] ,'";
@@ -824,8 +850,9 @@  discard block
 block discarded – undo
824 850
 		foreach ($context['previous_posts'] as $post)
825 851
 		{
826 852
 			$ignoring = false;
827
-			if (!empty($post['is_ignored']))
828
-				$ignored_posts[] = $ignoring = $post['id'];
853
+			if (!empty($post['is_ignored'])) {
854
+							$ignored_posts[] = $ignoring = $post['id'];
855
+			}
829 856
 
830 857
 			echo '
831 858
 			<div class="windowbg">
@@ -1007,10 +1034,10 @@  discard block
 block discarded – undo
1007 1034
 		<div id="temporary_posting_area" style="display: none;"></div>
1008 1035
 		<script>';
1009 1036
 
1010
-	if ($context['close_window'])
1011
-		echo '
1037
+	if ($context['close_window']) {
1038
+			echo '
1012 1039
 			window.close();';
1013
-	else
1040
+	} else
1014 1041
 	{
1015 1042
 		// Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;)
1016 1043
 		echo '
@@ -1064,11 +1091,12 @@  discard block
 block discarded – undo
1064 1091
 				</p>
1065 1092
 				<ul>';
1066 1093
 
1067
-	foreach ($context['groups'] as $group)
1068
-		echo '
1094
+	foreach ($context['groups'] as $group) {
1095
+			echo '
1069 1096
 					<li>
1070 1097
 						<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>
1071 1098
 					</li>';
1099
+	}
1072 1100
 
1073 1101
 	echo '
1074 1102
 					<li>
Please login to merge, or discard this patch.
Themes/default/ManageMembers.template.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
 				</thead>
149 149
 				<tbody>';
150 150
 
151
-	foreach ($context['membergroups'] as $membergroup)
152
-		echo '
151
+	foreach ($context['membergroups'] as $membergroup) {
152
+			echo '
153 153
 					<tr class="windowbg">
154 154
 						<td>', $membergroup['name'], '</td>
155 155
 						<td class="centercol">
@@ -159,6 +159,7 @@  discard block
 block discarded – undo
159 159
 							', $membergroup['can_be_additional'] ? '<input type="checkbox" name="membergroups[2][]" value="' . $membergroup['id'] . '" checked>' : '', '
160 160
 						</td>
161 161
 					</tr>';
162
+	}
162 163
 
163 164
 	echo '
164 165
 					<tr class="windowbg">
@@ -185,8 +186,8 @@  discard block
 block discarded – undo
185 186
 				</thead>
186 187
 				<tbody>';
187 188
 
188
-	foreach ($context['postgroups'] as $postgroup)
189
-		echo '
189
+	foreach ($context['postgroups'] as $postgroup) {
190
+			echo '
190 191
 					<tr class="windowbg">
191 192
 						<td>
192 193
 							', $postgroup['name'], '
@@ -195,6 +196,7 @@  discard block
 block discarded – undo
195 196
 							<input type="checkbox" name="postgroups[]" value="', $postgroup['id'], '" checked>
196 197
 						</td>
197 198
 					</tr>';
199
+	}
198 200
 
199 201
 	echo '
200 202
 					<tr class="windowbg">
Please login to merge, or discard this patch.
Themes/default/ManageSearch.template.php 1 patch
Braces   +23 added lines, -20 removed lines patch added patch discarded remove patch
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
127 127
 			<div class="windowbg2 noup">
128 128
 				<dl class="settings">';
129 129
 
130
-	if (!empty($context['table_info']))
131
-		echo '
130
+	if (!empty($context['table_info'])) {
131
+			echo '
132 132
 					<dt>
133 133
 						<strong>', $txt['search_method_messages_table_space'], ':</strong>
134 134
 					</dt>
@@ -141,6 +141,7 @@  discard block
 block discarded – undo
141 141
 					<dd>
142 142
 						', $context['table_info']['index_length'], '
143 143
 					</dd>';
144
+	}
144 145
 	echo '
145 146
 				</dl>
146 147
 				', $context['double_index'] ? '<div class="noticebox">
@@ -163,17 +164,17 @@  discard block
 block discarded – undo
163 164
 						<dd>
164 165
 							<span class="smalltext">';
165 166
 
166
-	if (empty($context['fulltext_index']) && empty($context['cannot_create_fulltext']))
167
-		echo '
167
+	if (empty($context['fulltext_index']) && empty($context['cannot_create_fulltext'])) {
168
+			echo '
168 169
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_no_index_exists'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=createfulltext;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_method_fulltext_create'], '</a>]';
169
-
170
-	elseif (empty($context['fulltext_index']) && !empty($context['cannot_create_fulltext']))
171
-		echo '
170
+	} elseif (empty($context['fulltext_index']) && !empty($context['cannot_create_fulltext'])) {
171
+			echo '
172 172
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_fulltext_cannot_create'];
173
-	else
174
-		echo '
173
+	} else {
174
+			echo '
175 175
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_index_already_exists'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=removefulltext;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_method_fulltext_remove'], '</a>]<br>
176 176
 								<strong>', $txt['search_index_size'], ':</strong> ', $context['table_info']['fulltext_length'];
177
+	}
177 178
 	echo '
178 179
 							</span>
179 180
 						</dd>';
@@ -187,26 +188,27 @@  discard block
 block discarded – undo
187 188
 						<dd>
188 189
 							<span class="smalltext">';
189 190
 
190
-	if ($context['custom_index'])
191
-		echo '
191
+	if ($context['custom_index']) {
192
+			echo '
192 193
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_index_already_exists'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=removecustom;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_index_custom_remove'], '</a>]<br>
193 194
 								<strong>', $txt['search_index_size'], ':</strong> ', $context['table_info']['custom_index_length'];
194
-
195
-	elseif ($context['partial_custom_index'])
196
-		echo '
195
+	} elseif ($context['partial_custom_index']) {
196
+			echo '
197 197
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_index_partial'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=removecustom;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_index_custom_remove'], '</a>] [<a href="', $scripturl, '?action=admin;area=managesearch;sa=createmsgindex;resume;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-msm_token_var'], '=', $context['admin-msm_token'], '">', $txt['search_index_custom_resume'], '</a>]<br>
198 198
 								<strong>', $txt['search_index_size'], ':</strong> ', $context['table_info']['custom_index_length'];
199
-	else
200
-		echo '
199
+	} else {
200
+			echo '
201 201
 								<strong>', $txt['search_index_label'], ':</strong> ', $txt['search_method_no_index_exists'], ' [<a href="', $scripturl, '?action=admin;area=managesearch;sa=createmsgindex">', $txt['search_index_create_custom'], '</a>]';
202
+	}
202 203
 	echo '
203 204
 							</span>
204 205
 						</dd>';
205 206
 
206 207
 	foreach ($context['search_apis'] as $api)
207 208
 	{
208
-		if (empty($api['label']) || $api['has_template'])
209
-			continue;
209
+		if (empty($api['label']) || $api['has_template']) {
210
+					continue;
211
+		}
210 212
 
211 213
 		echo '
212 214
 						<dt>
@@ -214,12 +216,13 @@  discard block
 block discarded – undo
214 216
 							', $api['label'], '
215 217
 						</dt>';
216 218
 
217
-	if ($api['desc'])
218
-		echo '
219
+	if ($api['desc']) {
220
+			echo '
219 221
 						<dd>
220 222
 							<span class="smalltext">', $api['desc'], '</span>
221 223
 						</dd>';
222 224
 	}
225
+	}
223 226
 
224 227
 	echo '
225 228
 					</dl>
Please login to merge, or discard this patch.
Themes/default/GenericMenu.template.php 1 patch
Braces   +50 added lines, -37 removed lines patch added patch discarded remove patch
@@ -91,8 +91,9 @@  discard block
 block discarded – undo
91 91
 		foreach ($section['areas'] as $i => $area)
92 92
 		{
93 93
 			// Not supposed to be printed?
94
-			if (empty($area['label']))
95
-				continue;
94
+			if (empty($area['label'])) {
95
+							continue;
96
+			}
96 97
 
97 98
 			echo '
98 99
 								<li', !empty($area['subsections']) ? ' class="subsections"' : '', '>';
@@ -101,8 +102,9 @@  discard block
 block discarded – undo
101 102
 									<a class="', $area['icon_class'], !empty($area['selected']) ? ' chosen ' : '', '" href="', (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i), $menu_context['extra_parameters'], '">', $area['icon'], $area['label'], '</a>';
102 103
 
103 104
 			// Is this the current area, or just some area?
104
-			if (!empty($area['selected']) && empty($context['tabs']))
105
-					$context['tabs'] = isset($area['subsections']) ? $area['subsections'] : array();
105
+			if (!empty($area['selected']) && empty($context['tabs'])) {
106
+								$context['tabs'] = isset($area['subsections']) ? $area['subsections'] : array();
107
+			}
106 108
 
107 109
 			// Are there any subsections?
108 110
 			if (!empty($area['subsections']))
@@ -112,8 +114,9 @@  discard block
 block discarded – undo
112 114
 
113 115
 				foreach ($area['subsections'] as $sa => $sub)
114 116
 				{
115
-					if (!empty($sub['disabled']))
116
-						continue;
117
+					if (!empty($sub['disabled'])) {
118
+											continue;
119
+					}
117 120
 
118 121
 					$url = isset($sub['url']) ? $sub['url'] : (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i) . ';sa=' . $sa;
119 122
 
@@ -160,8 +163,9 @@  discard block
 block discarded – undo
160 163
 							<h3 class="catbg">';
161 164
 
162 165
 		// The function is in Admin.template.php, but since this template is used elsewhere too better check if the function is available
163
-		if (function_exists('template_admin_quick_search'))
164
-			template_admin_quick_search();
166
+		if (function_exists('template_admin_quick_search')) {
167
+					template_admin_quick_search();
168
+		}
165 169
 
166 170
 		// Exactly how many tabs do we have?
167 171
 		if (!empty($context['tabs']))
@@ -176,30 +180,36 @@  discard block
 block discarded – undo
176 180
 				}
177 181
 
178 182
 				// Did this not even exist - or do we not have a label?
179
-				if (!isset($tab_context['tabs'][$id]))
180
-					$tab_context['tabs'][$id] = array('label' => $tab['label']);
181
-				elseif (!isset($tab_context['tabs'][$id]['label']))
182
-					$tab_context['tabs'][$id]['label'] = $tab['label'];
183
+				if (!isset($tab_context['tabs'][$id])) {
184
+									$tab_context['tabs'][$id] = array('label' => $tab['label']);
185
+				} elseif (!isset($tab_context['tabs'][$id]['label'])) {
186
+									$tab_context['tabs'][$id]['label'] = $tab['label'];
187
+				}
183 188
 
184 189
 				// Has a custom URL defined in the main admin structure?
185
-				if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url']))
186
-					$tab_context['tabs'][$id]['url'] = $tab['url'];
190
+				if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url'])) {
191
+									$tab_context['tabs'][$id]['url'] = $tab['url'];
192
+				}
187 193
 
188 194
 				// Any additional paramaters for the url?
189
-				if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params']))
190
-					$tab_context['tabs'][$id]['add_params'] = $tab['add_params'];
195
+				if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params'])) {
196
+									$tab_context['tabs'][$id]['add_params'] = $tab['add_params'];
197
+				}
191 198
 
192 199
 				// Has it been deemed selected?
193
-				if (!empty($tab['is_selected']))
194
-					$tab_context['tabs'][$id]['is_selected'] = true;
200
+				if (!empty($tab['is_selected'])) {
201
+									$tab_context['tabs'][$id]['is_selected'] = true;
202
+				}
195 203
 
196 204
 				// Does it have its own help?
197
-				if (!empty($tab['help']))
198
-					$tab_context['tabs'][$id]['help'] = $tab['help'];
205
+				if (!empty($tab['help'])) {
206
+									$tab_context['tabs'][$id]['help'] = $tab['help'];
207
+				}
199 208
 
200 209
 				// Is this the last one?
201
-				if (!empty($tab['is_last']) && !isset($tab_context['override_last']))
202
-					$tab_context['tabs'][$id]['is_last'] = true;
210
+				if (!empty($tab['is_last']) && !isset($tab_context['override_last'])) {
211
+									$tab_context['tabs'][$id]['is_last'] = true;
212
+				}
203 213
 			}
204 214
 
205 215
 			// Find the selected tab
@@ -216,20 +226,21 @@  discard block
 block discarded – undo
216 226
 		// Show an icon and/or a help item?
217 227
 		if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class']) || !empty($selected_tab['icon']) || !empty($tab_context['icon']) || !empty($selected_tab['help']) || !empty($tab_context['help']))
218 228
 		{
219
-			if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class']))
220
-				echo '
229
+			if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class'])) {
230
+							echo '
221 231
 								<span class="', !empty($selected_tab['icon_class']) ? $selected_tab['icon_class'] : $tab_context['icon_class'], ' icon"></span>';
222
-			elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon']))
223
-				echo '
232
+			} elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon'])) {
233
+							echo '
224 234
 								<img src="', $settings['images_url'], '/icons/', !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'], '" alt="" class="icon">';
235
+			}
225 236
 
226
-			if (!empty($selected_tab['help']) || !empty($tab_context['help']))
227
-				echo '
237
+			if (!empty($selected_tab['help']) || !empty($tab_context['help'])) {
238
+							echo '
228 239
 								<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>';
240
+			}
229 241
 
230 242
 			echo $tab_context['title'];
231
-		}
232
-		else
243
+		} else
233 244
 		{
234 245
 			echo '
235 246
 								', $tab_context['title'];
@@ -242,11 +253,12 @@  discard block
 block discarded – undo
242 253
 	}
243 254
 
244 255
 	// Shall we use the tabs? Yes, it's the only known way!
245
-	if (!empty($selected_tab['description']) || !empty($tab_context['description']))
246
-		echo '
256
+	if (!empty($selected_tab['description']) || !empty($tab_context['description'])) {
257
+			echo '
247 258
 					<p class="information">
248 259
 						', !empty($selected_tab['description']) ? $selected_tab['description'] : $tab_context['description'], '
249 260
 					</p>';
261
+	}
250 262
 
251 263
 	// Print out all the items in this tab (if any).
252 264
 	if (!empty($context['tabs']))
@@ -258,8 +270,9 @@  discard block
 block discarded – undo
258 270
 
259 271
 		foreach ($tab_context['tabs'] as $sa => $tab)
260 272
 		{
261
-			if (!empty($tab['disabled']))
262
-				continue;
273
+			if (!empty($tab['disabled'])) {
274
+							continue;
275
+			}
263 276
 
264 277
 			if (!empty($tab['is_selected']))
265 278
 			{
@@ -267,12 +280,12 @@  discard block
 block discarded – undo
267 280
 							<li>
268 281
 								<a class="active" href="', isset($tab['url']) ? $tab['url'] : $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa, $menu_context['extra_parameters'], isset($tab['add_params']) ? $tab['add_params'] : '', '">', $tab['label'], '</a>
269 282
 							</li>';
270
-			}
271
-			else
272
-				echo '
283
+			} else {
284
+							echo '
273 285
 							<li>
274 286
 								<a href="', isset($tab['url']) ? $tab['url'] : $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa, $menu_context['extra_parameters'], isset($tab['add_params']) ? $tab['add_params'] : '', '">', $tab['label'], '</a>
275 287
 							</li>';
288
+			}
276 289
 		}
277 290
 
278 291
 		// The end of tabs
Please login to merge, or discard this patch.
Themes/default/ManageScheduledTasks.template.php 1 patch
Braces   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -20,13 +20,12 @@
 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">
Please login to merge, or discard this patch.
Themes/default/ManageBoards.template.php 1 patch
Braces   +99 added lines, -68 removed lines patch added patch discarded remove patch
@@ -25,18 +25,20 @@  discard block
 block discarded – undo
25 25
 		</div>
26 26
 		<div class="windowbg2 noup">';
27 27
 
28
-	if (!empty($context['move_board']))
29
-		echo '
28
+	if (!empty($context['move_board'])) {
29
+			echo '
30 30
 			<div class="noticebox">
31 31
 				', $context['move_title'], ' [<a href="', $scripturl, '?action=admin;area=manageboards">', $txt['mboards_cancel_moving'], '</a>]', '
32 32
 			</div>';
33
+	}
33 34
 
34 35
 	// No categories so show a label.
35
-	if (empty($context['categories']))
36
-		echo '
36
+	if (empty($context['categories'])) {
37
+			echo '
37 38
 			<div class="windowbg centertext">
38 39
 				', $txt['mboards_no_cats'], '
39 40
 			</div>';
41
+	}
40 42
 
41 43
 	// Loop through every category, listing the boards in each as we go.
42 44
 	foreach ($context['categories'] as $category)
@@ -54,9 +56,10 @@  discard block
 block discarded – undo
54 56
 			<form action="', $scripturl, '?action=admin;area=manageboards;sa=newboard;cat=', $category['id'], '" method="post" accept-charset="', $context['character_set'], '">
55 57
 				<ul id="category_', $category['id'], '" class="nolist">';
56 58
 
57
-		if (!empty($category['move_link']))
58
-			echo '
59
+		if (!empty($category['move_link'])) {
60
+					echo '
59 61
 					<li><a href="', $category['move_link']['href'], '" title="', $category['move_link']['label'], '"><span class="generic_icons select_above"></span></a></li>';
62
+		}
60 63
 
61 64
 		$recycle_board = '<a href="' . $scripturl . '?action=admin;area=manageboards;sa=settings"> <img src="' . $settings['images_url'] . '/post/recycled.png" alt="' . $txt['recycle_board'] . '" title="' . $txt['recycle_board'] . '"></a>';
62 65
 		$redirect_board = '<img src="' . $settings['images_url'] . '/new_redirect.png" alt="' . $txt['redirect_board_desc'] . '" title="' . $txt['redirect_board_desc'] . '">';
@@ -81,9 +84,10 @@  discard block
 block discarded – undo
81 84
 				echo '
82 85
 					<li class="windowbg" style="padding-', $context['right_to_left'] ? 'right' : 'left', ': ', 5 + 30 * $board['move_links'][0]['child_level'], 'px;">';
83 86
 
84
-				foreach ($board['move_links'] as $link)
85
-					echo '
87
+				foreach ($board['move_links'] as $link) {
88
+									echo '
86 89
 						<a href="', $link['href'], '" class="move_links" title="', $link['label'], '"><span class="generic_icons select_', $link['class'], '" title="', $link['label'], '"></span></a>';
90
+				}
87 91
 
88 92
 				echo '
89 93
 					</li>';
@@ -132,9 +136,10 @@  discard block
 block discarded – undo
132 136
 						<select name="cat_order">';
133 137
 
134 138
 		// Print every existing category into a select box.
135
-		foreach ($context['category_order'] as $order)
136
-			echo '
139
+		foreach ($context['category_order'] as $order) {
140
+					echo '
137 141
 							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
142
+		}
138 143
 		echo '
139 144
 						</select>
140 145
 					</dd>';
@@ -169,14 +174,15 @@  discard block
 block discarded – undo
169 174
 	{
170 175
 		foreach ($context['custom_category_settings'] as $catset_id => $catset)
171 176
 		{
172
-			if (!empty($catset['dt']) && !empty($catset['dd']))
173
-				echo '
177
+			if (!empty($catset['dt']) && !empty($catset['dd'])) {
178
+							echo '
174 179
 					<dt class="clear', !is_numeric($catset_id) ? ' catset_' . $catset_id : '', '">
175 180
 						', $catset['dt'], '
176 181
 					</dt>
177 182
 					<dd', !is_numeric($catset_id) ? ' class="catset_' . $catset_id . '"' : '', '>
178 183
 						', $catset['dd'], '
179 184
 					</dd>';
185
+			}
180 186
 		}
181 187
 	}
182 188
 
@@ -184,21 +190,23 @@  discard block
 block discarded – undo
184 190
 	echo '
185 191
 				</dl>';
186 192
 
187
-	if (isset($context['category']['is_new']))
188
-		echo '
193
+	if (isset($context['category']['is_new'])) {
194
+			echo '
189 195
 				<input type="submit" name="add" value="', $txt['mboards_add_cat_button'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" class="button">';
190
-	else
191
-		echo '
196
+	} else {
197
+			echo '
192 198
 				<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.cat_name);" tabindex="', $context['tabindex']++, '" class="button">
193 199
 				<input type="submit" name="delete" value="', $txt['mboards_delete_cat'], '" data-confirm="', $txt['catConfirm'], '" class="button you_sure">';
200
+	}
194 201
 	echo '
195 202
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
196 203
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
197 204
 
198 205
 	// If this category is empty we don't bother with the next confirmation screen.
199
-	if ($context['category']['is_empty'])
200
-		echo '
206
+	if ($context['category']['is_empty']) {
207
+			echo '
201 208
 				<input type="hidden" name="empty" value="1">';
209
+	}
202 210
 
203 211
 	echo '
204 212
 			</div><!-- .windowbg2 -->
@@ -225,9 +233,10 @@  discard block
 block discarded – undo
225 233
 				<p>', $txt['mboards_delete_cat_contains'], ':</p>
226 234
 				<ul>';
227 235
 
228
-	foreach ($context['category']['children'] as $child)
229
-		echo '
236
+	foreach ($context['category']['children'] as $child) {
237
+			echo '
230 238
 					<li>', $child, '</li>';
239
+	}
231 240
 
232 241
 	echo '
233 242
 				</ul>
@@ -241,10 +250,11 @@  discard block
 block discarded – undo
241 250
 					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"', count($context['category_order']) == 1 ? ' disabled' : '', '>', $txt['mboards_delete_option2'], '</label>:
242 251
 					<select name="cat_to"', count($context['category_order']) == 1 ? ' disabled' : '', '>';
243 252
 
244
-	foreach ($context['category_order'] as $cat)
245
-		if ($cat['id'] != 0)
253
+	foreach ($context['category_order'] as $cat) {
254
+			if ($cat['id'] != 0)
246 255
 			echo '
247 256
 						<option value="', $cat['id'], '">', $cat['true_name'], '</option>';
257
+	}
248 258
 
249 259
 	echo '
250 260
 					</select>
@@ -287,9 +297,10 @@  discard block
 block discarded – undo
287 297
 					<dd>
288 298
 						<select name="new_cat" onchange="if (this.form.order) {this.form.order.disabled = this.options[this.selectedIndex].value != 0; this.form.board_order.disabled = this.options[this.selectedIndex].value != 0 || this.form.order.options[this.form.order.selectedIndex].value == \'\';}">';
289 299
 
290
-		foreach ($context['categories'] as $category)
291
-			echo '
300
+		foreach ($context['categories'] as $category) {
301
+					echo '
292 302
 							<option', $category['selected'] ? ' selected' : '', ' value="', $category['id'], '">', $category['name'], '</option>';
303
+		}
293 304
 		echo '
294 305
 						</select>
295 306
 					</dd>';
@@ -317,9 +328,10 @@  discard block
 block discarded – undo
317 328
 						<select id="board_order" name="board_order"', !isset($context['board']['is_new']) ? ' disabled' : '', '>
318 329
 							', !isset($context['board']['is_new']) ? '<option value="">(' . $txt['mboards_unchanged'] . ')</option>' : '';
319 330
 
320
-		foreach ($context['board_order'] as $order)
321
-			echo '
331
+		foreach ($context['board_order'] as $order) {
332
+					echo '
322 333
 							<option', $order['selected'] ? ' selected' : '', ' value="', $order['id'], '">', $order['name'], '</option>';
334
+		}
323 335
 		echo '
324 336
 						</select>
325 337
 					</dd>';
@@ -348,13 +360,15 @@  discard block
 block discarded – undo
348 360
 					<dd>
349 361
 						<select name="profile">';
350 362
 
351
-	if (isset($context['board']['is_new']))
352
-		echo '
363
+	if (isset($context['board']['is_new'])) {
364
+			echo '
353 365
 							<option value="-1">[', $txt['permission_profile_inherit'], ']</option>';
366
+	}
354 367
 
355
-	foreach ($context['profiles'] as $id => $profile)
356
-		echo '
368
+	foreach ($context['profiles'] as $id => $profile) {
369
+			echo '
357 370
 							<option value="', $id, '"', $id == $context['board']['profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
371
+	}
358 372
 
359 373
 	echo '
360 374
 						</select>
@@ -367,8 +381,8 @@  discard block
 block discarded – undo
367 381
 					</dt>
368 382
 					<dd>';
369 383
 
370
-	if (!empty($modSettings['deny_boards_access']))
371
-		echo '
384
+	if (!empty($modSettings['deny_boards_access'])) {
385
+			echo '
372 386
 						<table>
373 387
 							<tr>
374 388
 								<td></td>
@@ -376,10 +390,11 @@  discard block
 block discarded – undo
376 390
 								<th>', $txt['permissions_option_off'], '</th>
377 391
 								<th>', $txt['permissions_option_deny'], '</th>
378 392
 							</tr>';
393
+	}
379 394
 
380 395
 	// List all the membergroups so the user can choose who may access this board.
381
-	foreach ($context['groups'] as $group)
382
-		if (empty($modSettings['deny_boards_access']))
396
+	foreach ($context['groups'] as $group) {
397
+			if (empty($modSettings['deny_boards_access']))
383 398
 			echo '
384 399
 						<label for="groups_', $group['id'], '">
385 400
 							<input type="checkbox" name="groups[', $group['id'], ']" value="allow" id="groups_', $group['id'], '"', in_array($group['id'], $context['board_managers']) ? ' checked disabled' : ($group['allow'] ? ' checked' : ''), '>
@@ -387,8 +402,9 @@  discard block
 block discarded – undo
387 402
 								', $group['name'], '
388 403
 							</span>
389 404
 						</label><br>';
390
-		else
391
-			echo '
405
+	}
406
+		else {
407
+					echo '
392 408
 							<tr>
393 409
 								<td>
394 410
 									<label for="groups_', $group['id'], '_a">
@@ -408,16 +424,17 @@  discard block
 block discarded – undo
408 424
 								</td>
409 425
 								<td></td>
410 426
 							</tr>';
427
+		}
411 428
 
412
-	if (empty($modSettings['deny_boards_access']))
413
-		echo '
429
+	if (empty($modSettings['deny_boards_access'])) {
430
+			echo '
414 431
 						<span class="select_all_box">
415 432
 							<em>', $txt['check_all'], '</em> <input type="checkbox" onclick="invertAll(this, this.form, \'groups[\');">
416 433
 						</span>
417 434
 						<br><br>
418 435
 					</dd>';
419
-	else
420
-		echo '
436
+	} else {
437
+			echo '
421 438
 							<tr class="select_all_box">
422 439
 								<td>
423 440
 								</td>
@@ -436,6 +453,7 @@  discard block
 block discarded – undo
436 453
 							</tr>
437 454
 						</table>
438 455
 					</dd>';
456
+	}
439 457
 
440 458
 	// Options to choose moderators, specify as announcement board and choose whether to count posts here.
441 459
 	echo '
@@ -490,8 +508,8 @@  discard block
 block discarded – undo
490 508
 					</dl>
491 509
 				</div>';
492 510
 
493
-		if ($context['board']['redirect'])
494
-			echo '
511
+		if ($context['board']['redirect']) {
512
+					echo '
495 513
 				<div id="reset_redirect_div">
496 514
 					<dl class="settings">
497 515
 						<dt>
@@ -504,6 +522,7 @@  discard block
 block discarded – undo
504 522
 						</dd>
505 523
 					</dl>
506 524
 				</div>';
525
+		}
507 526
 	}
508 527
 
509 528
 	echo '
@@ -531,9 +550,10 @@  discard block
 block discarded – undo
531 550
 							<select name="boardtheme" id="boardtheme" onchange="refreshOptions();">
532 551
 								<option value="0"', $context['board']['theme'] == 0 ? ' selected' : '', '>', $txt['mboards_theme_default'], '</option>';
533 552
 
534
-	foreach ($context['themes'] as $theme)
535
-		echo '
553
+	foreach ($context['themes'] as $theme) {
554
+			echo '
536 555
 									<option value="', $theme['id'], '"', $context['board']['theme'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
556
+	}
537 557
 
538 558
 	echo '
539 559
 							</select>
@@ -562,14 +582,15 @@  discard block
 block discarded – undo
562 582
 
563 583
 		foreach ($context['custom_board_settings'] as $cbs_id => $cbs)
564 584
 		{
565
-			if (!empty($cbs['dt']) && !empty($cbs['dd']))
566
-				echo '
585
+			if (!empty($cbs['dt']) && !empty($cbs['dd'])) {
586
+							echo '
567 587
 						<dt class="clear', !is_numeric($cbs_id) ? ' cbs_' . $cbs_id : '', '">
568 588
 							', $cbs['dt'], '
569 589
 						</dt>
570 590
 						<dd', !is_numeric($cbs_id) ? ' class="cbs_' . $cbs_id . '"' : '', '>
571 591
 							', $cbs['dd'], '
572 592
 						</dd>';
593
+			}
573 594
 		}
574 595
 
575 596
 		echo '
@@ -577,9 +598,10 @@  discard block
 block discarded – undo
577 598
 				</div>';
578 599
 	}
579 600
 
580
-	if (!empty($context['board']['is_recycle']))
581
-		echo '
601
+	if (!empty($context['board']['is_recycle'])) {
602
+			echo '
582 603
 				<div class="noticebox">', $txt['mboards_recycle_disabled_delete'], '</div>';
604
+	}
583 605
 
584 606
 	echo '
585 607
 				<input type="hidden" name="rid" value="', $context['redirect_location'], '">
@@ -587,21 +609,24 @@  discard block
 block discarded – undo
587 609
 				<input type="hidden" name="', $context['admin-be-' . $context['board']['id'] . '_token_var'], '" value="', $context['admin-be-' . $context['board']['id'] . '_token'], '">';
588 610
 
589 611
 	// If this board has no children don't bother with the next confirmation screen.
590
-	if ($context['board']['no_children'])
591
-		echo '
612
+	if ($context['board']['no_children']) {
613
+			echo '
592 614
 				<input type="hidden" name="no_children" value="1">';
615
+	}
593 616
 
594
-	if (isset($context['board']['is_new']))
595
-		echo '
617
+	if (isset($context['board']['is_new'])) {
618
+			echo '
596 619
 				<input type="hidden" name="cur_cat" value="', $context['board']['category'], '">
597 620
 				<input type="submit" name="add" value="', $txt['mboards_new_board'], '" onclick="return !isEmptyText(this.form.board_name);" class="button">';
598
-	else
599
-		echo '
621
+	} else {
622
+			echo '
600 623
 				<input type="submit" name="edit" value="', $txt['modify'], '" onclick="return !isEmptyText(this.form.board_name);" class="button">';
624
+	}
601 625
 
602
-	if (!isset($context['board']['is_new']) && empty($context['board']['is_recycle']))
603
-		echo '
626
+	if (!isset($context['board']['is_new']) && empty($context['board']['is_recycle'])) {
627
+			echo '
604 628
 				<input type="submit" name="delete" value="', $txt['mboards_delete_board'], '" data-confirm="', $txt['boardConfirm'], '" class="button you_sure">';
629
+	}
605 630
 	echo '
606 631
 			</div><!-- .windowbg2 -->
607 632
 		</form>
@@ -622,12 +647,13 @@  discard block
 block discarded – undo
622 647
 			sItemListContainerId: \'moderator_container\',
623 648
 			aListItems: [';
624 649
 
625
-	foreach ($context['board']['moderators'] as $id_member => $member_name)
626
-		echo '
650
+	foreach ($context['board']['moderators'] as $id_member => $member_name) {
651
+			echo '
627 652
 					{
628 653
 						sItemId: ', JavaScriptEscape($id_member), ',
629 654
 						sItemName: ', JavaScriptEscape($member_name), '
630 655
 					}', $id_member == $context['board']['last_moderator_id'] ? '' : ',';
656
+	}
631 657
 
632 658
 	echo '
633 659
 				]
@@ -647,12 +673,13 @@  discard block
 block discarded – undo
647 673
 			sItemListContainerId: \'moderator_group_container\',
648 674
 			aListItems: [';
649 675
 
650
-	foreach ($context['board']['moderator_groups'] as $id_group => $group_name)
651
-		echo '
676
+	foreach ($context['board']['moderator_groups'] as $id_group => $group_name) {
677
+			echo '
652 678
 					{
653 679
 						sItemId: ', JavaScriptEscape($id_group), ',
654 680
 						sItemName: ', JavaScriptEscape($group_name), '
655 681
 					}', $id_group == $context['board']['last_moderator_group_id'] ? '' : ',';
682
+	}
656 683
 
657 684
 		echo '
658 685
 				]
@@ -678,17 +705,19 @@  discard block
 block discarded – undo
678 705
 		echo '
679 706
 			document.getElementById("redirect_address_div").style.display = redirectEnabled ? "" : "none";';
680 707
 
681
-		if ($context['board']['redirect'])
682
-			echo '
708
+		if ($context['board']['redirect']) {
709
+					echo '
683 710
 			document.getElementById("reset_redirect_div").style.display = redirectEnabled ? "" : "none";';
711
+		}
684 712
 	}
685 713
 
686 714
 	// Include any JavaScript added by mods using the 'integrate_edit_board' hook.
687 715
 	if (!empty($context['custom_refreshOptions']) && is_array($context['custom_refreshOptions']))
688 716
 	{
689
-		foreach ($context['custom_refreshOptions'] as $refreshOption)
690
-			echo '
717
+		foreach ($context['custom_refreshOptions'] as $refreshOption) {
718
+					echo '
691 719
 			', $refreshOption;
720
+		}
692 721
 	}
693 722
 
694 723
 	echo '
@@ -717,9 +746,10 @@  discard block
 block discarded – undo
717 746
 				<p>', $txt['mboards_delete_board_contains'], '</p>
718 747
 				<ul>';
719 748
 
720
-	foreach ($context['children'] as $child)
721
-		echo '
749
+	foreach ($context['children'] as $child) {
750
+			echo '
722 751
 					<li>', $child['node']['name'], '</li>';
752
+	}
723 753
 
724 754
 	echo '
725 755
 				</ul>
@@ -733,10 +763,11 @@  discard block
 block discarded – undo
733 763
 					<label for="delete_action1"><input type="radio" id="delete_action1" name="delete_action" value="1"', empty($context['can_move_children']) ? ' disabled' : '', '>', $txt['mboards_delete_board_option2'], '</label>:
734 764
 					<select name="board_to"', empty($context['can_move_children']) ? ' disabled' : '', '>';
735 765
 
736
-	foreach ($context['board_order'] as $board)
737
-		if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
766
+	foreach ($context['board_order'] as $board) {
767
+			if ($board['id'] != $context['board']['id'] && empty($board['is_child']))
738 768
 			echo '
739 769
 						<option value="', $board['id'], '">', $board['name'], '</option>';
770
+	}
740 771
 
741 772
 	echo '
742 773
 					</select>
Please login to merge, or discard this patch.
Themes/default/ManagePermissions.template.php 1 patch
Braces   +159 added lines, -122 removed lines patch added patch discarded remove patch
@@ -19,26 +19,28 @@  discard block
 block discarded – undo
19 19
 	global $context, $settings, $scripturl, $txt, $modSettings;
20 20
 
21 21
 	// Not allowed to edit?
22
-	if (!$context['can_modify'])
23
-		echo '
22
+	if (!$context['can_modify']) {
23
+			echo '
24 24
 	<div class="errorbox">
25 25
 		', sprintf($txt['permission_cannot_edit'], $scripturl . '?action=admin;area=permissions;sa=profiles'), '
26 26
 	</div>';
27
+	}
27 28
 
28 29
 	echo '
29 30
 	<div id="admin_form_wrapper">
30 31
 		<form action="', $scripturl, '?action=admin;area=permissions;sa=quick" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" id="permissionForm">';
31 32
 
32
-	if (!empty($context['profile']))
33
-		echo '
33
+	if (!empty($context['profile'])) {
34
+			echo '
34 35
 			<div class="cat_bar">
35 36
 				<h3 class="catbg">', $txt['permissions_for_profile'], ': &quot;', $context['profile']['name'], '&quot;</h3>
36 37
 			</div>';
37
-	else
38
-		echo '
38
+	} else {
39
+			echo '
39 40
 			<div class="cat_bar">
40 41
 				<h3 class="catbg">', $txt['permissions_title'], '</h3>
41 42
 			</div>';
43
+	}
42 44
 
43 45
 	echo '
44 46
 			<table class="table_grid">
@@ -47,13 +49,14 @@  discard block
 block discarded – undo
47 49
 						<th>', $txt['membergroups_name'], '</th>
48 50
 						<th class="small_table">', $txt['membergroups_members_top'], '</th>';
49 51
 
50
-	if (empty($modSettings['permission_enable_deny']))
51
-		echo '
52
+	if (empty($modSettings['permission_enable_deny'])) {
53
+			echo '
52 54
 						<th class="small_table">', $txt['membergroups_permissions'], '</th>';
53
-	else
54
-		echo '
55
+	} else {
56
+			echo '
55 57
 						<th class="small_table">', $txt['permissions_allowed'], '</th>
56 58
 						<th class="small_table">', $txt['permissions_denied'], '</th>';
59
+	}
57 60
 
58 61
 	echo '
59 62
 						<th class="small_table">', $context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view'], '</th>
@@ -71,26 +74,28 @@  discard block
 block discarded – undo
71 74
 						<td>
72 75
 							', !empty($group['help']) ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=' . $group['help'] . '" onclick="return reqOverlayDiv(this.href);"><span class="generic_icons help" title="' . $txt['help'] . '"></span></a>' : '<img class="icon" src="' . $settings['images_url'] . '/blank.png" alt="' . $txt['help'] . '">', '&nbsp;<span>', $group['name'], '</span>';
73 76
 
74
-		if (!empty($group['children']))
75
-			echo '
77
+		if (!empty($group['children'])) {
78
+					echo '
76 79
 							<br>
77 80
 							<span class="smalltext">', $txt['permissions_includes_inherited'], ': &quot;', implode('&quot;, &quot;', $group['children']), '&quot;</span>';
81
+		}
78 82
 
79 83
 		echo '
80 84
 						</td>
81 85
 						<td>', $group['can_search'] ? $group['link'] : $group['num_members'], '</td>';
82 86
 
83
-		if (empty($modSettings['permission_enable_deny']))
84
-			echo '
87
+		if (empty($modSettings['permission_enable_deny'])) {
88
+					echo '
85 89
 						<td>', $group['num_permissions']['allowed'], '</td>';
86
-		else
87
-			echo '
90
+		} else {
91
+					echo '
88 92
 						<td ', $group['id'] == 1 ? ' style="font-style: italic;"' : '', '>
89 93
 							', $group['num_permissions']['allowed'], '
90 94
 						</td>
91 95
 						<td ', $group['id'] == 1 || $group['id'] == -1 ? ' style="font-style: italic;"' : (!empty($group['num_permissions']['denied']) ? ' class="red"' : ''), '>
92 96
 							', $group['num_permissions']['denied'], '
93 97
 						</td>';
98
+		}
94 99
 
95 100
 		echo '
96 101
 						<td>
@@ -142,9 +147,10 @@  discard block
 block discarded – undo
142 147
 
143 148
 		foreach ($context['groups'] as $group)
144 149
 		{
145
-			if ($group['id'] != 1)
146
-				echo '
150
+			if ($group['id'] != 1) {
151
+							echo '
147 152
 								<option value="', $group['id'], '">', $group['name'], '</option>';
153
+			}
148 154
 		}
149 155
 
150 156
 		echo '
@@ -155,9 +161,10 @@  discard block
 block discarded – undo
155 161
 								<option value="add">', $txt['permissions_add'], '...</option>
156 162
 								<option value="clear">', $txt['permissions_remove'], '...</option>';
157 163
 
158
-		if (!empty($modSettings['permission_enable_deny']))
159
-			echo '
164
+		if (!empty($modSettings['permission_enable_deny'])) {
165
+					echo '
160 166
 								<option value="deny">', $txt['permissions_deny'], '...</option>';
167
+		}
161 168
 
162 169
 		echo '
163 170
 							</select>
@@ -168,31 +175,35 @@  discard block
 block discarded – undo
168 175
 
169 176
 		foreach ($context['permissions'] as $permissionType)
170 177
 		{
171
-			if ($permissionType['id'] == 'membergroup' && !empty($context['profile']))
172
-				continue;
178
+			if ($permissionType['id'] == 'membergroup' && !empty($context['profile'])) {
179
+							continue;
180
+			}
173 181
 
174 182
 			foreach ($permissionType['columns'] as $column)
175 183
 			{
176 184
 				foreach ($column as $permissionGroup)
177 185
 				{
178
-					if ($permissionGroup['hidden'])
179
-						continue;
186
+					if ($permissionGroup['hidden']) {
187
+											continue;
188
+					}
180 189
 
181 190
 					echo '
182 191
 								<option value="" disabled>[', $permissionGroup['name'], ']</option>';
183 192
 
184 193
 					foreach ($permissionGroup['permissions'] as $perm)
185 194
 					{
186
-						if ($perm['hidden'])
187
-							continue;
195
+						if ($perm['hidden']) {
196
+													continue;
197
+						}
188 198
 
189
-						if ($perm['has_own_any'])
190
-							echo '
199
+						if ($perm['has_own_any']) {
200
+													echo '
191 201
 								<option value="', $permissionType['id'], '/', $perm['own']['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], ' (', $perm['own']['name'], ')</option>
192 202
 								<option value="', $permissionType['id'], '/', $perm['any']['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], ' (', $perm['any']['name'], ')</option>';
193
-						else
194
-							echo '
203
+						} else {
204
+													echo '
195 205
 								<option value="', $permissionType['id'], '/', $perm['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], '</option>';
206
+						}
196 207
 					}
197 208
 				}
198 209
 			}
@@ -258,9 +269,10 @@  discard block
 block discarded – undo
258 269
 				}
259 270
 			</script>';
260 271
 
261
-		if (!empty($context['profile']))
262
-			echo '
272
+		if (!empty($context['profile'])) {
273
+					echo '
263 274
 			<input type="hidden" name="pid" value="', $context['profile']['id'], '">';
275
+		}
264 276
 
265 277
 		echo '
266 278
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -305,9 +317,10 @@  discard block
 block discarded – undo
305 317
 					<h3 class="subbg">', $category['name'], '</h3>
306 318
 				</div>';
307 319
 
308
-		if (!empty($category['boards']))
309
-			echo '
320
+		if (!empty($category['boards'])) {
321
+					echo '
310 322
 				<ul class="perm_boards flow_hidden">';
323
+		}
311 324
 
312 325
 		foreach ($category['boards'] as $board)
313 326
 		{
@@ -323,33 +336,36 @@  discard block
 block discarded – undo
323 336
 				echo '
324 337
 							<select name="boardprofile[', $board['id'], ']">';
325 338
 
326
-				foreach ($context['profiles'] as $id => $profile)
327
-					echo '
339
+				foreach ($context['profiles'] as $id => $profile) {
340
+									echo '
328 341
 								<option value="', $id, '"', $id == $board['profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
342
+				}
329 343
 
330 344
 				echo '
331 345
 							</select>';
332
-			}
333
-			else
334
-				echo '
346
+			} else {
347
+							echo '
335 348
 							<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $board['profile'], ';', $context['session_var'], '=', $context['session_id'], '">', $board['profile_name'], '</a>';
349
+			}
336 350
 
337 351
 			echo '
338 352
 						</span>
339 353
 					</li>';
340 354
 		}
341 355
 
342
-		if (!empty($category['boards']))
343
-			echo '
356
+		if (!empty($category['boards'])) {
357
+					echo '
344 358
 				</ul>';
359
+		}
345 360
 	}
346 361
 
347
-	if ($context['edit_all'])
348
-		echo '
362
+	if ($context['edit_all']) {
363
+			echo '
349 364
 				<input type="submit" name="save_changes" value="', $txt['save'], '" class="button">';
350
-	else
351
-		echo '
365
+	} else {
366
+			echo '
352 367
 				<a class="button" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a>';
368
+	}
353 369
 
354 370
 	echo '
355 371
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -389,12 +405,13 @@  discard block
 block discarded – undo
389 405
 					<tr class="windowbg">
390 406
 						<td>';
391 407
 
392
-		if (!empty($context['show_rename_boxes']) && $profile['can_edit'])
393
-			echo '
408
+		if (!empty($context['show_rename_boxes']) && $profile['can_edit']) {
409
+					echo '
394 410
 							<input type="text" name="rename_profile[', $profile['id'], ']" value="', $profile['name'], '">';
395
-		else
396
-			echo '
411
+		} else {
412
+					echo '
397 413
 							<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $profile['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $profile['name'], '</a>';
414
+		}
398 415
 
399 416
 		echo '
400 417
 						</td>
@@ -414,9 +431,10 @@  discard block
 block discarded – undo
414 431
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
415 432
 				<input type="hidden" name="', $context['admin-mpp_token_var'], '" value="', $context['admin-mpp_token'], '">';
416 433
 
417
-	if ($context['can_edit_something'])
418
-		echo '
434
+	if ($context['can_edit_something']) {
435
+			echo '
419 436
 				<input type="submit" name="rename" value="', empty($context['show_rename_boxes']) ? $txt['permissions_profile_rename'] : $txt['permissions_commit'], '" class="button">';
437
+	}
420 438
 
421 439
 	echo '
422 440
 				<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" class="button" ', !empty($context['show_rename_boxes']) ? ' style="display:none"' : '', '/>
@@ -441,9 +459,10 @@  discard block
 block discarded – undo
441 459
 					<dd>
442 460
 						<select name="copy_from">';
443 461
 
444
-	foreach ($context['profiles'] as $id => $profile)
445
-		echo '
462
+	foreach ($context['profiles'] as $id => $profile) {
463
+			echo '
446 464
 							<option value="', $id, '">', $profile['name'], '</option>';
465
+	}
447 466
 
448 467
 	echo '
449 468
 						</select>
@@ -471,8 +490,7 @@  discard block
 block discarded – undo
471 490
 	<div class="errorbox">
472 491
 		', sprintf($txt['permission_cannot_edit'], $scripturl . '?action=admin;area=permissions;sa=profiles'), '
473 492
 	</div>';
474
-	}
475
-	else
493
+	} else
476 494
 	{
477 495
 		echo '
478 496
 	<script>
@@ -492,22 +510,24 @@  discard block
 block discarded – undo
492 510
 	<div id="admincenter">
493 511
 		<form id="permissions" action="', $scripturl, '?action=admin;area=permissions;sa=modify2;group=', $context['group']['id'], ';pid=', $context['profile']['id'], '" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" onsubmit="return warnAboutDeny();">';
494 512
 
495
-	if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1)
496
-		echo '
513
+	if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1) {
514
+			echo '
497 515
 			<div class="information">
498 516
 				', $txt['permissions_option_desc'], '
499 517
 			</div>';
518
+	}
500 519
 
501 520
 	echo '
502 521
 			<div class="cat_bar">
503 522
 				<h3 class="catbg">';
504 523
 
505
-	if ($context['permission_type'] == 'board')
506
-		echo '
524
+	if ($context['permission_type'] == 'board') {
525
+			echo '
507 526
 				', $txt['permissions_local_for'], ' &quot;', $context['group']['name'], '&quot; ', $txt['permissions_on'], ' &quot;', $context['profile']['name'], '&quot;';
508
-	else
509
-		echo '
527
+	} else {
528
+			echo '
510 529
 				', $context['permission_type'] == 'membergroup' ? $txt['permissions_general'] : $txt['permissions_board'], ' - &quot;', $context['group']['name'], '&quot;';
530
+	}
511 531
 	echo '
512 532
 				</h3>
513 533
 			</div>';
@@ -530,15 +550,17 @@  discard block
 block discarded – undo
530 550
 		template_modify_group_display('board');
531 551
 	}
532 552
 
533
-	if ($context['profile']['can_modify'])
534
-		echo '
553
+	if ($context['profile']['can_modify']) {
554
+			echo '
535 555
 			<div class="padding">
536 556
 				<input type="submit" value="', $txt['permissions_commit'], '" class="button">
537 557
 			</div>';
558
+	}
538 559
 
539
-	foreach ($context['hidden_perms'] as $hidden_perm)
540
-		echo '
560
+	foreach ($context['hidden_perms'] as $hidden_perm) {
561
+			echo '
541 562
 			<input type="hidden" name="perm[', $hidden_perm[0], '][', $hidden_perm[1], ']" value="', $hidden_perm[2], '">';
563
+	}
542 564
 
543 565
 	echo '
544 566
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -566,17 +588,19 @@  discard block
 block discarded – undo
566 588
 
567 589
 		foreach ($column as $permissionGroup)
568 590
 		{
569
-			if (empty($permissionGroup['permissions']))
570
-				continue;
591
+			if (empty($permissionGroup['permissions'])) {
592
+							continue;
593
+			}
571 594
 
572 595
 			// Are we likely to have something in this group to display or is it all hidden?
573 596
 			$has_display_content = false;
574 597
 			if (!$permissionGroup['hidden'])
575 598
 			{
576 599
 				// Before we go any further check we are going to have some data to print otherwise we just have a silly heading.
577
-				foreach ($permissionGroup['permissions'] as $permission)
578
-					if (!$permission['hidden'])
600
+				foreach ($permissionGroup['permissions'] as $permission) {
601
+									if (!$permission['hidden'])
579 602
 						$has_display_content = true;
603
+				}
580 604
 
581 605
 				if ($has_display_content)
582 606
 				{
@@ -585,10 +609,11 @@  discard block
 block discarded – undo
585 609
 							<th></th>
586 610
 							<th', $context['group']['id'] == -1 ? ' colspan="2"' : '', ' class="smalltext">', $permissionGroup['name'], '</th>';
587 611
 
588
-					if ($context['group']['id'] != -1)
589
-						echo '
612
+					if ($context['group']['id'] != -1) {
613
+											echo '
590 614
 							<th>', $txt['permissions_option_own'], '</th>
591 615
 							<th>', $txt['permissions_option_any'], '</th>';
616
+					}
592 617
 
593 618
 					echo '
594 619
 						</tr>';
@@ -611,17 +636,18 @@  discard block
 block discarded – undo
611 636
 						// Guests can't do their own thing.
612 637
 						if ($context['group']['id'] != -1)
613 638
 						{
614
-							if (empty($modSettings['permission_enable_deny']))
615
-								echo '
639
+							if (empty($modSettings['permission_enable_deny'])) {
640
+															echo '
616 641
 								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['own']['id'], ']"', $permission['own']['select'] == 'on' ? ' checked="checked"' : '', ' value="on" id="', $permission['own']['id'], '_on" ', $disable_field, '/>';
617
-							else
642
+							} else
618 643
 							{
619 644
 								echo '
620 645
 								<select name="perm[', $permission_type['id'], '][', $permission['own']['id'], ']" ', $disable_field, '>';
621 646
 
622
-								foreach (array('on', 'off', 'deny') as $c)
623
-									echo '
647
+								foreach (array('on', 'off', 'deny') as $c) {
648
+																	echo '
624 649
 									<option ', $permission['own']['select'] == $c ? ' selected' : '', ' value="', $c, '">', $txt['permissions_option_' . $c], '</option>';
650
+								}
625 651
 								echo '
626 652
 								</select>';
627 653
 							}
@@ -631,39 +657,41 @@  discard block
 block discarded – undo
631 657
 							<td>';
632 658
 						}
633 659
 
634
-						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1)
635
-							echo '
660
+						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) {
661
+													echo '
636 662
 								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['any']['id'], ']"', $permission['any']['select'] == 'on' ? ' checked="checked"' : '', ' value="on" ', $disable_field, '/>';
637
-						else
663
+						} else
638 664
 						{
639 665
 							echo '
640 666
 								<select name="perm[', $permission_type['id'], '][', $permission['any']['id'], ']" ', $disable_field, '>';
641 667
 
642
-							foreach (array('on', 'off', 'deny') as $c)
643
-								echo '
668
+							foreach (array('on', 'off', 'deny') as $c) {
669
+															echo '
644 670
 									<option ', $permission['any']['select'] == $c ? ' selected' : '', ' value="', $c, '">', $txt['permissions_option_' . $c], '</option>';
671
+							}
645 672
 							echo '
646 673
 								</select>';
647 674
 						}
648
-					}
649
-					else
675
+					} else
650 676
 					{
651
-						if ($context['group']['id'] != -1)
652
-							echo '
677
+						if ($context['group']['id'] != -1) {
678
+													echo '
653 679
 							</td>
654 680
 							<td>';
681
+						}
655 682
 
656
-						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1)
657
-							echo '
683
+						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) {
684
+													echo '
658 685
 								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['id'], ']"', $permission['select'] == 'on' ? ' checked="checked"' : '', ' value="on" ', $disable_field, '/>';
659
-						else
686
+						} else
660 687
 						{
661 688
 							echo '
662 689
 								<select name="perm[', $permission_type['id'], '][', $permission['id'], ']" ', $disable_field, '>';
663 690
 
664
-							foreach (array('on', 'off', 'deny') as $c)
665
-								echo '
691
+							foreach (array('on', 'off', 'deny') as $c) {
692
+															echo '
666 693
 									<option ', $permission['select'] == $c ? ' selected' : '', ' value="', $c, '">', $txt['permissions_option_' . $c], '</option>';
694
+							}
667 695
 							echo '
668 696
 								</select>';
669 697
 						}
@@ -694,11 +722,11 @@  discard block
 block discarded – undo
694 722
 											<fieldset id="', $context['current_permission'], '">
695 723
 												<legend><a href="javascript:void(0);" onclick="document.getElementById(\'', $context['current_permission'], '\').style.display = \'none\';document.getElementById(\'', $context['current_permission'], '_groups_link\').style.display = \'block\'; return false;" class="toggle_up"> ', $txt['avatar_select_permission'], '</a></legend>';
696 724
 
697
-	if (empty($modSettings['permission_enable_deny']))
698
-		echo '
725
+	if (empty($modSettings['permission_enable_deny'])) {
726
+			echo '
699 727
 												<ul>';
700
-	else
701
-		echo '
728
+	} else {
729
+			echo '
702 730
 												<div class="information">', $txt['permissions_option_desc'], '</div>
703 731
 												<dl class="settings">
704 732
 													<dt>
@@ -708,47 +736,52 @@  discard block
 block discarded – undo
708 736
 													</dt>
709 737
 													<dd>
710 738
 													</dd>';
739
+	}
711 740
 
712 741
 	foreach ($context['member_groups'] as $group)
713 742
 	{
714
-		if (!empty($modSettings['permission_enable_deny']))
715
-			echo '
743
+		if (!empty($modSettings['permission_enable_deny'])) {
744
+					echo '
716 745
 													<dt>';
717
-		else
718
-			echo '
746
+		} else {
747
+					echo '
719 748
 													<li>';
749
+		}
720 750
 
721
-		if (empty($modSettings['permission_enable_deny']))
722
-			echo '
751
+		if (empty($modSettings['permission_enable_deny'])) {
752
+					echo '
723 753
 														<input type="checkbox" name="', $context['current_permission'], '[', $group['id'], ']" value="on"', $group['status'] == 'on' ? ' checked' : '', '>';
724
-		else
725
-			echo '
754
+		} else {
755
+					echo '
726 756
 														<span class="perms"><input type="radio" name="', $context['current_permission'], '[', $group['id'], ']" value="on"', $group['status'] == 'on' ? ' checked' : '', '></span>
727 757
 														<span class="perms"><input type="radio" name="', $context['current_permission'], '[', $group['id'], ']" value="off"', $group['status'] == 'off' ? ' checked' : '', '></span>
728 758
 														<span class="perms"><input type="radio" name="', $context['current_permission'], '[', $group['id'], ']" value="deny"', $group['status'] == 'deny' ? ' checked' : '', '></span>';
759
+		}
729 760
 
730
-		if (!empty($modSettings['permission_enable_deny']))
731
-			echo '
761
+		if (!empty($modSettings['permission_enable_deny'])) {
762
+					echo '
732 763
 													</dt>
733 764
 													<dd>
734 765
 														<span', $group['is_postgroup'] ? ' style="font-style: italic;"' : '', '>', $group['name'], '</span>
735 766
 													</dd>';
736
-		else
737
-			echo '
767
+		} else {
768
+					echo '
738 769
 														<span', $group['is_postgroup'] ? ' style="font-style: italic;"' : '', '>', $group['name'], '</span>
739 770
 													</li>';
771
+		}
740 772
 	}
741 773
 
742
-	if (empty($modSettings['permission_enable_deny']))
743
-		echo '
774
+	if (empty($modSettings['permission_enable_deny'])) {
775
+			echo '
744 776
 													<li>
745 777
 														<input type="checkbox" onclick="invertAll(this, this.form, \''. $context['current_permission'] . '[\');">
746 778
 														<span>', $txt['check_all'], '</span>
747 779
 													</li>
748 780
 												</ul>';
749
-	else
750
-		echo '
781
+	} else {
782
+			echo '
751 783
 												</dl>';
784
+	}
752 785
 
753 786
 	echo '
754 787
 											</fieldset>
@@ -788,9 +821,10 @@  discard block
 block discarded – undo
788 821
 	if (!empty($modSettings['postmod_active']))
789 822
 	{
790 823
 		// Got advanced permissions - if so warn!
791
-		if (!empty($modSettings['permission_enable_deny']))
792
-			echo '
824
+		if (!empty($modSettings['permission_enable_deny'])) {
825
+					echo '
793 826
 							<div class="information">', $txt['permissions_post_moderation_deny_note'], '</div>';
827
+		}
794 828
 
795 829
 		echo '
796 830
 							<div class="padding">
@@ -805,10 +839,11 @@  discard block
 block discarded – undo
805 839
 									', $txt['permissions_post_moderation_select'], ':
806 840
 									<select name="pid" onchange="document.forms.postmodForm.submit();">';
807 841
 
808
-		foreach ($context['profiles'] as $profile)
809
-			if ($profile['can_modify'])
842
+		foreach ($context['profiles'] as $profile) {
843
+					if ($profile['can_modify'])
810 844
 				echo '
811 845
 										<option value="', $profile['id'], '"', $profile['id'] == $context['current_profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
846
+		}
812 847
 
813 848
 		echo '
814 849
 									</select>
@@ -829,11 +864,12 @@  discard block
 block discarded – undo
829 864
 											', $txt['permissions_post_moderation_replies_any'], '
830 865
 										</th>';
831 866
 
832
-		if ($modSettings['attachmentEnable'] == 1)
833
-			echo '
867
+		if ($modSettings['attachmentEnable'] == 1) {
868
+					echo '
834 869
 										<th class="centercol" colspan="3">
835 870
 											', $txt['permissions_post_moderation_attachments'], '
836 871
 										</th>';
872
+		}
837 873
 
838 874
 		echo '
839 875
 									</tr>
@@ -851,11 +887,12 @@  discard block
 block discarded – undo
851 887
 										<th><span class="generic_icons post_moderation_moderate"></span></th>
852 888
 										<th><span class="generic_icons post_moderation_deny"></span></th>';
853 889
 
854
-		if ($modSettings['attachmentEnable'] == 1)
855
-			echo '
890
+		if ($modSettings['attachmentEnable'] == 1) {
891
+					echo '
856 892
 										<th><span class="generic_icons post_moderation_allow"></span></th>
857 893
 										<th><span class="generic_icons post_moderation_moderate"></span></th>
858 894
 										<th><span class="generic_icons post_moderation_deny"></span></th>';
895
+		}
859 896
 
860 897
 		echo '
861 898
 									</tr>
@@ -869,10 +906,11 @@  discard block
 block discarded – undo
869 906
 										<td class="half_table">
870 907
 											<span ', ($group['color'] ? 'style="color: ' . $group['color'] . '"' : ''), '>', $group['name'], '</span>';
871 908
 
872
-				if (!empty($group['children']))
873
-					echo '
909
+				if (!empty($group['children'])) {
910
+									echo '
874 911
 											<br>
875 912
 											<span class="smalltext">', $txt['permissions_includes_inherited'], ': &quot;', implode('&quot;, &quot;', $group['children']), '&quot;</span>';
913
+				}
876 914
 
877 915
 				echo '
878 916
 										</td>
@@ -891,8 +929,7 @@  discard block
 block discarded – undo
891 929
 				{
892 930
 					echo '
893 931
 										<td colspan="3"></td>';
894
-				}
895
-				else
932
+				} else
896 933
 				{
897 934
 					echo '
898 935
 										<td class="centercol">
Please login to merge, or discard this patch.
Themes/default/index.template.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -232,7 +232,7 @@
 block discarded – undo
232 232
 			// In maintenance mode, only login is allowed and don't show OverlayDiv
233 233
 			echo '
234 234
 			<ul class="floatleft welcome">
235
-				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl. '?action=login', 'return true;'), '</li>
235
+				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl . '?action=login', 'return true;'), '</li>
236 236
 			</ul>';
237 237
 
238 238
 	if (!empty($modSettings['userLanguage']) && !empty($context['languages']) && count($context['languages']) > 1)
Please login to merge, or discard this patch.
Braces   +89 added lines, -61 removed lines patch added patch discarded remove patch
@@ -72,9 +72,10 @@  discard block
 block discarded – undo
72 72
 
73 73
 	// Allow css/js files to be disabled for this specific theme.
74 74
 	// Add the identifier as an array key. IE array('smf_script'); Some external files might not add identifiers, on those cases SMF uses its filename as reference.
75
-	if (!isset($settings['disable_files']))
76
-		$settings['disable_files'] = array();
77
-}
75
+	if (!isset($settings['disable_files'])) {
76
+			$settings['disable_files'] = array();
77
+	}
78
+	}
78 79
 
79 80
 /**
80 81
  * The main sub template above the content.
@@ -112,8 +113,9 @@  discard block
 block discarded – undo
112 113
 		echo '
113 114
 	<meta';
114 115
 
115
-		foreach ($meta_tag as $meta_key => $meta_value)
116
-			echo ' ', $meta_key, '="', $meta_value, '"';
116
+		foreach ($meta_tag as $meta_key => $meta_value) {
117
+					echo ' ', $meta_key, '="', $meta_value, '"';
118
+		}
117 119
 
118 120
 		echo '>';
119 121
 	}
@@ -124,14 +126,16 @@  discard block
 block discarded – undo
124 126
 	<meta name="theme-color" content="#557EA0">';
125 127
 
126 128
 	// Please don't index these Mr Robot.
127
-	if (!empty($context['robot_no_index']))
128
-		echo '
129
+	if (!empty($context['robot_no_index'])) {
130
+			echo '
129 131
 	<meta name="robots" content="noindex">';
132
+	}
130 133
 
131 134
 	// Present a canonical url for search engines to prevent duplicate content in their indices.
132
-	if (!empty($context['canonical_url']))
133
-		echo '
135
+	if (!empty($context['canonical_url'])) {
136
+			echo '
134 137
 	<link rel="canonical" href="', $context['canonical_url'], '">';
138
+	}
135 139
 
136 140
 	// Show all the relative links, such as help, search, contents, and the like.
137 141
 	echo '
@@ -140,10 +144,11 @@  discard block
 block discarded – undo
140 144
 	<link rel="search" href="' . $scripturl . '?action=search">' : '');
141 145
 
142 146
 	// If RSS feeds are enabled, advertise the presence of one.
143
-	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged']))
144
-		echo '
147
+	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged'])) {
148
+			echo '
145 149
 	<link rel="alternate" type="application/rss+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['rss'], '" href="', $scripturl, '?action=.xml;type=rss2', !empty($context['current_board']) ? ';board=' . $context['current_board'] : '', '">
146 150
 	<link rel="alternate" type="application/atom+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['atom'], '" href="', $scripturl, '?action=.xml;type=atom', !empty($context['current_board']) ? ';board=' . $context['current_board'] : '', '">';
151
+	}
147 152
 
148 153
 	// If we're viewing a topic, these should be the previous and next topics, respectively.
149 154
 	if (!empty($context['links']['next']))
@@ -159,9 +164,10 @@  discard block
 block discarded – undo
159 164
 	}
160 165
 
161 166
 	// If we're in a board, or a topic for that matter, the index will be the board's index.
162
-	if (!empty($context['current_board']))
163
-		echo '
167
+	if (!empty($context['current_board'])) {
168
+			echo '
164 169
 	<link rel="index" href="', $scripturl, '?board=', $context['current_board'], '.0">';
170
+	}
165 171
 
166 172
 	// Output any remaining HTML headers. (from mods, maybe?)
167 173
 	echo $context['html_headers'];
@@ -193,8 +199,9 @@  discard block
 block discarded – undo
193 199
 			<ul class="floatleft" id="top_info">
194 200
 				<li>
195 201
 					<a href="', $scripturl, '?action=profile"', !empty($context['self_profile']) ? ' class="active"' : '', ' id="profile_menu_top" onclick="return false;">';
196
-			if (!empty($context['user']['avatar']))
197
-				echo $context['user']['avatar']['image'];
202
+			if (!empty($context['user']['avatar'])) {
203
+							echo $context['user']['avatar']['image'];
204
+			}
198 205
 
199 206
 			echo $context['user']['name'], '</a>
200 207
 					<div id="profile_menu" class="top_menu"></div>
@@ -223,17 +230,18 @@  discard block
 block discarded – undo
223 230
 	}
224 231
 	// Otherwise they're a guest. Ask them to either register or login.
225 232
 	else
226
-		if (empty($maintenance))
227
-			echo '
233
+		if (empty($maintenance)) {
234
+					echo '
228 235
 			<ul class="floatleft welcome">
229 236
 				<li>', sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup'), '</li>
230 237
 			</ul>';
231
-		else
232
-			// In maintenance mode, only login is allowed and don't show OverlayDiv
238
+		} else {
239
+					// In maintenance mode, only login is allowed and don't show OverlayDiv
233 240
 			echo '
234 241
 			<ul class="floatleft welcome">
235 242
 				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl. '?action=login', 'return true;'), '</li>
236 243
 			</ul>';
244
+		}
237 245
 
238 246
 	if (!empty($modSettings['userLanguage']) && !empty($context['languages']) && count($context['languages']) > 1)
239 247
 	{
@@ -241,9 +249,10 @@  discard block
 block discarded – undo
241 249
 			<form id="languages_form" method="get" class="floatright">
242 250
 				<select id="language_select" name="language" onchange="this.form.submit()">';
243 251
 
244
-		foreach ($context['languages'] as $language)
245
-			echo '
252
+		foreach ($context['languages'] as $language) {
253
+					echo '
246 254
 					<option value="', $language['filename'], '"', isset($context['user']['language']) && $context['user']['language'] == $language['filename'] ? ' selected="selected"' : '', '>', str_replace('-utf8', '', $language['name']), '</option>';
255
+		}
247 256
 
248 257
 		echo '
249 258
 				</select>
@@ -267,31 +276,36 @@  discard block
 block discarded – undo
267 276
 					<option value="all"', ($selected == 'all' ? ' selected' : ''), '>', $txt['search_entireforum'], ' </option>';
268 277
 
269 278
 		// Can't limit it to a specific topic if we are not in one
270
-		if (!empty($context['current_topic']))
271
-			echo '
279
+		if (!empty($context['current_topic'])) {
280
+					echo '
272 281
 					<option value="topic"', ($selected == 'current_topic' ? ' selected' : ''), '>', $txt['search_thistopic'], '</option>';
282
+		}
273 283
 
274 284
 		// Can't limit it to a specific board if we are not in one
275
-		if (!empty($context['current_board']))
276
-			echo '
285
+		if (!empty($context['current_board'])) {
286
+					echo '
277 287
 					<option value="board"', ($selected == 'current_board' ? ' selected' : ''), '>', $txt['search_thisbrd'], '</option>';
288
+		}
278 289
 
279 290
 		// Can't search for members if we can't see the memberlist
280
-		if (!empty($context['allow_memberlist']))
281
-			echo '
291
+		if (!empty($context['allow_memberlist'])) {
292
+					echo '
282 293
 					<option value="members"', ($selected == 'members' ? ' selected' : ''), '>', $txt['search_members'], ' </option>';
294
+		}
283 295
 
284 296
 		echo '
285 297
 				</select>';
286 298
 
287 299
 		// Search within current topic?
288
-		if (!empty($context['current_topic']))
289
-			echo '
300
+		if (!empty($context['current_topic'])) {
301
+					echo '
290 302
 				<input type="hidden" name="sd_topic" value="', $context['current_topic'], '">';
303
+		}
291 304
 		// If we're on a certain board, limit it to this board ;).
292
-		elseif (!empty($context['current_board']))
293
-			echo '
305
+		elseif (!empty($context['current_board'])) {
306
+					echo '
294 307
 				<input type="hidden" name="sd_brd" value="', $context['current_board'], '">';
308
+		}
295 309
 
296 310
 		echo '
297 311
 				<input type="submit" name="search2" value="', $txt['search'], '" class="button">
@@ -323,12 +337,13 @@  discard block
 block discarded – undo
323 337
 					</div>';
324 338
 
325 339
 	// Show a random news item? (or you could pick one from news_lines...)
326
-	if (!empty($settings['enable_news']) && !empty($context['random_news_line']))
327
-		echo '
340
+	if (!empty($settings['enable_news']) && !empty($context['random_news_line'])) {
341
+			echo '
328 342
 					<div class="news">
329 343
 						<h2>', $txt['news'], ': </h2>
330 344
 						<p>', $context['random_news_line'], '</p>
331 345
 					</div>';
346
+	}
332 347
 
333 348
 	echo '
334 349
 					<hr class="clear">
@@ -389,9 +404,10 @@  discard block
 block discarded – undo
389 404
 		</ul>';
390 405
 
391 406
 	// Show the load time?
392
-	if ($context['show_load_time'])
393
-		echo '
407
+	if ($context['show_load_time']) {
408
+			echo '
394 409
 		<p>', sprintf($txt['page_created_full'], $context['load_time'], $context['load_queries']), '</p>';
410
+	}
395 411
 
396 412
 	echo '
397 413
 		</div>
@@ -422,18 +438,20 @@  discard block
 block discarded – undo
422 438
 	global $context, $shown_linktree, $scripturl, $txt;
423 439
 
424 440
 	// If linktree is empty, just return - also allow an override.
425
-	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show))
426
-		return;
441
+	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show)) {
442
+			return;
443
+	}
427 444
 		echo '
428 445
 				<div class="navigate_section">
429 446
 					<ul>';
430 447
 
431
-	if ($context['user']['is_logged'])
432
-		echo '
448
+	if ($context['user']['is_logged']) {
449
+			echo '
433 450
 						<li class="unread_links">
434 451
 							<a href="', $scripturl, '?action=unread" title="', $txt['unread_since_visit'], '">', $txt['view_unread_category'], '</a>
435 452
 							<a href="', $scripturl, '?action=unreadreplies" title="', $txt['show_unread_replies'], '">', $txt['unread_replies'], '</a>
436 453
 						</li>';
454
+	}
437 455
 
438 456
 	// Each tree item has a URL and name. Some may have extra_before and extra_after.
439 457
 	foreach ($context['linktree'] as $link_num => $tree)
@@ -444,25 +462,29 @@  discard block
 block discarded – undo
444 462
 		// Don't show a separator for the first one.
445 463
 		// Better here. Always points to the next level when the linktree breaks to a second line.
446 464
 		// Picked a better looking HTML entity, and added support for RTL plus a span for styling.
447
-		if ($link_num != 0)
448
-			echo '
465
+		if ($link_num != 0) {
466
+					echo '
449 467
 							<span class="dividers">', $context['right_to_left'] ? ' &#9668; ' : ' &#9658; ', '</span>';
468
+		}
450 469
 
451 470
 		// Show something before the link?
452
-		if (isset($tree['extra_before']))
453
-			echo $tree['extra_before'], ' ';
471
+		if (isset($tree['extra_before'])) {
472
+					echo $tree['extra_before'], ' ';
473
+		}
454 474
 
455 475
 		// Show the link, including a URL if it should have one.
456
-		if (isset($tree['url']))
457
-			echo '
476
+		if (isset($tree['url'])) {
477
+					echo '
458 478
 							<a href="' . $tree['url'] . '"><span>' . $tree['name'] . '</span></a>';
459
-		else
460
-			echo '
479
+		} else {
480
+					echo '
461 481
 							<span>' . $tree['name'] . '</span>';
482
+		}
462 483
 
463 484
 		// Show something after the link...?
464
-		if (isset($tree['extra_after']))
465
-			echo ' ', $tree['extra_after'];
485
+		if (isset($tree['extra_after'])) {
486
+					echo ' ', $tree['extra_after'];
487
+		}
466 488
 
467 489
 		echo '
468 490
 						</li>';
@@ -513,13 +535,14 @@  discard block
 block discarded – undo
513 535
 					echo '
514 536
 									<ul>';
515 537
 
516
-					foreach ($childbutton['sub_buttons'] as $grandchildbutton)
517
-						echo '
538
+					foreach ($childbutton['sub_buttons'] as $grandchildbutton) {
539
+											echo '
518 540
 										<li>
519 541
 											<a href="', $grandchildbutton['href'], '"', isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
520 542
 												', $grandchildbutton['title'], '
521 543
 											</a>
522 544
 										</li>';
545
+					}
523 546
 
524 547
 					echo '
525 548
 									</ul>';
@@ -550,8 +573,9 @@  discard block
 block discarded – undo
550 573
 {
551 574
 	global $context, $txt;
552 575
 
553
-	if (!is_array($strip_options))
554
-		$strip_options = array();
576
+	if (!is_array($strip_options)) {
577
+			$strip_options = array();
578
+	}
555 579
 
556 580
 	// Create the buttons...
557 581
 	$buttons = array();
@@ -560,8 +584,9 @@  discard block
 block discarded – undo
560 584
 		// As of 2.1, the 'test' for each button happens while the array is being generated. The extra 'test' check here is deprecated but kept for backward compatibility (update your mods, folks!)
561 585
 		if (!isset($value['test']) || !empty($context[$value['test']]))
562 586
 		{
563
-			if (!isset($value['id']))
564
-				$value['id'] = $key;
587
+			if (!isset($value['id'])) {
588
+							$value['id'] = $key;
589
+			}
565 590
 
566 591
 			$button = '
567 592
 				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a>';
@@ -574,13 +599,15 @@  discard block
 block discarded – undo
574 599
 							<div class="overview">';
575 600
 				foreach ($value['sub_buttons'] as $element)
576 601
 				{
577
-					if (isset($element['test']) && empty($context[$element['test']]))
578
-						continue;
602
+					if (isset($element['test']) && empty($context[$element['test']])) {
603
+											continue;
604
+					}
579 605
 
580 606
 					$button .= '
581 607
 								<a href="' . $element['url'] . '"><strong>' . $txt[$element['text']] . '</strong>';
582
-					if (isset($txt[$element['text'] . '_desc']))
583
-						$button .= '<br><span>' . $txt[$element['text'] . '_desc'] . '</span>';
608
+					if (isset($txt[$element['text'] . '_desc'])) {
609
+											$button .= '<br><span>' . $txt[$element['text'] . '_desc'] . '</span>';
610
+					}
584 611
 					$button .= '</a>';
585 612
 				}
586 613
 				$button .= '
@@ -594,8 +621,9 @@  discard block
 block discarded – undo
594 621
 	}
595 622
 
596 623
 	// No buttons? No button strip either.
597
-	if (empty($buttons))
598
-		return;
624
+	if (empty($buttons)) {
625
+			return;
626
+	}
599 627
 
600 628
 	echo '
601 629
 		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '>
Please login to merge, or discard this patch.