Completed
Push — release-2.1 ( 9016ca...8bb38c )
by Colin
12:28 queued 03:14
created
Themes/default/ManageMaintenance.template.php 1 patch
Braces   +45 added lines, -31 removed lines patch added patch discarded remove patch
@@ -18,11 +18,12 @@  discard block
 block discarded – undo
18 18
 	global $context, $txt, $scripturl, $modSettings;
19 19
 
20 20
 	// If maintenance has finished tell the user.
21
-	if (!empty($context['maintenance_finished']))
22
-		echo '
21
+	if (!empty($context['maintenance_finished'])) {
22
+			echo '
23 23
 	<div class="infobox">
24 24
 		', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
25 25
 	</div>';
26
+	}
26 27
 
27 28
 	echo '
28 29
 	<div id="manage_maintenance">
@@ -39,8 +40,8 @@  discard block
 block discarded – undo
39 40
 		</div>';
40 41
 
41 42
 	// Show an option to convert the body column of the post table to MEDIUMTEXT or TEXT
42
-	if (isset($context['convert_to']))
43
-		echo '
43
+	if (isset($context['convert_to'])) {
44
+			echo '
44 45
 		<div class="cat_bar">
45 46
 			<h3 class="catbg">', $txt[$context['convert_to'] . '_title'], '</h3>
46 47
 		</div>
@@ -53,10 +54,11 @@  discard block
 block discarded – undo
53 54
 				<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '">
54 55
 			</form>
55 56
 		</div>';
57
+	}
56 58
 
57 59
 	// Show an option to convert to UTF-8 if we're not on UTF-8 yet.
58
-	if ($context['convert_utf8'])
59
-		echo '
60
+	if ($context['convert_utf8']) {
61
+			echo '
60 62
 		<div class="cat_bar">
61 63
 			<h3 class="catbg">', $txt['utf8_title'], '</h3>
62 64
 		</div>
@@ -69,10 +71,11 @@  discard block
 block discarded – undo
69 71
 				<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '">
70 72
 			</form>
71 73
 		</div>';
74
+	}
72 75
 
73 76
 	// We might want to convert entities if we're on UTF-8.
74
-	if ($context['convert_entities'])
75
-		echo '
77
+	if ($context['convert_entities']) {
78
+			echo '
76 79
 		<div class="cat_bar">
77 80
 			<h3 class="catbg">', $txt['entity_convert_title'], '</h3>
78 81
 		</div>
@@ -84,6 +87,7 @@  discard block
 block discarded – undo
84 87
 				<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '">
85 88
 			</form>
86 89
 		</div>';
90
+	}
87 91
 
88 92
 	echo '
89 93
 	</div><!-- #manage_maintenance -->';
@@ -101,11 +105,12 @@  discard block
 block discarded – undo
101 105
 	<div id="manage_maintenance">';
102 106
 
103 107
 	// If maintenance has finished tell the user.
104
-	if (!empty($context['maintenance_finished']))
105
-		echo '
108
+	if (!empty($context['maintenance_finished'])) {
109
+			echo '
106 110
 		<div class="infobox">
107 111
 			', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
108 112
 		</div>';
113
+	}
109 114
 
110 115
 	echo '
111 116
 		<div class="cat_bar">
@@ -237,11 +242,12 @@  discard block
 block discarded – undo
237 242
 	<div id="manage_maintenance">';
238 243
 
239 244
 	// If maintenance has finished, tell the user.
240
-	if (!empty($context['maintenance_finished']))
241
-		echo '
245
+	if (!empty($context['maintenance_finished'])) {
246
+			echo '
242 247
 		<div class="infobox">
243 248
 			', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
244 249
 		</div>';
250
+	}
245 251
 
246 252
 	echo '
247 253
 		<div class="cat_bar">
@@ -303,9 +309,10 @@  discard block
 block discarded – undo
303 309
 				</p>
304 310
 				<div style="display: none;" id="membersPanel">';
305 311
 
306
-	foreach ($context['membergroups'] as $group)
307
-		echo '
312
+	foreach ($context['membergroups'] as $group) {
313
+			echo '
308 314
 					<label for="groups', $group['id'], '"><input type="checkbox" name="groups[', $group['id'], ']" id="groups', $group['id'], '" checked> ', $group['name'], '</label><br>';
315
+	}
309 316
 
310 317
 	echo '
311 318
 				</div>
@@ -349,11 +356,12 @@  discard block
 block discarded – undo
349 356
 	global $scripturl, $txt, $context, $settings, $modSettings;
350 357
 
351 358
 	// If maintenance has finished tell the user.
352
-	if (!empty($context['maintenance_finished']))
353
-		echo '
359
+	if (!empty($context['maintenance_finished'])) {
360
+			echo '
354 361
 	<div class="infobox">
355 362
 		', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
356 363
 	</div>';
364
+	}
357 365
 
358 366
 	// Bit of javascript for showing which boards to prune in an otherwise hidden list.
359 367
 	echo '
@@ -421,21 +429,23 @@  discard block
 block discarded – undo
421 429
 								<ul>';
422 430
 
423 431
 		// Display a checkbox with every board.
424
-		foreach ($category['boards'] as $board)
425
-			echo '
432
+		foreach ($category['boards'] as $board) {
433
+					echo '
426 434
 									<li style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'] * 1.5, 'em;">
427 435
 										<label for="boards_', $board['id'], '"><input type="checkbox" name="boards[', $board['id'], ']" id="boards_', $board['id'], '" checked>', $board['name'], '</label>
428 436
 									</li>';
437
+		}
429 438
 
430 439
 		echo '
431 440
 								</ul>
432 441
 							</fieldset>';
433 442
 
434 443
 		// Increase $i, and check if we're at the middle yet.
435
-		if (++$i == $middle)
436
-			echo '
444
+		if (++$i == $middle) {
445
+					echo '
437 446
 						</div><!-- .floatleft -->
438 447
 						<div class="floatright" style="width: 49%;">';
448
+		}
439 449
 	}
440 450
 
441 451
 	echo '
@@ -477,9 +487,10 @@  discard block
 block discarded – undo
477 487
 		echo '
478 488
 						<optgroup label="', $category['name'], '">';
479 489
 
480
-		foreach ($category['boards'] as $board)
481
-			echo '
490
+		foreach ($category['boards'] as $board) {
491
+					echo '
482 492
 							<option value="', $board['id'], '"> ', str_repeat('==', $board['child_level']), '=&gt;&nbsp;', $board['name'], '</option>';
493
+		}
483 494
 
484 495
 		echo '
485 496
 						</optgroup>';
@@ -497,9 +508,10 @@  discard block
 block discarded – undo
497 508
 		echo '
498 509
 						<optgroup label="', $category['name'], '">';
499 510
 
500
-		foreach ($category['boards'] as $board)
501
-			echo '
511
+		foreach ($category['boards'] as $board) {
512
+					echo '
502 513
 							<option value="', $board['id'], '"> ', str_repeat('==', $board['child_level']), '=&gt;&nbsp;', $board['name'], '</option>';
514
+		}
503 515
 
504 516
 		echo '
505 517
 						</optgroup>';
@@ -540,9 +552,10 @@  discard block
 block discarded – undo
540 552
 				', $txt['database_optimize_attempt'], '<br>';
541 553
 
542 554
 	// List each table being optimized...
543
-	foreach ($context['optimized_tables'] as $table)
544
-		echo '
555
+	foreach ($context['optimized_tables'] as $table) {
556
+			echo '
545 557
 				', sprintf($txt['database_optimizing'], $table['name'], $table['data_freed']), '<br>';
558
+	}
546 559
 
547 560
 	// How did we go?
548 561
 	echo '
@@ -602,13 +615,14 @@  discard block
 block discarded – undo
602 615
 				</li>
603 616
 			</ul>';
604 617
 
605
-		if (!empty($context['exceeding_messages_morethan']))
606
-			echo '
618
+		if (!empty($context['exceeding_messages_morethan'])) {
619
+					echo '
607 620
 			<p>', $context['exceeding_messages_morethan'], '</p>';
608
-	}
609
-	else
610
-		echo '
621
+		}
622
+	} else {
623
+			echo '
611 624
 			<p class="infobox">', $txt['convert_to_text'], '</p>';
625
+	}
612 626
 
613 627
 	echo '
614 628
 			<form action="', $scripturl, '?action=admin;area=maintain;sa=database;activity=convertmsgbody" method="post" accept-charset="', $context['character_set'], '">
Please login to merge, or discard this patch.
Themes/default/ReportedContent.template.php 1 patch
Braces   +66 added lines, -44 removed lines patch added patch discarded remove patch
@@ -18,11 +18,12 @@  discard block
 block discarded – undo
18 18
 	global $context, $txt, $scripturl;
19 19
 
20 20
 	// Let them know the action was a success.
21
-	if (!empty($context['report_post_action']))
22
-		echo '
21
+	if (!empty($context['report_post_action'])) {
22
+			echo '
23 23
 	<div class="infobox">
24 24
 		', $txt['report_action_' . $context['report_post_action']], '
25 25
 	</div>';
26
+	}
26 27
 
27 28
 	echo '
28 29
 	<form id="reported_posts" action="', $scripturl, '?action=moderate;area=reportedposts;sa=show', $context['view_closed'] ? ';closed' : '', ';start=', $context['start'], '" method="post" accept-charset="', $context['character_set'], '">
@@ -52,8 +53,9 @@  discard block
 block discarded – undo
52 53
 
53 54
 		// Prepare the comments...
54 55
 		$comments = array();
55
-		foreach ($report['comments'] as $comment)
56
-			$comments[$comment['member']['id']] = $comment['member']['link'];
56
+		foreach ($report['comments'] as $comment) {
57
+					$comments[$comment['member']['id']] = $comment['member']['link'];
58
+		}
57 59
 
58 60
 		echo '
59 61
 				', $txt['mc_reportedp_reported_by'], ': ', implode(', ', $comments), '
@@ -69,18 +71,21 @@  discard block
 block discarded – undo
69 71
 				<li><a href="', $scripturl, '?action=moderate;area=reportedposts;sa=handle;closed=', (int) !$report['closed'], ';rid=', $report['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';', $context['mod-report-closed_token_var'], '=', $context['mod-report-closed_token'], '">', $close_button, '</a></li>';
