Completed
Pull Request — release-2.1 (#3922)
by Fran
08:25
created
Themes/default/PersonalMessage.template.php 1 patch
Braces   +262 added lines, -181 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
 	<div id="personal_messages">';
22 22
 
23 23
 	// Show the capacity bar, if available.
24
-	if (!empty($context['limit_bar']))
25
-		echo '
24
+	if (!empty($context['limit_bar'])) {
25
+			echo '
26 26
 		<div class="cat_bar">
27 27
 			<h3 class="catbg">
28 28
 				<span class="floatleft">', $txt['pm_capacity'], ':</span>
@@ -32,14 +32,16 @@  discard block
 block discarded – undo
32 32
 				<span class="floatright', $context['limit_bar']['percent'] > 90 ? ' alert' : '', '">', $context['limit_bar']['text'], '</span>
33 33
 			</h3>
34 34
 		</div>';
35
+	}
35 36
 
36 37
 	// Message sent? Show a small indication.
37
-	if (isset($context['pm_sent']))
38
-		echo '
38
+	if (isset($context['pm_sent'])) {
39
+			echo '
39 40
 		<div class="infobox">
40 41
 			', $txt['pm_sent'], '
41 42
 		</div>';
42
-}
43
+	}
44
+	}
43 45
 
44 46
 /**
45 47
  * Just the end of the index bar, nothing special.
@@ -72,8 +74,7 @@  discard block
 block discarded – undo
72 74
 	{
73 75
 		echo '
74 76
 			<div class="no_unread">', $txt['pm_no_unread'], '</div>';
75
-	}
76
-	else
77
+	} else
77 78
 	{
78 79
 		foreach ($context['unread_pms'] as $id_pm => $pm_details)
79 80
 		{
@@ -193,14 +194,15 @@  discard block
 block discarded – undo
193 194
 	if ($context['get_pmessage']('message', true))
194 195
 	{
195 196
 		// Show the helpful titlebar - generally.
196
-		if ($context['display_mode'] != 1)
197
-			echo '
197
+		if ($context['display_mode'] != 1) {
198
+					echo '
198 199
 				<div class="cat_bar">
199 200
 					<h3 class="catbg">
200 201
 						<span id="author">', $txt['author'], '</span>
201 202
 						<span id="topic_title">', $txt[$context['display_mode'] == 0 ? 'messages' : 'conversation'], '</span>
202 203
 					</h3>
203 204
 				</div>';
205
+		}
204 206
 
205 207
 		// Show a few buttons if we are in conversation mode and outputting the first message.
206 208
 		if ($context['display_mode'] == 2)
@@ -229,9 +231,10 @@  discard block
 block discarded – undo
229 231
 			<div class="custom_fields_above_member">
230 232
 				<ul class="nolist">';
231 233
 
232
-			foreach ($message['custom_fields']['above_member'] as $custom)
233
-				echo '
234
+			foreach ($message['custom_fields']['above_member'] as $custom) {
235
+							echo '
234 236
 					<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
237
+			}
235 238
 
236 239
 			echo '
237 240
 				</ul>
@@ -243,9 +246,10 @@  discard block
 block discarded – undo
243 246
 				<a id="msg', $message['id'], '"></a>';
244 247
 
245 248
 		// Show online and offline buttons?
246
-		if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest'])
247
-			echo '
249
+		if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest']) {
250
+					echo '
248 251
 				<span class="' . ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $message['member']['online']['text'] . '"></span>';
252
+		}
249 253
 
250 254
 		// Show a link to the member's profile (but only if the sender isn't a guest).
251 255
 				echo '
@@ -258,48 +262,56 @@  discard block
 block discarded – undo
258 262
 			<ul class="user_info">';
259 263
 
260 264
 			// Show the user's avatar.
261
-			if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))
262
-				echo '
265
+			if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image'])) {
266
+							echo '
263 267
 				<li class="avatar">
264 268
 					<a href="', $scripturl, '?action=profile;u=', $message['member']['id'], '">', $message['member']['avatar']['image'], '</a>
265 269
 				</li>';
270
+			}
266 271
 
267 272
 		// Are there any custom fields below the avatar?
268
-		if (!empty($message['custom_fields']['below_avatar']))
269
-			foreach ($message['custom_fields']['below_avatar'] as $custom)
273
+		if (!empty($message['custom_fields']['below_avatar'])) {
274
+					foreach ($message['custom_fields']['below_avatar'] as $custom)
270 275
 				echo '
271 276
 				<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
277
+		}
272 278
 
273
-			if (!$message['member']['is_guest'])
274
-				echo '
279
+			if (!$message['member']['is_guest']) {
280
+							echo '
275 281
 				<li class="icons">', $message['member']['group_icons'], '</li>';
282
+			}
276 283
 			// Show the member's primary group (like 'Administrator') if they have one.
277
-			if (isset($message['member']['group']) && $message['member']['group'] != '')
278
-				echo '
284
+			if (isset($message['member']['group']) && $message['member']['group'] != '') {
285
+							echo '
279 286
 				<li class="membergroup">', $message['member']['group'], '</li>';
287
+			}
280 288
 
281 289
 			// Show the member's custom title, if they have one.
282
-			if (isset($message['member']['title']) && $message['member']['title'] != '')
283
-				echo '
290
+			if (isset($message['member']['title']) && $message['member']['title'] != '') {
291
+							echo '
284 292
 				<li class="title">', $message['member']['title'], '</li>';
293
+			}
285 294
 
286 295
 			// Don't show these things for guests.
287 296
 			if (!$message['member']['is_guest'])
288 297
 			{
289 298
 				// Show the post group if and only if they have no other group or the option is on, and they are in a post group.
290
-				if ((empty($modSettings['hide_post_group']) || $message['member']['group'] == '') && $message['member']['post_group'] != '')
291
-					echo '
299
+				if ((empty($modSettings['hide_post_group']) || $message['member']['group'] == '') && $message['member']['post_group'] != '') {
300
+									echo '
292 301
 				<li class="postgroup">', $message['member']['post_group'], '</li>';
302
+				}
293 303
 
294 304
 				// Show how many posts they have made.
295
-				if (!isset($context['disabled_fields']['posts']))
296
-					echo '
305
+				if (!isset($context['disabled_fields']['posts'])) {
306
+									echo '
297 307
 				<li class="postcount">', $txt['member_postcount'], ': ', $message['member']['posts'], '</li>';
308
+				}
298 309
 
299 310
 				// Show their personal text?
300
-				if (!empty($modSettings['show_blurb']) && $message['member']['blurb'] != '')
301
-					echo '
311
+				if (!empty($modSettings['show_blurb']) && $message['member']['blurb'] != '') {
312
+									echo '
302 313
 				<li class="blurb">', $message['member']['blurb'], '</li>';
314
+				}
303 315
 
304 316
 				// Any custom fields to show as icons?
305 317
 				if (!empty($message['custom_fields']['icons']))
@@ -308,9 +320,10 @@  discard block
 block discarded – undo
308 320
 				<li class="im_icons">
309 321
 					<ol>';
310 322
 
311
-					foreach ($message['custom_fields']['icons'] as $custom)
312
-						echo '
323
+					foreach ($message['custom_fields']['icons'] as $custom) {
324
+											echo '
313 325
 						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
326
+					}
314 327
 
315 328
 					echo '
316 329
 					</ol>
@@ -318,19 +331,22 @@  discard block
 block discarded – undo
318 331
 				}
319 332
 
320 333
 		// Show the IP to this user for this post - because you can moderate?
321
-		if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip']))
322
-			echo '
334
+		if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip'])) {
335
+					echo '
323 336
 				<li class="poster_ip"><a href="', $scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '">', $message['member']['ip'], '</a> <a href="', $scripturl, '?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a></li>';
337
+		}
324 338
 
325 339
 		// Or, should we show it because this is you?
326
-		elseif ($message['can_see_ip'])
327
-			echo '
340
+		elseif ($message['can_see_ip']) {
341
+					echo '
328 342
 				<li class="poster_ip"><a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $message['member']['ip'], '</a></li>';
343
+		}
329 344
 
330 345
 		// Okay, you are logged in, then we can show something about why IPs are logged...
331
-		else
332
-			echo '
346
+		else {
347
+					echo '
333 348
 				<li class="poster_ip"><a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $txt['logged'], '</a></li>';
349
+		}
334 350
 
335 351
 				// Show the profile, website, email address, and personal message buttons.
336 352
 				if ($message['member']['show_profile_buttons'])
@@ -340,24 +356,28 @@  discard block
 block discarded – undo
340 356
 					<ol class="profile_icons">';
341 357
 
342 358
 					// Show the profile button
343
-					if ($message['member']['can_view_profile'])
344
-						echo '
359
+					if ($message['member']['can_view_profile']) {
360
+											echo '
345 361
 						<li><a href="', $message['member']['href'], '">', ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="' . $txt['view_profile'] . '" title="' . $txt['view_profile'] . '">' : $txt['view_profile']), '</a></li>';
362
+					}
346 363
 
347 364
 					// Don't show an icon if they haven't specified a website.
348
-					if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website']))
349
-						echo '
365
+					if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website'])) {
366
+											echo '
350 367
 						<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<span class="generic_icons www centericon" title="' . $message['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
368
+					}
351 369
 
352 370
 					// Don't show the email address if they want it hidden.
353
-					if ($message['member']['show_email'])
354
-						echo '
371
+					if ($message['member']['show_email']) {
372
+											echo '
355 373
 						<li><a href="mailto:', $message['member']['email'], '" rel="nofollow">', ($settings['use_image_buttons'] ? '<span class="generic_icons mail centericon" title="' . $txt['email'] . '"></span>' : $txt['email']), '</a></li>';
374
+					}
356 375
 
357 376
 					// Since we know this person isn't a guest, you *can* message them.
358
-					if ($context['can_send_pm'])
359
-						echo '
377
+					if ($context['can_send_pm']) {
378
+											echo '
360 379
 						<li><a href="', $scripturl, '?action=pm;sa=send;u=', $message['member']['id'], '" title="', $message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline'], '">', $settings['use_image_buttons'] ? '<span class="generic_icons im_' . ($message['member']['online']['is_online'] ? 'on' : 'off') . ' centericon" title="' . ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']) . '"></span> ' : ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']), '</a></li>';
380
+					}
361 381
 
362 382
 					echo '
363 383
 					</ol>
@@ -365,21 +385,24 @@  discard block
 block discarded – undo
365 385
 				}
366 386
 
367 387
 				// Any custom fields for standard placement?
368
-				if (!empty($message['custom_fields']['standard']))
369
-					foreach ($message['custom_fields']['standard'] as $custom)
388
+				if (!empty($message['custom_fields']['standard'])) {
389
+									foreach ($message['custom_fields']['standard'] as $custom)
370 390
 						echo '
371 391
 				<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
392
+				}
372 393
 
373 394
 				// Are we showing the warning status?
374
-				if ($message['member']['can_see_warning'])
375
-					echo '
395
+				if ($message['member']['can_see_warning']) {
396
+									echo '
376 397
 				<li class="warning">', $context['can_issue_warning'] ? '<a href="' . $scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '', '<span class="generic_icons warning_', $message['member']['warning_status'], '"></span>', $context['can_issue_warning'] ? '</a>' : '', '<span class="warn_', $message['member']['warning_status'], '">', $txt['warn_' . $message['member']['warning_status']], '</span></li>';
398
+				}
377 399
 
378 400
 				// Are there any custom fields to show at the bottom of the poster info?
379
-				if (!empty($message['custom_fields']['bottom_poster']))
380
-					foreach ($message['custom_fields']['bottom_poster'] as $custom)
401
+				if (!empty($message['custom_fields']['bottom_poster'])) {
402
+									foreach ($message['custom_fields']['bottom_poster'] as $custom)
381 403
 						echo '
382 404
 				<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
405
+				}
383 406
 			}
384 407
 
385 408
 			// Done with the information about the poster... on to the post itself.
@@ -398,24 +421,28 @@  discard block
 block discarded – undo
398 421
 					<span class="smalltext">&#171; <strong> ', $txt['sent_to'], ':</strong> ';
399 422
 
400 423
 			// People it was sent directly to....
401
-			if (!empty($message['recipients']['to']))
402
-				echo implode(', ', $message['recipients']['to']);
424
+			if (!empty($message['recipients']['to'])) {
425
+							echo implode(', ', $message['recipients']['to']);
426
+			}
403 427
 			// Otherwise, we're just going to say "some people"...
404
-			elseif ($context['folder'] != 'sent')
405
-				echo '(', $txt['pm_undisclosed_recipients'], ')';
428
+			elseif ($context['folder'] != 'sent') {
429
+							echo '(', $txt['pm_undisclosed_recipients'], ')';
430
+			}
406 431
 
407 432
 			echo '
408 433
 						<strong> ', $txt['on'], ':</strong> ', $message['time'], ' &#187;
409 434
 					</span>';
410 435
 
411 436
 			// If we're in the sent items, show who it was sent to besides the "To:" people.
412
-			if (!empty($message['recipients']['bcc']))
413
-				echo '
437
+			if (!empty($message['recipients']['bcc'])) {
438
+							echo '
414 439
 					<br><span class="smalltext">&#171; <strong> ', $txt['pm_bcc'], ':</strong> ', implode(', ', $message['recipients']['bcc']), ' &#187;</span>';
440
+			}
415 441
 
416
-			if (!empty($message['is_replied_to']))
417
-				echo '
442
+			if (!empty($message['is_replied_to'])) {
443
+							echo '
418 444
 					<br><span class="smalltext">&#171; ', $context['folder'] == 'sent' ? $txt['pm_sent_is_replied_to'] : $txt['pm_is_replied_to'], ' &#187;</span>';
445
+			}
419 446
 
420 447
 			echo '
421 448
 				</div>
@@ -423,13 +450,15 @@  discard block
 block discarded – undo
423 450
 			<div class="post">
424 451
 				<div class="inner" id="msg_', $message['id'], '"', '>', $message['body'], '</div>';
425 452
 
426
-			if ($message['can_report'] || $context['can_send_pm'])
427
-			echo '
453
+			if ($message['can_report'] || $context['can_send_pm']) {
454
+						echo '
428 455
 				<div class="under_message">';
456
+			}
429 457
 
430
-				if ($message['can_report'])
431
-				echo '
458
+				if ($message['can_report']) {
459
+								echo '
432 460
 					<a href="' . $scripturl . '?action=pm;sa=report;l=' . $context['current_label_id'] . ';pmsg=' . $message['id'] . '" class="floatright">' . $txt['pm_report_to_admin'] . '</a>';
461
+				}
433 462
 
434 463
 				echo '
435 464
 					<ul class="quickbuttons">';
@@ -441,32 +470,36 @@  discard block
 block discarded – undo
441 470
 					if (!$message['member']['is_guest'])
442 471
 					{
443 472
 						// Is there than more than one recipient you can reply to?
444
-						if ($message['number_recipients'] > 1)
445
-							echo '
473
+						if ($message['number_recipients'] > 1) {
474
+													echo '
446 475
 						<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=all"><span class="generic_icons reply_all_button"></span>', $txt['reply_to_all'], '</a></li>';
476
+						}
447 477
 
448 478
 						echo '
449 479
 						<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>
450 480
 						<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote', $context['folder'] == 'sent' ? '' : ';u=' . $message['member']['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
451 481
 					}
452 482
 					// This is for "forwarding" - even if the member is gone.
453
-					else
454
-						echo '
483
+					else {
484
+											echo '
455 485
 						<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote"><span class="generic_icons quote"></span>', $txt['reply_quote'], '</a></li>';
486
+					}
456 487
 				}
457 488
 				echo '
458 489
 						<li><a href="', $scripturl, '?action=pm;sa=pmactions;pm_actions%5b', $message['id'], '%5D=delete;f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', addslashes($txt['remove_message_question']), '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>';
459 490
 
460
-				if (empty($context['display_mode']))
461
-					echo '
491
+				if (empty($context['display_mode'])) {
492
+									echo '
462 493
 						<li><input type="checkbox" name="pms[]" id="deletedisplay', $message['id'], '" value="', $message['id'], '" onclick="document.getElementById(\'deletelisting', $message['id'], '\').checked = this.checked;" class="input_check"></li>';
494
+				}
463 495
 
464 496
 				echo '
465 497
 					</ul>';
466 498
 
467
-			if ($message['can_report'] || $context['can_send_pm'])
468
-			echo '
499
+			if ($message['can_report'] || $context['can_send_pm']) {
500
+						echo '
469 501
 				</div>';
502
+			}
470 503
 
471 504
 			// Are there any custom profile fields for above the signature?
472 505
 			if (!empty($message['custom_fields']['above_signature']))
@@ -475,9 +508,10 @@  discard block
 block discarded – undo
475 508
 					<div class="custom_fields_above_signature">
476 509
 						<ul class="nolist">';
477 510
 
478
-				foreach ($message['custom_fields']['above_signature'] as $custom)
479
-					echo '
511
+				foreach ($message['custom_fields']['above_signature'] as $custom) {
512
+									echo '
480 513
 							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
514
+				}
481 515
 
482 516
 				echo '
483 517
 						</ul>
@@ -485,9 +519,10 @@  discard block
 block discarded – undo
485 519
 			}
486 520
 
487 521
 			// Show the member's signature?
488
-			if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled'])
489
-				echo '
522
+			if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled']) {
523
+							echo '
490 524
 				<div class="signature">', $message['member']['signature'], '</div>';
525
+			}
491 526
 
492 527
 			// Are there any custom profile fields for below the signature?
493 528
 			if (!empty($message['custom_fields']['below_signature']))
@@ -496,9 +531,10 @@  discard block
 block discarded – undo
496 531
 					<div class="custom_fields_below_signature">
497 532
 						<ul class="nolist">';
498 533
 
499
-				foreach ($message['custom_fields']['below_signature'] as $custom)
500
-					echo '
534
+				foreach ($message['custom_fields']['below_signature'] as $custom) {
535
+									echo '
501 536
 							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
537
+				}
502 538
 
503 539
 				echo '
504 540
 						</ul>
@@ -523,19 +559,21 @@  discard block
 block discarded – undo
523 559
 					{
524 560
 						echo '
525 561
 						<option value="" disabled>', $txt['pm_msg_label_apply'], ':</option>';
526
-						foreach ($context['labels'] as $label)
527
-							if (!isset($message['labels'][$label['id']]))
562
+						foreach ($context['labels'] as $label) {
563
+													if (!isset($message['labels'][$label['id']]))
528 564
 								echo '
529 565
 							<option value="', $label['id'], '">&nbsp;', $label['name'], '</option>';
566
+						}
530 567
 					}
531 568
 					// ... and are there any that can be removed?
532 569
 					if (!empty($message['labels']) && (count($message['labels']) > 1 || !isset($message['labels'][-1])))
533 570
 					{
534 571
 						echo '
535 572
 						<option value="" disabled>', $txt['pm_msg_label_remove'], ':</option>';
536
-						foreach ($message['labels'] as $label)
537
-							echo '
573
+						foreach ($message['labels'] as $label) {
574
+													echo '
538 575
 							<option value="', $label['id'], '">&nbsp;', $label['name'], '</option>';
576
+						}
539 577
 					}
540 578
 					echo '
541 579
 					</select>
@@ -555,13 +593,14 @@  discard block
 block discarded – undo
555 593
 	</div>';
556 594
 		}
557 595
 
558
-		if (empty($context['display_mode']))
559
-			echo '
596
+		if (empty($context['display_mode'])) {
597
+					echo '
560 598
 
561 599
 	<div class="pagesection">
562 600
 		<div class="floatleft">', $context['page_index'], '</div>
563 601
 		<div class="floatright"><input type="submit" name="del_selected" value="', $txt['quickmod_delete_selected'], '" style="font-weight: normal;" onclick="if (!confirm(\'', $txt['delete_selected_confirm'], '\')) return false;" class="button_submit"></div>
564 602
 	</div>';
603
+		}
565 604
 
566 605
 		// Show a few buttons if we are in conversation mode and outputting the first message.
567 606
 		elseif ($context['display_mode'] == 2 && isset($context['conversation_buttons']))
@@ -621,11 +660,12 @@  discard block
 block discarded – undo
621 660
 		</tr>
622 661
 	</thead>
623 662
 	<tbody>';
624
-	if (!$context['show_delete'])
625
-		echo '
663
+	if (!$context['show_delete']) {
664
+			echo '
626 665
 		<tr class="windowbg">
627 666
 			<td colspan="5">', $txt['pm_alert_none'], '</td>
628 667
 		</tr>';
668
+	}
629 669
 
630 670
 	while ($message = $context['get_pmessage']('subject'))
631 671
 	{
@@ -678,9 +718,10 @@  discard block
 block discarded – undo
678 718
 
679 719
 			foreach ($context['labels'] as $label)
680 720
 			{
681
-				if ($label['id'] != $context['current_label_id'])
682
-					echo '
721
+				if ($label['id'] != $context['current_label_id']) {
722
+									echo '
683 723
 					<option value="add_', $label['id'], '">&nbsp;', $label['name'], '</option>';
724
+				}
684 725
 			}
685 726
 
686 727
 			echo '
@@ -765,9 +806,10 @@  discard block
 block discarded – undo
765 806
 					<dt class="between">', $txt['pm_search_post_age'], ':</dt>
766 807
 					<dd>', $txt['pm_search_between'], ' <input type="number" name="minage" value="', empty($context['search_params']['minage']) ? '0' : $context['search_params']['minage'], '" size="5" maxlength="5" class="input_text" min="0" max="9999">&nbsp;', $txt['pm_search_between_and'], '&nbsp;<input type="number" name="maxage" value="', empty($context['search_params']['maxage']) ? '9999' : $context['search_params']['maxage'], '" size="5" maxlength="5" class="input_text" min="0" max="9999"> ', $txt['pm_search_between_days'], '</dd>
767 808
 				</dl>';
768
-	if (!$context['currently_using_labels'])
769
-		echo '
809
+	if (!$context['currently_using_labels']) {
810
+			echo '
770 811
 				<input type="submit" name="pm_search" value="', $txt['pm_search_go'], '" class="button_submit">';
812
+	}
771 813
 		echo '
772 814
 				<br class="clear_right">
773 815
 			</div>
@@ -787,12 +829,13 @@  discard block
 block discarded – undo
787 829
 				<div id="advanced_panel_div">
788 830
 					<ul id="searchLabelsExpand">';
789 831
 
790
-		foreach ($context['search_labels'] as $label)
791
-			echo '
832
+		foreach ($context['search_labels'] as $label) {
833
+					echo '
792 834
 						<li>
793 835
 							<label for="searchlabel_', $label['id'], '"><input type="checkbox" id="searchlabel_', $label['id'], '" name="searchlabel[', $label['id'], ']" value="', $label['id'], '"', $label['checked'] ? ' checked' : '', ' class="input_check">
794 836
 							', $label['name'], '</label>
795 837
 						</li>';
838
+		}
796 839
 
797 840
 		echo '
798 841
 					</ul>
@@ -852,8 +895,8 @@  discard block
 block discarded – undo
852 895
 		</div>';
853 896
 
854 897
 	// complete results ?
855
-	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages']))
856
-		echo '
898
+	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages'])) {
899
+			echo '
857 900
 	<table class="table_grid">
858 901
 	<thead>
859 902
 		<tr class="title_bar">
@@ -863,6 +906,7 @@  discard block
 block discarded – undo
863 906
 		</tr>
864 907
 	</thead>
865 908
 	<tbody>';
909
+	}
866 910
 
867 911
 	// Print each message out...
868 912
 	foreach ($context['personal_messages'] as $message)
@@ -882,11 +926,13 @@  discard block
 block discarded – undo
882 926
 
883 927
 				// Show the recipients.
884 928
 				// @todo This doesn't deal with the sent item searching quite right for bcc.
885
-				if (!empty($message['recipients']['to']))
886
-					echo implode(', ', $message['recipients']['to']);
929
+				if (!empty($message['recipients']['to'])) {
930
+									echo implode(', ', $message['recipients']['to']);
931
+				}
887 932
 				// Otherwise, we're just going to say "some people"...
888
-				elseif ($context['folder'] != 'sent')
889
-					echo '(', $txt['pm_undisclosed_recipients'], ')';
933
+				elseif ($context['folder'] != 'sent') {
934
+									echo '(', $txt['pm_undisclosed_recipients'], ')';
935
+				}
890 936
 
891 937
 					echo '
892 938
 				</h3>
@@ -900,14 +946,16 @@  discard block
 block discarded – undo
900 946
 					$quote_button = create_button('quote.png', 'reply_quote', 'reply_quote', 'class="centericon"');
901 947
 					$reply_button = create_button('im_reply.png', 'reply', 'reply', 'class="centericon"');
902 948
 					// You can only reply if they are not a guest...
903
-					if (!$message['member']['is_guest'])
904
-						echo '
949
+					if (!$message['member']['is_guest']) {
950
+											echo '
905 951
 							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
906 952
 							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
953
+					}
907 954
 					// This is for "forwarding" - even if the member is gone.
908
-					else
909
-						echo '
955
+					else {
956
+											echo '
910 957
 							<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
958
+					}
911 959
 				}
912 960
 
913 961
 				echo '
@@ -928,17 +976,19 @@  discard block
 block discarded – undo
928 976
 	}
929 977
 
930 978
 	// Finish off the page...
931
-	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages']))
932
-		echo '
979
+	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages'])) {
980
+			echo '
933 981
 		</tbody>
934 982
 		</table>';
983
+	}
935 984
 
936 985
 	// No results?
937
-	if (empty($context['personal_messages']))
938
-		echo '
986
+	if (empty($context['personal_messages'])) {
987
+			echo '
939 988
 		<div class="windowbg">
940 989
 			<p class="centertext">', $txt['pm_search_none_found'], '</p>
941 990
 		</div>';
991
+	}
942 992
 
943 993
 	echo '
944 994
 		<div class="pagesection">
@@ -962,12 +1012,14 @@  discard block
 block discarded – undo
962 1012
 				<h3 class="catbg">', $txt['pm_send_report'], '</h3>
963 1013
 			</div>
964 1014
 			<div class="windowbg">';
965
-				if (!empty($context['send_log']['sent']))
966
-					foreach ($context['send_log']['sent'] as $log_entry)
1015
+				if (!empty($context['send_log']['sent'])) {
1016
+									foreach ($context['send_log']['sent'] as $log_entry)
967 1017
 						echo '<span class="error">', $log_entry, '</span><br>';
968
-				if (!empty($context['send_log']['failed']))
969
-					foreach ($context['send_log']['failed'] as $log_entry)
1018
+				}
1019
+				if (!empty($context['send_log']['failed'])) {
1020
+									foreach ($context['send_log']['failed'] as $log_entry)
970 1021
 						echo '<span class="error">', $log_entry, '</span><br>';
1022
+				}
971 1023
 				echo '
972 1024
 			</div>
973 1025
 			<br>';
@@ -1015,12 +1067,13 @@  discard block
 block discarded – undo
1015 1067
 				</dl>
1016 1068
 			</div>';
1017 1069
 
1018
-	if (!empty($modSettings['drafts_pm_enabled']))
1019
-		echo '
1070
+	if (!empty($modSettings['drafts_pm_enabled'])) {
1071
+			echo '
1020 1072
 			<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
1021 1073
 				sprintf($txt['draft_pm_saved'], $scripturl . '?action=pm;sa=showpmdrafts'), '
1022 1074
 				', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
1023 1075
 			</div>';
1076
+	}
1024 1077
 
1025 1078
 	echo '
1026 1079
 			<dl id="post_header">';
@@ -1075,9 +1128,10 @@  discard block
 block discarded – undo
1075 1128
 	}
1076 1129
 
1077 1130
 	// What about smileys?
1078
-	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup']))
1079
-		echo '
1131
+	if (!empty($context['smileys']['postform']) || !empty($context['smileys']['popup'])) {
1132
+			echo '
1080 1133
 			<div id="smileyBox_message"></div>';
1134
+	}
1081 1135
 
1082 1136
 	// Show BBC buttons, smileys and textbox.
1083 1137
 	echo '
@@ -1124,10 +1178,11 @@  discard block
 block discarded – undo
1124 1178
 					<dt><strong>', $txt['subject'], '</strong></dt>
1125 1179
 					<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
1126 1180
 
1127
-		foreach ($context['drafts'] as $draft)
1128
-			echo '
1181
+		foreach ($context['drafts'] as $draft) {
1182
+					echo '
1129 1183
 					<dt>', $draft['link'], '</dt>
1130 1184
 					<dd>', $draft['poster_time'], '</dd>';
1185
+		}
1131 1186
 		echo '
1132 1187
 				</dl>
1133 1188
 			</div>';
@@ -1233,8 +1288,8 @@  discard block
 block discarded – undo
1233 1288
 			}';
1234 1289
 
1235 1290
 	// Code for showing and hiding drafts
1236
-	if (!empty($context['drafts']))
1237
-		echo '
1291
+	if (!empty($context['drafts'])) {
1292
+			echo '
1238 1293
 			var oSwapDraftOptions = new smc_Toggle({
1239 1294
 				bToggleEnabled: true,
1240 1295
 				bCurrentlyCollapsed: true,
@@ -1256,13 +1311,14 @@  discard block
 block discarded – undo
1256 1311
 					}
1257 1312
 				]
1258 1313
 			});';
1314
+	}
1259 1315
 
1260 1316
 	echo '
1261 1317
 		</script>';
1262 1318
 
1263 1319
 	// Show the message you're replying to.
1264
-	if ($context['reply'])
1265
-		echo '
1320
+	if ($context['reply']) {
1321
+			echo '
1266 1322
 	<br>
1267 1323
 	<br>
1268 1324
 	<div class="cat_bar">
@@ -1276,6 +1332,7 @@  discard block
 block discarded – undo
1276 1332
 		<hr>
1277 1333
 		', $context['quoted_message']['body'], '
1278 1334
 	</div><br class="clear">';
1335
+	}
1279 1336
 
1280 1337
 	echo '
1281 1338
 		<script>
@@ -1286,22 +1343,24 @@  discard block
 block discarded – undo
1286 1343
 				sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
1287 1344
 				sToControlId: \'to_control\',
1288 1345
 				aToRecipients: [';
1289
-	foreach ($context['recipients']['to'] as $i => $member)
1290
-		echo '
1346
+	foreach ($context['recipients']['to'] as $i => $member) {
1347
+			echo '
1291 1348
 					{
1292 1349
 						sItemId: ', JavaScriptEscape($member['id']), ',
1293 1350
 						sItemName: ', JavaScriptEscape($member['name']), '
1294 1351
 					}', $i == count($context['recipients']['to']) - 1 ? '' : ',';
1352
+	}
1295 1353
 
1296 1354
 	echo '
1297 1355
 				],
1298 1356
 				aBccRecipients: [';
1299
-	foreach ($context['recipients']['bcc'] as $i => $member)
1300
-		echo '
1357
+	foreach ($context['recipients']['bcc'] as $i => $member) {
1358
+			echo '
1301 1359
 					{
1302 1360
 						sItemId: ', JavaScriptEscape($member['id']), ',
1303 1361
 						sItemName: ', JavaScriptEscape($member['name']), '
1304 1362
 					}', $i == count($context['recipients']['bcc']) - 1 ? '' : ',';
1363
+	}
1305 1364
 
1306 1365
 	echo '
1307 1366
 				],
@@ -1388,26 +1447,28 @@  discard block
 block discarded – undo
1388 1447
 				</th>
1389 1448
 				<th class="centertext table_icon">';
1390 1449
 
1391
-	if (count($context['labels']) > 2)
1392
-		echo '
1450
+	if (count($context['labels']) > 2) {
1451
+			echo '
1393 1452
 					<input type="checkbox" class="input_check" onclick="invertAll(this, this.form);">';
1453
+	}
1394 1454
 
1395 1455
 	echo '
1396 1456
 				</th>
1397 1457
 			</tr>
1398 1458
 		</thead>
1399 1459
 		<tbody>';
1400
-	if (count($context['labels']) < 2)
1401
-		echo '
1460
+	if (count($context['labels']) < 2) {
1461
+			echo '
1402 1462
 			<tr class="windowbg">
1403 1463
 				<td colspan="2">', $txt['pm_labels_no_exist'], '</td>
1404 1464
 			</tr>';
1405
-	else
1465
+	} else
1406 1466
 	{
1407 1467
 		foreach ($context['labels'] as $label)
1408 1468
 		{
1409
-			if ($label['id'] == -1)
1410
-				continue;
1469
+			if ($label['id'] == -1) {
1470
+							continue;
1471
+			}
1411 1472
 
1412 1473
 				echo '
1413 1474
 			<tr class="windowbg">
@@ -1422,12 +1483,13 @@  discard block
 block discarded – undo
1422 1483
 		</tbody>
1423 1484
 		</table>';
1424 1485
 
1425
-	if (!count($context['labels']) < 2)
1426
-		echo '
1486
+	if (!count($context['labels']) < 2) {
1487
+			echo '
1427 1488
 		<div class="padding">
1428 1489
 			<input type="submit" name="save" value="', $txt['save'], '" class="button_submit">
1429 1490
 			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button_submit you_sure">
1430 1491
 		</div>';
1492
+	}
1431 1493
 
1432 1494
 	echo '
1433 1495
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1482,9 +1544,10 @@  discard block
 block discarded – undo
1482 1544
 				<dd>
1483 1545
 					<select name="id_admin">
1484 1546
 						<option value="0">', $txt['pm_report_all_admins'], '</option>';
1485
-		foreach ($context['admins'] as $id => $name)
1486
-			echo '
1547
+		foreach ($context['admins'] as $id => $name) {
1548
+					echo '
1487 1549
 						<option value="', $id, '">', $name, '</option>';
1550
+		}
1488 1551
 		echo '
1489 1552
 					</select>
1490 1553
 				</dd>';
@@ -1546,9 +1609,10 @@  discard block
 block discarded – undo
1546 1609
 				</th>
1547 1610
 				<th class="centertext table_icon">';
1548 1611
 
1549
-	if (!empty($context['rules']))
1550
-		echo '
1612
+	if (!empty($context['rules'])) {
1613
+			echo '
1551 1614
 					<input type="checkbox" onclick="invertAll(this, this.form);" class="input_check">';
1615
+	}
1552 1616
 
1553 1617
 	echo '
1554 1618
 				</th>
@@ -1556,13 +1620,14 @@  discard block
 block discarded – undo
1556 1620
 		</thead>
1557 1621
 		<tbody>';
1558 1622
 
1559
-	if (empty($context['rules']))
1560
-		echo '
1623
+	if (empty($context['rules'])) {
1624
+			echo '
1561 1625
 			<tr class="windowbg">
1562 1626
 				<td colspan="2">
1563 1627
 					', $txt['pm_rules_none'], '
1564 1628
 				</td>
1565 1629
 			</tr>';
1630
+	}
1566 1631
 
1567 1632
 	foreach ($context['rules'] as $rule)
1568 1633
 	{
@@ -1583,14 +1648,16 @@  discard block
 block discarded – undo
1583 1648
 		<div class="righttext">
1584 1649
 			<a class="button_link" href="', $scripturl, '?action=pm;sa=manrules;add;rid=0">', $txt['pm_add_rule'], '</a>';
1585 1650
 
1586
-	if (!empty($context['rules']))
1587
-		echo '
1651
+	if (!empty($context['rules'])) {
1652
+			echo '
1588 1653
 			[<a href="', $scripturl, '?action=pm;sa=manrules;apply;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['pm_js_apply_rules_confirm'], '\');">', $txt['pm_apply_rules'], '</a>]';
1654
+	}
1589 1655
 
1590
-	if (!empty($context['rules']))
1591
-		echo '
1656
+	if (!empty($context['rules'])) {
1657
+			echo '
1592 1658
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
1593 1659
 			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button_submit smalltext you_sure">';
1660
+	}
1594 1661
 
1595 1662
 	echo '
1596 1663
 		</div>
@@ -1612,14 +1679,16 @@  discard block
 block discarded – undo
1612 1679
 			var groups = new Array()
1613 1680
 			var labels = new Array()';
1614 1681
 
1615
-	foreach ($context['groups'] as $id => $title)
1616
-		echo '
1682
+	foreach ($context['groups'] as $id => $title) {
1683
+			echo '
1617 1684
 			groups[', $id, '] = "', addslashes($title), '";';
1685
+	}
1618 1686
 
1619
-	foreach ($context['labels'] as $label)
1620
-		if ($label['id'] != -1)
1687
+	foreach ($context['labels'] as $label) {
1688
+			if ($label['id'] != -1)
1621 1689
 			echo '
1622 1690
 			labels[', ($label['id']), '] = "', addslashes($label['name']), '";';
1691
+	}
1623 1692
 
1624 1693
 	echo '
1625 1694
 			function addCriteriaOption()
@@ -1634,8 +1703,9 @@  discard block
 block discarded – undo
1634 1703
 
1635 1704
 				setOuterHTML(document.getElementById("criteriaAddHere"), \'<br><select name="ruletype[\' + criteriaNum + \']" id="ruletype\' + criteriaNum + \'" onchange="updateRuleDef(\' + criteriaNum + \'); rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_criteria_pick']), ':<\' + \'/option><option value="mid">', addslashes($txt['pm_rule_mid']), '<\' + \'/option><option value="gid">', addslashes($txt['pm_rule_gid']), '<\' + \'/option><option value="sub">', addslashes($txt['pm_rule_sub']), '<\' + \'/option><option value="msg">', addslashes($txt['pm_rule_msg']), '<\' + \'/option><option value="bud">', addslashes($txt['pm_rule_bud']), '<\' + \'/option><\' + \'/select>&nbsp;<span id="defdiv\' + criteriaNum + \'" style="display: none;"><input type="text" name="ruledef[\' + criteriaNum + \']" id="ruledef\' + criteriaNum + \'" onkeyup="rebuildRuleDesc();" value="" class="input_text"><\' + \'/span><span id="defseldiv\' + criteriaNum + \'" style="display: none;"><select name="ruledefgroup[\' + criteriaNum + \']" id="ruledefgroup\' + criteriaNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_group']), '<\' + \'/option>';
1636 1705
 
1637
-	foreach ($context['groups'] as $id => $group)
1638
-		echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
1706
+	foreach ($context['groups'] as $id => $group) {
1707
+			echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
1708
+	}
1639 1709
 
1640 1710
 	echo '<\' + \'/select><\' + \'/span><span id="criteriaAddHere"><\' + \'/span>\');
1641 1711
 			}
@@ -1652,9 +1722,10 @@  discard block
 block discarded – undo
1652 1722
 
1653 1723
 				setOuterHTML(document.getElementById("actionAddHere"), \'<br><select name="acttype[\' + actionNum + \']" id="acttype\' + actionNum + \'" onchange="updateActionDef(\' + actionNum + \'); rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_action']), ':<\' + \'/option><option value="lab">', addslashes($txt['pm_rule_label']), '<\' + \'/option><option value="del">', addslashes($txt['pm_rule_delete']), '<\' + \'/option><\' + \'/select>&nbsp;<span id="labdiv\' + actionNum + \'" style="display: none;"><select name="labdef[\' + actionNum + \']" id="labdef\' + actionNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_label']), '<\' + \'/option>';
1654 1724
 
1655
-	foreach ($context['labels'] as $label)
1656
-		if ($label['id'] != -1)
1725
+	foreach ($context['labels'] as $label) {
1726
+			if ($label['id'] != -1)
1657 1727
 			echo '<option value="', ($label['id']), '">', addslashes($label['name']), '<\' + \'/option>';
1728
+	}
1658 1729
 
1659 1730
 	echo '<\' + \'/select><\' + \'/span><span id="actionAddHere"><\' + \'/span>\');
1660 1731
 			}
@@ -1768,18 +1839,20 @@  discard block
 block discarded – undo
1768 1839
 	$isFirst = true;
1769 1840
 	foreach ($context['rule']['criteria'] as $k => $criteria)
1770 1841
 	{
1771
-		if (!$isFirst && $criteria['t'] == '')
1772
-			echo '<div id="removeonjs1">';
1773
-		elseif (!$isFirst)
1774
-			echo '<br>';
1842
+		if (!$isFirst && $criteria['t'] == '') {
1843
+					echo '<div id="removeonjs1">';
1844
+		} elseif (!$isFirst) {
1845
+					echo '<br>';
1846
+		}
1775 1847
 
1776 1848
 		echo '
1777 1849
 				<select name="ruletype[', $k, ']" id="ruletype', $k, '" onchange="updateRuleDef(', $k, '); rebuildRuleDesc();">
1778 1850
 					<option value="">', $txt['pm_rule_criteria_pick'], ':</option>';
1779 1851
 
1780
-		foreach (array('mid', 'gid', 'sub', 'msg', 'bud') as $cr)
1781
-			echo '
1852
+		foreach (array('mid', 'gid', 'sub', 'msg', 'bud') as $cr) {
1853
+					echo '
1782 1854
 					<option value="', $cr, '"', $criteria['t'] == $cr ? ' selected' : '', '>', $txt['pm_rule_' . $cr], '</option>';
1855
+		}
1783 1856
 
1784 1857
 		echo '
1785 1858
 				</select>
@@ -1790,18 +1863,20 @@  discard block
 block discarded – undo
1790 1863
 					<select name="ruledefgroup[', $k, ']" id="ruledefgroup', $k, '" onchange="rebuildRuleDesc();">
1791 1864
 						<option value="">', $txt['pm_rule_sel_group'], '</option>';
1792 1865
 
1793
-		foreach ($context['groups'] as $id => $group)
1794
-			echo '
1866
+		foreach ($context['groups'] as $id => $group) {
1867
+					echo '
1795 1868
 						<option value="', $id, '"', $criteria['t'] == 'gid' && $criteria['v'] == $id ? ' selected' : '', '>', $group, '</option>';
1869
+		}
1796 1870
 		echo '
1797 1871
 					</select>
1798 1872
 				</span>';
1799 1873
 
1800 1874
 		// If this is the dummy we add a means to hide for non js users.
1801
-		if ($isFirst)
1802
-			$isFirst = false;
1803
-		elseif ($criteria['t'] == '')
1804
-			echo '</div>';
1875
+		if ($isFirst) {
1876
+					$isFirst = false;
1877
+		} elseif ($criteria['t'] == '') {
1878
+					echo '</div>';
1879
+		}
1805 1880
 	}
1806 1881
 
1807 1882
 	echo '
@@ -1824,10 +1899,11 @@  discard block
 block discarded – undo
1824 1899
 	$isFirst = true;
1825 1900
 	foreach ($context['rule']['actions'] as $k => $action)
1826 1901
 	{
1827
-		if (!$isFirst && $action['t'] == '')
1828
-			echo '<div id="removeonjs2">';
1829
-		elseif (!$isFirst)
1830
-			echo '<br>';
1902
+		if (!$isFirst && $action['t'] == '') {
1903
+					echo '<div id="removeonjs2">';
1904
+		} elseif (!$isFirst) {
1905
+					echo '<br>';
1906
+		}
1831 1907
 
1832 1908
 		echo '
1833 1909
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
@@ -1838,20 +1914,22 @@  discard block
 block discarded – undo
1838 1914
 				<span id="labdiv', $k, '">
1839 1915
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
1840 1916
 						<option value="">', $txt['pm_rule_sel_label'], '</option>';
1841
-		foreach ($context['labels'] as $label)
1842
-			if ($label['id'] != -1)
1917
+		foreach ($context['labels'] as $label) {
1918
+					if ($label['id'] != -1)
1843 1919
 				echo '
1844 1920
 						<option value="', ($label['id']), '"', $action['t'] == 'lab' && $action['v'] == $label['id'] ? ' selected' : '', '>', $label['name'], '</option>';
1921
+		}
1845 1922
 
1846 1923
 		echo '
1847 1924
 					</select>
1848 1925
 				</span>';
1849 1926
 
1850
-		if ($isFirst)
1851
-			$isFirst = false;
1852
-		elseif ($action['t'] == '')
1853
-			echo '
1927
+		if ($isFirst) {
1928
+					$isFirst = false;
1929
+		} elseif ($action['t'] == '') {
1930
+					echo '
1854 1931
 			</div>';
1932
+		}
1855 1933
 	}
1856 1934
 
1857 1935
 	echo '
@@ -1875,22 +1953,25 @@  discard block
 block discarded – undo
1875 1953
 		echo '
1876 1954
 	<script>';
1877 1955
 
1878
-	foreach ($context['rule']['criteria'] as $k => $c)
1879
-		echo '
1956
+	foreach ($context['rule']['criteria'] as $k => $c) {
1957
+			echo '
1880 1958
 			updateRuleDef(', $k, ');';
1959
+	}
1881 1960
 
1882
-	foreach ($context['rule']['actions'] as $k => $c)
1883
-		echo '
1961
+	foreach ($context['rule']['actions'] as $k => $c) {
1962
+			echo '
1884 1963
 			updateActionDef(', $k, ');';
1964
+	}
1885 1965
 
1886 1966
 	echo '
1887 1967
 			rebuildRuleDesc();';
1888 1968
 
1889 1969
 	// If this isn't a new rule and we have JS enabled remove the JS compatibility stuff.
1890
-	if ($context['rid'])
1891
-		echo '
1970
+	if ($context['rid']) {
1971
+			echo '
1892 1972
 			document.getElementById("removeonjs1").style.display = "none";
1893 1973
 			document.getElementById("removeonjs2").style.display = "none";';
1974
+	}
1894 1975
 
1895 1976
 	echo '
1896 1977
 			document.getElementById("addonjs1").style.display = "";
@@ -1918,12 +1999,12 @@  discard block
 block discarded – undo
1918 1999
 		</div>';
1919 2000
 
1920 2001
 	// No drafts? Just show an informative message.
1921
-	if (empty($context['drafts']))
1922
-		echo '
2002
+	if (empty($context['drafts'])) {
2003
+			echo '
1923 2004
 		<div class="windowbg2 centertext">
1924 2005
 			', $txt['draft_none'], '
1925 2006
 		</div>';
1926
-	else
2007
+	} else
1927 2008
 	{
1928 2009
 		// For every draft to be displayed, give it its own div, and show the important details of the draft.
1929 2010
 		foreach ($context['drafts'] as $draft)
Please login to merge, or discard this patch.