Completed
Pull Request — release-2.1 (#4184)
by Mert
10:16
created
attachments/index.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
 	header('Location: ' . $boardurl);
13 13
 }
14 14
 // Can't find it... just forget it.
15
-else
15
+else {
16 16
 	exit;
17
+}
17 18
 
18 19
 ?>
19 20
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/fugue/index.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Try to handle it with the upper level index.php. (it should know what to do.)
4
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
4
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
5 5
 	include (dirname(dirname(__FILE__)) . '/index.php');
6
-else
6
+} else {
7 7
 	exit;
8
+}
8 9
 
9 10
 ?>
10 11
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/aaron/index.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Try to handle it with the upper level index.php. (it should know what to do.)
4
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
4
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
5 5
 	include (dirname(dirname(__FILE__)) . '/index.php');
6
-else
6
+} else {
7 7
 	exit;
8
+}
8 9
 
9 10
 ?>
10 11
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/akyhne/index.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Try to handle it with the upper level index.php. (it should know what to do.)
4
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
4
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
5 5
 	include (dirname(dirname(__FILE__)) . '/index.php');
6
-else
6
+} else {
7 7
 	exit;
8
+}
8 9
 
9 10
 ?>
10 11
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/index.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
 	header('Location: ' . $boardurl);
13 13
 }
14 14
 // Can't find it... just forget it.
15
-else
15
+else {
16 16
 	exit;
17
+}
17 18
 
18 19
 ?>
19 20
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/default/index.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Try to handle it with the upper level index.php. (it should know what to do.)
4
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
4
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
5 5
 	include (dirname(dirname(__FILE__)) . '/index.php');
6
-else
6
+} else {
7 7
 	exit;
8
+}
8 9
 
9 10
 ?>
10 11
\ No newline at end of file
Please login to merge, or discard this patch.
Themes/index.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
 	header('Location: ' . $boardurl);
13 13
 }
14 14
 // Can't find it... just forget it.
15
-else
15
+else {
16 16
 	exit;
17
+}
17 18
 
18 19
 ?>
19 20
\ No newline at end of file
Please login to merge, or discard this patch.
Themes/default/languages/index.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Try to handle it with the upper level index.php. (it should know what to do.)
4
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
4
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
5 5
 	include (dirname(dirname(__FILE__)) . '/index.php');
6
-else
6
+} else {
7 7
 	exit;
8
+}
8 9
 
9 10
 ?>
10 11
\ No newline at end of file
Please login to merge, or discard this patch.
Themes/default/ModerationCenter.template.php 1 patch
Braces   +56 added lines, -39 removed lines patch added patch discarded remove patch
@@ -55,18 +55,20 @@  discard block
 block discarded – undo
55 55
 			<div class="modbox">
56 56
 				<ul>';
57 57
 
58
-		foreach ($context['group_requests'] as $request)
59
-			echo '
58
+		foreach ($context['group_requests'] as $request) {
59
+					echo '
60 60
 				<li class="smalltext">
61 61
 					<a href="', $request['request_href'], '">', $request['group']['name'], '</a> ', $txt['mc_groupr_by'], ' ', $request['member']['link'], '
62 62
 				</li>';
63
+		}
63 64
 
64 65
 		// Don't have any watched users right now?
65
-		if (empty($context['group_requests']))
66
-			echo '
66
+		if (empty($context['group_requests'])) {
67
+					echo '
67 68
 				<li>
68 69
 					<strong class="smalltext">', $txt['mc_group_requests_none'], '</strong>
69 70
 				</li>';
71
+		}
70 72
 
71 73
 		echo '
72 74
 				</ul>
@@ -124,18 +126,20 @@  discard block
 block discarded – undo
124 126
 			<div class="modbox">
125 127
 				<ul>';
126 128
 
127
-		foreach ($context['watched_users'] as $user)
128
-			echo '
129
+		foreach ($context['watched_users'] as $user) {
130
+					echo '
129 131
 					<li>
130 132
 						<span class="smalltext">', sprintf(!empty($user['last_login']) ? $txt['mc_seen'] : $txt['mc_seen_never'], $user['link'], $user['last_login']), '</span>
131 133
 					</li>';
134
+		}
132 135
 
133 136
 		// Don't have any watched users right now?