70 72
 
71 73
 		// Delete message button.
72
-		if (!$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards'])))
73
-			echo '
74
+		if (!$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards']))) {
75
+					echo '
74 76
 				<li><a href="', $scripturl, '?action=deletemsg;topic=', $report['topic']['id'], '.0;msg=', $report['topic']['id_msg'], ';modcenter;', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['mc_reportedp_delete_confirm'], '" class="you_sure">', $delete_button, '</a></li>';
77
+		}
75 78
 
76 79
 		// Ban this user button.
77
-		if (!$report['closed'] && !empty($context['report_manage_bans']))
78
-			echo '
80
+		if (!$report['closed'] && !empty($context['report_manage_bans'])) {
81
+					echo '
79 82
 				<li><a href="', $scripturl, '?action=admin;area=ban;sa=add', (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']), ';', $context['session_var'], '=', $context['session_id'], '">', $ban_button, '</a></li>';
83
+		}
80 84
 
81
-		if (!$context['view_closed'])
82
-			echo '
85
+		if (!$context['view_closed']) {
86
+					echo '
83 87
 				<li><input type="checkbox" name="close[]" value="' . $report['id'] . '"></li>';
88
+		}
84 89
 
85 90
 		echo '
86 91
 			</ul>
@@ -88,18 +93,20 @@  discard block
 block discarded – undo
88 93
 	}
89 94
 
90 95
 	// Were none found?
91
-	if (empty($context['reports']))
92
-		echo '
96
+	if (empty($context['reports'])) {
97
+			echo '
93 98
 		<div class="windowbg2">
94 99
 			<p class="centertext">', $txt['mc_reportedp_none_found'], '</p>
95 100
 		</div>';
101
+	}
96 102
 
97 103
 	echo '
98 104
 		<div class="pagesection">';
99 105
 	
100
-	if (!empty($context['total_reports']) && $context['total_reports'] >= $context['reports_how_many'])
101
-		echo '
106
+	if (!empty($context['total_reports']) && $context['total_reports'] >= $context['reports_how_many']) {
107
+			echo '
102 108
 			<div class="pagelinks floatleft">' . $context['page_index'] . '</div>';
109
+	}
103 110
 
104 111
 	echo '
105 112
 			<div class="floatright">', !$context['view_closed'] ? '
@@ -130,18 +137,20 @@  discard block
 block discarded – undo
130 137
 			<div class="modbox">
131 138
 				<ul>';
132 139
 
133
-	foreach ($context['reported_posts'] as $report)
134
-		echo '
140
+	foreach ($context['reported_posts'] as $report) {
141
+			echo '
135 142
 					<li class="smalltext">
136 143
 						<a href="', $report['report_href'], '">', $report['subject'], '</a> ', $txt['mc_reportedp_by'], ' ', $report['author']['link'], '
137 144
 					</li>';
145
+	}
138 146
 
139 147
 	// Don't have any watched users right now?
140
-	if (empty($context['reported_posts']))
141
-		echo '
148
+	if (empty($context['reported_posts'])) {
149
+			echo '
142 150
 					<li>
143 151
 						<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
144 152
 					</li>';
153
+	}
145 154
 
146 155
 	echo '
147 156
 				</ul>
@@ -189,11 +198,12 @@  discard block
 block discarded – undo
189 198
 	global $context, $scripturl, $txt;
190 199
 
191 200
 	// Let them know the action was a success.
192
-	if (!empty($context['report_post_action']))
193
-		echo '
201
+	if (!empty($context['report_post_action'])) {
202
+			echo '
194 203
 	<div class="infobox">
195 204
 		', $txt['report_action_' . $context['report_post_action']], '
196 205
 	</div>';
206
+	}
197 207
 
198 208
 	echo '
199 209
 	<div id="modcenter">
@@ -229,14 +239,15 @@  discard block
 block discarded – undo
229 239
 				<h3 class="catbg">', $txt['mc_modreport_whoreported_title'], '</h3>
230 240
 			</div>';
231 241
 
232
-	foreach ($context['report']['comments'] as $comment)
233
-		echo '
242
+	foreach ($context['report']['comments'] as $comment) {
243
+			echo '
234 244
 			<div class="windowbg">
235 245
 				<p class="smalltext">
236 246
 					', sprintf($txt['mc_modreport_whoreported_data'], $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''), $comment['time']), '
237 247
 				</p>
238 248
 				<p>', $comment['message'], '</p>
239 249
 			</div>';
250
+	}
240 251
 
241 252
 	echo '
242 253
 			<br>
@@ -245,11 +256,12 @@  discard block
 block discarded – undo
245 256
 			</div>
246 257
 			<div>';
247 258
 
248
-	if (empty($context['report']['mod_comments']))
249
-		echo '
259
+	if (empty($context['report']['mod_comments'])) {
260
+			echo '
250 261
 				<div class="information">
251 262
 					<p class="centertext">', $txt['mc_modreport_no_mod_comment'], '</p>
252 263
 				</div>';
264
+	}
253 265
 
254 266
 	foreach ($context['report']['mod_comments'] as $comment)
255 267
 	{
@@ -335,18 +347,20 @@  discard block
 block discarded – undo
335 347
 			<div class="modbox">
336 348
 				<ul>';
337 349
 
338
-	foreach ($context['reported_members'] as $report)
339
-		echo '
350
+	foreach ($context['reported_members'] as $report) {
351
+			echo '
340 352
 					<li class="smalltext">
341 353
 						<a href="', $report['report_href'], '">', $report['user_name'], '</a>
342 354
 					</li>';
355
+	}
343 356
 
344 357
 	// Don't have any reported members right now?
345
-	if (empty($context['reported_members']))
346
-		echo '
358
+	if (empty($context['reported_members'])) {
359
+			echo '
347 360
 					<li>
348 361
 						<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
349 362
 					</li>';
363
+	}
350 364
 
351 365
 	echo '
352 366
 				</ul>
@@ -394,11 +408,12 @@  discard block
 block discarded – undo
394 408
 	global $context, $txt, $scripturl;
395 409
 
396 410
 	// Let them know the action was a success.
397
-	if (!empty($context['report_post_action']) && !empty($txt['report_action_' . $context['report_post_action']]))
398
-		echo '
411
+	if (!empty($context['report_post_action']) && !empty($txt['report_action_' . $context['report_post_action']])) {
412
+			echo '
399 413
 	<div class="infobox">
400 414
 		', $txt['report_action_' . $context['report_post_action']], '
401 415
 	</div>';
416
+	}
402 417
 
403 418
 	echo '
404 419
 	<form id="reported_members" action="', $scripturl, '?action=moderate;area=reportedmembers;sa=show', $context['view_closed'] ? ';closed' : '', ';start=', $context['start'], '" method="post" accept-charset="', $context['character_set'], '">
@@ -430,8 +445,9 @@  discard block
 block discarded – undo
430 445
 
431 446
 		// Prepare the comments...
432 447
 		$comments = array();
433
-		foreach ($report['comments'] as $comment)
434
-			$comments[$comment['member']['id']] = $comment['member']['link'];
448
+		foreach ($report['comments'] as $comment) {
449
+					$comments[$comment['member']['id']] = $comment['member']['link'];
450
+		}
435 451
 
436 452
 		echo '
437 453
 				', $txt['mc_reportedp_reported_by'], ': ', implode(', ', $comments), '
@@ -443,13 +459,15 @@  discard block
 block discarded – undo
443 459
 				<li><a href="', $scripturl, '?action=moderate;area=reportedmembers;sa=handle;closed=', (int) !$report['closed'], ';rid=', $report['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';', $context['mod-report-closed_token_var'], '=', $context['mod-report-closed_token'], '">', $close_button, '</a></li>';
444 460
 
445 461
 		// Ban this user button.
446
-		if (!$report['closed'] && !empty($context['report_manage_bans']) && !empty($report['user']['id']))
447
-			echo '
462
+		if (!$report['closed'] && !empty($context['report_manage_bans']) && !empty($report['user']['id'])) {
463
+					echo '
448 464
 				<li><a href="', $scripturl, '?action=admin;area=ban;sa=add;u=', $report['user']['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $ban_button, '</a></li>';
465
+		}
449 466
 
450
-		if (!$context['view_closed'])
451
-			echo '
467
+		if (!$context['view_closed']) {
468
+					echo '
452 469
 				<li><input type="checkbox" name="close[]" value="' . $report['id'] . '"></li>';
470
+		}
453 471
 
454 472
 			echo '
455 473
 			</ul>
@@ -457,11 +475,12 @@  discard block
 block discarded – undo
457 475
 	}
458 476
 
459 477
 	// Were none found?
460
-	if (empty($context['reports']))
461
-		echo '
478
+	if (empty($context['reports'])) {
479
+			echo '
462 480
 		<div class="windowbg2">
463 481
 			<p class="centertext">', $txt['mc_reportedp_none_found'], '</p>
464 482
 		</div>';
483
+	}
465 484
 
466 485
 	echo '
467 486
 		<div class="pagesection">
@@ -482,11 +501,12 @@  discard block
 block discarded – undo
482 501
 	global $context, $scripturl, $txt;
483 502
 
484 503
 	// Let them know the action was a success.
485
-	if (!empty($context['report_post_action']))
486
-		echo '
504
+	if (!empty($context['report_post_action'])) {
505
+			echo '
487 506
 	<div class="infobox">
488 507
 		', $txt['report_action_' . $context['report_post_action']], '
489 508
 	</div>';
509
+	}
490 510
 
491 511
 	echo '
492 512
 	<div id="modcenter">
@@ -519,14 +539,15 @@  discard block
 block discarded – undo
519 539
 				<h3 class="catbg">', $txt['mc_memberreport_whoreported_title'], '</h3>
520 540
 			</div>';
521 541
 
522
-	foreach ($context['report']['comments'] as $comment)
523
-		echo '
542
+	foreach ($context['report']['comments'] as $comment) {
543
+			echo '
524 544
 			<div class="windowbg">
525 545
 				<p class="smalltext">
526 546
 					', sprintf($txt['mc_modreport_whoreported_data'], $comment['member']['link'] . (empty($comment['member']['id']) && !empty($comment['member']['ip']) ? ' (' . $comment['member']['ip'] . ')' : ''), $comment['time']), '
527 547
 				</p>
528 548
 				<p>', $comment['message'], '</p>
529 549
 			</div>';
550
+	}
530 551
 
531 552
 	echo '
532 553
 			<br>
@@ -535,11 +556,12 @@  discard block
 block discarded – undo
535 556
 			</div>
536 557
 			<div>';
537 558
 
538
-	if (empty($context['report']['mod_comments']))
539
-		echo '
559
+	if (empty($context['report']['mod_comments'])) {
560
+			echo '
540 561
 				<div class="information">
541 562
 					<p class="centertext">', $txt['mc_modreport_no_mod_comment'], '</p>
542 563
 				</div>';
564
+	}
543 565
 
544 566
 	foreach ($context['report']['mod_comments'] as $comment)
545 567
 	{
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/Themes.template.php 1 patch
Braces   +121 added lines, -92 removed lines patch added patch discarded remove patch
@@ -54,9 +54,10 @@  discard block
 block discarded – undo
54 54
 					<dd>
55 55
 						<div id="known_themes_list">';
56 56
 
57
-	foreach ($context['themes'] as $theme)
58
-		echo '
57
+	foreach ($context['themes'] as $theme) {
58
+			echo '
59 59
 							<label for="options-known_themes_', $theme['id'], '"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_', $theme['id'], '" value="', $theme['id'], '"', $theme['known'] ? ' checked' : '', '> ', $theme['name'], '</label><br>';
60
+	}
60 61
 
61 62
 	echo '
62 63
 						</div>
@@ -73,9 +74,10 @@  discard block
 block discarded – undo
73 74
 						<select name="options[theme_guests]" id="theme_guests">';
74 75
 
75 76
 	// Put an option for each theme in the select box.
76
-	foreach ($context['themes'] as $theme)
77
-		echo '
77
+	foreach ($context['themes'] as $theme) {
78
+			echo '
78 79
 							<option value="', $theme['id'], '"', $modSettings['theme_guests'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
80
+	}
79 81
 
80 82
 	echo '
81 83
 						</select>
@@ -90,9 +92,10 @@  discard block
 block discarded – undo
90 92
 							<option value="0">', $txt['theme_forum_default'], '</option>';
91 93
 
92 94
 	// Same thing, this time for changing the theme of everyone.
93
-	foreach ($context['themes'] as $theme)
94
-		echo '
95
+	foreach ($context['themes'] as $theme) {
96
+			echo '
95 97
 							<option value="', $theme['id'], '">', $theme['name'], '</option>';
98
+	}
96 99
 
97 100
 	echo '
98 101
 						</select>
@@ -187,11 +190,12 @@  discard block
 block discarded – undo
187 190
 	global $context, $scripturl, $txt;
188 191
 
189 192
 	// Show a nice confirmation message.
190
-	if (isset($_GET['done']))
191
-		echo '
193
+	if (isset($_GET['done'])) {
194
+			echo '
192 195
 	<div class="infobox">
193 196
 		', $txt['theme_confirmed_' . $_GET['done']], '
194 197
 	</div>';
198
+	}
195 199
 
196 200
 	echo '
197 201
 	<div id="admincenter">
@@ -354,11 +358,12 @@  discard block
 block discarded – undo
354 358
 		if (empty($setting) || !is_array($setting))
355 359
 		{
356 360
 			// Insert a separator (unless this is the first item in the list)
357
-			if ($i !== $first_option_key)
358
-				echo '
361
+			if ($i !== $first_option_key) {
362
+							echo '
359 363
 				</dl>
360 364
 				<hr>
361 365
 				<dl class="settings">';
366
+			}
362 367
 
363 368
 			// Should we give a name to this section?
364 369
 			if (is_string($setting) && !empty($setting))
@@ -367,9 +372,9 @@  discard block
 block discarded – undo
367 372
 				echo '
368 373
 					<dt><strong>' . $setting . '</strong></dt>
369 374
 					<dd></dd>';
375
+			} else {
376
+							$titled_section = false;
370 377
 			}
371
-			else
372
-				$titled_section = false;
373 378
 
374 379
 			continue;
375 380
 		}
@@ -378,8 +383,8 @@  discard block
 block discarded – undo
378 383
 					<dt>';
379 384
 
380 385
 		// Show the change option box?
381
-		if ($context['theme_options_reset'])
382
-			echo '
386
+		if ($context['theme_options_reset']) {
387
+					echo '
383 388
 						<span class="floatleft">
384 389
 							<select name="', !empty($setting['default']) ? 'default_' : '', 'options_master[', $setting['id'], ']" onchange="this.form.options_', $setting['id'], '.disabled = this.selectedIndex != 1;">
385 390
 								<option value="0" selected>', $txt['themeadmin_reset_options_none'], '</option>
@@ -387,23 +392,26 @@  discard block
 block discarded – undo
387 392
 								<option value="2">', $txt['themeadmin_reset_options_default'], '</option>
388 393
 							</select>
389 394
 						</span>';
395
+		}
390 396
 
391 397
 		echo '
392 398
 						<label for="options_', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>';
393 399
 
394
-		if (isset($setting['description']))
395
-			echo '
400
+		if (isset($setting['description'])) {
401
+					echo '
396 402
 						<br>
397 403
 						<span class="smalltext">', $setting['description'], '</span>';
404
+		}
398 405
 		echo '
399 406
 					</dt>';
400 407
 
401 408
 		// Display checkbox options
402
-		if ($setting['type'] == 'checkbox')
403
-			echo '
409
+		if ($setting['type'] == 'checkbox') {
410
+					echo '
404 411
 					<dd>
405 412
 						<input type="hidden" name="' . (!empty($setting['default']) ? 'default_' : '') . 'options[' . $setting['id'] . ']" value="0">
406 413
 						<input type="checkbox" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '"', !empty($setting['value']) ? ' checked' : '', $context['theme_options_reset'] ? ' disabled' : '', ' value="1" class="floatleft">';
414
+		}
407 415
 
408 416
 		// How about selection lists, we all love them
409 417
 		elseif ($setting['type'] == 'list')
@@ -412,9 +420,10 @@  discard block
 block discarded – undo
412 420
 					<dd>
413 421
 						<select class="floatleft" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '"', $context['theme_options_reset'] ? ' disabled' : '', '>';
414 422
 
415
-			foreach ($setting['options'] as $value => $label)
416
-				echo '
423
+			foreach ($setting['options'] as $value => $label) {
424
+							echo '
417 425
 							<option value="', $value, '"', $value == $setting['value'] ? ' selected' : '', '>', $label, '</option>';
426
+			}
418 427
 
419 428
 			echo '
420 429
 						</select>';
@@ -433,14 +442,13 @@  discard block
 block discarded – undo
433 442
 
434 443
 				echo '
435 444
 						<input type="number"', $min . $max . $step;
436
-			}
437
-			elseif (isset($setting['type']) && $setting['type'] == 'url')
438
-				echo'
445
+			} elseif (isset($setting['type']) && $setting['type'] == 'url') {
446
+							echo'
439 447
 						<input type="url"';
440
-
441
-			else
442
-				echo '
448
+			} else {
449
+							echo '
443 450
 						<input type="text"';
451
+			}
444 452
 
445 453
 			echo ' name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '" value="', $setting['value'], '"', $setting['type'] == 'number' ? ' size="5"' : '', $context['theme_options_reset'] ? ' disabled' : '', '>';
446 454
 		}
@@ -479,8 +487,8 @@  discard block
 block discarded – undo
479 487
 			<br>';
480 488
 
481 489
 	// @todo Why can't I edit the default theme popup.
482
-	if ($context['theme_settings']['theme_id'] != 1)
483
-		echo '
490
+	if ($context['theme_settings']['theme_id'] != 1) {
491
+			echo '
484 492
 			<div class="cat_bar">
485 493
 				<h3 class="catbg config_hd">
486 494
 					', $txt['theme_edit'], '
@@ -496,6 +504,7 @@  discard block
 block discarded – undo
496 504
 					</li>
497 505
 				</ul>
498 506
 			</div>';
507
+	}
499 508
 
500 509
 	echo '
501 510
 			<div class="cat_bar">
@@ -549,9 +558,10 @@  discard block
 block discarded – undo
549 558
 					<dd>
550 559
 						<select id="variant" name="options[default_variant]" onchange="changeVariant(this.value)">';
551 560
 
552
-		foreach ($context['theme_variants'] as $key => $variant)
553
-			echo '
561
+		foreach ($context['theme_variants'] as $key => $variant) {
562
+					echo '
554 563
 							<option value="', $key, '"', $context['default_variant'] == $key ? ' selected' : '', '>', $variant['label'], '</option>';
564
+		}
555 565
 
556 566
 		echo '
557 567
 						</select>
@@ -587,11 +597,12 @@  discard block
 block discarded – undo
587 597
 		if (empty($setting) || !is_array($setting))
588 598
 		{
589 599
 			// We don't need a separator before the first list element
590
-			if ($i !== $first_setting_key)
591
-				echo '
600
+			if ($i !== $first_setting_key) {
601
+							echo '
592 602
 				</dl>
593 603
 				<hr>
594 604
 				<dl class="settings">';
605
+			}
595 606
 
596 607
 			// Add a fake heading?
597 608
 			if (is_string($setting) && !empty($setting))
@@ -600,9 +611,9 @@  discard block
 block discarded – undo
600 611
 				echo '
601 612
 					<dt><strong>' . $setting . '</strong></dt>
602 613
 					<dd></dd>';
614
+			} else {
615
+							$titled_section = false;
603 616
 			}
604
-			else
605
-				$titled_section = false;
606 617
 
607 618
 			continue;
608 619
 		}
@@ -611,20 +622,22 @@  discard block
 block discarded – undo
611 622
 					<dt>
612 623
 						<label for="', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>:';
613 624
 
614
-		if (isset($setting['description']))
615
-			echo '<br>
625
+		if (isset($setting['description'])) {
626
+					echo '<br>
616 627
 						<span class="smalltext">', $setting['description'], '</span>';
628
+		}
617 629
 
618 630
 		echo '
619 631
 					</dt>';
620 632
 
621 633
 		// A checkbox?