134
-		if (empty($context['watched_users']))
135
-			echo '
137
+		if (empty($context['watched_users'])) {
138
+					echo '
136 139
 					<li>
137 140
 						<strong class="smalltext">', $txt['mc_watched_users_none'], '</strong>
138 141
 					</li>';
142
+		}
139 143
 
140 144
 		echo '
141 145
 				</ul>
@@ -193,18 +197,20 @@  discard block
 block discarded – undo
193 197
 			<div class="modbox">
194 198
 				<ul>';
195 199
 
196
-		foreach ($context['reported_posts'] as $post)
197
-			echo '
200
+		foreach ($context['reported_posts'] as $post) {
201
+					echo '
198 202
 					<li>
199 203
 						<span class="smalltext">', sprintf($txt['mc_post_report'], $post['report_link'], $post['author']['link']), '</span>
200 204
 					</li>';
205
+		}
201 206
 
202 207
 		// Don't have any watched users right now?
203
-		if (empty($context['reported_posts']))
204
-			echo '
208
+		if (empty($context['reported_posts'])) {
209
+					echo '
205 210
 					<li>
206 211
 						<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
207 212
 					</li>';
213
+		}
208 214
 
209 215
 		echo '
210 216
 				</ul>
@@ -262,18 +268,20 @@  discard block
 block discarded – undo
262 268
 			<div class="modbox">
263 269
 				<ul>';
264 270
 
265
-		foreach ($context['reported_users'] as $user)
266
-			echo '
271
+		foreach ($context['reported_users'] as $user) {
272
+					echo '
267 273
 					<li>
268 274
 						<span class="smalltext">', $user['user']['link'], '</span>
269 275
 					</li>';
276
+		}
270 277
 
271 278
 		// Don't have any watched users right now?
272
-		if (empty($context['reported_users']))
273
-			echo '
279
+		if (empty($context['reported_users'])) {
280
+					echo '
274 281
 					<li>
275 282
 						<strong class="smalltext">', $txt['mc_reported_users_none'], '</strong>
276 283
 					</li>';
284
+		}
277 285
 
278 286
 		echo '
279 287
 				</ul>
@@ -344,9 +352,10 @@  discard block
 block discarded – undo
344 352
 						<ul class="moderation_notes">';
345 353
 
346 354
 			// Cycle through the notes.
347
-			foreach ($context['notes'] as $note)
348
-				echo '
355
+			foreach ($context['notes'] as $note) {
356
+							echo '
349 357
 							<li class="smalltext">', ($note['can_delete'] ? '<a href="' . $note['delete_href'] . ';' . $context['mod-modnote-del_token_var'] . '=' . $context['mod-modnote-del_token'] . '" data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '" class="you_sure"><span class="generic_icons delete"></span></a>' : ''), $note['time'], ' <strong>', $note['author']['link'], ':</strong> ', $note['text'], '</li>';
358
+			}
350 359
 
351 360
 			echo '
352 361
 						</ul>
@@ -388,16 +397,17 @@  discard block
 block discarded – undo
388 397
 	$remove_button = create_button('delete', 'remove_message', 'remove');
389 398
 
390 399
 	// No posts?
391
-	if (empty($context['unapproved_items']))
392
-		echo '
400
+	if (empty($context['unapproved_items'])) {
401
+			echo '
393 402
 		<div class="windowbg2">
394 403
 			<p class="centertext">', $txt['mc_unapproved_' . $context['current_view'] . '_none_found'], '</p>
395 404
 		</div>';
396
-	else
397
-		echo '
405
+	} else {
406
+			echo '
398 407
 			<div class="pagesection floatleft">
399 408
 				', $context['page_index'], '
400 409
 			</div>';
410
+	}
401 411
 
402 412
 	foreach ($context['unapproved_items'] as $item)
403 413
 	{
@@ -414,14 +424,16 @@  discard block
 block discarded – undo
414 424
 			<span class="floatright">
415 425
 				<a href="', $scripturl, '?action=moderate;area=postmod;sa=', $context['current_view'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';approve=', $item['id'], '">', $approve_button, '</a>';
416 426
 
417
-		if ($item['can_delete'])
418
-			echo '
427
+		if ($item['can_delete']) {
428
+					echo '
419 429
 			', $context['menu_separator'], '
420 430
 				<a href="', $scripturl, '?action=moderate;area=postmod;sa=', $context['current_view'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';delete=', $item['id'], '">', $remove_button, '</a>';
431
+		}
421 432
 
422
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
423
-			echo '
433
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
434
+					echo '
424 435
 				<input type="checkbox" name="item[]" value="', $item['id'], '" checked class="input_check"> ';
436
+		}
425 437
 