622
-		if ($setting['type'] == 'checkbox')
623
-			echo '
634
+		if ($setting['type'] == 'checkbox') {
635
+					echo '
624 636
 					<dd>
625 637
 						<input type="hidden" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" value="0">
626 638
 						<input type="checkbox" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="', $setting['id'], '"', !empty($setting['value']) ? ' checked' : '', ' value="1">
627 639
 					</dd>';
640
+		}
628 641
 
629 642
 		// A list with options?
630 643
 		elseif ($setting['type'] == 'list')
@@ -633,9 +646,10 @@  discard block
 block discarded – undo
633 646
 					<dd>
634 647
 						<select name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="', $setting['id'], '">';
635 648
 
636
-			foreach ($setting['options'] as $value => $label)
637
-				echo '
649
+			foreach ($setting['options'] as $value => $label) {
650
+							echo '
638 651
 							<option value="', $value, '"', $value == $setting['value'] ? ' selected' : '', '>', $label, '</option>';
652
+			}
639 653
 
640 654
 			echo '
641 655
 						</select>
@@ -663,14 +677,13 @@  discard block
 block discarded – undo
663 677
 
664 678
 				echo '
665 679
 						<input type="number"', $min . $max . $step;
666
-			}
667
-			elseif (isset($setting['type']) && $setting['type'] == 'url')
668
-				echo'
680
+			} elseif (isset($setting['type']) && $setting['type'] == 'url') {
681
+							echo'
669 682
 						<input type="url"';
670
-
671
-			else
672
-				echo '
683
+			} else {
684
+							echo '
673 685
 						<input type="text"';
686
+			}
674 687
 
675 688
 			echo ' name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '" value="', $setting['value'], '"', $setting['type'] == 'number' ? ' size="5"' : (empty($settings['size']) ? ' size="40"' : ' size="' . $setting['size'] . '"'), '>
676 689
 					</dd>';
@@ -742,9 +755,10 @@  discard block
 block discarded – undo
742 755
 					<label for="variant', $theme['id'], '"><strong>', $theme['pick_label'], '</strong></label>:
743 756
 					<select id="variant', $theme['id'], '" name="vrt[', $theme['id'], ']" onchange="changeVariant', $theme['id'], '(this.value);">';
744 757
 
745
-			foreach ($theme['variants'] as $key => $variant)
746
-				echo '
758
+			foreach ($theme['variants'] as $key => $variant) {
759
+							echo '
747 760
 						<option value="', $key, '"', $theme['selected_variant'] == $key ? ' selected' : '', '>', $variant['label'], '</option>';
761
+			}
748 762
 
749 763
 			echo '
750 764
 					</select>
@@ -822,21 +836,23 @@  discard block
 block discarded – undo
822 836
 		<div class="windowbg">';
823 837
 
824 838
 	// Oops! there was an error :(
825
-	if (!empty($context['error_message']))
826
-		echo '
839
+	if (!empty($context['error_message'])) {
840
+			echo '
827 841
 			<p>
828 842
 				', $context['error_message'], '
829 843
 			</p>';
844
+	}
830 845
 
831 846
 	// Not much to show except a link back...
832
-	else
833
-		echo '
847
+	else {
848
+			echo '
834 849
 			<p>
835 850
 				<a href="', $scripturl, '?action=admin;area=theme;sa=list;th=', $context['installed_theme']['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $context['installed_theme']['name'], '</a> ', $txt['theme_' . (isset($context['installed_theme']['updated']) ? 'updated' : 'installed') . '_message'], '
836 851
 			</p>
837 852
 			<p>
838 853
 				<a href="', $scripturl, '?action=admin;area=theme;sa=admin;', $context['session_var'], '=', $context['session_id'], '">', $txt['back'], '</a>
839 854
 			</p>';
855
+	}
840 856
 
841 857
 	echo '
842 858
 		</div><!-- .windowbg -->
@@ -903,11 +919,12 @@  discard block
 block discarded – undo
903 919
 					<span class="floatleft">', $template['filename'], $template['already_exists'] ? ' <span class="error">(' . $txt['themeadmin_edit_exists'] . ')</span>' : '', '</span>
904 920
 					<span class="floatright">';
905 921
 
906
-		if ($template['can_copy'])
907
-			echo '
922
+		if ($template['can_copy']) {
923
+					echo '
908 924
 						<a href="', $scripturl, '?action=admin;area=theme;th=', $context['theme_id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=copy;template=', $template['value'], '" data-confirm="', $template['already_exists'] ? $txt['themeadmin_edit_overwrite_confirm'] : $txt['themeadmin_edit_copy_confirm'], '" class="you_sure">', $txt['themeadmin_edit_do_copy'], '</a>';
909
-		else
910
-			echo $txt['themeadmin_edit_no_copy'];
925
+		} else {
926
+					echo $txt['themeadmin_edit_no_copy'];
927
+		}
911 928
 
912 929
 		echo '
913 930
 					</span>
@@ -930,11 +947,12 @@  discard block
 block discarded – undo
930 947
 	echo '
931 948
 	<div id="admincenter">';
932 949
 
933
-	if (!empty($context['browse_title']))
934
-		echo '
950
+	if (!empty($context['browse_title'])) {
951
+			echo '
935 952
 		<div class="cat_bar">
936 953
 			<h3 class="catbg">', $context['browse_title'], '</h3>
937 954
 		</div>';
955
+	}
938 956
 
939 957
 	echo '
940 958
 		<table class="table_grid tborder">
@@ -954,16 +972,15 @@  discard block
 block discarded – undo
954 972
 				<tr class="windowbg">
955 973
 					<td>';
956 974
 
957
-		if ($file['is_editable'])
958
-			echo '
975
+		if ($file['is_editable']) {
976
+					echo '
959 977
 						<a href="', $file['href'], '"', $file['is_template'] ? ' style="font-weight: bold;"' : '', '>', $file['filename'], '</a>';
960
-
961
-		elseif ($file['is_directory'])
962
-			echo '
978
+		} elseif ($file['is_directory']) {
979
+					echo '
963 980
 						<a href="', $file['href'], '" class="is_directory"><span class="generic_icons folder"></span>', $file['filename'], '</a>';
964
-
965
-		else
966
-			echo $file['filename'];
981
+		} else {
982
+					echo $file['filename'];
983
+		}
967 984
 
968 985
 		echo '
969 986
 					</td>
@@ -985,11 +1002,12 @@  discard block
 block discarded – undo
985 1002
 {
986 1003
 	global $context, $settings, $scripturl, $txt;
987 1004
 
988
-	if ($context['session_error'])
989
-		echo '
1005
+	if ($context['session_error']) {
1006
+			echo '
990 1007
 	<div class="errorbox">
991 1008
 		', $txt['error_session_timeout'], '
992 1009
 	</div>';
1010
+	}
993 1011
 
994 1012
 	// From now on no one can complain that editing css is difficult. If you disagree, go to www.w3schools.com.
995 1013
 	echo '
@@ -1053,17 +1071,18 @@  discard block
 block discarded – undo
1053 1071
 					{
1054 1072
 					';
1055 1073
 
1056
-	if (isBrowser('is_ie'))
1057
-		echo '
1074
+	if (isBrowser('is_ie')) {
1075
+			echo '
1058 1076
 						var sheets = frames["css_preview_box"].document.styleSheets;
1059 1077
 						for (var j = 0; j < sheets.length; j++)
1060 1078
 						{
1061 1079
 							if (sheets[j].id == "css_preview_box")
1062 1080
 								sheets[j].cssText = document.forms.stylesheetForm.entire_file.value;
1063 1081
 						}';
1064
-	else
1065
-		echo '
1082
+	} else {
1083
+			echo '
1066 1084
 						setInnerHTML(frames["css_preview_box"].document.getElementById("css_preview_sheet"), document.forms.stylesheetForm.entire_file.value);';
1085
+	}
1067 1086
 	echo '
1068 1087
 					}
1069 1088
 					catch (e)
@@ -1115,9 +1134,10 @@  discard block
 block discarded – undo
1115 1134
 			</div>
1116 1135
 			<div class="windowbg">';
1117 1136
 
1118
-	if (!$context['allow_save'])
1119
-		echo '
1137
+	if (!$context['allow_save']) {
1138
+			echo '
1120 1139
 				', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '<br>';
1140
+	}
1121 1141
 
1122 1142
 	echo '
1123 1143
 				<textarea class="edit_file" name="entire_file" cols="80" rows="20" onkeyup="setPreviewTimeout();" onchange="refreshPreview(true);">', $context['entire_file'], '</textarea>
@@ -1131,9 +1151,10 @@  discard block
 block discarded – undo
1131 1151
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
1132 1152
 
1133 1153
 	// Hopefully it exists.
1134
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
1135
-		echo '
1154
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
1155
+			echo '
1136 1156
 			<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
1157
+	}
1137 1158
 
1138 1159
 	echo '
1139 1160
 		</form>
@@ -1147,18 +1168,20 @@  discard block
 block discarded – undo
1147 1168
 {
1148 1169
 	global $context, $scripturl, $txt;
1149 1170
 
1150
-	if ($context['session_error'])
1151
-		echo '
1171
+	if ($context['session_error']) {
1172
+			echo '
1152 1173
 	<div class="errorbox">
1153 1174
 		', $txt['error_session_timeout'], '
1154 1175
 	</div>';
1176
+	}
1155 1177
 
1156
-	if (isset($context['parse_error']))
1157
-		echo '
1178
+	if (isset($context['parse_error'])) {
1179
+			echo '
1158 1180
 	<div class="errorbox">
1159 1181
 		', $txt['themeadmin_edit_error'], '
1160 1182
 		<div><pre>', $context['parse_error'], '</pre></div>
1161 1183
 	</div>';
1184
+	}
1162 1185
 
1163 1186
 	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
1164 1187
 	echo '
@@ -1169,16 +1192,18 @@  discard block
 block discarded – undo
1169 1192
 			</div>
1170 1193
 			<div class="windowbg">';
1171 1194
 
1172
-	if (!$context['allow_save'])
1173
-		echo '
1195
+	if (!$context['allow_save']) {
1196
+			echo '
1174 1197
 				', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '<br>';
1198
+	}
1175 1199
 
1176
-	foreach ($context['file_parts'] as $part)
1177
-		echo '
1200
+	foreach ($context['file_parts'] as $part) {
1201
+			echo '
1178 1202
 				<label for="on_line', $part['line'], '">', $txt['themeadmin_edit_on_line'], ' ', $part['line'], '</label>:<br>
1179 1203
 				<div class="centertext">
1180 1204
 					<textarea id="on_line', $part['line'], '" name="entire_file[]" cols="80" rows="', $part['lines'] > 14 ? '14' : $part['lines'], '" class="edit_file">', $part['data'], '</textarea>
1181 1205
 				</div>';
1206
+	}
1182 1207
 
1183 1208
 	echo '
1184 1209
 				<div class="padding righttext">
@@ -1187,9 +1212,10 @@  discard block
 block discarded – undo
1187 1212
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
1188 1213
 
1189 1214
 	// Hopefully it exists.
1190
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
1191
-		echo '
1215
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
1216
+			echo '
1192 1217
 					<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
1218
+	}
1193 1219
 
1194 1220
 	echo '
1195 1221
 				</div><!-- .righttext -->
@@ -1205,18 +1231,20 @@  discard block
 block discarded – undo
1205 1231
 {
1206 1232
 	global $context, $scripturl, $txt;
1207 1233
 
1208
-	if ($context['session_error'])
1209
-		echo '
1234
+	if ($context['session_error']) {
1235
+			echo '
1210 1236
 	<div class="errorbox">
1211 1237
 		', $txt['error_session_timeout'], '
1212 1238
 	</div>';
1239
+	}
1213 1240
 
1214 1241
 	// Is this file writeable?
1215
-	if (!$context['allow_save'])
1216
-		echo '
1242
+	if (!$context['allow_save']) {
1243
+			echo '
1217 1244
 	<div class="errorbox">
1218 1245
 		', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '
1219 1246
 	</div>';
1247
+	}
1220 1248
 
1221 1249
 	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
1222 1250
 	echo '
@@ -1232,9 +1260,10 @@  discard block
 block discarded – undo
1232 1260
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
1233 1261
 
1234 1262
 	// Hopefully it exists.
1235
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
1236
-		echo '
1263
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
1264
+			echo '
1237 1265
 				<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
1266
+	}
1238 1267
 
1239 1268
 	echo '
1240 1269
 			</div><!-- .windowbg -->
Please login to merge, or discard this patch.
Themes/default/GenericMenu.template.php 1 patch
Braces   +54 added lines, -39 removed lines patch added patch discarded remove patch
@@ -89,16 +89,18 @@  discard block
 block discarded – undo
89 89
 		foreach ($section['areas'] as $i => $area)
90 90
 		{
91 91
 			// Not supposed to be printed?
92
-			if (empty($area['label']))
93
-				continue;
92
+			if (empty($area['label'])) {
93
+							continue;
94
+			}
94 95
 
95 96
 			echo '
96 97
 								<li', !empty($area['subsections']) ? ' class="subsections"' : '', '>
97 98
 									<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>';
98 99
 
99 100
 			// Is this the current area, or just some area?
100
-			if (!empty($area['selected']) && empty($context['tabs']))
101
-					$context['tabs'] = isset($area['subsections']) ? $area['subsections'] : array();
101
+			if (!empty($area['selected']) && empty($context['tabs'])) {
102
+								$context['tabs'] = isset($area['subsections']) ? $area['subsections'] : array();
103
+			}
102 104
 
103 105
 			// Are there any subsections?
104 106
 			if (!empty($area['subsections']))
@@ -108,8 +110,9 @@  discard block
 block discarded – undo
108 110
 
109 111
 				foreach ($area['subsections'] as $sa => $sub)
110 112
 				{
111
-					if (!empty($sub['disabled']))
112
-						continue;
113
+					if (!empty($sub['disabled'])) {
114
+											continue;
115
+					}
113 116
 
114 117
 					$url = isset($sub['url']) ? $sub['url'] : (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i) . ';sa=' . $sa;
115 118
 
@@ -156,8 +159,9 @@  discard block
 block discarded – undo
156 159
 							<h3 class="catbg">';
157 160
 
158 161
 		// The function is in Admin.template.php, but since this template is used elsewhere too better check if the function is available
159
-		if (function_exists('template_admin_quick_search'))
160
-			template_admin_quick_search();
162
+		if (function_exists('template_admin_quick_search')) {
163
+					template_admin_quick_search();
164
+		}
161 165
 
162 166
 		// Exactly how many tabs do we have?
163 167
 		if (!empty($context['tabs']))
@@ -172,30 +176,36 @@  discard block
 block discarded – undo
172 176
 				}
173 177
 
174 178
 				// Did this not even exist - or do we not have a label?
175
-				if (!isset($tab_context['tabs'][$id]))
176
-					$tab_context['tabs'][$id] = array('label' => $tab['label']);
177
-				elseif (!isset($tab_context['tabs'][$id]['label']))
178
-					$tab_context['tabs'][$id]['label'] = $tab['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
+				}
179 184
 
180 185
 				// Has a custom URL defined in the main admin structure?
181
-				if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url']))
182
-					$tab_context['tabs'][$id]['url'] = $tab['url'];
186
+				if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url'])) {
187
+									$tab_context['tabs'][$id]['url'] = $tab['url'];
188
+				}
183 189
 
184 190
 				// Any additional paramaters for the url?
185
-				if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params']))
186
-					$tab_context['tabs'][$id]['add_params'] = $tab['add_params'];
191
+				if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params'])) {
192
+									$tab_context['tabs'][$id]['add_params'] = $tab['add_params'];
193
+				}
187 194
 
188 195
 				// Has it been deemed selected?
189
-				if (!empty($tab['is_selected']))
190
-					$tab_context['tabs'][$id]['is_selected'] = true;
196
+				if (!empty($tab['is_selected'])) {
197
+									$tab_context['tabs'][$id]['is_selected'] = true;
198
+				}
191 199
 
192 200
 				// Does it have its own help?
193
-				if (!empty($tab['help']))
194
-					$tab_context['tabs'][$id]['help'] = $tab['help'];
201
+				if (!empty($tab['help'])) {
202
+									$tab_context['tabs'][$id]['help'] = $tab['help'];
203
+				}
195 204
 
196 205
 				// Is this the last one?
197
-				if (!empty($tab['is_last']) && !isset($tab_context['override_last']))
198
-					$tab_context['tabs'][$id]['is_last'] = true;
206
+				if (!empty($tab['is_last']) && !isset($tab_context['override_last'])) {
207
+									$tab_context['tabs'][$id]['is_last'] = true;
208
+				}
199 209
 			}
200 210
 
201 211
 			// Find the selected tab
@@ -212,22 +222,24 @@  discard block
 block discarded – undo
212 222
 		// Show an icon and/or a help item?
213 223
 		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']))
214 224
 		{
215
-			if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class']))
216
-				echo '
225
+			if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class'])) {
226
+							echo '
217 227
 								<span class="', !empty($selected_tab['icon_class']) ? $selected_tab['icon_class'] : $tab_context['icon_class'], ' icon"></span>';
218
-			elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon']))
219
-				echo '
228
+			} elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon'])) {
229
+							echo '
220 230
 								<img src="', $settings['images_url'], '/icons/', !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'], '" alt="" class="icon">';
231
+			}
221 232
 
222
-			if (!empty($selected_tab['help']) || !empty($tab_context['help']))
223
-				echo '
233
+			if (!empty($selected_tab['help']) || !empty($tab_context['help'])) {
234
+							echo '
224 235
 								<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>';
236
+			}
225 237
 
226 238
 			echo $tab_context['title'];
227
-		}
228
-		else
229
-			echo '
239
+		} else {
240
+					echo '
230 241
 								', $tab_context['title'];
242
+		}
231 243
 
232 244
 		echo '
233 245
 							</h3>', (function_exists('template_admin_quick_search') ? '
@@ -236,11 +248,12 @@  discard block
 block discarded – undo
236 248
 	}
237 249
 
238 250
 	// Shall we use the tabs? Yes, it's the only known way!
239
-	if (!empty($selected_tab['description']) || !empty($tab_context['description']))
240
-		echo '
251
+	if (!empty($selected_tab['description']) || !empty($tab_context['description'])) {
252
+			echo '
241 253
 					<p class="information">
242 254
 						', !empty($selected_tab['description']) ? $selected_tab['description'] : $tab_context['description'], '
243 255
 					</p>';
256
+	}
244 257
 
245 258
 	// Print out all the items in this tab (if any).
246 259
 	if (!empty($context['tabs']))
@@ -252,19 +265,21 @@  discard block
 block discarded – undo
252 265
 
253 266
 		foreach ($tab_context['tabs'] as $sa => $tab)
254 267
 		{
255
-			if (!empty($tab['disabled']))
256
-				continue;
268
+			if (!empty($tab['disabled'])) {
269
+							continue;
270
+			}
257 271
 
258
-			if (!empty($tab['is_selected']))
259
-				echo '
272
+			if (!empty($tab['is_selected'])) {
273
+							echo '
260 274
 							<li>
261 275
 								<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>
262 276
 							</li>';
263
-			else
264
-				echo '
277
+			} else {
278
+							echo '
265 279
 							<li>
266 280
 								<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>
267 281
 							</li>';
282
+			}
268 283
 		}
269 284
 
270 285
 		// The end of tabs
Please login to merge, or discard this patch.
Themes/default/Reports.template.php 1 patch
Braces   +32 added lines, -24 removed lines patch added patch discarded remove patch
@@ -29,9 +29,10 @@  discard block
 block discarded – undo
29 29
 	// Go through each type of report they can run.
30 30
 	foreach ($context['report_types'] as $type)