426 438
 		echo '
427 439
 			</span>
@@ -431,8 +443,8 @@  discard block
 block discarded – undo
431 443
 	echo '
432 444
 		<div class="pagesection">';
433 445
 
434
-	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
435
-		echo '
446
+	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
447
+			echo '
436 448
 			<div class="floatright">
437 449
 				<select name="do" onchange="if (this.value != 0 &amp;&amp; confirm(\'', $txt['mc_unapproved_sure'], '\')) submit();">
438 450
 					<option value="0">', $txt['with_selected'], ':</option>
@@ -442,12 +454,14 @@  discard block
 block discarded – undo
442 454
 				</select>
443 455
 				<noscript><input type="submit" name="mc_go" value="', $txt['go'], '" class="button_submit"></noscript>
444 456
 			</div>';
457
+	}
445 458
 
446
-	if (!empty($context['unapproved_items']))
447
-		echo '
459
+	if (!empty($context['unapproved_items'])) {
460
+			echo '
448 461
 			<div class="floatleft">
449 462
 				<div class="pagelinks">', $context['page_index'], '</div>
450 463
 			</div>';
464
+	}
451 465
 
452 466
 	echo '
453 467
 		</div>
@@ -467,8 +481,9 @@  discard block
 block discarded – undo
467 481
 	global $scripturl, $context, $txt, $delete_button;
468 482
 
469 483
 	// We'll have a delete please bob.
470
-	if (empty($delete_button))
471
-		$delete_button = create_button('delete', 'remove_message', 'remove', 'class="centericon"');
484
+	if (empty($delete_button)) {
485
+			$delete_button = create_button('delete', 'remove_message', 'remove', 'class="centericon"');
486
+	}
472 487
 
473 488
 	$output_html = '
474 489
 					<div>
@@ -477,10 +492,11 @@  discard block
 block discarded – undo
477 492
 						</div>
478 493
 						<div class="floatright">';
479 494
 
480
-	if ($post['can_delete'])
481
-		$output_html .= '
495
+	if ($post['can_delete']) {
496
+			$output_html .= '
482 497
 							<a href="' . $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" data-confirm="' . $txt['mc_watched_users_delete_post'] . '" class="you_sure">' . $delete_button . '</a>
483 498
 							<input type="checkbox" name="delete[]" value="' . $post['id'] . '" class="input_check">';
499
+	}
484 500
 
485 501
 	$output_html .= '
486 502
 						</div>
@@ -522,12 +538,12 @@  discard block
 block discarded – undo
522 538
 				<input type="submit" name="save" value="', $txt['save'], '" class="button_submit">
523 539
 			</div>
524 540
 		</form>';
525
-	}
526
-	else
527
-		echo '
541
+	} else {
542
+			echo '
528 543
 		<div class="windowbg">
529 544
 			<div class="centertext">', $txt['mc_no_settings'], '</div>
530 545
 		</div>';
546
+	}
531 547
 
532 548
 	echo '
533 549
 	</div>';
@@ -623,8 +639,8 @@  discard block
 block discarded – undo
623 639
 					</dd>
624 640
 				</dl>';
625 641
 
626
-	if ($context['template_data']['can_edit_personal'])
627
-		echo '
642
+	if ($context['template_data']['can_edit_personal']) {
643
+			echo '
628 644
 				<input type="checkbox" name="make_personal" id="make_personal"', $context['template_data']['personal'] ? ' checked' : '', ' class="input_check">
629 645
 					<label for="make_personal">
630 646
 						<strong>', $txt['mc_warning_template_personal'], '</strong>
@@ -632,6 +648,7 @@  discard block
 block discarded – undo
632 648
 					<br>
633 649
 					<span class="smalltext">', $txt['mc_warning_template_personal_desc'], '</span>
634 650
 					<br>';
651
+	}
635 652
 
636 653
 	echo '
637 654
 				<hr>
Please login to merge, or discard this patch.