31 31
 	{
32
-		if (isset($type['description']))
33
-			echo '
32
+		if (isset($type['description'])) {
33
+					echo '
34 34
 					<dt>', $type['description'], '</dt>';
35
+		}
35 36
 
36 37
 		echo '
37 38
 					<dd>
@@ -62,8 +63,9 @@  discard block
 block discarded – undo
62 63
 		</div>
63 64
 		<div id="report_buttons">';
64 65
 
65
-	if (!empty($context['report_buttons']))
66
-		template_button_strip($context['report_buttons'], 'right');
66
+	if (!empty($context['report_buttons'])) {
67
+			template_button_strip($context['report_buttons'], 'right');
68
+	}
67 69
 
68 70
 	echo '
69 71
 		</div>';
@@ -74,25 +76,27 @@  discard block
 block discarded – undo
74 76
 		echo '
75 77
 		<table class="table_grid report_results">';
76 78
 
77
-		if (!empty($table['title']))
78
-			echo '
79
+		if (!empty($table['title'])) {
80
+					echo '
79 81
 			<thead>
80 82
 				<tr class="title_bar">
81 83
 					<th scope="col" colspan="', $table['column_count'], '">', $table['title'], '</th>
82 84
 				</tr>
83 85
 			</thead>
84 86
 			<tbody>';
87
+		}
85 88
 
86 89
 		// Now do each row!
87 90
 		$row_number = 0;
88 91
 		foreach ($table['data'] as $row)
89 92
 		{
90
-			if ($row_number == 0 && !empty($table['shading']['top']))
91
-				echo '
93
+			if ($row_number == 0 && !empty($table['shading']['top'])) {
94
+							echo '
92 95
 				<tr class="windowbg table_caption">';
93
-			else
94
-				echo '
96
+			} else {
97
+							echo '
95 98
 				<tr class="', !empty($row[0]['separator']) ? 'title_bar' : 'windowbg', '">';
99
+			}
96 100
 
97 101
 			// Now do each column.
98 102
 			$column_number = 0;
@@ -110,16 +114,17 @@  discard block
 block discarded – undo
110 114
 				}
111 115
 
112 116
 				// Shaded?
113
-				if ($column_number == 0 && !empty($table['shading']['left']))
114
-					echo '
117
+				if ($column_number == 0 && !empty($table['shading']['left'])) {
118
+									echo '
115 119
 					<td class="table_caption ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
116 120
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
117 121
 					</td>';
118
-				else
119
-					echo '
122
+				} else {
123
+									echo '
120 124
 					<td class="smalltext centertext" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
121 125
 						', $data['v'], '
122 126
 					</td>';
127
+				}
123 128
 
124 129
 				$column_number++;
125 130
 			}
@@ -168,24 +173,26 @@  discard block
 block discarded – undo
168 173
 		<div style="overflow: visible;', $table['max_width'] != 'auto' ? ' width: ' . $table['max_width'] . 'px;' : '', '">
169 174
 			<table class="bordercolor">';
170 175
 
171
-		if (!empty($table['title']))
172
-			echo '
176
+		if (!empty($table['title'])) {
177
+					echo '
173 178
 				<tr class="title_bar">
174 179
 					<td colspan="', $table['column_count'], '">
175 180
 						', $table['title'], '
176 181
 					</td>
177 182
 				</tr>';
183
+		}
178 184
 
179 185
 		// Now do each row!
180 186
 		$row_number = 0;
181 187
 		foreach ($table['data'] as $row)
182 188
 		{
183
-			if ($row_number == 0 && !empty($table['shading']['top']))
184
-				echo '
189
+			if ($row_number == 0 && !empty($table['shading']['top'])) {
190
+							echo '
185 191
 				<tr class="titlebg">';
186
-			else
187
-				echo '
192
+			} else {
193
+							echo '
188 194
 				<tr class="windowbg">';
195
+			}
189 196
 
190 197
 			// Now do each column!!
191 198
 			$column_number = 0;
@@ -202,16 +209,17 @@  discard block
 block discarded – undo
202 209
 				}
203 210
 
204 211
 				// Shaded?
205
-				if ($column_number == 0 && !empty($table['shading']['left']))
206
-					echo '
212
+				if ($column_number == 0 && !empty($table['shading']['left'])) {
213
+									echo '
207 214
 					<td class="titlebg ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
208 215
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
209 216
 					</td>';
210
-				else
211
-					echo '
217
+				} else {
218
+									echo '
212 219
 					<td class="centertext" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
213 220
 						', $data['v'], '
214 221
 					</td>';
222
+				}
215 223
 
216 224
 				$column_number++;
217 225
 			}
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,11 +216,12 @@  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>';
224
+		}
222 225
 	}
223 226
 
224 227
 	echo '
Please login to merge, or discard this patch.
Themes/default/ManagePermissions.template.php 1 patch
Braces   +170 added lines, -128 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'] . '">', '<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>
@@ -141,10 +146,11 @@  discard block
 block discarded – undo
141 146
 							<select name="copy_from">
142 147
 								<option value="empty">(', $txt['permissions_select_membergroup'], ')</option>';
143 148
 
144
-		foreach ($context['groups'] as $group)
145
-			if ($group['id'] != 1)
149
+		foreach ($context['groups'] as $group) {
150
+					if ($group['id'] != 1)
146 151
 				echo '
147 152
 								<option value="', $group['id'], '">', $group['name'], '</option>';
153
+		}
148 154
 
149 155
 		echo '
150 156
 							</select>
@@ -154,9 +160,10 @@  discard block
 block discarded – undo
154 160
 								<option value="add">', $txt['permissions_add'], '...</option>
155 161
 								<option value="clear">', $txt['permissions_remove'], '...</option>';
156 162
 
157
-		if (!empty($modSettings['permission_enable_deny']))
158
-			echo '
163
+		if (!empty($modSettings['permission_enable_deny'])) {
164
+					echo '
159 165
 								<option value="deny">', $txt['permissions_deny'], '...</option>';
166
+		}
160 167
 
161 168
 		echo '
162 169
 							</select>
@@ -167,31 +174,35 @@  discard block
 block discarded – undo
167 174
 
168 175
 		foreach ($context['permissions'] as $permissionType)
169 176
 		{
170
-			if ($permissionType['id'] == 'membergroup' && !empty($context['profile']))
171
-				continue;
177
+			if ($permissionType['id'] == 'membergroup' && !empty($context['profile'])) {
178
+							continue;
179
+			}
172 180
 
173 181
 			foreach ($permissionType['columns'] as $column)
174 182
 			{
175 183
 				foreach ($column as $permissionGroup)
176 184
 				{
177
-					if ($permissionGroup['hidden'])
178
-						continue;
185
+					if ($permissionGroup['hidden']) {
186
+											continue;
187
+					}
179 188
 
180 189
 					echo '
181 190
 								<option value="" disabled>[', $permissionGroup['name'], ']</option>';
182 191
 
183 192
 					foreach ($permissionGroup['permissions'] as $perm)
184 193
 					{
185
-						if ($perm['hidden'])
186
-							continue;
194
+						if ($perm['hidden']) {
195
+													continue;
196
+						}
187 197
 
188
-						if ($perm['has_own_any'])
189
-							echo '
198
+						if ($perm['has_own_any']) {
199
+													echo '
190 200
 								<option value="', $permissionType['id'], '/', $perm['own']['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], ' (', $perm['own']['name'], ')</option>
191 201
 								<option value="', $permissionType['id'], '/', $perm['any']['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], ' (', $perm['any']['name'], ')</option>';
192
-						else
193
-							echo '
202
+						} else {
203
+													echo '
194 204
 								<option value="', $permissionType['id'], '/', $perm['id'], '">&nbsp;&nbsp;&nbsp;', $perm['name'], '</option>';
205
+						}
195 206
 					}
196 207
 				}
197 208
 			}
@@ -256,9 +267,10 @@  discard block
 block discarded – undo
256 267
 				}
257 268
 			</script>';
258 269
 
259
-		if (!empty($context['profile']))
260
-			echo '
270
+		if (!empty($context['profile'])) {
271
+					echo '
261 272
 			<input type="hidden" name="pid" value="', $context['profile']['id'], '">';
273
+		}
262 274
 
263 275
 		echo '
264 276
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -303,9 +315,10 @@  discard block
 block discarded – undo
303 315
 					<h3 class="subbg">', $category['name'], '</h3>
304 316
 				</div>';
305 317
 
306
-		if (!empty($category['boards']))
307
-			echo '
318
+		if (!empty($category['boards'])) {
319
+					echo '
308 320
 				<ul class="perm_boards flow_hidden">';
321
+		}
309 322
 
310 323
 		foreach ($category['boards'] as $board)
311 324
 		{
@@ -321,33 +334,36 @@  discard block
 block discarded – undo
321 334
 				echo '
322 335
 							<select name="boardprofile[', $board['id'], ']">';
323 336
 
324
-				foreach ($context['profiles'] as $id => $profile)
325
-					echo '
337
+				foreach ($context['profiles'] as $id => $profile) {
338
+									echo '
326 339
 								<option value="', $id, '"', $id == $board['profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
340
+				}
327 341
 
328 342
 				echo '
329 343
 							</select>';
330
-			}
331
-			else
332
-				echo '
344
+			} else {
345
+							echo '
333 346
 							<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $board['profile'], ';', $context['session_var'], '=', $context['session_id'], '">', $board['profile_name'], '</a>';
347
+			}
334 348
 
335 349
 			echo '
336 350
 						</span>
337 351
 					</li>';
338 352
 		}
339 353
 
340
-		if (!empty($category['boards']))
341
-			echo '
354
+		if (!empty($category['boards'])) {
355
+					echo '
342 356
 				</ul>';
357
+		}
343 358
 	}
344 359
 
345
-	if ($context['edit_all'])
346
-		echo '
360
+	if ($context['edit_all']) {
361
+			echo '
347 362
 				<input type="submit" name="save_changes" value="', $txt['save'], '" class="button">';
348
-	else
349
-		echo '
363
+	} else {
364
+			echo '
350 365
 				<a class="button" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a>';
366
+	}
351 367
 
352 368
 	echo '
353 369
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -387,12 +403,13 @@  discard block
 block discarded – undo
387 403
 					<tr class="windowbg">
388 404
 						<td>';
389 405
 
390
-		if (!empty($context['show_rename_boxes']) && $profile['can_edit'])
391
-			echo '
406
+		if (!empty($context['show_rename_boxes']) && $profile['can_edit']) {
407
+					echo '
392 408
 							<input type="text" name="rename_profile[', $profile['id'], ']" value="', $profile['name'], '">';
393
-		else
394
-			echo '
409
+		} else {
410
+					echo '
395 411
 							<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $profile['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $profile['name'], '</a>';
412
+		}
396 413
 
397 414
 		echo '
398 415
 						</td>
@@ -412,9 +429,10 @@  discard block
 block discarded – undo
412 429
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
413 430
 				<input type="hidden" name="', $context['admin-mpp_token_var'], '" value="', $context['admin-mpp_token'], '">';
414 431
 
415
-	if ($context['can_edit_something'])
416
-		echo '
432
+	if ($context['can_edit_something']) {
433
+			echo '
417 434
 				<input type="submit" name="rename" value="', empty($context['show_rename_boxes']) ? $txt['permissions_profile_rename'] : $txt['permissions_commit'], '" class="button">';
435
+	}
418 436
 
419 437
 	echo '
420 438
 				<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" class="button" ', !empty($context['show_rename_boxes']) ? ' style="display:none"' : '', '>
@@ -439,9 +457,10 @@  discard block
 block discarded – undo
439 457
 					<dd>
440 458
 						<select name="copy_from">';
441 459
 
442
-	foreach ($context['profiles'] as $id => $profile)
443
-		echo '
460
+	foreach ($context['profiles'] as $id => $profile) {
461
+			echo '
444 462
 							<option value="', $id, '">', $profile['name'], '</option>';
463
+	}
445 464
 
446 465
 	echo '
447 466
 						</select>
@@ -463,13 +482,13 @@  discard block
 block discarded – undo
463 482
 	global $context, $scripturl, $txt, $modSettings;
464 483
 
465 484
 	// Cannot be edited?
466
-	if (!$context['profile']['can_modify'])
467
-		echo '
485
+	if (!$context['profile']['can_modify']) {
486
+			echo '
468 487
 	<div class="errorbox">
469 488
 		', sprintf($txt['permission_cannot_edit'], $scripturl . '?action=admin;area=permissions;sa=profiles'), '
470 489
 	</div>';
471
-	else
472
-		echo '
490
+	} else {
491
+			echo '
473 492
 	<script>
474 493
 		window.smf_usedDeny = false;
475 494
 
@@ -481,27 +500,30 @@  discard block
 block discarded – undo
481 500
 				return true;
482 501
 		}
483 502
 	</script>';
503
+	}
484 504
 
485 505
 	echo '
486 506
 	<div id="admincenter">
487 507
 		<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();">';
488 508
 
489
-	if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1)
490
-		echo '
509
+	if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1) {
510
+			echo '
491 511
 			<div class="information">
492 512
 				', $txt['permissions_option_desc'], '
493 513
 			</div>';
514
+	}
494 515
 
495 516
 	echo '
496 517
 			<div class="cat_bar">
497 518
 				<h3 class="catbg">';
498 519
 
499
-	if ($context['permission_type'] == 'board')
500
-		echo '
520
+	if ($context['permission_type'] == 'board') {
521
+			echo '
501 522
 				', $txt['permissions_local_for'], ' &quot;', $context['group']['name'], '&quot; ', $txt['permissions_on'], ' &quot;', $context['profile']['name'], '&quot;';
502
-	else
503
-		echo '
523
+	} else {
524
+			echo '
504 525
 				', $context['permission_type'] == 'membergroup' ? $txt['permissions_general'] : $txt['permissions_board'], ' - &quot;', $context['group']['name'], '&quot;';
526
+	}
505 527
 	echo '
506 528
 				</h3>
507 529
 			</div>';
@@ -524,15 +546,17 @@  discard block
 block discarded – undo
524 546
 		template_modify_group_display('board');
525 547
 	}
526 548
 
527
-	if ($context['profile']['can_modify'])
528
-		echo '
549
+	if ($context['profile']['can_modify']) {
550
+			echo '
529 551
 			<div class="padding">
530 552
 				<input type="submit" value="', $txt['permissions_commit'], '" class="button">
531 553
 			</div>';
554
+	}
532 555
 
533
-	foreach ($context['hidden_perms'] as $hidden_perm)
534
-		echo '
556
+	foreach ($context['hidden_perms'] as $hidden_perm) {
557
+			echo '
535 558
 			<input type="hidden" name="perm[', $hidden_perm[0], '][', $hidden_perm[1], ']" value="', $hidden_perm[2], '">';
559
+	}
536 560
 
537 561
 	echo '
538 562
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -560,17 +584,19 @@  discard block
 block discarded – undo
560 584
 
561 585
 		foreach ($column as $permissionGroup)
562 586
 		{
563
-			if (empty($permissionGroup['permissions']))
564
-				continue;
587
+			if (empty($permissionGroup['permissions'])) {
588
+							continue;
589
+			}
565 590
 
566 591
 			// Are we likely to have something in this group to display or is it all hidden?
567 592
 			$has_display_content = false;
568 593
 			if (!$permissionGroup['hidden'])
569 594
 			{
570 595
 				// Before we go any further check we are going to have some data to print otherwise we just have a silly heading.
571
-				foreach ($permissionGroup['permissions'] as $permission)
572
-					if (!$permission['hidden'])
596
+				foreach ($permissionGroup['permissions'] as $permission) {
597
+									if (!$permission['hidden'])
573 598
 						$has_display_content = true;
599
+				}
574 600
 
575 601
 				if ($has_display_content)
576 602
 				{
@@ -579,10 +605,11 @@  discard block
 block discarded – undo
579 605
 							<th></th>
580 606
 							<th', $context['group']['id'] == -1 ? ' colspan="2"' : '', ' class="smalltext">', $permissionGroup['name'], '</th>';
581 607
 
582
-					if ($context['group']['id'] != -1)
583
-						echo '
608
+					if ($context['group']['id'] != -1) {
609
+											echo '
584 610
 							<th>', $txt['permissions_option_own'], '</th>
585 611
 							<th>', $txt['permissions_option_any'], '</th>';
612
+					}
586 613
 
587 614
 					echo '
588 615
 						</tr>';
@@ -605,17 +632,18 @@  discard block
 block discarded – undo
605 632
 						// Guests can't do their own thing.
606 633
 						if ($context['group']['id'] != -1)
607 634
 						{
608
-							if (empty($modSettings['permission_enable_deny']))
609
-								echo '
635
+							if (empty($modSettings['permission_enable_deny'])) {
636
+															echo '
610 637
 								<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, '>';
611
-							else
638
+							} else
612 639
 							{
613 640
 								echo '
614 641
 								<select name="perm[', $permission_type['id'], '][', $permission['own']['id'], ']" ', $disable_field, '>';
615 642
 
616
-								foreach (array('on', 'off', 'deny') as $c)
617
-									echo '
643
+								foreach (array('on', 'off', 'deny') as $c) {
644
+																	echo '
618 645
 									<option ', $permission['own']['select'] == $c ? ' selected' : '', ' value="', $c, '">', $txt['permissions_option_' . $c], '</option>';
646
+								}
619 647
 								echo '
620 648
 								</select>';
621 649
 							}
@@ -625,39 +653,41 @@  discard block
 block discarded – undo
625 653
 							<td>';
626 654
 						}
627 655
 
628
-						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1)
629
-							echo '
656
+						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) {
657
+													echo '
630 658
 								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['any']['id'], ']"', $permission['any']['select'] == 'on' ? ' checked="checked"' : '', ' value="on" ', $disable_field, '>';
631
-						else
659
+						} else
632 660
 						{
633 661
 							echo '
634 662
 								<select name="perm[', $permission_type['id'], '][', $permission['any']['id'], ']" ', $disable_field, '>';
635 663
 
636
-							foreach (array('on', 'off', 'deny') as $c)
637
-								echo '
664
+							foreach (array('on', 'off', 'deny') as $c) {
665
+															echo '
638 666
 									<option ', $permission['any']['select'] == $c ? ' selected' : '', ' value="', $c, '">', $txt['permissions_option_' . $c], '</option>';
667
+							}
639 668
 							echo '
640 669
 								</select>';
641 670
 						}
642
-					}
643
-					else
671
+					} else
644 672
 					{
645
-						if ($context['group']['id'] != -1)
646
-							echo '
673
+						if ($context['group']['id'] != -1) {
674
+													echo '
647 675
 							</td>
648 676
 							<td>';
677
+						}
649 678
 
650
-						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1)
651
-							echo '
679
+						if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1) {
680
+													echo '
652 681
 								<input type="checkbox" name="perm[', $permission_type['id'], '][', $permission['id'], ']"', $permission['select'] == 'on' ? ' checked="checked"' : '', ' value="on" ', $disable_field, '>';
653
-						else
682
+						} else
654 683
 						{
655 684
 							echo '
656 685
 								<select name="perm[', $permission_type['id'], '][', $permission['id'], ']" ', $disable_field, '>';
657 686
 
658
-							foreach (array('on', 'off', 'deny') as $c)
659
-								echo '
687
+							foreach (array('on', 'off', 'deny') as $c) {
688
+															echo '
660 689
 									<option ', $permission['select'] == $c ? ' selected' : '', ' value="', $c, '">', $txt['permissions_option_' . $c], '</option>';
690
+							}
661 691
 							echo '
662 692
 								</select>';
663 693
 						}
@@ -689,11 +719,11 @@  discard block
 block discarded – undo
689 719
 											<fieldset id="', $context['current_permission'], '">
690 720
 												<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>';
691 721
 
692
-	if (empty($modSettings['permission_enable_deny']))
693
-		echo '
722
+	if (empty($modSettings['permission_enable_deny'])) {
723
+			echo '
694 724
 												<ul>';
695
-	else
696
-		echo '
725
+	} else {
726
+			echo '
697 727
 												<div class="information">', $txt['permissions_option_desc'], '</div>
698 728
 												<dl class="settings">
699 729
 													<dt>
@@ -703,47 +733,52 @@  discard block
 block discarded – undo
703 733
 													</dt>
704 734
 													<dd>
705 735
 													</dd>';
736
+	}
706 737
 
707 738
 	foreach ($context['member_groups'] as $group)
708 739
 	{
709
-		if (!empty($modSettings['permission_enable_deny']))
710
-			echo '
740
+		if (!empty($modSettings['permission_enable_deny'])) {
741
+					echo '
711 742
 													<dt>';
712
-		else
713
-			echo '
743
+		} else {
744
+					echo '
714 745
 													<li>';
746
+		}
715 747
 
716
-		if (empty($modSettings['permission_enable_deny']))
717
-			echo '
748
+		if (empty($modSettings['permission_enable_deny'])) {
749
+					echo '
718 750
 														<input type="checkbox" name="', $context['current_permission'], '[', $group['id'], ']" value="on"', $group['status'] == 'on' ? ' checked' : '', '>';
719
-		else
720
-			echo '
751
+		} else {
752
+					echo '
721 753
 														<span class="perms"><input type="radio" name="', $context['current_permission'], '[', $group['id'], ']" value="on"', $group['status'] == 'on' ? ' checked' : '', '></span>
722 754
 														<span class="perms"><input type="radio" name="', $context['current_permission'], '[', $group['id'], ']" value="off"', $group['status'] == 'off' ? ' checked' : '', '></span>
723 755
 														<span class="perms"><input type="radio" name="', $context['current_permission'], '[', $group['id'], ']" value="deny"', $group['status'] == 'deny' ? ' checked' : '', '></span>';
756
+		}
724 757
 
725
-		if (!empty($modSettings['permission_enable_deny']))
726
-			echo '
758
+		if (!empty($modSettings['permission_enable_deny'])) {
759
+					echo '
727 760
 													</dt>
728 761
 													<dd>
729 762
 														<span', $group['is_postgroup'] ? ' style="font-style: italic;"' : '', '>', $group['name'], '</span>
730 763
 													</dd>';
731
-		else
732
-			echo '
764
+		} else {
765
+					echo '
733 766
 														<span', $group['is_postgroup'] ? ' style="font-style: italic;"' : '', '>', $group['name'], '</span>
734 767
 													</li>';
768
+		}
735 769
 	}
736 770
 
737
-	if (empty($modSettings['permission_enable_deny']))
738
-		echo '
771
+	if (empty($modSettings['permission_enable_deny'])) {
772
+			echo '
739 773
 													<li>
740 774
 														<input type="checkbox" onclick="invertAll(this, this.form, \''. $context['current_permission'] . '[\');">
741 775
 														<span>', $txt['check_all'], '</span>
742 776
 													</li>
743 777
 												</ul>';
744
-	else
745
-		echo '
778
+	} else {
779
+			echo '
746 780
 												</dl>';
781
+	}
747 782
 
748 783
 	echo '
749 784
 											</fieldset>
@@ -783,9 +818,10 @@  discard block
 block discarded – undo
783 818
 	if (!empty($modSettings['postmod_active']))
784 819
 	{
785 820
 		// Got advanced permissions - if so warn!
786
-		if (!empty($modSettings['permission_enable_deny']))
787
-			echo '
821
+		if (!empty($modSettings['permission_enable_deny'])) {
822
+					echo '
788 823
 							<div class="information">', $txt['permissions_post_moderation_deny_note'], '</div>';
824
+		}
789 825
 
790 826
 		echo '
791 827
 							<div class="padding">
@@ -800,10 +836,11 @@  discard block
 block discarded – undo
800 836
 									', $txt['permissions_post_moderation_select'], ':
801 837
 									<select name="pid" onchange="document.forms.postmodForm.submit();">';
802 838
 
803
-		foreach ($context['profiles'] as $profile)
804
-			if ($profile['can_modify'])
839
+		foreach ($context['profiles'] as $profile) {
840
+					if ($profile['can_modify'])
805 841
 				echo '
806 842
 										<option value="', $profile['id'], '"', $profile['id'] == $context['current_profile'] ? ' selected' : '', '>', $profile['name'], '</option>';
843
+		}
807 844
 
808 845
 		echo '
809 846
 									</select>
@@ -824,11 +861,12 @@  discard block
 block discarded – undo
824 861
 											', $txt['permissions_post_moderation_replies_any'], '
825 862
 										</th>';
826 863
 
827
-		if ($modSettings['attachmentEnable'] == 1)
828
-			echo '
864
+		if ($modSettings['attachmentEnable'] == 1) {
865
+					echo '
829 866
 										<th class="centercol" colspan="3">
830 867
 											', $txt['permissions_post_moderation_attachments'], '
831 868
 										</th>';
869
+		}
832 870
 
833 871
 		echo '
834 872
 									</tr>
@@ -846,11 +884,12 @@  discard block
 block discarded – undo
846 884
 										<th><span class="generic_icons post_moderation_moderate"></span></th>
847 885
 										<th><span class="generic_icons post_moderation_deny"></span></th>';
848 886
 
849
-		if ($modSettings['attachmentEnable'] == 1)
850
-			echo '
887
+		if ($modSettings['attachmentEnable'] == 1) {
888
+					echo '
851 889
 										<th><span class="generic_icons post_moderation_allow"></span></th>
852 890
 										<th><span class="generic_icons post_moderation_moderate"></span></th>
853 891
 										<th><span class="generic_icons post_moderation_deny"></span></th>';
892
+		}
854 893
 
855 894
 		echo '
856 895
 									</tr>
@@ -864,10 +903,11 @@  discard block
 block discarded – undo
864 903
 										<td class="half_table">
865 904
 											<span ', ($group['color'] ? 'style="color: ' . $group['color'] . '"' : ''), '>', $group['name'], '</span>';
866 905
 
867
-				if (!empty($group['children']))
868
-					echo '
906
+				if (!empty($group['children'])) {
907
+									echo '
869 908
 											<br>
870 909
 											<span class="smalltext">', $txt['permissions_includes_inherited'], ': &quot;', implode('&quot;, &quot;', $group['children']), '&quot;</span>';
910
+				}
871 911
 
872 912
 				echo '
873 913
 										</td>
@@ -882,11 +922,11 @@  discard block
 block discarded – undo
882 922
 										</td>';
883 923
 
884 924
 				// Guests can't have "own" permissions
885
-				if ($group['id'] == '-1')
886
-					echo '
925
+				if ($group['id'] == '-1') {
926
+									echo '
887 927
 										<td colspan="3"></td>';
888
-				else
889
-					echo '
928
+				} else {
929
+									echo '
890 930
 										<td class="centercol">
891 931
 											<input type="radio" name="replies_own[', $group['id'], ']" value="allow"', $group['replies_own'] == 'allow' ? ' checked' : '', '>
892 932
 										</td>
@@ -896,6 +936,7 @@  discard block
 block discarded – undo
896 936
 										<td class="centercol">
897 937
 											<input type="radio" name="replies_own[', $group['id'], ']" value="disallow"', $group['replies_own'] == 'disallow' ? ' checked' : '', '>
898 938
 										</td>';
939
+				}
899 940
 
900 941
 				echo '
901 942
 										<td class="centercol">
@@ -908,8 +949,8 @@  discard block
 block discarded – undo
908 949
 											<input type="radio" name="replies_any[', $group['id'], ']" value="disallow"', $group['replies_any'] == 'disallow' ? ' checked' : '', '>
909 950
 										</td>';
910 951
 
911
-				if ($modSettings['attachmentEnable'] == 1)
912
-					echo '
952
+				if ($modSettings['attachmentEnable'] == 1) {
953
+									echo '
913 954
 										<td class="centercol">
914 955
 											<input type="radio" name="attachment[', $group['id'], ']" value="allow"', $group['attachment'] == 'allow' ? ' checked' : '', '>
915 956
 										</td>
@@ -919,6 +960,7 @@  discard block
 block discarded – undo
919 960
 										<td class="centercol">
920 961
 											<input type="radio" name="attachment[', $group['id'], ']" value="disallow"', $group['attachment'] == 'disallow' ? ' checked' : '', '>
921 962
 										</td>';
963
+				}
922 964
 
923 965
 				echo '
924 966
 									</tr>';
Please login to merge, or discard this patch.
Themes/default/ManageCalendar.template.php 1 patch
Braces   +14 added lines, -10 removed lines patch added patch discarded remove patch
@@ -40,9 +40,10 @@  discard block
 block discarded – undo
40 40
 							<option value="0000"', $context['holiday']['year'] == '0000' ? ' selected' : '', '>', $txt['every_year'], '</option>';
41 41
 
42 42
 	// Show a list of all the years we allow...
43
-	for ($year = $modSettings['cal_minyear']; $year <= $modSettings['cal_maxyear']; $year++)
44
-		echo '
43
+	for ($year = $modSettings['cal_minyear']; $year <= $modSettings['cal_maxyear']; $year++) {
44
+			echo '
45 45
 							<option value="', $year, '"', $year == $context['holiday']['year'] ? ' selected' : '', '>', $year, '</option>';
46
+	}
46 47
 
47 48
 	echo '
48 49
 						</select>
@@ -50,9 +51,10 @@  discard block
 block discarded – undo
50 51
 						<select name="month" id="month" onchange="generateDays();">';
51 52
 
52 53
 	// There are 12 months per year - ensure that they all get listed.
53
-	for ($month = 1; $month <= 12; $month++)
54
-		echo '
54
+	for ($month = 1; $month <= 12; $month++) {
55
+			echo '
55 56
 							<option value="', $month, '"', $month == $context['holiday']['month'] ? ' selected' : '', '>', $txt['months'][$month], '</option>';
57
+	}
56 58
 
57 59
 	echo '
58 60
 						</select>
@@ -60,23 +62,25 @@  discard block
 block discarded – undo
60 62
 						<select name="day" id="day" onchange="generateDays();">';
61 63
 
62 64
 	// This prints out all the days in the current month - this changes dynamically as we switch months.
63
-	for ($day = 1; $day <= $context['holiday']['last_day']; $day++)
64
-		echo '
65
+	for ($day = 1; $day <= $context['holiday']['last_day']; $day++) {
66
+			echo '
65 67
 							<option value="', $day, '"', $day == $context['holiday']['day'] ? ' selected' : '', '>', $day, '</option>';
68
+	}
66 69
 
67 70
 	echo '
68 71
 						</select>
69 72
 					</dd>
70 73
 				</dl>';
71 74
 
72
-	if ($context['is_new'])
73
-		echo '
75
+	if ($context['is_new']) {
76
+			echo '
74 77
 				<input type="submit" value="', $txt['holidays_button_add'], '" class="button">';
75
-	else
76
-		echo '
78
+	} else {
79
+			echo '
77 80
 				<input type="submit" name="edit" value="', $txt['holidays_button_edit'], '" class="button">
78 81
 				<input type="submit" name="delete" value="', $txt['holidays_button_remove'], '" class="button">
79 82
 				<input type="hidden" name="holiday" value="', $context['holiday']['id'], '">';
83
+	}
80 84
 	echo '
81 85
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
82 86
 			</div><!-- .windowbg2 -->
Please login to merge, or discard this patch.