Completed
Push — release-2.1 ( e7ba5c...784b50 )
by Jeremy
17:43 queued 10:00
created
Sources/Profile-View.php 1 patch
Braces   +313 added lines, -229 removed lines patch added patch discarded remove patch
@@ -11,8 +11,9 @@  discard block
 block discarded – undo
11 11
  * @version 2.1 Beta 4
12 12
  */
13 13
 
14
-if (!defined('SMF'))
14
+if (!defined('SMF')) {
15 15
 	die('No direct access...');
16
+}
16 17
 
17 18
 /**
18 19
  * View a summary.
@@ -23,8 +24,9 @@  discard block
 block discarded – undo
23 24
 	global $context, $memberContext, $txt, $modSettings, $user_profile, $sourcedir, $scripturl, $smcFunc;
24 25
 
25 26
 	// Attempt to load the member's profile data.
26
-	if (!loadMemberContext($memID) || !isset($memberContext[$memID]))
27
-		fatal_lang_error('not_a_user', false, 404);
27
+	if (!loadMemberContext($memID) || !isset($memberContext[$memID])) {
28
+			fatal_lang_error('not_a_user', false, 404);
29
+	}
28 30
 
29 31
 	// Set up the stuff and load the user.
30 32
 	$context += array(
@@ -49,19 +51,21 @@  discard block
 block discarded – undo
49 51
 
50 52
 	// See if they have broken any warning levels...
51 53
 	list ($modSettings['warning_enable'], $modSettings['user_limit']) = explode(',', $modSettings['warning_settings']);
52
-	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning'])
53
-		$context['warning_status'] = $txt['profile_warning_is_muted'];
54
-	elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning'])
55
-		$context['warning_status'] = $txt['profile_warning_is_moderation'];
56
-	elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning'])
57
-		$context['warning_status'] = $txt['profile_warning_is_watch'];
54
+	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning']) {
55
+			$context['warning_status'] = $txt['profile_warning_is_muted'];
56
+	} elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning']) {
57
+			$context['warning_status'] = $txt['profile_warning_is_moderation'];
58
+	} elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning']) {
59
+			$context['warning_status'] = $txt['profile_warning_is_watch'];
60
+	}
58 61
 
59 62
 	// They haven't even been registered for a full day!?
60 63
 	$days_registered = (int) ((time() - $user_profile[$memID]['date_registered']) / (3600 * 24));
61
-	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1)
62
-		$context['member']['posts_per_day'] = $txt['not_applicable'];
63
-	else
64
-		$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
64
+	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1) {
65
+			$context['member']['posts_per_day'] = $txt['not_applicable'];
66
+	} else {
67
+			$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
68
+	}
65 69
 
66 70
 	// Set the age...
67 71
 	if (empty($context['member']['birth_date']) || substr($context['member']['birth_date'], 0, 4) < 1002)
@@ -70,8 +74,7 @@  discard block
 block discarded – undo
70 74
 			'age' => $txt['not_applicable'],
71 75
 			'today_is_birthday' => false
72 76
 		);
73
-	}
74
-	else
77
+	} else
75 78
 	{
76 79
 		list ($birth_year, $birth_month, $birth_day) = sscanf($context['member']['birth_date'], '%d-%d-%d');
77 80
 		$datearray = getdate(forum_time());
@@ -84,15 +87,16 @@  discard block
 block discarded – undo
84 87
 	if (allowedTo('moderate_forum'))
85 88
 	{
86 89
 		// Make sure it's a valid ip address; otherwise, don't bother...
87
-		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup']))
88
-			$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
89
-		else
90
-			$context['member']['hostname'] = '';
90
+		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup'])) {
91
+					$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
92
+		} else {
93
+					$context['member']['hostname'] = '';
94
+		}
91 95
 
92 96
 		$context['can_see_ip'] = true;
97
+	} else {
98
+			$context['can_see_ip'] = false;
93 99
 	}
94
-	else
95
-		$context['can_see_ip'] = false;
96 100
 
97 101
 	// Are they hidden?
98 102
 	$context['member']['is_hidden'] = empty($user_profile[$memID]['show_online']);
@@ -103,8 +107,9 @@  discard block
 block discarded – undo
103 107
 		include_once($sourcedir . '/Who.php');
104 108
 		$action = determineActions($user_profile[$memID]['url']);
105 109
 
106
-		if ($action !== false)
107
-			$context['member']['action'] = $action;
110
+		if ($action !== false) {
111
+					$context['member']['action'] = $action;
112
+		}
108 113
 	}
109 114
 
110 115
 	// If the user is awaiting activation, and the viewer has permission - setup some activation context messages.
@@ -133,9 +138,10 @@  discard block
 block discarded – undo
133 138
 		list ($sig_limits, $sig_bbc) = explode(':', $modSettings['signature_settings']);
134 139
 		$sig_limits = explode(',', $sig_limits);
135 140
 
136
-		if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
137
-			addInlineCss('
141
+		if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
142
+					addInlineCss('
138 143
 	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
144
+		}
139 145
 	}
140 146
 
141 147
 	// How about, are they banned?
@@ -178,13 +184,15 @@  discard block
 block discarded – undo
178 184
 		{
179 185
 			// Work out what restrictions we actually have.
180 186
 			$ban_restrictions = array();
181
-			foreach (array('access', 'login', 'post') as $type)
182
-				if ($row['cannot_' . $type])
187
+			foreach (array('access', 'login', 'post') as $type) {
188
+							if ($row['cannot_' . $type])
183 189
 					$ban_restrictions[] = $txt['ban_type_' . $type];
190
+			}
184 191
 
185 192
 			// No actual ban in place?
186
-			if (empty($ban_restrictions))
187
-				continue;
193
+			if (empty($ban_restrictions)) {
194
+							continue;
195
+			}
188 196
 
189 197
 			// Prepare the link for context.
190 198
 			$ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>');
@@ -206,9 +214,10 @@  discard block
 block discarded – undo
206 214
 	$context['print_custom_fields'] = array();
207 215
 
208 216
 	// Any custom profile fields?
209
-	if (!empty($context['custom_fields']))
210
-		foreach ($context['custom_fields'] as $custom)
217
+	if (!empty($context['custom_fields'])) {
218
+			foreach ($context['custom_fields'] as $custom)
211 219
 			$context['print_custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
220
+	}
212 221
 
213 222
 }
214 223
 
@@ -233,8 +242,9 @@  discard block
 block discarded – undo
233 242
 	// are we someone else?
234 243
 	if (empty($user_info) || $user_info['id'] != $memID)
235 244
 	{
236
-		if (empty($user_profile[$memID]))
237
-			loadMemberData($memID, false, 'profile');
245
+		if (empty($user_profile[$memID])) {
246
+					loadMemberData($memID, false, 'profile');
247
+		}
238 248
 		$user_info = $user_profile[$memID];
239 249
 	}
240 250
 
@@ -265,16 +275,18 @@  discard block
 block discarded – undo
265 275
 		$row['extra'] = !empty($row['extra']) ? $smcFunc['json_decode']($row['extra'], true) : array();
266 276
 		$alerts[$id_alert] = $row;
267 277
 
268
-		if (!empty($row['sender_id']))
269
-			$senders[] = $row['sender_id'];
278
+		if (!empty($row['sender_id'])) {
279
+					$senders[] = $row['sender_id'];
280
+		}
270 281
 	}
271 282
 	$smcFunc['db_free_result']($request);
272 283
 
273 284
 	if($withSender)
274 285
 	{
275 286
 		$senders = loadMemberData($senders);
276
-		foreach ($senders as $member)
277
-			loadMemberContext($member);
287
+		foreach ($senders as $member) {
288
+					loadMemberContext($member);
289
+		}
278 290
 	}
279 291
 
280 292
 	// Now go through and actually make with the text.
@@ -289,12 +301,15 @@  discard block
 block discarded – undo
289 301
 	$msgs = array();
290 302
 	foreach ($alerts as $id_alert => $alert)
291 303
 	{
292
-		if (isset($alert['extra']['board']))
293
-			$boards[$alert['extra']['board']] = $txt['board_na'];
294
-		if (isset($alert['extra']['topic']))
295
-			$topics[$alert['extra']['topic']] = $txt['topic_na'];
296
-		if ($alert['content_type'] == 'msg')
297
-			$msgs[$alert['content_id']] = $txt['topic_na'];
304
+		if (isset($alert['extra']['board'])) {
305
+					$boards[$alert['extra']['board']] = $txt['board_na'];
306
+		}
307
+		if (isset($alert['extra']['topic'])) {
308
+					$topics[$alert['extra']['topic']] = $txt['topic_na'];
309
+		}
310
+		if ($alert['content_type'] == 'msg') {
311
+					$msgs[$alert['content_id']] = $txt['topic_na'];
312
+		}
298 313
 	}
299 314
 
300 315
 	// Having figured out what boards etc. there are, let's now get the names of them if we can see them. If not, there's already a fallback set up.
@@ -309,8 +324,9 @@  discard block
 block discarded – undo
309 324
 				'boards' => array_keys($boards),
310 325
 			)
311 326
 		);
312
-		while ($row = $smcFunc['db_fetch_assoc']($request))
313
-			$boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
327
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
328
+					$boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
329
+		}
314 330
 	}
315 331
 	if (!empty($topics))
316 332
 	{
@@ -325,8 +341,9 @@  discard block
 block discarded – undo
325 341
 				'topics' => array_keys($topics),
326 342
 			)
327 343
 		);
328
-		while ($row = $smcFunc['db_fetch_assoc']($request))
329
-			$topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>';
344
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
345
+					$topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>';
346
+		}
330 347
 	}
331 348
 	if (!empty($msgs))
332 349
 	{
@@ -341,44 +358,51 @@  discard block
 block discarded – undo
341 358
 				'msgs' => array_keys($msgs),
342 359
 			)
343 360
 		);
344
-		while ($row = $smcFunc['db_fetch_assoc']($request))
345
-			$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
361
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
362
+					$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
363
+		}
346 364
 	}
347 365
 
348 366
 	// Now to go back through the alerts, reattach this extra information and then try to build the string out of it (if a hook didn't already)
349 367
 	foreach ($alerts as $id_alert => $alert)
350 368
 	{
351
-		if (!empty($alert['text']))
352
-			continue;
353
-		if (isset($alert['extra']['board']))
354
-			if ($boards[$alert['extra']['board']] == $txt['board_na'])
369
+		if (!empty($alert['text'])) {
370
+					continue;
371
+		}
372
+		if (isset($alert['extra']['board'])) {
373
+					if ($boards[$alert['extra']['board']] == $txt['board_na'])
355 374
 			{
356 375
 				unset($alerts[$id_alert]);
376
+		}
357 377
 				continue;
378
+			} else {
379
+							$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
358 380
 			}
359
-			else
360
-				$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
361
-		if (isset($alert['extra']['topic']))
362
-			if ($alert['extra']['topic'] == $txt['topic_na'])
381
+		if (isset($alert['extra']['topic'])) {
382
+					if ($alert['extra']['topic'] == $txt['topic_na'])
363 383
 			{
364 384
 				unset($alerts[$id_alert]);
385
+		}
365 386
 				continue;
387
+			} else {
388
+							$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
366 389
 			}
367
-			else
368
-				$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
369
-		if ($alert['content_type'] == 'msg')
370
-			if ($msgs[$alert['content_id']] == $txt['topic_na'])
390
+		if ($alert['content_type'] == 'msg') {
391
+					if ($msgs[$alert['content_id']] == $txt['topic_na'])
371 392
 			{
372 393
 				unset($alerts[$id_alert]);
394
+		}
373 395
 				continue;
396
+			} else {
397
+							$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
374 398
 			}
375
-			else
376
-				$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
377
-		if ($alert['content_type'] == 'profile')
378
-			$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
399
+		if ($alert['content_type'] == 'profile') {
400
+					$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
401
+		}
379 402
 
380
-		if (!empty($memberContext[$alert['sender_id']]))
381
-			$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
403
+		if (!empty($memberContext[$alert['sender_id']])) {
404
+					$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
405
+		}
382 406
 
383 407
 		$string = 'alert_' . $alert['content_type'] . '_' . $alert['content_action'];
384 408
 		if (isset($txt[$string]))
@@ -428,8 +452,8 @@  discard block
 block discarded – undo
428 452
 	$context['pagination'] = constructPageIndex($scripturl . '?action=profile;area=showalerts;u=' . $memID, $start, $count, $maxIndex, false);
429 453
 
430 454
 	// Set some JavaScript for checking all alerts at once.
431
-	if ($context['showCheckboxes'])
432
-		addInlineJavaScript('
455
+	if ($context['showCheckboxes']) {
456
+			addInlineJavaScript('
433 457
 		$(function(){
434 458
 			$(\'#select_all\').on(\'change\', function() {
435 459
 				var checkboxes = $(\'ul.quickbuttons\').find(\':checkbox\');
@@ -441,6 +465,7 @@  discard block
 block discarded – undo
441 465
 				}
442 466
 			});
443 467
 		});', true);
468
+	}
444 469
 
445 470
 	// Set a nice message.
446 471
 	if (!empty($_SESSION['update_message']))
@@ -472,11 +497,11 @@  discard block
 block discarded – undo
472 497
 		checkSession('request');
473 498
 
474 499
 		// Call it!
475
-		if ($action == 'remove')
476
-			alert_delete($toMark, $memID);
477
-
478
-		else
479
-			alert_mark($memID, $toMark, $action == 'read' ? 1 : 0);
500
+		if ($action == 'remove') {
501
+					alert_delete($toMark, $memID);
502
+		} else {
503
+					alert_mark($memID, $toMark, $action == 'read' ? 1 : 0);
504
+		}
480 505
 
481 506
 		// Set a nice update message.
482 507
 		$_SESSION['update_message'] = true;
@@ -526,23 +551,27 @@  discard block
 block discarded – undo
526 551
 	);
527 552
 
528 553
 	// Set the page title
529
-	if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title))
530
-		$context['page_title'] = $txt['show' . $title[$_GET['sa']]];
531
-	else
532
-		$context['page_title'] = $txt['showPosts'];
554
+	if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title)) {
555
+			$context['page_title'] = $txt['show' . $title[$_GET['sa']]];
556
+	} else {
557
+			$context['page_title'] = $txt['showPosts'];
558
+	}
533 559
 
534 560
 	$context['page_title'] .= ' - ' . $user_profile[$memID]['real_name'];
535 561
 
536 562
 	// Is the load average too high to allow searching just now?
537
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts'])
538
-		fatal_lang_error('loadavg_show_posts_disabled', false);
563
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts']) {
564
+			fatal_lang_error('loadavg_show_posts_disabled', false);
565
+	}
539 566
 
540 567
 	// If we're specifically dealing with attachments use that function!
541
-	if (isset($_GET['sa']) && $_GET['sa'] == 'attach')
542
-		return showAttachments($memID);
568
+	if (isset($_GET['sa']) && $_GET['sa'] == 'attach') {
569
+			return showAttachments($memID);
570
+	}
543 571
 	// Instead, if we're dealing with unwatched topics (and the feature is enabled) use that other function.
544
-	elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics')
545
-		return showUnwatched($memID);
572
+	elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics') {
573
+			return showUnwatched($memID);
574
+	}
546 575
 
547 576
 	// Are we just viewing topics?
548 577
 	$context['is_topics'] = isset($_GET['sa']) && $_GET['sa'] == 'topics' ? true : false;
@@ -565,27 +594,30 @@  discard block
 block discarded – undo
565 594
 		$smcFunc['db_free_result']($request);
566 595
 
567 596
 		// Trying to remove a message that doesn't exist.
568
-		if (empty($info))
569
-			redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
597
+		if (empty($info)) {
598
+					redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
599
+		}
570 600
 
571 601
 		// We can be lazy, since removeMessage() will check the permissions for us.
572 602
 		require_once($sourcedir . '/RemoveTopic.php');
573 603
 		removeMessage((int) $_GET['delete']);
574 604
 
575 605
 		// Add it to the mod log.
576
-		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id']))
577
-			logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3]));
606
+		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) {
607
+					logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3]));
608
+		}
578 609
 
579 610
 		// Back to... where we are now ;).
580 611
 		redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
581 612
 	}
582 613
 
583 614
 	// Default to 10.
584
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
585
-		$_REQUEST['viewscount'] = '10';
615
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
616
+			$_REQUEST['viewscount'] = '10';
617
+	}
586 618
 
587
-	if ($context['is_topics'])
588
-		$request = $smcFunc['db_query']('', '
619
+	if ($context['is_topics']) {
620
+			$request = $smcFunc['db_query']('', '
589 621
 			SELECT COUNT(*)
590 622
 			FROM {db_prefix}topics AS t' . ($user_info['query_see_board'] == '1=1' ? '' : '
591 623
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board AND {query_see_board})') . '
@@ -598,8 +630,8 @@  discard block
 block discarded – undo
598 630
 				'board' => $board,
599 631
 			)
600 632
 		);
601
-	else
602
-		$request = $smcFunc['db_query']('', '
633
+	} else {
634
+			$request = $smcFunc['db_query']('', '
603 635
 			SELECT COUNT(*)
604 636
 			FROM {db_prefix}messages AS m' . ($user_info['query_see_board'] == '1=1' ? '' : '
605 637
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board AND {query_see_board})') . '
@@ -612,6 +644,7 @@  discard block
 block discarded – undo
612 644
 				'board' => $board,
613 645
 			)
614 646
 		);
647
+	}
615 648
 	list ($msgCount) = $smcFunc['db_fetch_row']($request);
616 649
 	$smcFunc['db_free_result']($request);
617 650
 
@@ -632,10 +665,11 @@  discard block
 block discarded – undo
632 665
 
633 666
 	$range_limit = '';
634 667
 
635
-	if ($context['is_topics'])
636
-		$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
637
-	else
638
-		$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
668
+	if ($context['is_topics']) {
669
+			$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
670
+	} else {
671
+			$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
672
+	}
639 673
 
640 674
 	$maxIndex = $maxPerPage;
641 675
 
@@ -661,9 +695,9 @@  discard block
 block discarded – undo
661 695
 		{
662 696
 			$margin *= 5;
663 697
 			$range_limit = $reverse ? 't.id_first_msg < ' . ($min_msg_member + $margin) : 't.id_first_msg > ' . ($max_msg_member - $margin);
698
+		} else {
699
+					$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
664 700
 		}
665
-		else
666
-			$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
667 701
 	}
668 702
 
669 703
 	// Find this user's posts.  The left join on categories somehow makes this faster, weird as it looks.
@@ -695,8 +729,7 @@  discard block
 block discarded – undo
695 729
 					'max' => $maxIndex,
696 730
 				)
697 731
 			);
698
-		}
699
-		else
732
+		} else
700 733
 		{
701 734
 			$request = $smcFunc['db_query']('', '
702 735
 				SELECT
@@ -725,8 +758,9 @@  discard block
 block discarded – undo
725 758
 		}
726 759
 
727 760
 		// Make sure we quit this loop.
728
-		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped || $range_limit == '')
729
-			break;
761
+		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped || $range_limit == '') {
762
+					break;
763
+		}
730 764
 		$looped = true;
731 765
 		$range_limit = '';
732 766
 	}
@@ -770,19 +804,21 @@  discard block
 block discarded – undo
770 804
 			'css_class' => $row['approved'] ? 'windowbg' : 'approvebg',
771 805
 		);
772 806
 
773
-		if ($user_info['id'] == $row['id_member_started'])
774
-			$board_ids['own'][$row['id_board']][] = $counter;
807
+		if ($user_info['id'] == $row['id_member_started']) {
808
+					$board_ids['own'][$row['id_board']][] = $counter;
809
+		}
775 810
 		$board_ids['any'][$row['id_board']][] = $counter;
776 811
 	}
777 812
 	$smcFunc['db_free_result']($request);
778 813
 
779 814
 	// All posts were retrieved in reverse order, get them right again.
780
-	if ($reverse)
781
-		$context['posts'] = array_reverse($context['posts'], true);
815
+	if ($reverse) {
816
+			$context['posts'] = array_reverse($context['posts'], true);
817
+	}
782 818
 
783 819
 	// These are all the permissions that are different from board to board..
784
-	if ($context['is_topics'])
785
-		$permissions = array(
820
+	if ($context['is_topics']) {
821
+			$permissions = array(
786 822
 			'own' => array(
787 823
 				'post_reply_own' => 'can_reply',
788 824
 			),
@@ -790,8 +826,8 @@  discard block
 block discarded – undo
790 826
 				'post_reply_any' => 'can_reply',
791 827
 			)
792 828
 		);
793
-	else
794
-		$permissions = array(
829
+	} else {
830
+			$permissions = array(
795 831
 			'own' => array(
796 832
 				'post_reply_own' => 'can_reply',
797 833
 				'delete_own' => 'can_delete',
@@ -801,6 +837,7 @@  discard block
 block discarded – undo
801 837
 				'delete_any' => 'can_delete',
802 838
 			)
803 839
 		);
840
+	}
804 841
 
805 842
 	// For every permission in the own/any lists...
806 843
 	foreach ($permissions as $type => $list)
@@ -811,19 +848,22 @@  discard block
 block discarded – undo
811 848
 			$boards = boardsAllowedTo($permission);
812 849
 
813 850
 			// Hmm, they can do it on all boards, can they?
814
-			if (!empty($boards) && $boards[0] == 0)
815
-				$boards = array_keys($board_ids[$type]);
851
+			if (!empty($boards) && $boards[0] == 0) {
852
+							$boards = array_keys($board_ids[$type]);
853
+			}
816 854
 
817 855
 			// Now go through each board they can do the permission on.
818 856
 			foreach ($boards as $board_id)
819 857
 			{
820 858
 				// There aren't any posts displayed from this board.
821
-				if (!isset($board_ids[$type][$board_id]))
822
-					continue;
859
+				if (!isset($board_ids[$type][$board_id])) {
860
+									continue;
861
+				}
823 862
 
824 863
 				// Set the permission to true ;).
825
-				foreach ($board_ids[$type][$board_id] as $counter)
826
-					$context['posts'][$counter][$allowed] = true;
864
+				foreach ($board_ids[$type][$board_id] as $counter) {
865
+									$context['posts'][$counter][$allowed] = true;
866
+				}
827 867
 			}
828 868
 		}
829 869
 	}
@@ -854,8 +894,9 @@  discard block
 block discarded – undo
854 894
 	$boardsAllowed = boardsAllowedTo('view_attachments');
855 895
 
856 896
 	// Make sure we can't actually see anything...
857
-	if (empty($boardsAllowed))
858
-		$boardsAllowed = array(-1);
897
+	if (empty($boardsAllowed)) {
898
+			$boardsAllowed = array(-1);
899
+	}
859 900
 
860 901
 	require_once($sourcedir . '/Subs-List.php');
861 902
 
@@ -1006,8 +1047,8 @@  discard block
 block discarded – undo
1006 1047
 		)
1007 1048
 	);
1008 1049
 	$attachments = array();
1009
-	while ($row = $smcFunc['db_fetch_assoc']($request))
1010
-		$attachments[] = array(
1050
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
1051
+			$attachments[] = array(
1011 1052
 			'id' => $row['id_attach'],
1012 1053
 			'filename' => $row['filename'],
1013 1054
 			'downloads' => $row['downloads'],
@@ -1019,6 +1060,7 @@  discard block
 block discarded – undo
1019 1060
 			'board_name' => $row['name'],
1020 1061
 			'approved' => $row['approved'],
1021 1062
 		);
1063
+	}
1022 1064
 
1023 1065
 	$smcFunc['db_free_result']($request);
1024 1066
 
@@ -1073,8 +1115,9 @@  discard block
 block discarded – undo
1073 1115
 	global $txt, $user_info, $scripturl, $modSettings, $context, $sourcedir;
1074 1116
 
1075 1117
 	// Only the owner can see the list (if the function is enabled of course)
1076
-	if ($user_info['id'] != $memID)
1077
-		return;
1118
+	if ($user_info['id'] != $memID) {
1119
+			return;
1120
+	}
1078 1121
 
1079 1122
 	require_once($sourcedir . '/Subs-List.php');
1080 1123
 
@@ -1220,8 +1263,9 @@  discard block
 block discarded – undo
1220 1263
 	);
1221 1264
 
1222 1265
 	$topics = array();
1223
-	while ($row = $smcFunc['db_fetch_assoc']($request))
1224
-		$topics[] = $row['id_topic'];
1266
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
1267
+			$topics[] = $row['id_topic'];
1268
+	}
1225 1269
 
1226 1270
 	$smcFunc['db_free_result']($request);
1227 1271
 
@@ -1241,8 +1285,9 @@  discard block
 block discarded – undo
1241 1285
 				'topics' => $topics,
1242 1286
 			)
1243 1287
 		);
1244
-		while ($row = $smcFunc['db_fetch_assoc']($request))
1245
-			$topicsInfo[] = $row;
1288
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
1289
+					$topicsInfo[] = $row;
1290
+		}
1246 1291
 		$smcFunc['db_free_result']($request);
1247 1292
 	}
1248 1293
 
@@ -1290,8 +1335,9 @@  discard block
 block discarded – undo
1290 1335
 	$context['page_title'] = $txt['statPanel_showStats'] . ' ' . $user_profile[$memID]['real_name'];
1291 1336
 
1292 1337
 	// Is the load average too high to allow searching just now?
1293
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats'])
1294
-		fatal_lang_error('loadavg_userstats_disabled', false);
1338
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats']) {
1339
+			fatal_lang_error('loadavg_userstats_disabled', false);
1340
+	}
1295 1341
 
1296 1342
 	// General user statistics.
1297 1343
 	$timeDays = floor($user_profile[$memID]['total_time_logged_in'] / 86400);
@@ -1434,11 +1480,13 @@  discard block
 block discarded – undo
1434 1480
 	}
1435 1481
 	$smcFunc['db_free_result']($result);
1436 1482
 
1437
-	if ($maxPosts > 0)
1438
-		for ($hour = 0; $hour < 24; $hour++)
1483
+	if ($maxPosts > 0) {
1484
+			for ($hour = 0;
1485
+	}
1486
+	$hour < 24; $hour++)
1439 1487
 		{
1440
-			if (!isset($context['posts_by_time'][$hour]))
1441
-				$context['posts_by_time'][$hour] = array(
1488
+			if (!isset($context['posts_by_time'][$hour])) {
1489
+							$context['posts_by_time'][$hour] = array(
1442 1490
 					'hour' => $hour,
1443 1491
 					'hour_format' => stripos($user_info['time_format'], '%p') === false ? $hour : date('g a', mktime($hour)),
1444 1492
 					'posts' => 0,
@@ -1446,7 +1494,7 @@  discard block
 block discarded – undo
1446 1494
 					'relative_percent' => 0,
1447 1495
 					'is_last' => $hour == 23,
1448 1496
 				);
1449
-			else
1497
+			} else
1450 1498
 			{
1451 1499
 				$context['posts_by_time'][$hour]['posts_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $realPosts);
1452 1500
 				$context['posts_by_time'][$hour]['relative_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $maxPosts);
@@ -1479,8 +1527,9 @@  discard block
 block discarded – undo
1479 1527
 
1480 1528
 	foreach ($subActions as $sa => $action)
1481 1529
 	{
1482
-		if (!allowedTo($action[2]))
1483
-			unset($subActions[$sa]);
1530
+		if (!allowedTo($action[2])) {
1531
+					unset($subActions[$sa]);
1532
+		}
1484 1533
 	}
1485 1534
 
1486 1535
 	// Create the tabs for the template.
@@ -1498,15 +1547,18 @@  discard block
 block discarded – undo
1498 1547
 	);
1499 1548
 
1500 1549
 	// Moderation must be on to track edits.
1501
-	if (empty($modSettings['userlog_enabled']))
1502
-		unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']);
1550
+	if (empty($modSettings['userlog_enabled'])) {
1551
+			unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']);
1552
+	}
1503 1553
 
1504 1554
 	// Group requests must be active to show it...
1505
-	if (empty($modSettings['show_group_membership']))
1506
-		unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']);
1555
+	if (empty($modSettings['show_group_membership'])) {
1556
+			unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']);
1557
+	}
1507 1558
 
1508
-	if (empty($subActions))
1509
-		fatal_lang_error('no_access', false);
1559
+	if (empty($subActions)) {
1560
+			fatal_lang_error('no_access', false);
1561
+	}
1510 1562
 
1511 1563
 	$keys = array_keys($subActions);
1512 1564
 	$default = array_shift($keys);
@@ -1519,9 +1571,10 @@  discard block
 block discarded – undo
1519 1571
 	$context['sub_template'] = $subActions[$context['tracking_area']][0];
1520 1572
 	$call = call_helper($subActions[$context['tracking_area']][0], true);
1521 1573
 
1522
-	if (!empty($call))
1523
-		call_user_func($call, $memID);
1524
-}
1574
+	if (!empty($call)) {
1575
+			call_user_func($call, $memID);
1576
+	}
1577
+	}
1525 1578
 
1526 1579
 /**
1527 1580
  * Handles tracking a user's activity
@@ -1537,8 +1590,9 @@  discard block
 block discarded – undo
1537 1590
 	isAllowedTo('moderate_forum');
1538 1591
 
1539 1592
 	$context['last_ip'] = $user_profile[$memID]['member_ip'];
1540
-	if ($context['last_ip'] != $user_profile[$memID]['member_ip2'])
1541
-		$context['last_ip2'] = $user_profile[$memID]['member_ip2'];
1593
+	if ($context['last_ip'] != $user_profile[$memID]['member_ip2']) {
1594
+			$context['last_ip2'] = $user_profile[$memID]['member_ip2'];
1595
+	}
1542 1596
 	$context['member']['name'] = $user_profile[$memID]['real_name'];
1543 1597
 
1544 1598
 	// Set the options for the list component.
@@ -1705,8 +1759,9 @@  discard block
 block discarded – undo
1705 1759
 			)
1706 1760
 		);
1707 1761
 		$message_members = array();
1708
-		while ($row = $smcFunc['db_fetch_assoc']($request))
1709
-			$message_members[] = $row['id_member'];
1762
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
1763
+					$message_members[] = $row['id_member'];
1764
+		}
1710 1765
 		$smcFunc['db_free_result']($request);
1711 1766
 
1712 1767
 		// Fetch their names, cause of the GROUP BY doesn't like giving us that normally.
@@ -1721,8 +1776,9 @@  discard block
 block discarded – undo
1721 1776
 					'ip_list' => $ips,
1722 1777
 				)
1723 1778
 			);
1724
-			while ($row = $smcFunc['db_fetch_assoc']($request))
1725
-				$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
1779
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
1780
+							$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
1781
+			}
1726 1782
 			$smcFunc['db_free_result']($request);
1727 1783
 		}
1728 1784
 
@@ -1736,8 +1792,9 @@  discard block
 block discarded – undo
1736 1792
 				'ip_list' => $ips,
1737 1793
 			)
1738 1794
 		);
1739
-		while ($row = $smcFunc['db_fetch_assoc']($request))
1740
-			$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
1795
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
1796
+					$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
1797
+		}
1741 1798
 		$smcFunc['db_free_result']($request);
1742 1799
 	}
1743 1800
 }
@@ -1797,8 +1854,8 @@  discard block
 block discarded – undo
1797 1854
 		))
1798 1855
 	);
1799 1856
 	$error_messages = array();
1800
-	while ($row = $smcFunc['db_fetch_assoc']($request))
1801
-		$error_messages[] = array(
1857
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
1858
+			$error_messages[] = array(
1802 1859
 			'ip' => inet_dtop($row['ip']),
1803 1860
 			'member_link' => $row['id_member'] > 0 ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>' : $row['display_name'],
1804 1861
 			'message' => strtr($row['message'], array('&lt;span class=&quot;remove&quot;&gt;' => '', '&lt;/span&gt;' => '')),
@@ -1806,6 +1863,7 @@  discard block
 block discarded – undo
1806 1863
 			'time' => timeformat($row['log_time']),
1807 1864
 			'timestamp' => forum_time(true, $row['log_time']),
1808 1865
 		);
1866
+	}
1809 1867
 	$smcFunc['db_free_result']($request);
1810 1868
 
1811 1869
 	return $error_messages;
@@ -1868,8 +1926,8 @@  discard block
 block discarded – undo
1868 1926
 		))
1869 1927
 	);
1870 1928
 	$messages = array();
1871
-	while ($row = $smcFunc['db_fetch_assoc']($request))
1872
-		$messages[] = array(
1929
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
1930
+			$messages[] = array(
1873 1931
 			'ip' => inet_dtop($row['poster_ip']),
1874 1932
 			'member_link' => empty($row['id_member']) ? $row['display_name'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>',
1875 1933
 			'board' => array(
@@ -1882,6 +1940,7 @@  discard block
 block discarded – undo
1882 1940
 			'time' => timeformat($row['poster_time']),
1883 1941
 			'timestamp' => forum_time(true, $row['poster_time'])
1884 1942
 		);
1943
+	}
1885 1944
 	$smcFunc['db_free_result']($request);
1886 1945
 
1887 1946
 	return $messages;
@@ -1908,19 +1967,20 @@  discard block
 block discarded – undo
1908 1967
 		$context['sub_template'] = 'trackIP';
1909 1968
 		$context['page_title'] = $txt['profile'];
1910 1969
 		$context['base_url'] = $scripturl . '?action=trackip';
1911
-	}
1912
-	else
1970
+	} else
1913 1971
 	{
1914 1972
 		$context['ip'] = ip2range($user_profile[$memID]['member_ip']);
1915 1973
 		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
1916 1974
 	}
1917 1975
 
1918 1976
 	// Searching?
1919
-	if (isset($_REQUEST['searchip']))
1920
-		$context['ip'] = ip2range(trim($_REQUEST['searchip']));
1977
+	if (isset($_REQUEST['searchip'])) {
1978
+			$context['ip'] = ip2range(trim($_REQUEST['searchip']));
1979
+	}
1921 1980
 
1922
-	if (count($context['ip']) !== 2)
1923
-		fatal_lang_error('invalid_tracking_ip', false);
1981
+	if (count($context['ip']) !== 2) {
1982
+			fatal_lang_error('invalid_tracking_ip', false);
1983
+	}
1924 1984
 
1925 1985
 	$ip_string = array('{inet:ip_address_low}','{inet:ip_address_high}');
1926 1986
 	$fields = array(
@@ -1930,13 +1990,15 @@  discard block
 block discarded – undo
1930 1990
 
1931 1991
 	$ip_var = $context['ip'];
1932 1992
 
1933
-	if ($context['ip']['low'] !==  $context['ip']['high'])
1934
-		$context['ip'] = $context['ip']['low'] . ' - ' . $context['ip']['high'];
1935
-	else
1936
-		$context['ip'] = $context['ip']['low'];
1993
+	if ($context['ip']['low'] !==  $context['ip']['high']) {
1994
+			$context['ip'] = $context['ip']['low'] . ' - ' . $context['ip']['high'];
1995
+	} else {
1996
+			$context['ip'] = $context['ip']['low'];
1997
+	}
1937 1998
 
1938
-	if (empty($context['tracking_area']))
1939
-		$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
1999
+	if (empty($context['tracking_area'])) {
2000
+			$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
2001
+	}
1940 2002
 
1941 2003
 	$request = $smcFunc['db_query']('', '
1942 2004
 		SELECT id_member, real_name AS display_name, member_ip
@@ -1945,8 +2007,9 @@  discard block
 block discarded – undo
1945 2007
 		$fields
1946 2008
 	);
1947 2009
 	$context['ips'] = array();
1948
-	while ($row = $smcFunc['db_fetch_assoc']($request))
1949
-		$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
2010
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
2011
+			$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
2012
+	}
1950 2013
 	$smcFunc['db_free_result']($request);
1951 2014
 
1952 2015
 	ksort($context['ips']);
@@ -2176,10 +2239,11 @@  discard block
 block discarded – undo
2176 2239
 	// Gonna want this for the list.
2177 2240
 	require_once($sourcedir . '/Subs-List.php');
2178 2241
 
2179
-	if ($memID == 0)
2180
-		$context['base_url'] = $scripturl . '?action=trackip';
2181
-	else
2182
-		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
2242
+	if ($memID == 0) {
2243
+			$context['base_url'] = $scripturl . '?action=trackip';
2244
+	} else {
2245
+			$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
2246
+	}
2183 2247
 
2184 2248
 	// Start with the user messages.
2185 2249
 	$listOptions = array(
@@ -2289,12 +2353,13 @@  discard block
 block discarded – undo
2289 2353
 		)
2290 2354
 	);
2291 2355
 	$logins = array();
2292
-	while ($row = $smcFunc['db_fetch_assoc']($request))
2293
-		$logins[] = array(
2356
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
2357
+			$logins[] = array(
2294 2358
 			'time' => timeformat($row['time']),
2295 2359
 			'ip' => inet_dtop($row['ip']),
2296 2360
 			'ip2' => inet_dtop($row['ip2']),
2297 2361
 		);
2362
+	}
2298 2363
 	$smcFunc['db_free_result']($request);
2299 2364
 
2300 2365
 	return $logins;
@@ -2319,11 +2384,12 @@  discard block
 block discarded – undo
2319 2384
 		)
2320 2385
 	);
2321 2386
 	$context['custom_field_titles'] = array();
2322
-	while ($row = $smcFunc['db_fetch_assoc']($request))
2323
-		$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
2387
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
2388
+			$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
2324 2389
 			'title' => $row['field_name'],
2325 2390
 			'parse_bbc' => $row['bbc'],
2326 2391
 		);
2392
+	}
2327 2393
 	$smcFunc['db_free_result']($request);
2328 2394
 
2329 2395
 	// Set the options for the error lists.
@@ -2462,19 +2528,22 @@  discard block
 block discarded – undo
2462 2528
 	while ($row = $smcFunc['db_fetch_assoc']($request))
2463 2529
 	{
2464 2530
 		$extra = $smcFunc['json_decode']($row['extra'], true);
2465
-		if (!empty($extra['applicator']))
2466
-			$members[] = $extra['applicator'];
2531
+		if (!empty($extra['applicator'])) {
2532
+					$members[] = $extra['applicator'];
2533
+		}
2467 2534
 
2468 2535
 		// Work out what the name of the action is.
2469
-		if (isset($txt['trackEdit_action_' . $row['action']]))
2470
-			$action_text = $txt['trackEdit_action_' . $row['action']];
2471
-		elseif (isset($txt[$row['action']]))
2472
-			$action_text = $txt[$row['action']];
2536
+		if (isset($txt['trackEdit_action_' . $row['action']])) {
2537
+					$action_text = $txt['trackEdit_action_' . $row['action']];
2538
+		} elseif (isset($txt[$row['action']])) {
2539
+					$action_text = $txt[$row['action']];
2540
+		}
2473 2541
 		// Custom field?
2474
-		elseif (isset($context['custom_field_titles'][$row['action']]))
2475
-			$action_text = $context['custom_field_titles'][$row['action']]['title'];
2476
-		else
2477
-			$action_text = $row['action'];
2542
+		elseif (isset($context['custom_field_titles'][$row['action']])) {
2543
+					$action_text = $context['custom_field_titles'][$row['action']]['title'];
2544
+		} else {
2545
+					$action_text = $row['action'];
2546
+		}
2478 2547
 
2479 2548
 		// Parse BBC?
2480 2549
 		$parse_bbc = isset($context['custom_field_titles'][$row['action']]) && $context['custom_field_titles'][$row['action']]['parse_bbc'] ? true : false;
@@ -2506,13 +2575,15 @@  discard block
 block discarded – undo
2506 2575
 			)
2507 2576
 		);
2508 2577
 		$members = array();
2509
-		while ($row = $smcFunc['db_fetch_assoc']($request))
2510
-			$members[$row['id_member']] = $row['real_name'];
2578
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
2579
+					$members[$row['id_member']] = $row['real_name'];
2580
+		}
2511 2581
 		$smcFunc['db_free_result']($request);
2512 2582
 
2513
-		foreach ($edits as $key => $value)
2514
-			if (isset($members[$value['id_member']]))
2583
+		foreach ($edits as $key => $value) {
2584
+					if (isset($members[$value['id_member']]))
2515 2585
 				$edits[$key]['member_link'] = '<a href="' . $scripturl . '?action=profile;u=' . $value['id_member'] . '">' . $members[$value['id_member']] . '</a>';
2586
+		}
2516 2587
 	}
2517 2588
 
2518 2589
 	return $edits;
@@ -2713,10 +2784,11 @@  discard block
 block discarded – undo
2713 2784
 	$context['board'] = $board;
2714 2785
 
2715 2786
 	// Determine which groups this user is in.
2716
-	if (empty($user_profile[$memID]['additional_groups']))
2717
-		$curGroups = array();
2718
-	else
2719
-		$curGroups = explode(',', $user_profile[$memID]['additional_groups']);
2787
+	if (empty($user_profile[$memID]['additional_groups'])) {
2788
+			$curGroups = array();
2789
+	} else {
2790
+			$curGroups = explode(',', $user_profile[$memID]['additional_groups']);
2791
+	}
2720 2792
 	$curGroups[] = $user_profile[$memID]['id_group'];
2721 2793
 	$curGroups[] = $user_profile[$memID]['id_post_group'];
2722 2794
 
@@ -2736,28 +2808,30 @@  discard block
 block discarded – undo
2736 2808
 	$context['no_access_boards'] = array();
2737 2809
 	while ($row = $smcFunc['db_fetch_assoc']($request))
2738 2810
 	{
2739
-		if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod'])
2740
-			$context['no_access_boards'][] = array(
2811
+		if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod']) {
2812
+					$context['no_access_boards'][] = array(
2741 2813
 				'id' => $row['id_board'],
2742 2814
 				'name' => $row['name'],
2743 2815
 				'is_last' => false,
2744 2816
 			);
2745
-		elseif ($row['id_profile'] != 1 || $row['is_mod'])
2746
-			$context['boards'][$row['id_board']] = array(
2817
+		} elseif ($row['id_profile'] != 1 || $row['is_mod']) {
2818
+					$context['boards'][$row['id_board']] = array(
2747 2819
 				'id' => $row['id_board'],
2748 2820
 				'name' => $row['name'],
2749 2821
 				'selected' => $board == $row['id_board'],
2750 2822
 				'profile' => $row['id_profile'],
2751 2823
 				'profile_name' => $context['profiles'][$row['id_profile']]['name'],
2752 2824
 			);
2825
+		}
2753 2826
 	}
2754 2827
 	$smcFunc['db_free_result']($request);
2755 2828
 
2756 2829
 	require_once($sourcedir . '/Subs-Boards.php');
2757 2830
 	sortBoards($context['boards']);
2758 2831
 
2759
-	if (!empty($context['no_access_boards']))
2760
-		$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
2832
+	if (!empty($context['no_access_boards'])) {
2833
+			$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
2834
+	}
2761 2835
 
2762 2836
 	$context['member']['permissions'] = array(
2763 2837
 		'general' => array(),
@@ -2766,8 +2840,9 @@  discard block
 block discarded – undo
2766 2840
 
2767 2841
 	// If you're an admin we know you can do everything, we might as well leave.
2768 2842
 	$context['member']['has_all_permissions'] = in_array(1, $curGroups);
2769
-	if ($context['member']['has_all_permissions'])
2770
-		return;
2843
+	if ($context['member']['has_all_permissions']) {
2844
+			return;
2845
+	}
2771 2846
 
2772 2847
 	$denied = array();
2773 2848
 
@@ -2786,21 +2861,24 @@  discard block
 block discarded – undo
2786 2861
 	while ($row = $smcFunc['db_fetch_assoc']($result))
2787 2862
 	{
2788 2863
 		// We don't know about this permission, it doesn't exist :P.
2789
-		if (!isset($txt['permissionname_' . $row['permission']]))
2790
-			continue;
2864
+		if (!isset($txt['permissionname_' . $row['permission']])) {
2865
+					continue;
2866
+		}
2791 2867
 
2792
-		if (empty($row['add_deny']))
2793
-			$denied[] = $row['permission'];
2868
+		if (empty($row['add_deny'])) {
2869
+					$denied[] = $row['permission'];
2870
+		}
2794 2871
 
2795 2872
 		// Permissions that end with _own or _any consist of two parts.
2796
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
2797
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
2798
-		else
2799
-			$name = $txt['permissionname_' . $row['permission']];
2873
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) {
2874
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
2875
+		} else {
2876
+					$name = $txt['permissionname_' . $row['permission']];
2877
+		}
2800 2878
 
2801 2879
 		// Add this permission if it doesn't exist yet.
2802
-		if (!isset($context['member']['permissions']['general'][$row['permission']]))
2803
-			$context['member']['permissions']['general'][$row['permission']] = array(
2880
+		if (!isset($context['member']['permissions']['general'][$row['permission']])) {
2881
+					$context['member']['permissions']['general'][$row['permission']] = array(
2804 2882
 				'id' => $row['permission'],
2805 2883
 				'groups' => array(
2806 2884
 					'allowed' => array(),
@@ -2810,6 +2888,7 @@  discard block
 block discarded – undo
2810 2888
 				'is_denied' => false,
2811 2889
 				'is_global' => true,
2812 2890
 			);
2891
+		}
2813 2892
 
2814 2893
 		// Add the membergroup to either the denied or the allowed groups.
2815 2894
 		$context['member']['permissions']['general'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
@@ -2843,18 +2922,20 @@  discard block
 block discarded – undo
2843 2922
 	while ($row = $smcFunc['db_fetch_assoc']($request))
2844 2923
 	{
2845 2924
 		// We don't know about this permission, it doesn't exist :P.
2846
-		if (!isset($txt['permissionname_' . $row['permission']]))
2847
-			continue;
2925
+		if (!isset($txt['permissionname_' . $row['permission']])) {
2926
+					continue;
2927
+		}
2848 2928
 
2849 2929
 		// The name of the permission using the format 'permission name' - 'own/any topic/event/etc.'.
2850
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
2851
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
2852
-		else
2853
-			$name = $txt['permissionname_' . $row['permission']];
2930
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) {
2931
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
2932
+		} else {
2933
+					$name = $txt['permissionname_' . $row['permission']];
2934
+		}
2854 2935
 
2855 2936
 		// Create the structure for this permission.
2856
-		if (!isset($context['member']['permissions']['board'][$row['permission']]))
2857
-			$context['member']['permissions']['board'][$row['permission']] = array(
2937
+		if (!isset($context['member']['permissions']['board'][$row['permission']])) {
2938
+					$context['member']['permissions']['board'][$row['permission']] = array(
2858 2939
 				'id' => $row['permission'],
2859 2940
 				'groups' => array(
2860 2941
 					'allowed' => array(),
@@ -2864,6 +2945,7 @@  discard block
 block discarded – undo
2864 2945
 				'is_denied' => false,
2865 2946
 				'is_global' => empty($board),
2866 2947
 			);
2948
+		}
2867 2949
 
2868 2950
 		$context['member']['permissions']['board'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][$row['id_group']] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
2869 2951
 
@@ -2882,8 +2964,9 @@  discard block
 block discarded – undo
2882 2964
 	global $modSettings, $context, $sourcedir, $txt, $scripturl;
2883 2965
 
2884 2966
 	// Firstly, can we actually even be here?
2885
-	if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum'))
2886
-		fatal_lang_error('no_access', false);
2967
+	if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum')) {
2968
+			fatal_lang_error('no_access', false);
2969
+	}
2887 2970
 
2888 2971
 	// Make sure things which are disabled stay disabled.
2889 2972
 	$modSettings['warning_watch'] = !empty($modSettings['warning_watch']) ? $modSettings['warning_watch'] : 110;
@@ -2970,9 +3053,10 @@  discard block
 block discarded – undo
2970 3053
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_own_muted'],
2971 3054
 	);
2972 3055
 	$context['current_level'] = 0;
2973
-	foreach ($context['level_effects'] as $limit => $dummy)
2974
-		if ($context['member']['warning'] >= $limit)
3056
+	foreach ($context['level_effects'] as $limit => $dummy) {
3057
+			if ($context['member']['warning'] >= $limit)
2975 3058
 			$context['current_level'] = $limit;
2976
-}
3059
+	}
3060
+	}
2977 3061
 
2978 3062
 ?>
2979 3063
\ No newline at end of file
Please login to merge, or discard this patch.
Sources/Display.php 1 patch
Braces   +295 added lines, -216 removed lines patch added patch discarded remove patch
@@ -14,8 +14,9 @@  discard block
 block discarded – undo
14 14
  * @version 2.1 Beta 4
15 15
  */
16 16
 
17
-if (!defined('SMF'))
17
+if (!defined('SMF')) {
18 18
 	die('No direct access...');
19
+}
19 20
 
20 21
 /**
21 22
  * The central part of the board - topic display.
@@ -34,8 +35,9 @@  discard block
 block discarded – undo
34 35
 	global $messages_request, $language, $smcFunc;
35 36
 
36 37
 	// What are you gonna display if these are empty?!
37
-	if (empty($topic))
38
-		fatal_lang_error('no_board', false);
38
+	if (empty($topic)) {
39
+			fatal_lang_error('no_board', false);
40
+	}
39 41
 
40 42
 	// Load the proper template.
41 43
 	loadTemplate('Display');
@@ -52,15 +54,17 @@  discard block
 block discarded – undo
52 54
 	$context['messages_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
53 55
 
54 56
 	// Let's do some work on what to search index.
55
-	if (count($_GET) > 2)
56
-		foreach ($_GET as $k => $v)
57
+	if (count($_GET) > 2) {
58
+			foreach ($_GET as $k => $v)
57 59
 		{
58 60
 			if (!in_array($k, array('topic', 'board', 'start', session_name())))
59 61
 				$context['robot_no_index'] = true;
62
+	}
60 63
 		}
61 64
 
62
-	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0))
63
-		$context['robot_no_index'] = true;
65
+	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0)) {
66
+			$context['robot_no_index'] = true;
67
+	}
64 68
 
65 69
 	// Find the previous or next topic.  Make a fuss if there are no more.
66 70
 	if (isset($_REQUEST['prev_next']) && ($_REQUEST['prev_next'] == 'prev' || $_REQUEST['prev_next'] == 'next'))
@@ -172,8 +176,9 @@  discard block
 block discarded – undo
172 176
 			$topic_parameters
173 177
 	);
174 178
 
175
-	if ($smcFunc['db_num_rows']($request) == 0)
176
-		fatal_lang_error('not_a_topic', false, 404);
179
+	if ($smcFunc['db_num_rows']($request) == 0) {
180
+			fatal_lang_error('not_a_topic', false, 404);
181
+	}
177 182
 	$context['topicinfo'] = $smcFunc['db_fetch_assoc']($request);
178 183
 	$smcFunc['db_free_result']($request);
179 184
 
@@ -210,8 +215,9 @@  discard block
 block discarded – undo
210 215
 	$context['topic_unwatched'] = isset($context['topicinfo']['unwatched']) ? $context['topicinfo']['unwatched'] : 0;
211 216
 
212 217
 	// Add up unapproved replies to get real number of replies...
213
-	if ($modSettings['postmod_active'] && $approve_posts)
214
-		$context['real_num_replies'] += $context['topicinfo']['unapproved_posts'] - ($context['topicinfo']['approved'] ? 0 : 1);
218
+	if ($modSettings['postmod_active'] && $approve_posts) {
219
+			$context['real_num_replies'] += $context['topicinfo']['unapproved_posts'] - ($context['topicinfo']['approved'] ? 0 : 1);
220
+	}
215 221
 
216 222
 	// If this topic has unapproved posts, we need to work out how many posts the user can see, for page indexing.
217 223
 	if ($modSettings['postmod_active'] && $context['topicinfo']['unapproved_posts'] && !$user_info['is_guest'] && !$approve_posts)
@@ -231,11 +237,11 @@  discard block
 block discarded – undo
231 237
 		$smcFunc['db_free_result']($request);
232 238
 
233 239
 		$context['total_visible_posts'] = $context['num_replies'] + $myUnapprovedPosts + ($context['topicinfo']['approved'] ? 1 : 0);
240
+	} elseif ($user_info['is_guest']) {
241
+			$context['total_visible_posts'] = $context['num_replies'] + ($context['topicinfo']['approved'] ? 1 : 0);
242
+	} else {
243
+			$context['total_visible_posts'] = $context['num_replies'] + $context['topicinfo']['unapproved_posts'] + ($context['topicinfo']['approved'] ? 1 : 0);
234 244
 	}
235
-	elseif ($user_info['is_guest'])
236
-		$context['total_visible_posts'] = $context['num_replies'] + ($context['topicinfo']['approved'] ? 1 : 0);
237
-	else
238
-		$context['total_visible_posts'] = $context['num_replies'] + $context['topicinfo']['unapproved_posts'] + ($context['topicinfo']['approved'] ? 1 : 0);
239 245
 
240 246
 	// The start isn't a number; it's information about what to do, where to go.
241 247
 	if (!is_numeric($_REQUEST['start']))
@@ -248,8 +254,7 @@  discard block
 block discarded – undo
248 254
 			{
249 255
 				$context['start_from'] = $context['total_visible_posts'] - 1;
250 256
 				$_REQUEST['start'] = empty($options['view_newest_first']) ? $context['start_from'] : 0;
251
-			}
252
-			else
257
+			} else
253 258
 			{
254 259
 				// Find the earliest unread message in the topic. (the use of topics here is just for both tables.)
255 260
 				$request = $smcFunc['db_query']('', '
@@ -277,9 +282,9 @@  discard block
 block discarded – undo
277 282
 		if (substr($_REQUEST['start'], 0, 4) == 'from')
278 283
 		{
279 284
 			$timestamp = (int) substr($_REQUEST['start'], 4);
280
-			if ($timestamp === 0)
281
-				$_REQUEST['start'] = 0;
282
-			else
285
+			if ($timestamp === 0) {
286
+							$_REQUEST['start'] = 0;
287
+			} else
283 288
 			{
284 289
 				// Find the number of messages posted before said time...
285 290
 				$request = $smcFunc['db_query']('', '
@@ -307,11 +312,11 @@  discard block
 block discarded – undo
307 312
 		elseif (substr($_REQUEST['start'], 0, 3) == 'msg')
308 313
 		{
309 314
 			$virtual_msg = (int) substr($_REQUEST['start'], 3);
310
-			if (!$context['topicinfo']['unapproved_posts'] && $virtual_msg >= $context['topicinfo']['id_last_msg'])
311
-				$context['start_from'] = $context['total_visible_posts'] - 1;
312
-			elseif (!$context['topicinfo']['unapproved_posts'] && $virtual_msg <= $context['topicinfo']['id_first_msg'])
313
-				$context['start_from'] = 0;
314
-			else
315
+			if (!$context['topicinfo']['unapproved_posts'] && $virtual_msg >= $context['topicinfo']['id_last_msg']) {
316
+							$context['start_from'] = $context['total_visible_posts'] - 1;
317
+			} elseif (!$context['topicinfo']['unapproved_posts'] && $virtual_msg <= $context['topicinfo']['id_first_msg']) {
318
+							$context['start_from'] = 0;
319
+			} else
315 320
 			{
316 321
 				// Find the start value for that message......
317 322
 				$request = $smcFunc['db_query']('', '
@@ -365,9 +370,10 @@  discard block
 block discarded – undo
365 370
 		list ($sig_limits, $sig_bbc) = explode(':', $modSettings['signature_settings']);
366 371
 		$sig_limits = explode(',', $sig_limits);
367 372
 
368
-		if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
369
-			addInlineCss('
373
+		if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
374
+					addInlineCss('
370 375
 	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
376
+		}
371 377
 	}
372 378
 
373 379
 	// Censor the title...
@@ -405,21 +411,25 @@  discard block
 block discarded – undo
405 411
 		);
406 412
 		while ($row = $smcFunc['db_fetch_assoc']($request))
407 413
 		{
408
-			if (empty($row['id_member']))
409
-				continue;
414
+			if (empty($row['id_member'])) {
415
+							continue;
416
+			}
410 417
 
411
-			if (!empty($row['online_color']))
412
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
413
-			else
414
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
418
+			if (!empty($row['online_color'])) {
419
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
420
+			} else {
421
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
422
+			}
415 423
 
416 424
 			$is_buddy = in_array($row['id_member'], $user_info['buddies']);
417
-			if ($is_buddy)
418
-				$link = '<strong>' . $link . '</strong>';
425
+			if ($is_buddy) {
426
+							$link = '<strong>' . $link . '</strong>';
427
+			}
419 428
 
420 429
 			// Add them both to the list and to the more detailed list.
421
-			if (!empty($row['show_online']) || allowedTo('moderate_forum'))
422
-				$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
430
+			if (!empty($row['show_online']) || allowedTo('moderate_forum')) {
431
+							$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
432
+			}
423 433
 			$context['view_members'][$row['log_time'] . $row['member_name']] = array(
424 434
 				'id' => $row['id_member'],
425 435
 				'username' => $row['member_name'],
@@ -431,8 +441,9 @@  discard block
 block discarded – undo
431 441
 				'hidden' => empty($row['show_online']),
432 442
 			);
433 443
 
434
-			if (empty($row['show_online']))
435
-				$context['view_num_hidden']++;
444
+			if (empty($row['show_online'])) {
445
+							$context['view_num_hidden']++;
446
+			}
436 447
 		}
437 448
 
438 449
 		// The number of guests is equal to the rows minus the ones we actually used ;).
@@ -446,11 +457,13 @@  discard block
 block discarded – undo
446 457
 
447 458
 	// If all is set, but not allowed... just unset it.
448 459
 	$can_show_all = !empty($modSettings['enableAllMessages']) && $context['total_visible_posts'] > $context['messages_per_page'] && $context['total_visible_posts'] < $modSettings['enableAllMessages'];
449
-	if (isset($_REQUEST['all']) && !$can_show_all)
450
-		unset($_REQUEST['all']);
460
+	if (isset($_REQUEST['all']) && !$can_show_all) {
461
+			unset($_REQUEST['all']);
462
+	}
451 463
 	// Otherwise, it must be allowed... so pretend start was -1.
452
-	elseif (isset($_REQUEST['all']))
453
-		$_REQUEST['start'] = -1;
464
+	elseif (isset($_REQUEST['all'])) {
465
+			$_REQUEST['start'] = -1;
466
+	}
454 467
 
455 468
 	// Construct the page index, allowing for the .START method...
456 469
 	$context['page_index'] = constructPageIndex($scripturl . '?topic=' . $topic . '.%1$d', $_REQUEST['start'], $context['total_visible_posts'], $context['messages_per_page'], true);
@@ -487,8 +500,9 @@  discard block
 block discarded – undo
487 500
 			$_REQUEST['start'] = 0;
488 501
 		}
489 502
 		// They aren't using it, but the *option* is there, at least.
490
-		else
491
-			$context['page_index'] .= '&nbsp;<a href="' . $scripturl . '?topic=' . $topic . '.0;all">' . $txt['all'] . '</a> ';
503
+		else {
504
+					$context['page_index'] .= '&nbsp;<a href="' . $scripturl . '?topic=' . $topic . '.0;all">' . $txt['all'] . '</a> ';
505
+		}
492 506
 	}
493 507
 
494 508
 	// Build the link tree.
@@ -504,14 +518,16 @@  discard block
 block discarded – undo
504 518
 	if (!empty($board_info['moderators']))
505 519
 	{
506 520
 		// Add a link for each moderator...
507
-		foreach ($board_info['moderators'] as $mod)
508
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
521
+		foreach ($board_info['moderators'] as $mod) {
522
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
523
+		}
509 524
 	}
510 525
 	if (!empty($board_info['moderator_groups']))
511 526
 	{
512 527
 		// Add a link for each moderator group as well...
513
-		foreach ($board_info['moderator_groups'] as $mod_group)
514
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=viewmemberes;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
528
+		foreach ($board_info['moderator_groups'] as $mod_group) {
529
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=viewmemberes;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
530
+		}
515 531
 	}
516 532
 
517 533
 	if (!empty($context['link_moderators']))
@@ -542,9 +558,9 @@  discard block
 block discarded – undo
542 558
 	// For quick reply we need a response prefix in the default forum language.
543 559
 	if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix', 600)))
544 560
 	{
545
-		if ($language === $user_info['language'])
546
-			$context['response_prefix'] = $txt['response_prefix'];
547
-		else
561
+		if ($language === $user_info['language']) {
562
+					$context['response_prefix'] = $txt['response_prefix'];
563
+		} else
548 564
 		{
549 565
 			loadLanguage('index', $language, false);
550 566
 			$context['response_prefix'] = $txt['response_prefix'];
@@ -576,8 +592,9 @@  discard block
 block discarded – undo
576 592
 			list($start, $end, $allday, $span, $tz, $tz_abbrev) = buildEventDatetimes($row);
577 593
 
578 594
 			// Sanity check
579
-			if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count']))
580
-				continue;
595
+			if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) {
596
+							continue;
597
+			}
581 598
 
582 599
 			$linked_calendar_event = array(
583 600
 				'id' => $row['id_event'],
@@ -626,8 +643,9 @@  discard block
 block discarded – undo
626 643
 		}
627 644
 		$smcFunc['db_free_result']($request);
628 645
 
629
-		if (!empty($context['linked_calendar_events']))
630
-			$context['linked_calendar_events'][count($context['linked_calendar_events']) - 1]['is_last'] = true;
646
+		if (!empty($context['linked_calendar_events'])) {
647
+					$context['linked_calendar_events'][count($context['linked_calendar_events']) - 1]['is_last'] = true;
648
+		}
631 649
 	}
632 650
 
633 651
 	// Create the poll info if it exists.
@@ -690,8 +708,9 @@  discard block
 block discarded – undo
690 708
 		$smcFunc['db_free_result']($request);
691 709
 
692 710
 		// Got we multi choice?
693
-		if ($pollinfo['max_votes'] > 1)
694
-			$realtotal = $pollinfo['total'];
711
+		if ($pollinfo['max_votes'] > 1) {
712
+					$realtotal = $pollinfo['total'];
713
+		}
695 714
 
696 715
 		// If this is a guest we need to do our best to work out if they have voted, and what they voted for.
697 716
 		if ($user_info['is_guest'] && $pollinfo['guest_vote'] && allowedTo('poll_vote'))
@@ -704,20 +723,21 @@  discard block
 block discarded – undo
704 723
 				foreach ($guestinfo as $i => $guestvoted)
705 724
 				{
706 725
 					$guestvoted = explode(',', $guestvoted);
707
-					if ($guestvoted[0] == $context['topicinfo']['id_poll'])
708
-						break;
726
+					if ($guestvoted[0] == $context['topicinfo']['id_poll']) {
727
+											break;
728
+					}
709 729
 				}
710 730
 				// Has the poll been reset since guest voted?
711 731
 				if ($pollinfo['reset_poll'] > $guestvoted[1])
712 732
 				{
713 733
 					// Remove the poll info from the cookie to allow guest to vote again
714 734
 					unset($guestinfo[$i]);
715
-					if (!empty($guestinfo))
716
-						$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
717
-					else
718
-						unset($_COOKIE['guest_poll_vote']);
719
-				}
720
-				else
735
+					if (!empty($guestinfo)) {
736
+											$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
737
+					} else {
738
+											unset($_COOKIE['guest_poll_vote']);
739
+					}
740
+				} else
721 741
 				{
722 742
 					// What did they vote for?
723 743
 					unset($guestvoted[0], $guestvoted[1]);
@@ -831,23 +851,29 @@  discard block
 block discarded – undo
831 851
 		// Build the poll moderation button array.
832 852
 		$context['poll_buttons'] = array();
833 853
 
834
-		if ($context['allow_return_vote'])
835
-			$context['poll_buttons']['vote'] = array('text' => 'poll_return_vote', 'image' => 'poll_options.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start']);
854
+		if ($context['allow_return_vote']) {
855
+					$context['poll_buttons']['vote'] = array('text' => 'poll_return_vote', 'image' => 'poll_options.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start']);
856
+		}
836 857
 
837
-		if ($context['show_view_results_button'])
838
-			$context['poll_buttons']['results'] = array('text' => 'poll_results', 'image' => 'poll_results.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start'] . ';viewresults');
858
+		if ($context['show_view_results_button']) {
859
+					$context['poll_buttons']['results'] = array('text' => 'poll_results', 'image' => 'poll_results.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start'] . ';viewresults');
860
+		}
839 861
 
840
-		if ($context['allow_change_vote'])
841
-			$context['poll_buttons']['change_vote'] = array('text' => 'poll_change_vote', 'image' => 'poll_change_vote.png', 'url' => $scripturl . '?action=vote;topic=' . $context['current_topic'] . '.' . $context['start'] . ';poll=' . $context['poll']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']);
862
+		if ($context['allow_change_vote']) {
863
+					$context['poll_buttons']['change_vote'] = array('text' => 'poll_change_vote', 'image' => 'poll_change_vote.png', 'url' => $scripturl . '?action=vote;topic=' . $context['current_topic'] . '.' . $context['start'] . ';poll=' . $context['poll']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']);
864
+		}
842 865
 
843
-		if ($context['allow_lock_poll'])
844
-			$context['poll_buttons']['lock'] = array('text' => (!$context['poll']['is_locked'] ? 'poll_lock' : 'poll_unlock'), 'image' => 'poll_lock.png', 'url' => $scripturl . '?action=lockvoting;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
866
+		if ($context['allow_lock_poll']) {
867
+					$context['poll_buttons']['lock'] = array('text' => (!$context['poll']['is_locked'] ? 'poll_lock' : 'poll_unlock'), 'image' => 'poll_lock.png', 'url' => $scripturl . '?action=lockvoting;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
868
+		}
845 869
 
846
-		if ($context['allow_edit_poll'])
847
-			$context['poll_buttons']['edit'] = array('text' => 'poll_edit', 'image' => 'poll_edit.png', 'url' => $scripturl . '?action=editpoll;topic=' . $context['current_topic'] . '.' . $context['start']);
870
+		if ($context['allow_edit_poll']) {
871
+					$context['poll_buttons']['edit'] = array('text' => 'poll_edit', 'image' => 'poll_edit.png', 'url' => $scripturl . '?action=editpoll;topic=' . $context['current_topic'] . '.' . $context['start']);
872
+		}
848 873
 
849
-		if ($context['can_remove_poll'])
850
-			$context['poll_buttons']['remove_poll'] = array('text' => 'poll_remove', 'image' => 'admin_remove_poll.png', 'custom' => 'data-confirm="' . $txt['poll_remove_warn'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removepoll;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
874
+		if ($context['can_remove_poll']) {
875
+					$context['poll_buttons']['remove_poll'] = array('text' => 'poll_remove', 'image' => 'admin_remove_poll.png', 'custom' => 'data-confirm="' . $txt['poll_remove_warn'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removepoll;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
876
+		}
851 877
 
852 878
 		// Allow mods to add additional buttons here
853 879
 		call_integration_hook('integrate_poll_buttons');
@@ -883,9 +909,9 @@  discard block
 block discarded – undo
883 909
 	{
884 910
 		$start_char = 'C';
885 911
 		$page_id = $ascending ? $context['topicinfo']['id_first_msg'] : $context['topicinfo']['id_last_msg'];
912
+	} else {
913
+			$start_char = null;
886 914
 	}
887
-	else
888
-		$start_char = null;
889 915
 
890 916
 	$limit = $context['messages_per_page'];
891 917
 
@@ -899,17 +925,17 @@  discard block
 block discarded – undo
899 925
 		{
900 926
 			$ascending_seek = true;
901 927
 			$page_operator = $ascending ? '>=' : '<=';
902
-		}
903
-		else
928
+		} else
904 929
 		{
905 930
 			$ascending_seek = false;
906 931
 			$page_operator = $ascending ? '<=' : '>=';
907 932
 		}
908 933
 
909
-		if ($start_char === 'C')
910
-			$limit_seek = $limit;
911
-		else
912
-			$limit_seek  = $limit + 1;
934
+		if ($start_char === 'C') {
935
+					$limit_seek = $limit;
936
+		} else {
937
+					$limit_seek  = $limit + 1;
938
+		}
913 939
 
914 940
 		$request = $smcFunc['db_query']('', '
915 941
 			SELECT id_msg, id_member, approved
@@ -932,21 +958,23 @@  discard block
 block discarded – undo
932 958
 		$found_msg = false;
933 959
 
934 960
 		// Fallback
935
-		if ($smcFunc['db_num_rows']($request) < 1)
936
-			unset($start_char);
937
-		else
961
+		if ($smcFunc['db_num_rows']($request) < 1) {
962
+					unset($start_char);
963
+		} else
938 964
 		{
939 965
 			while ($row = $smcFunc['db_fetch_assoc']($request))
940 966
 			{
941 967
 				// Check if the start msg is in our result
942
-				if ($row['id_msg'] == $page_id)
943
-					$found_msg = true;
968
+				if ($row['id_msg'] == $page_id) {
969
+									$found_msg = true;
970
+				}
944 971
 
945 972
 				// Skip the the start msg if we not in mode C
946 973
 				if ($start_char === 'C' || $row['id_msg'] != $page_id)
947 974
 				{
948
-					if (!empty($row['id_member']))
949
-						$all_posters[$row['id_msg']] = $row['id_member'];
975
+					if (!empty($row['id_member'])) {
976
+											$all_posters[$row['id_msg']] = $row['id_member'];
977
+					}
950 978
 
951 979
 					$messages[] = $row['id_msg'];
952 980
 				}
@@ -962,8 +990,9 @@  discard block
 block discarded – undo
962 990
 		}
963 991
 
964 992
 		// Before Page bring in the right order
965
-		if (!empty($start_char) && $start_char === 'L')
966
-			krsort($messages);
993
+		if (!empty($start_char) && $start_char === 'L') {
994
+					krsort($messages);
995
+		}
967 996
 	}
968 997
 
969 998
 	// Jump to page
@@ -998,14 +1027,16 @@  discard block
 block discarded – undo
998 1027
 
999 1028
 		while ($row = $smcFunc['db_fetch_assoc']($request))
1000 1029
 		{
1001
-			if (!empty($row['id_member']))
1002
-				$all_posters[$row['id_msg']] = $row['id_member'];
1030
+			if (!empty($row['id_member'])) {
1031
+							$all_posters[$row['id_msg']] = $row['id_member'];
1032
+			}
1003 1033
 			$messages[] = $row['id_msg'];
1004 1034
 		}
1005 1035
 
1006 1036
 		// Sort the messages into the correct display order
1007
-		if (!$ascending)
1008
-			sort($messages);
1037
+		if (!$ascending) {
1038
+					sort($messages);
1039
+		}
1009 1040
 	}
1010 1041
 
1011 1042
 	// Remember the paging data for next time
@@ -1025,8 +1056,9 @@  discard block
 block discarded – undo
1025 1056
 	if (!$user_info['is_guest'] && !empty($messages))
1026 1057
 	{
1027 1058
 		$mark_at_msg = max($messages);
1028
-		if ($mark_at_msg >= $context['topicinfo']['id_last_msg'])
1029
-			$mark_at_msg = $modSettings['maxMsgID'];
1059
+		if ($mark_at_msg >= $context['topicinfo']['id_last_msg']) {
1060
+					$mark_at_msg = $modSettings['maxMsgID'];
1061
+		}
1030 1062
 		if ($mark_at_msg >= $context['topicinfo']['new_from'])
1031 1063
 		{
1032 1064
 			$smcFunc['db_insert']($context['topicinfo']['new_from'] == 0 ? 'ignore' : 'replace',
@@ -1058,8 +1090,9 @@  discard block
 block discarded – undo
1058 1090
 		while ($row = $smcFunc['db_fetch_assoc']($request))
1059 1091
 		{
1060 1092
 			// Find if this topic is marked for notification...
1061
-			if (!empty($row['id_topic']))
1062
-				$context['is_marked_notify'] = true;
1093
+			if (!empty($row['id_topic'])) {
1094
+							$context['is_marked_notify'] = true;
1095
+			}
1063 1096
 
1064 1097
 			// Only do this once, but mark the notifications as "not sent yet" for next time.
1065 1098
 			if (!empty($row['sent']) && $do_once)
@@ -1081,8 +1114,9 @@  discard block
 block discarded – undo
1081 1114
 		}
1082 1115
 
1083 1116
 		// Have we recently cached the number of new topics in this board, and it's still a lot?
1084
-		if (isset($_REQUEST['topicseen']) && isset($_SESSION['topicseen_cache'][$board]) && $_SESSION['topicseen_cache'][$board] > 5)
1085
-			$_SESSION['topicseen_cache'][$board]--;
1117
+		if (isset($_REQUEST['topicseen']) && isset($_SESSION['topicseen_cache'][$board]) && $_SESSION['topicseen_cache'][$board] > 5) {
1118
+					$_SESSION['topicseen_cache'][$board]--;
1119
+		}
1086 1120
 		// Mark board as seen if this is the only new topic.
1087 1121
 		elseif (isset($_REQUEST['topicseen']))
1088 1122
 		{
@@ -1106,14 +1140,16 @@  discard block
 block discarded – undo
1106 1140
 			$smcFunc['db_free_result']($request);
1107 1141
 
1108 1142
 			// If there're no real new topics in this board, mark the board as seen.
1109
-			if (empty($numNewTopics))
1110
-				$_REQUEST['boardseen'] = true;
1111
-			else
1112
-				$_SESSION['topicseen_cache'][$board] = $numNewTopics;
1143
+			if (empty($numNewTopics)) {
1144
+							$_REQUEST['boardseen'] = true;
1145
+			} else {
1146
+							$_SESSION['topicseen_cache'][$board] = $numNewTopics;
1147
+			}
1113 1148
 		}
1114 1149
 		// Probably one less topic - maybe not, but even if we decrease this too fast it will only make us look more often.
1115
-		elseif (isset($_SESSION['topicseen_cache'][$board]))
1116
-			$_SESSION['topicseen_cache'][$board]--;
1150
+		elseif (isset($_SESSION['topicseen_cache'][$board])) {
1151
+					$_SESSION['topicseen_cache'][$board]--;
1152
+		}
1117 1153
 
1118 1154
 		// Mark board as seen if we came using last post link from BoardIndex. (or other places...)
1119 1155
 		if (isset($_REQUEST['boardseen']))
@@ -1170,23 +1206,26 @@  discard block
 block discarded – undo
1170 1206
 			$temp = array();
1171 1207
 			while ($row = $smcFunc['db_fetch_assoc']($request))
1172 1208
 			{
1173
-				if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id']))
1174
-					continue;
1209
+				if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) {
1210
+									continue;
1211
+				}
1175 1212
 
1176 1213
 				$temp[$row['id_attach']] = $row;
1177 1214
 				$temp[$row['id_attach']]['topic'] = $topic;
1178 1215
 				$temp[$row['id_attach']]['board'] = $board;
1179 1216
 
1180
-				if (!isset($context['loaded_attachments'][$row['id_msg']]))
1181
-					$context['loaded_attachments'][$row['id_msg']] = array();
1217
+				if (!isset($context['loaded_attachments'][$row['id_msg']])) {
1218
+									$context['loaded_attachments'][$row['id_msg']] = array();
1219
+				}
1182 1220
 			}
1183 1221
 			$smcFunc['db_free_result']($request);
1184 1222
 
1185 1223
 			// This is better than sorting it with the query...
1186 1224
 			ksort($temp);
1187 1225
 
1188
-			foreach ($temp as $row)
1189
-				$context['loaded_attachments'][$row['id_msg']][] = $row;
1226
+			foreach ($temp as $row) {
1227
+							$context['loaded_attachments'][$row['id_msg']][] = $row;
1228
+			}
1190 1229
 		}
1191 1230
 
1192 1231
 		$msg_parameters = array(
@@ -1213,21 +1252,23 @@  discard block
 block discarded – undo
1213 1252
 		);
1214 1253
 
1215 1254
 		// And the likes
1216
-		if (!empty($modSettings['enable_likes']))
1217
-			$context['my_likes'] = $context['user']['is_guest'] ? array() : prepareLikesContext($topic);
1255
+		if (!empty($modSettings['enable_likes'])) {
1256
+					$context['my_likes'] = $context['user']['is_guest'] ? array() : prepareLikesContext($topic);
1257
+		}
1218 1258
 
1219 1259
 		// Go to the last message if the given time is beyond the time of the last message.
1220
-		if (isset($context['start_from']) && $context['start_from'] >= $context['topicinfo']['num_replies'])
1221
-			$context['start_from'] = $context['topicinfo']['num_replies'];
1260
+		if (isset($context['start_from']) && $context['start_from'] >= $context['topicinfo']['num_replies']) {
1261
+					$context['start_from'] = $context['topicinfo']['num_replies'];
1262
+		}
1222 1263
 
1223 1264
 		// Since the anchor information is needed on the top of the page we load these variables beforehand.
1224 1265
 		$context['first_message'] = isset($messages[$firstIndex]) ? $messages[$firstIndex] : $messages[0];
1225
-		if (empty($options['view_newest_first']))
1226
-			$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['start_from'];
1227
-		else
1228
-			$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['topicinfo']['num_replies'] - $context['start_from'];
1229
-	}
1230
-	else
1266
+		if (empty($options['view_newest_first'])) {
1267
+					$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['start_from'];
1268
+		} else {
1269
+					$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['topicinfo']['num_replies'] - $context['start_from'];
1270
+		}
1271
+	} else
1231 1272
 	{
1232 1273
 		$messages_request = false;
1233 1274
 		$context['first_message'] = 0;
@@ -1262,8 +1303,9 @@  discard block
 block discarded – undo
1262 1303
 		'can_restore_msg' => 'move_any',
1263 1304
 		'can_like' => 'likes_like',
1264 1305
 	);
1265
-	foreach ($common_permissions as $contextual => $perm)
1266
-		$context[$contextual] = allowedTo($perm);
1306
+	foreach ($common_permissions as $contextual => $perm) {
1307
+			$context[$contextual] = allowedTo($perm);
1308
+	}
1267 1309
 
1268 1310
 	// Permissions with _any/_own versions.  $context[YYY] => ZZZ_any/_own.
1269 1311
 	$anyown_permissions = array(
@@ -1276,8 +1318,9 @@  discard block
 block discarded – undo
1276 1318
 		'can_reply_unapproved' => 'post_unapproved_replies',
1277 1319
 		'can_view_warning' => 'profile_warning',
1278 1320
 	);
1279
-	foreach ($anyown_permissions as $contextual => $perm)
1280
-		$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
1321
+	foreach ($anyown_permissions as $contextual => $perm) {
1322
+			$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
1323
+	}
1281 1324
 
1282 1325
 	if (!$user_info['is_admin'] && $context['can_move'] && !$modSettings['topic_move_any'])
1283 1326
 	{
@@ -1323,8 +1366,9 @@  discard block
 block discarded – undo
1323 1366
 	// Check if the draft functions are enabled and that they have permission to use them (for quick reply.)
1324 1367
 	$context['drafts_save'] = !empty($modSettings['drafts_post_enabled']) && allowedTo('post_draft') && $context['can_reply'];
1325 1368
 	$context['drafts_autosave'] = !empty($context['drafts_save']) && !empty($modSettings['drafts_autosave_enabled']);
1326
-	if (!empty($context['drafts_save']))
1327
-		loadLanguage('Drafts');
1369
+	if (!empty($context['drafts_save'])) {
1370
+			loadLanguage('Drafts');
1371
+	}
1328 1372
 
1329 1373
 	// When was the last time this topic was replied to?  Should we warn them about it?
1330 1374
 	if (!empty($modSettings['oldTopicDays']) && ($context['can_reply'] || $context['can_reply_unapproved']) && empty($context['topicinfo']['is_sticky']))
@@ -1385,26 +1429,31 @@  discard block
 block discarded – undo
1385 1429
 	// Message icons - customized icons are off?
1386 1430
 	$context['icons'] = getMessageIcons($board);
1387 1431
 
1388
-	if (!empty($context['icons']))
1389
-		$context['icons'][count($context['icons']) - 1]['is_last'] = true;
1432
+	if (!empty($context['icons'])) {
1433
+			$context['icons'][count($context['icons']) - 1]['is_last'] = true;
1434
+	}
1390 1435
 
1391 1436
 	// Build the normal button array.
1392 1437
 	$context['normal_buttons'] = array();
1393 1438
 
1394
-	if ($context['can_reply'])
1395
-		$context['normal_buttons']['reply'] = array('text' => 'reply', 'image' => 'reply.png', 'url' => $scripturl . '?action=post;topic=' . $context['current_topic'] . '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], 'active' => true);
1439
+	if ($context['can_reply']) {
1440
+			$context['normal_buttons']['reply'] = array('text' => 'reply', 'image' => 'reply.png', 'url' => $scripturl . '?action=post;topic=' . $context['current_topic'] . '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], 'active' => true);
1441
+	}
1396 1442
 
1397
-	if ($context['can_add_poll'])
1398
-		$context['normal_buttons']['add_poll'] = array('text' => 'add_poll', 'image' => 'add_poll.png', 'url' => $scripturl . '?action=editpoll;add;topic=' . $context['current_topic'] . '.' . $context['start']);
1443
+	if ($context['can_add_poll']) {
1444
+			$context['normal_buttons']['add_poll'] = array('text' => 'add_poll', 'image' => 'add_poll.png', 'url' => $scripturl . '?action=editpoll;add;topic=' . $context['current_topic'] . '.' . $context['start']);
1445
+	}
1399 1446
 
1400
-	if ($context['can_mark_unread'])
1401
-		$context['normal_buttons']['mark_unread'] = array('text' => 'mark_unread', 'image' => 'markunread.png', 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
1447
+	if ($context['can_mark_unread']) {
1448
+			$context['normal_buttons']['mark_unread'] = array('text' => 'mark_unread', 'image' => 'markunread.png', 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
1449
+	}
1402 1450
 
1403
-	if ($context['can_print'])
1404
-		$context['normal_buttons']['print'] = array('text' => 'print', 'image' => 'print.png', 'custom' => 'rel="nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0');
1451
+	if ($context['can_print']) {
1452
+			$context['normal_buttons']['print'] = array('text' => 'print', 'image' => 'print.png', 'custom' => 'rel="nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0');
1453
+	}
1405 1454
 
1406
-	if ($context['can_set_notify'])
1407
-		$context['normal_buttons']['notify'] = array(
1455
+	if ($context['can_set_notify']) {
1456
+			$context['normal_buttons']['notify'] = array(
1408 1457
 			'text' => 'notify_topic_' . $context['topic_notification_mode'],
1409 1458
 			'sub_buttons' => array(
1410 1459
 				array(
@@ -1426,38 +1475,47 @@  discard block
 block discarded – undo
1426 1475
 				),
1427 1476
 			),
1428 1477
 		);
1478
+	}
1429 1479
 
1430 1480
 	// Build the mod button array
1431 1481
 	$context['mod_buttons'] = array();
1432 1482
 
1433
-	if ($context['can_move'])
1434
-		$context['mod_buttons']['move'] = array('text' => 'move_topic', 'image' => 'admin_move.png', 'url' => $scripturl . '?action=movetopic;current_board=' . $context['current_board'] . ';topic=' . $context['current_topic'] . '.0');
1483
+	if ($context['can_move']) {
1484
+			$context['mod_buttons']['move'] = array('text' => 'move_topic', 'image' => 'admin_move.png', 'url' => $scripturl . '?action=movetopic;current_board=' . $context['current_board'] . ';topic=' . $context['current_topic'] . '.0');
1485
+	}
1435 1486
 
1436
-	if ($context['can_delete'])
1437
-		$context['mod_buttons']['delete'] = array('text' => 'remove_topic', 'image' => 'admin_rem.png', 'custom' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
1487
+	if ($context['can_delete']) {
1488
+			$context['mod_buttons']['delete'] = array('text' => 'remove_topic', 'image' => 'admin_rem.png', 'custom' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
1489
+	}
1438 1490
 
1439
-	if ($context['can_lock'])
1440
-		$context['mod_buttons']['lock'] = array('text' => empty($context['is_locked']) ? 'set_lock' : 'set_unlock', 'image' => 'admin_lock.png', 'url' => $scripturl . '?action=lock;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
1491
+	if ($context['can_lock']) {
1492
+			$context['mod_buttons']['lock'] = array('text' => empty($context['is_locked']) ? 'set_lock' : 'set_unlock', 'image' => 'admin_lock.png', 'url' => $scripturl . '?action=lock;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
1493
+	}
1441 1494
 
1442
-	if ($context['can_sticky'])
1443
-		$context['mod_buttons']['sticky'] = array('text' => empty($context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'image' => 'admin_sticky.png', 'url' => $scripturl . '?action=sticky;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
1495
+	if ($context['can_sticky']) {
1496
+			$context['mod_buttons']['sticky'] = array('text' => empty($context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'image' => 'admin_sticky.png', 'url' => $scripturl . '?action=sticky;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
1497
+	}
1444 1498
 
1445
-	if ($context['can_merge'])
1446
-		$context['mod_buttons']['merge'] = array('text' => 'merge', 'image' => 'merge.png', 'url' => $scripturl . '?action=mergetopics;board=' . $context['current_board'] . '.0;from=' . $context['current_topic']);
1499
+	if ($context['can_merge']) {
1500
+			$context['mod_buttons']['merge'] = array('text' => 'merge', 'image' => 'merge.png', 'url' => $scripturl . '?action=mergetopics;board=' . $context['current_board'] . '.0;from=' . $context['current_topic']);
1501
+	}
1447 1502
 
1448
-	if ($context['calendar_post'])
1449
-		$context['mod_buttons']['calendar'] = array('text' => 'calendar_link', 'image' => 'linktocal.png', 'url' => $scripturl . '?action=post;calendar;msg=' . $context['topic_first_message'] . ';topic=' . $context['current_topic'] . '.0');
1503
+	if ($context['calendar_post']) {
1504
+			$context['mod_buttons']['calendar'] = array('text' => 'calendar_link', 'image' => 'linktocal.png', 'url' => $scripturl . '?action=post;calendar;msg=' . $context['topic_first_message'] . ';topic=' . $context['current_topic'] . '.0');
1505
+	}
1450 1506
 
1451 1507
 	// Restore topic. eh?  No monkey business.
1452
-	if ($context['can_restore_topic'])
1453
-		$context['mod_buttons']['restore_topic'] = array('text' => 'restore_topic', 'image' => '', 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
1508
+	if ($context['can_restore_topic']) {
1509
+			$context['mod_buttons']['restore_topic'] = array('text' => 'restore_topic', 'image' => '', 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
1510
+	}
1454 1511
 
1455 1512
 	// Show a message in case a recently posted message became unapproved.
1456 1513
 	$context['becomesUnapproved'] = !empty($_SESSION['becomesUnapproved']) ? true : false;
1457 1514
 
1458 1515
 	// Don't want to show this forever...
1459
-	if ($context['becomesUnapproved'])
1460
-		unset($_SESSION['becomesUnapproved']);
1516
+	if ($context['becomesUnapproved']) {
1517
+			unset($_SESSION['becomesUnapproved']);
1518
+	}
1461 1519
 
1462 1520
 	// Allow adding new mod buttons easily.
1463 1521
 	// Note: $context['normal_buttons'] and $context['mod_buttons'] are added for backward compatibility with 2.0, but are deprecated and should not be used
@@ -1466,12 +1524,14 @@  discard block
 block discarded – undo
1466 1524
 	call_integration_hook('integrate_mod_buttons', array(&$context['mod_buttons']));
1467 1525
 
1468 1526
 	// Load the drafts js file
1469
-	if ($context['drafts_autosave'])
1470
-		loadJavaScriptFile('drafts.js', array('defer' => false, 'minimize' => true), 'smf_drafts');
1527
+	if ($context['drafts_autosave']) {
1528
+			loadJavaScriptFile('drafts.js', array('defer' => false, 'minimize' => true), 'smf_drafts');
1529
+	}
1471 1530
 
1472 1531
 	// Spellcheck
1473
-	if ($context['show_spellchecking'])
1474
-		loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
1532
+	if ($context['show_spellchecking']) {
1533
+			loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
1534
+	}
1475 1535
 
1476 1536
 	// topic.js
1477 1537
 	loadJavaScriptFile('topic.js', array('defer' => false, 'minimize' => true), 'smf_topic');
@@ -1505,16 +1565,19 @@  discard block
 block discarded – undo
1505 1565
 	static $counter = null;
1506 1566
 
1507 1567
 	// If the query returned false, bail.
1508
-	if ($messages_request == false)
1509
-		return false;
1568
+	if ($messages_request == false) {
1569
+			return false;
1570
+	}
1510 1571
 
1511 1572
 	// Remember which message this is.  (ie. reply #83)
1512
-	if ($counter === null || $reset)
1513
-		$counter = empty($options['view_newest_first']) ? $context['start'] : $context['total_visible_posts'] - $context['start'];
1573
+	if ($counter === null || $reset) {
1574
+			$counter = empty($options['view_newest_first']) ? $context['start'] : $context['total_visible_posts'] - $context['start'];
1575
+	}
1514 1576
 
1515 1577
 	// Start from the beginning...
1516
-	if ($reset)
1517
-		return @$smcFunc['db_data_seek']($messages_request, 0);
1578
+	if ($reset) {
1579
+			return @$smcFunc['db_data_seek']($messages_request, 0);
1580
+	}
1518 1581
 
1519 1582
 	// Attempt to get the next message.
1520 1583
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
@@ -1528,19 +1591,21 @@  discard block
 block discarded – undo
1528 1591
 	if (empty($context['icon_sources']))
1529 1592
 	{
1530 1593
 		$context['icon_sources'] = array();
1531
-		foreach ($context['stable_icons'] as $icon)
1532
-			$context['icon_sources'][$icon] = 'images_url';
1594
+		foreach ($context['stable_icons'] as $icon) {
1595
+					$context['icon_sources'][$icon] = 'images_url';
1596
+		}
1533 1597
 	}
1534 1598
 
1535 1599
 	// Message Icon Management... check the images exist.
1536 1600
 	if (empty($modSettings['messageIconChecks_disable']))
1537 1601
 	{
1538 1602
 		// If the current icon isn't known, then we need to do something...
1539
-		if (!isset($context['icon_sources'][$message['icon']]))
1540
-			$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
1603
+		if (!isset($context['icon_sources'][$message['icon']])) {
1604
+					$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
1605
+		}
1606
+	} elseif (!isset($context['icon_sources'][$message['icon']])) {
1607
+			$context['icon_sources'][$message['icon']] = 'images_url';
1541 1608
 	}
1542
-	elseif (!isset($context['icon_sources'][$message['icon']]))
1543
-		$context['icon_sources'][$message['icon']] = 'images_url';
1544 1609
 
1545 1610
 	// If you're a lazy bum, you probably didn't give a subject...
1546 1611
 	$message['subject'] = $message['subject'] != '' ? $message['subject'] : $txt['no_subject'];
@@ -1565,8 +1630,7 @@  discard block
 block discarded – undo
1565 1630
 		$memberContext[$message['id_member']]['email'] = $message['poster_email'];
1566 1631
 		$memberContext[$message['id_member']]['show_email'] = allowedTo('moderate_forum');
1567 1632
 		$memberContext[$message['id_member']]['is_guest'] = true;
1568
-	}
1569
-	else
1633
+	} else
1570 1634
 	{
1571 1635
 		// Define this here to make things a bit more readable
1572 1636
 		$can_view_warning = $context['user']['can_mod'] || allowedTo('view_warning_any') || ($message['id_member'] == $user_info['id'] && allowedTo('view_warning_own'));
@@ -1589,8 +1653,9 @@  discard block
 block discarded – undo
1589 1653
 	$message['body'] = parse_bbc($message['body'], $message['smileys_enabled'], $message['id_msg']);
1590 1654
 
1591 1655
 	// If it's in the recycle bin we need to override whatever icon we did have.
1592
-	if (!empty($board_info['recycle']))
1593
-		$message['icon'] = 'recycled';
1656
+	if (!empty($board_info['recycle'])) {
1657
+			$message['icon'] = 'recycled';
1658
+	}
1594 1659
 
1595 1660
 	require_once($sourcedir . '/Subs-Attachments.php');
1596 1661
 
@@ -1634,32 +1699,36 @@  discard block
 block discarded – undo
1634 1699
 	}
1635 1700
 
1636 1701
 	// Are likes enable?
1637
-	if (!empty($modSettings['enable_likes']))
1638
-		$output['likes'] = array(
1702
+	if (!empty($modSettings['enable_likes'])) {
1703
+			$output['likes'] = array(
1639 1704
 			'count' => $message['likes'],
1640 1705
 			'you' => in_array($message['id_msg'], $context['my_likes']),
1641 1706
 			'can_like' => !$context['user']['is_guest'] && $message['id_member'] != $context['user']['id'] && !empty($context['can_like']),
1642 1707
 		);
1708
+	}
1643 1709
 
1644 1710
 	// Is this user the message author?
1645 1711
 	$output['is_message_author'] = $message['id_member'] == $user_info['id'];
1646
-	if (!empty($output['modified']['name']))
1647
-		$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name']);
1712
+	if (!empty($output['modified']['name'])) {
1713
+			$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name']);
1714
+	}
1648 1715
 
1649 1716
 	// Did they give a reason for editing?
1650
-	if (!empty($output['modified']['name']) && !empty($output['modified']['reason']))
1651
-		$output['modified']['last_edit_text'] .= '&nbsp;' . sprintf($txt['last_edit_reason'], $output['modified']['reason']);
1717
+	if (!empty($output['modified']['name']) && !empty($output['modified']['reason'])) {
1718
+			$output['modified']['last_edit_text'] .= '&nbsp;' . sprintf($txt['last_edit_reason'], $output['modified']['reason']);
1719
+	}
1652 1720
 
1653 1721
 	// Any custom profile fields?
1654
-	if (!empty($memberContext[$message['id_member']]['custom_fields']))
1655
-		foreach ($memberContext[$message['id_member']]['custom_fields'] as $custom)
1722
+	if (!empty($memberContext[$message['id_member']]['custom_fields'])) {
1723
+			foreach ($memberContext[$message['id_member']]['custom_fields'] as $custom)
1656 1724
 			$output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
1725
+	}
1657 1726
 
1658
-	if (empty($options['view_newest_first']))
1659
-		$counter++;
1660
-
1661
-	else
1662
-		$counter--;
1727
+	if (empty($options['view_newest_first'])) {
1728
+			$counter++;
1729
+	} else {
1730
+			$counter--;
1731
+	}
1663 1732
 
1664 1733
 	call_integration_hook('integrate_prepare_display_context', array(&$output, &$message, $counter));
1665 1734
 
@@ -1685,8 +1754,9 @@  discard block
 block discarded – undo
1685 1754
  */
1686 1755
 function approved_attach_sort($a, $b)
1687 1756
 {
1688
-	if ($a['is_approved'] == $b['is_approved'])
1689
-		return 0;
1757
+	if ($a['is_approved'] == $b['is_approved']) {
1758
+			return 0;
1759
+	}
1690 1760
 
1691 1761
 	return $a['is_approved'] > $b['is_approved'] ? -1 : 1;
1692 1762
 }
@@ -1703,16 +1773,19 @@  discard block
 block discarded – undo
1703 1773
 
1704 1774
 	require_once($sourcedir . '/RemoveTopic.php');
1705 1775
 
1706
-	if (empty($_REQUEST['msgs']))
1707
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
1776
+	if (empty($_REQUEST['msgs'])) {
1777
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
1778
+	}
1708 1779
 
1709 1780
 	$messages = array();
1710
-	foreach ($_REQUEST['msgs'] as $dummy)
1711
-		$messages[] = (int) $dummy;
1781
+	foreach ($_REQUEST['msgs'] as $dummy) {
1782
+			$messages[] = (int) $dummy;
1783
+	}
1712 1784
 
1713 1785
 	// We are restoring messages. We handle this in another place.
1714
-	if (isset($_REQUEST['restore_selected']))
1715
-		redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
1786
+	if (isset($_REQUEST['restore_selected'])) {
1787
+			redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
1788
+	}
1716 1789
 	if (isset($_REQUEST['split_selection']))
1717 1790
 	{
1718 1791
 		$request = $smcFunc['db_query']('', '
@@ -1731,8 +1804,9 @@  discard block
 block discarded – undo
1731 1804
 	}
1732 1805
 
1733 1806
 	// Allowed to delete any message?
1734
-	if (allowedTo('delete_any'))
1735
-		$allowed_all = true;
1807
+	if (allowedTo('delete_any')) {
1808
+			$allowed_all = true;
1809
+	}
1736 1810
 	// Allowed to delete replies to their messages?
1737 1811
 	elseif (allowedTo('delete_replies'))
1738 1812
 	{
@@ -1749,13 +1823,14 @@  discard block
 block discarded – undo
1749 1823
 		$smcFunc['db_free_result']($request);
1750 1824
 
1751 1825
 		$allowed_all = $starter == $user_info['id'];
1826
+	} else {
1827
+			$allowed_all = false;
1752 1828
 	}
1753
-	else
1754
-		$allowed_all = false;
1755 1829
 
1756 1830
 	// Make sure they're allowed to delete their own messages, if not any.
1757
-	if (!$allowed_all)
1758
-		isAllowedTo('delete_own');
1831
+	if (!$allowed_all) {
1832
+			isAllowedTo('delete_own');
1833
+	}
1759 1834
 
1760 1835
 	// Allowed to remove which messages?
1761 1836
 	$request = $smcFunc['db_query']('', '
@@ -1775,8 +1850,9 @@  discard block
 block discarded – undo
1775 1850
 	$messages = array();
1776 1851
 	while ($row = $smcFunc['db_fetch_assoc']($request))
1777 1852
 	{
1778
-		if (!$allowed_all && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
1779
-			continue;
1853
+		if (!$allowed_all && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
1854
+					continue;
1855
+		}
1780 1856
 
1781 1857
 		$messages[$row['id_msg']] = array($row['subject'], $row['id_member']);
1782 1858
 	}
@@ -1799,17 +1875,20 @@  discard block
 block discarded – undo
1799 1875
 	foreach ($messages as $message => $info)
1800 1876
 	{
1801 1877
 		// Just skip the first message - if it's not the last.
1802
-		if ($message == $first_message && $message != $last_message)
1803
-			continue;
1878
+		if ($message == $first_message && $message != $last_message) {
1879
+					continue;
1880
+		}
1804 1881
 		// If the first message is going then don't bother going back to the topic as we're effectively deleting it.
1805
-		elseif ($message == $first_message)
1806
-			$topicGone = true;
1882
+		elseif ($message == $first_message) {
1883
+					$topicGone = true;
1884
+		}
1807 1885
 
1808 1886
 		removeMessage($message);
1809 1887
 
1810 1888
 		// Log this moderation action ;).
1811
-		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id']))
1812
-			logAction('delete', array('topic' => $topic, 'subject' => $info[0], 'member' => $info[1], 'board' => $board));
1889
+		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) {
1890
+					logAction('delete', array('topic' => $topic, 'subject' => $info[0], 'member' => $info[1], 'board' => $board));
1891
+		}
1813 1892
 	}
1814 1893
 
1815 1894
 	redirectexit(!empty($topicGone) ? 'board=' . $board : 'topic=' . $topic . '.' . $_REQUEST['start']);
Please login to merge, or discard this patch.
Sources/PersonalMessage.php 1 patch
Braces   +636 added lines, -473 removed lines patch added patch discarded remove patch
@@ -15,8 +15,9 @@  discard block
 block discarded – undo
15 15
  * @version 2.1 Beta 4
16 16
  */
17 17
 
18
-if (!defined('SMF'))
18
+if (!defined('SMF')) {
19 19
 	die('No direct access...');
20
+}
20 21
 
21 22
 /**
22 23
  * This helps organize things...
@@ -37,13 +38,14 @@  discard block
 block discarded – undo
37 38
 
38 39
 	loadLanguage('PersonalMessage+Drafts');
39 40
 
40
-	if (!isset($_REQUEST['xml']))
41
-		loadTemplate('PersonalMessage');
41
+	if (!isset($_REQUEST['xml'])) {
42
+			loadTemplate('PersonalMessage');
43
+	}
42 44
 
43 45
 	// Load up the members maximum message capacity.
44
-	if ($user_info['is_admin'])
45
-		$context['message_limit'] = 0;
46
-	elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
46
+	if ($user_info['is_admin']) {
47
+			$context['message_limit'] = 0;
48
+	} elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
47 49
 	{
48 50
 		// @todo Why do we do this?  It seems like if they have any limit we should use it.
49 51
 		$request = $smcFunc['db_query']('', '
@@ -78,8 +80,9 @@  discard block
 block discarded – undo
78 80
 	}
79 81
 
80 82
 	// a previous message was sent successfully? show a small indication.
81
-	if (isset($_GET['done']) && ($_GET['done'] == 'sent'))
82
-		$context['pm_sent'] = true;
83
+	if (isset($_GET['done']) && ($_GET['done'] == 'sent')) {
84
+			$context['pm_sent'] = true;
85
+	}
83 86
 
84 87
 	$context['labels'] = array();
85 88
 
@@ -210,11 +213,11 @@  discard block
 block discarded – undo
210 213
 	{
211 214
 		$_REQUEST['sa'] = '';
212 215
 		MessageFolder();
213
-	}
214
-	else
216
+	} else
215 217
 	{
216
-		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup')
217
-			messageIndexBar($_REQUEST['sa']);
218
+		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup') {
219
+					messageIndexBar($_REQUEST['sa']);
220
+		}
218 221
 
219 222
 		call_helper($subActions[$_REQUEST['sa']]);
220 223
 	}
@@ -291,16 +294,17 @@  discard block
 block discarded – undo
291 294
 	);
292 295
 
293 296
 	// Handle labels.
294
-	if (empty($context['currently_using_labels']))
295
-		unset($pm_areas['labels']);
296
-	else
297
+	if (empty($context['currently_using_labels'])) {
298
+			unset($pm_areas['labels']);
299
+	} else
297 300
 	{
298 301
 		// Note we send labels by id as it will have less problems in the querystring.
299 302
 		$unread_in_labels = 0;
300 303
 		foreach ($context['labels'] as $label)
301 304
 		{
302
-			if ($label['id'] == -1)
303
-				continue;
305
+			if ($label['id'] == -1) {
306
+							continue;
307
+			}
304 308
 
305 309
 			// Count the amount of unread items in labels.
306 310
 			$unread_in_labels += $label['unread_messages'];
@@ -314,8 +318,9 @@  discard block
 block discarded – undo
314 318
 			);
315 319
 		}
316 320
 
317
-		if (!empty($unread_in_labels))
318
-			$pm_areas['labels']['title'] .= ' <span class="amt">' . $unread_in_labels . '</span>';
321
+		if (!empty($unread_in_labels)) {
322
+					$pm_areas['labels']['title'] .= ' <span class="amt">' . $unread_in_labels . '</span>';
323
+		}
319 324
 	}
320 325
 
321 326
 	$pm_areas['folders']['areas']['inbox']['unread_messages'] = &$context['labels'][-1]['unread_messages'];
@@ -353,8 +358,9 @@  discard block
 block discarded – undo
353 358
 	unset($pm_areas);
354 359
 
355 360
 	// No menu means no access.
356
-	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession()))
357
-		fatal_lang_error('no_access', false);
361
+	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession())) {
362
+			fatal_lang_error('no_access', false);
363
+	}
358 364
 
359 365
 	// Make a note of the Unique ID for this menu.
360 366
 	$context['pm_menu_id'] = $context['max_menu_id'];
@@ -365,9 +371,10 @@  discard block
 block discarded – undo
365 371
 	$context['menu_item_selected'] = $current_area;
366 372
 
367 373
 	// Set the template for this area and add the profile layer.
368
-	if (!isset($_REQUEST['xml']))
369
-		$context['template_layers'][] = 'pm';
370
-}
374
+	if (!isset($_REQUEST['xml'])) {
375
+			$context['template_layers'][] = 'pm';
376
+	}
377
+	}
371 378
 
372 379
 /**
373 380
  * The popup for when we ask for the popup from the user.
@@ -399,8 +406,9 @@  discard block
 block discarded – undo
399 406
 		)
400 407
 	);
401 408
 	$pms = array();
402
-	while ($row = $smcFunc['db_fetch_row']($request))
403
-		$pms[] = $row[0];
409
+	while ($row = $smcFunc['db_fetch_row']($request)) {
410
+			$pms[] = $row[0];
411
+	}
404 412
 	$smcFunc['db_free_result']($request);
405 413
 
406 414
 	if (!empty($pms))
@@ -428,8 +436,9 @@  discard block
 block discarded – undo
428 436
 		);
429 437
 		while ($row = $smcFunc['db_fetch_assoc']($request))
430 438
 		{
431
-			if (!empty($row['id_member_from']))
432
-				$senders[] = $row['id_member_from'];
439
+			if (!empty($row['id_member_from'])) {
440
+							$senders[] = $row['id_member_from'];
441
+			}
433 442
 
434 443
 			$row['replied_to_you'] = $row['id_pm'] != $row['id_pm_head'];
435 444
 			$row['time'] = timeformat($row['timestamp']);
@@ -439,13 +448,15 @@  discard block
 block discarded – undo
439 448
 		$smcFunc['db_free_result']($request);
440 449
 
441 450
 		$senders = loadMemberData($senders);
442
-		foreach ($senders as $member)
443
-			loadMemberContext($member);
451
+		foreach ($senders as $member) {
452
+					loadMemberContext($member);
453
+		}
444 454
 
445 455
 		// Having loaded everyone, attach them to the PMs.
446
-		foreach ($context['unread_pms'] as $id_pm => $details)
447
-			if (!empty($memberContext[$details['id_member_from']]))
456
+		foreach ($context['unread_pms'] as $id_pm => $details) {
457
+					if (!empty($memberContext[$details['id_member_from']]))
448 458
 				$context['unread_pms'][$id_pm]['member'] = &$memberContext[$details['id_member_from']];
459
+		}
449 460
 	}
450 461
 }
451 462
 
@@ -465,12 +476,13 @@  discard block
 block discarded – undo
465 476
 	}
466 477
 
467 478
 	// Make sure the starting location is valid.
468
-	if (isset($_GET['start']) && $_GET['start'] != 'new')
469
-		$_GET['start'] = (int) $_GET['start'];
470
-	elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first']))
471
-		$_GET['start'] = 0;
472
-	else
473
-		$_GET['start'] = 'new';
479
+	if (isset($_GET['start']) && $_GET['start'] != 'new') {
480
+			$_GET['start'] = (int) $_GET['start'];
481
+	} elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first'])) {
482
+			$_GET['start'] = 0;
483
+	} else {
484
+			$_GET['start'] = 'new';
485
+	}
474 486
 
475 487
 	// Set up some basic theme stuff.
476 488
 	$context['from_or_to'] = $context['folder'] != 'sent' ? 'from' : 'to';
@@ -484,9 +496,10 @@  discard block
 block discarded – undo
484 496
 		list ($sig_limits, $sig_bbc) = explode(':', $modSettings['signature_settings']);
485 497
 		$sig_limits = explode(',', $sig_limits);
486 498
 
487
-		if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
488
-			addInlineCss('
499
+		if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
500
+					addInlineCss('
489 501
 	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
502
+		}
490 503
 	}
491 504
 
492 505
 	$labelJoin = '';
@@ -498,8 +511,7 @@  discard block
 block discarded – undo
498 511
 	{
499 512
 		$labelQuery = '
500 513
 			AND pmr.in_inbox = 1';
501
-	}
502
-	elseif ($context['folder'] != 'sent')
514
+	} elseif ($context['folder'] != 'sent')
503 515
 	{
504 516
 		$labelJoin = '
505 517
 			INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pmr.id_pm)';
@@ -541,22 +553,24 @@  discard block
 block discarded – undo
541 553
 	$txt['delete_all'] = str_replace('PMBOX', $pmbox, $txt['delete_all']);
542 554
 
543 555
 	// Now, build the link tree!
544
-	if ($context['current_label_id'] == -1)
545
-		$context['linktree'][] = array(
556
+	if ($context['current_label_id'] == -1) {
557
+			$context['linktree'][] = array(
546 558
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'],
547 559
 			'name' => $pmbox
548 560
 		);
561
+	}
549 562
 
550 563
 	// Build it further for a label.
551
-	if ($context['current_label_id'] != -1)
552
-		$context['linktree'][] = array(
564
+	if ($context['current_label_id'] != -1) {
565
+			$context['linktree'][] = array(
553 566
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'] . ';l=' . $context['current_label_id'],
554 567
 			'name' => $txt['pm_current_label'] . ': ' . $context['current_label']
555 568
 		);
569
+	}
556 570
 
557 571
 	// Figure out how many messages there are.
558
-	if ($context['folder'] == 'sent')
559
-		$request = $smcFunc['db_query']('', '
572
+	if ($context['folder'] == 'sent') {
573
+			$request = $smcFunc['db_query']('', '
560 574
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
561 575
 			FROM {db_prefix}personal_messages AS pm
562 576
 			WHERE pm.id_member_from = {int:current_member}
@@ -566,8 +580,8 @@  discard block
 block discarded – undo
566 580
 				'not_deleted' => 0,
567 581
 			)
568 582
 		);
569
-	else
570
-		$request = $smcFunc['db_query']('', '
583
+	} else {
584
+			$request = $smcFunc['db_query']('', '
571 585
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
572 586
 			FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
573 587
 				INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -578,6 +592,7 @@  discard block
 block discarded – undo
578 592
 				'not_deleted' => 0,
579 593
 			)
580 594
 		);
595
+	}
581 596
 	list ($max_messages) = $smcFunc['db_fetch_row']($request);
582 597
 	$smcFunc['db_free_result']($request);
583 598
 
@@ -586,10 +601,11 @@  discard block
 block discarded – undo
586 601
 	$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
587 602
 
588 603
 	// Start on the last page.
589
-	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages)
590
-		$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
591
-	elseif ($_GET['start'] < 0)
592
-		$_GET['start'] = 0;
604
+	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages) {
605
+			$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
606
+	} elseif ($_GET['start'] < 0) {
607
+			$_GET['start'] = 0;
608
+	}
593 609
 
594 610
 	// ... but wait - what if we want to start from a specific message?
595 611
 	if (isset($_GET['pmid']))
@@ -597,19 +613,21 @@  discard block
 block discarded – undo
597 613
 		$pmID = (int) $_GET['pmid'];
598 614
 
599 615
 		// Make sure you have access to this PM.
600
-		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
601
-			fatal_lang_error('no_access', false);
616
+		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
617
+					fatal_lang_error('no_access', false);
618
+		}
602 619
 
603 620
 		$context['current_pm'] = $pmID;
604 621
 
605 622
 		// With only one page of PM's we're gonna want page 1.
606
-		if ($max_messages <= $maxPerPage)
607
-			$_GET['start'] = 0;
623
+		if ($max_messages <= $maxPerPage) {
624
+					$_GET['start'] = 0;
625
+		}
608 626
 		// If we pass kstart we assume we're in the right place.
609 627
 		elseif (!isset($_GET['kstart']))
610 628
 		{
611
-			if ($context['folder'] == 'sent')
612
-				$request = $smcFunc['db_query']('', '
629
+			if ($context['folder'] == 'sent') {
630
+							$request = $smcFunc['db_query']('', '
613 631
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
614 632
 					FROM {db_prefix}personal_messages
615 633
 					WHERE id_member_from = {int:current_member}
@@ -621,8 +639,8 @@  discard block
 block discarded – undo
621 639
 						'id_pm' => $pmID,
622 640
 					)
623 641
 				);
624
-			else
625
-				$request = $smcFunc['db_query']('', '
642
+			} else {
643
+							$request = $smcFunc['db_query']('', '
626 644
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
627 645
 					FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
628 646
 						INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -635,6 +653,7 @@  discard block
 block discarded – undo
635 653
 						'id_pm' => $pmID,
636 654
 					)
637 655
 				);
656
+			}
638 657
 
639 658
 			list ($_GET['start']) = $smcFunc['db_fetch_row']($request);
640 659
 			$smcFunc['db_free_result']($request);
@@ -649,8 +668,9 @@  discard block
 block discarded – undo
649 668
 	{
650 669
 		$pmsg = (int) $_GET['pmsg'];
651 670
 
652
-		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
653
-			fatal_lang_error('no_access', false);
671
+		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
672
+					fatal_lang_error('no_access', false);
673
+		}
654 674
 	}
655 675
 
656 676
 	// Set up the page index.
@@ -744,8 +764,9 @@  discard block
 block discarded – undo
744 764
 	{
745 765
 		if (!isset($recipients[$row['id_pm']]))
746 766
 		{
747
-			if (isset($row['id_member_from']))
748
-				$posters[$row['id_pm']] = $row['id_member_from'];
767
+			if (isset($row['id_member_from'])) {
768
+							$posters[$row['id_pm']] = $row['id_member_from'];
769
+			}
749 770
 			$pms[$row['id_pm']] = $row['id_pm'];
750 771
 			$recipients[$row['id_pm']] = array(
751 772
 				'to' => array(),
@@ -754,29 +775,33 @@  discard block
 block discarded – undo
754 775
 		}
755 776
 
756 777
 		// Keep track of the last message so we know what the head is without another query!
757
-		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm']))
758
-			$lastData = array(
778
+		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm'])) {
779
+					$lastData = array(
759 780
 				'id' => $row['id_pm'],
760 781
 				'head' => $row['id_pm_head'],
761 782
 			);
783
+		}
762 784
 	}
763 785
 	$smcFunc['db_free_result']($request);
764 786
 
765 787
 	// Make sure that we have been given a correct head pm id!
766
-	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id'])
767
-		fatal_lang_error('no_access', false);
788
+	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id']) {
789
+			fatal_lang_error('no_access', false);
790
+	}
768 791
 
769 792
 	if (!empty($pms))
770 793
 	{
771 794
 		// Select the correct current message.
772
-		if (empty($pmID))
773
-			$context['current_pm'] = $lastData['id'];
795
+		if (empty($pmID)) {
796
+					$context['current_pm'] = $lastData['id'];
797
+		}
774 798
 
775 799
 		// This is a list of the pm's that are used for "full" display.
776
-		if ($context['display_mode'] == 0)
777
-			$display_pms = $pms;
778
-		else
779
-			$display_pms = array($context['current_pm']);
800
+		if ($context['display_mode'] == 0) {
801
+					$display_pms = $pms;
802
+		} else {
803
+					$display_pms = array($context['current_pm']);
804
+		}
780 805
 
781 806
 		// At this point we know the main id_pm's. But - if we are looking at conversations we need the others!
782 807
 		if ($context['display_mode'] == 2)
@@ -798,16 +823,18 @@  discard block
 block discarded – undo
798 823
 			while ($row = $smcFunc['db_fetch_assoc']($request))
799 824
 			{
800 825
 				// This is, frankly, a joke. We will put in a workaround for people sending to themselves - yawn!
801
-				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1)
802
-					continue;
803
-				elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1)
804
-					continue;
826
+				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1) {
827
+									continue;
828
+				} elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1) {
829
+									continue;
830
+				}
805 831
 
806
-				if (!isset($recipients[$row['id_pm']]))
807
-					$recipients[$row['id_pm']] = array(
832
+				if (!isset($recipients[$row['id_pm']])) {
833
+									$recipients[$row['id_pm']] = array(
808 834
 						'to' => array(),
809 835
 						'bcc' => array()
810 836
 					);
837
+				}
811 838
 				$display_pms[] = $row['id_pm'];
812 839
 				$posters[$row['id_pm']] = $row['id_member_from'];
813 840
 			}
@@ -858,8 +885,9 @@  discard block
 block discarded – undo
858 885
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
859 886
 				{
860 887
 					$l_id = $row2['id_label'];
861
-					if (isset($context['labels'][$l_id]))
862
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
888
+					if (isset($context['labels'][$l_id])) {
889
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
890
+					}
863 891
 				}
864 892
 
865 893
 				$smcFunc['db_free_result']($request2);
@@ -876,9 +904,10 @@  discard block
 block discarded – undo
876 904
 		// Make sure we don't load unnecessary data.
877 905
 		if ($context['display_mode'] == 1)
878 906
 		{
879
-			foreach ($posters as $k => $v)
880
-				if (!in_array($k, $display_pms))
907
+			foreach ($posters as $k => $v) {
908
+							if (!in_array($k, $display_pms))
881 909
 					unset($posters[$k]);
910
+			}
882 911
 		}
883 912
 
884 913
 		// Load any users....
@@ -889,8 +918,9 @@  discard block
 block discarded – undo
889 918
 		{
890 919
 			// Get the order right.
891 920
 			$orderBy = array();
892
-			foreach (array_reverse($pms) as $pm)
893
-				$orderBy[] = 'pm.id_pm = ' . $pm;
921
+			foreach (array_reverse($pms) as $pm) {
922
+							$orderBy[] = 'pm.id_pm = ' . $pm;
923
+			}
894 924
 
895 925
 			// Seperate query for these bits!
896 926
 			$subjects_request = $smcFunc['db_query']('', '
@@ -936,9 +966,9 @@  discard block
 block discarded – undo
936 966
 			// Allow mods to add additional buttons here
937 967
 			call_integration_hook('integrate_conversation_buttons');
938 968
 		}
969
+	} else {
970
+			$messages_request = false;
939 971
 	}
940
-	else
941
-		$messages_request = false;
942 972
 
943 973
 	$context['can_send_pm'] = allowedTo('pm_send');
944 974
 	$context['can_send_email'] = allowedTo('moderate_forum');
@@ -949,11 +979,13 @@  discard block
 block discarded – undo
949 979
 	if ($context['folder'] != 'sent' && !empty($context['labels'][(int) $context['current_label_id']]['unread_messages']))
950 980
 	{
951 981
 		// If the display mode is "old sk00l" do them all...
952
-		if ($context['display_mode'] == 0)
953
-			markMessages(null, $context['current_label_id']);
982
+		if ($context['display_mode'] == 0) {
983
+					markMessages(null, $context['current_label_id']);
984
+		}
954 985
 		// Otherwise do just the current one!
955
-		elseif (!empty($context['current_pm']))
956
-			markMessages($display_pms, $context['current_label_id']);
986
+		elseif (!empty($context['current_pm'])) {
987
+					markMessages($display_pms, $context['current_label_id']);
988
+		}
957 989
 	}
958 990
 }
959 991
 
@@ -971,8 +1003,9 @@  discard block
 block discarded – undo
971 1003
 
972 1004
 	// Count the current message number....
973 1005
 	static $counter = null;
974
-	if ($counter === null || $reset)
975
-		$counter = $context['start'];
1006
+	if ($counter === null || $reset) {
1007
+			$counter = $context['start'];
1008
+	}
976 1009
 
977 1010
 	static $temp_pm_selected = null;
978 1011
 	if ($temp_pm_selected === null)
@@ -1017,19 +1050,22 @@  discard block
 block discarded – undo
1017 1050
 	}
1018 1051
 
1019 1052
 	// Bail if it's false, ie. no messages.
1020
-	if ($messages_request == false)
1021
-		return false;
1053
+	if ($messages_request == false) {
1054
+			return false;
1055
+	}
1022 1056
 
1023 1057
 	// Reset the data?
1024
-	if ($reset == true)
1025
-		return @$smcFunc['db_data_seek']($messages_request, 0);
1058
+	if ($reset == true) {
1059
+			return @$smcFunc['db_data_seek']($messages_request, 0);
1060
+	}
1026 1061
 
1027 1062
 	// Get the next one... bail if anything goes wrong.
1028 1063
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
1029 1064
 	if (!$message)
1030 1065
 	{
1031
-		if ($type != 'subject')
1032
-			$smcFunc['db_free_result']($messages_request);
1066
+		if ($type != 'subject') {
1067
+					$smcFunc['db_free_result']($messages_request);
1068
+		}
1033 1069
 
1034 1070
 		return false;
1035 1071
 	}
@@ -1049,8 +1085,7 @@  discard block
 block discarded – undo
1049 1085
 		$memberContext[$message['id_member_from']]['email'] = '';
1050 1086
 		$memberContext[$message['id_member_from']]['show_email'] = false;
1051 1087
 		$memberContext[$message['id_member_from']]['is_guest'] = true;
1052
-	}
1053
-	else
1088
+	} else
1054 1089
 	{
1055 1090
 		$memberContext[$message['id_member_from']]['can_view_profile'] = allowedTo('profile_view') || ($message['id_member_from'] == $user_info['id'] && !$user_info['is_guest']);
1056 1091
 		$memberContext[$message['id_member_from']]['can_see_warning'] = !isset($context['disabled_fields']['warning_status']) && $memberContext[$message['id_member_from']]['warning_status'] && ($context['user']['can_mod'] || (!empty($modSettings['warning_show']) && ($modSettings['warning_show'] > 1 || $message['id_member_from'] == $user_info['id'])));
@@ -1091,9 +1126,10 @@  discard block
 block discarded – undo
1091 1126
 	$counter++;
1092 1127
 
1093 1128
 	// Any custom profile fields?
1094
-	if (!empty($memberContext[$message['id_member_from']]['custom_fields']))
1095
-		foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
1129
+	if (!empty($memberContext[$message['id_member_from']]['custom_fields'])) {
1130
+			foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
1096 1131
 			$output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
1132
+	}
1097 1133
 
1098 1134
 	call_integration_hook('integrate_prepare_pm_context', array(&$output, &$message, $counter));
1099 1135
 
@@ -1117,22 +1153,28 @@  discard block
 block discarded – undo
1117 1153
 			$context['search_params'][$k] = $v;
1118 1154
 		}
1119 1155
 	}
1120
-	if (isset($_REQUEST['search']))
1121
-		$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
1156
+	if (isset($_REQUEST['search'])) {
1157
+			$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
1158
+	}
1122 1159
 
1123
-	if (isset($context['search_params']['search']))
1124
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
1125
-	if (isset($context['search_params']['userspec']))
1126
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
1160
+	if (isset($context['search_params']['search'])) {
1161
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
1162
+	}
1163
+	if (isset($context['search_params']['userspec'])) {
1164
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
1165
+	}
1127 1166
 
1128
-	if (!empty($context['search_params']['searchtype']))
1129
-		$context['search_params']['searchtype'] = 2;
1167
+	if (!empty($context['search_params']['searchtype'])) {
1168
+			$context['search_params']['searchtype'] = 2;
1169
+	}
1130 1170
 
1131
-	if (!empty($context['search_params']['minage']))
1132
-		$context['search_params']['minage'] = (int) $context['search_params']['minage'];
1171
+	if (!empty($context['search_params']['minage'])) {
1172
+			$context['search_params']['minage'] = (int) $context['search_params']['minage'];
1173
+	}
1133 1174
 
1134
-	if (!empty($context['search_params']['maxage']))
1135
-		$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
1175
+	if (!empty($context['search_params']['maxage'])) {
1176
+			$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
1177
+	}
1136 1178
 
1137 1179
 	$context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']);
1138 1180
 	$context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']);
@@ -1159,8 +1201,9 @@  discard block
 block discarded – undo
1159 1201
 		$context['search_errors']['messages'] = array();
1160 1202
 		foreach ($context['search_errors'] as $search_error => $dummy)
1161 1203
 		{
1162
-			if ($search_error == 'messages')
1163
-				continue;
1204
+			if ($search_error == 'messages') {
1205
+							continue;
1206
+			}
1164 1207
 
1165 1208
 			$context['search_errors']['messages'][] = $txt['error_' . $search_error];
1166 1209
 		}
@@ -1182,8 +1225,9 @@  discard block
 block discarded – undo
1182 1225
 	global $scripturl, $modSettings, $user_info, $context, $txt;
1183 1226
 	global $memberContext, $smcFunc;
1184 1227
 
1185
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
1186
-		fatal_lang_error('loadavg_search_disabled', false);
1228
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) {
1229
+			fatal_lang_error('loadavg_search_disabled', false);
1230
+	}
1187 1231
 
1188 1232
 	/**
1189 1233
 	 * @todo For the moment force the folder to the inbox.
@@ -1212,35 +1256,40 @@  discard block
 block discarded – undo
1212 1256
 	$context['start'] = isset($_GET['start']) ? (int) $_GET['start'] : 0;
1213 1257
 
1214 1258
 	// Store whether simple search was used (needed if the user wants to do another query).
1215
-	if (!isset($search_params['advanced']))
1216
-		$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
1259
+	if (!isset($search_params['advanced'])) {
1260
+			$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
1261
+	}
1217 1262
 
1218 1263
 	// 1 => 'allwords' (default, don't set as param) / 2 => 'anywords'.
1219
-	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2))
1220
-		$search_params['searchtype'] = 2;
1264
+	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) {
1265
+			$search_params['searchtype'] = 2;
1266
+	}
1221 1267
 
1222 1268
 	// Minimum age of messages. Default to zero (don't set param in that case).
1223
-	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0))
1224
-		$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
1269
+	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) {
1270
+			$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
1271
+	}
1225 1272
 
1226 1273
 	// Maximum age of messages. Default to infinite (9999 days: param not set).
1227
-	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] != 9999))
1228
-		$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
1274
+	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] != 9999)) {
1275
+			$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
1276
+	}
1229 1277
 
1230 1278
 	$search_params['subject_only'] = !empty($search_params['subject_only']) || !empty($_REQUEST['subject_only']);
1231 1279
 	$search_params['show_complete'] = !empty($search_params['show_complete']) || !empty($_REQUEST['show_complete']);
1232 1280
 
1233 1281
 	// Default the user name to a wildcard matching every user (*).
1234
-	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
1235
-		$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
1282
+	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
1283
+			$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
1284
+	}
1236 1285
 
1237 1286
 	// This will be full of all kinds of parameters!
1238 1287
 	$searchq_parameters = array();
1239 1288
 
1240 1289
 	// If there's no specific user, then don't mention it in the main query.
1241
-	if (empty($search_params['userspec']))
1242
-		$userQuery = '';
1243
-	else
1290
+	if (empty($search_params['userspec'])) {
1291
+			$userQuery = '';
1292
+	} else
1244 1293
 	{
1245 1294
 		$userString = strtr($smcFunc['htmlspecialchars']($search_params['userspec'], ENT_QUOTES), array('&quot;' => '"'));
1246 1295
 		$userString = strtr($userString, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
@@ -1252,8 +1301,9 @@  discard block
 block discarded – undo
1252 1301
 		{
1253 1302
 			$possible_users[$k] = trim($possible_users[$k]);
1254 1303
 
1255
-			if (strlen($possible_users[$k]) == 0)
1256
-				unset($possible_users[$k]);
1304
+			if (strlen($possible_users[$k]) == 0) {
1305
+							unset($possible_users[$k]);
1306
+			}
1257 1307
 		}
1258 1308
 
1259 1309
 		if (!empty($possible_users))
@@ -1265,8 +1315,9 @@  discard block
 block discarded – undo
1265 1315
 			{
1266 1316
 				$where_params['name_' . $k] = $v;
1267 1317
 				$where_clause[] = '{raw:real_name} LIKE {string:name_' . $k . '}';
1268
-				if (!isset($where_params['real_name']))
1269
-					$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
1318
+				if (!isset($where_params['real_name'])) {
1319
+									$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
1320
+				}
1270 1321
 			}
1271 1322
 
1272 1323
 			// Who matches those criteria?
@@ -1279,28 +1330,28 @@  discard block
 block discarded – undo
1279 1330
 			);
1280 1331
 
1281 1332
 			// Simply do nothing if there're too many members matching the criteria.
1282
-			if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch)
1283
-				$userQuery = '';
1284
-			elseif ($smcFunc['db_num_rows']($request) == 0)
1333
+			if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch) {
1334
+							$userQuery = '';
1335
+			} elseif ($smcFunc['db_num_rows']($request) == 0)
1285 1336
 			{
1286 1337
 				$userQuery = 'AND pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})';
1287 1338
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
1288 1339
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
1289
-			}
1290
-			else
1340
+			} else
1291 1341
 			{
1292 1342
 				$memberlist = array();
1293
-				while ($row = $smcFunc['db_fetch_assoc']($request))
1294
-					$memberlist[] = $row['id_member'];
1343
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
1344
+									$memberlist[] = $row['id_member'];
1345
+				}
1295 1346
 				$userQuery = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})))';
1296 1347
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
1297 1348
 				$searchq_parameters['member_list'] = $memberlist;
1298 1349
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
1299 1350
 			}
1300 1351
 			$smcFunc['db_free_result']($request);
1352
+		} else {
1353
+					$userQuery = '';
1301 1354
 		}
1302
-		else
1303
-			$userQuery = '';
1304 1355
 	}
1305 1356
 
1306 1357
 	// Setup the sorting variables...
@@ -1308,8 +1359,9 @@  discard block
 block discarded – undo
1308 1359
 	$sort_columns = array(
1309 1360
 		'pm.id_pm',
1310 1361
 	);
1311
-	if (empty($search_params['sort']) && !empty($_REQUEST['sort']))
1312
-		list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
1362
+	if (empty($search_params['sort']) && !empty($_REQUEST['sort'])) {
1363
+			list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
1364
+	}
1313 1365
 	$search_params['sort'] = !empty($search_params['sort']) && in_array($search_params['sort'], $sort_columns) ? $search_params['sort'] : 'pm.id_pm';
1314 1366
 	$search_params['sort_dir'] = !empty($search_params['sort_dir']) && $search_params['sort_dir'] == 'asc' ? 'asc' : 'desc';
1315 1367
 
@@ -1319,24 +1371,27 @@  discard block
 block discarded – undo
1319 1371
 	if ($context['folder'] == 'inbox' && !empty($search_params['advanced']) && $context['currently_using_labels'])
1320 1372
 	{
1321 1373
 		// Came here from pagination?  Put them back into $_REQUEST for sanitization.
1322
-		if (isset($search_params['labels']))
1323
-			$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
1374
+		if (isset($search_params['labels'])) {
1375
+					$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
1376
+		}
1324 1377
 
1325 1378
 		// Assuming we have some labels - make them all integers.
1326 1379
 		if (!empty($_REQUEST['searchlabel']) && is_array($_REQUEST['searchlabel']))
1327 1380
 		{
1328
-			foreach ($_REQUEST['searchlabel'] as $key => $id)
1329
-				$_REQUEST['searchlabel'][$key] = (int) $id;
1381
+			foreach ($_REQUEST['searchlabel'] as $key => $id) {
1382
+							$_REQUEST['searchlabel'][$key] = (int) $id;
1383
+			}
1384
+		} else {
1385
+					$_REQUEST['searchlabel'] = array();
1330 1386
 		}
1331
-		else
1332
-			$_REQUEST['searchlabel'] = array();
1333 1387
 
1334 1388
 		// Now that everything is cleaned up a bit, make the labels a param.
1335 1389
 		$search_params['labels'] = implode(',', $_REQUEST['searchlabel']);
1336 1390
 
1337 1391
 		// No labels selected? That must be an error!
1338
-		if (empty($_REQUEST['searchlabel']))
1339
-			$context['search_errors']['no_labels_selected'] = true;
1392
+		if (empty($_REQUEST['searchlabel'])) {
1393
+					$context['search_errors']['no_labels_selected'] = true;
1394
+		}
1340 1395
 		// Otherwise prepare the query!
1341 1396
 		elseif (count($_REQUEST['searchlabel']) != count($context['labels']))
1342 1397
 		{
@@ -1359,8 +1414,7 @@  discard block
 block discarded – undo
1359 1414
 					// Not searching the inbox - PM must be labeled
1360 1415
 					$labelQuery = ' AND pml.id_label IN ({array_int:labels})';
1361 1416
 					$labelJoin = ' INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)';
1362
-				}
1363
-				else
1417
+				} else
1364 1418
 				{
1365 1419
 					// Searching the inbox - PM doesn't have to be labeled
1366 1420
 					$labelQuery = ' AND (' . substr($labelQuery, 5) . ' OR pml.id_label IN ({array_int:labels}))';
@@ -1375,8 +1429,9 @@  discard block
 block discarded – undo
1375 1429
 	// What are we actually searching for?
1376 1430
 	$search_params['search'] = !empty($search_params['search']) ? $search_params['search'] : (isset($_REQUEST['search']) ? $_REQUEST['search'] : '');
1377 1431
 	// If we ain't got nothing - we should error!
1378
-	if (!isset($search_params['search']) || $search_params['search'] == '')
1379
-		$context['search_errors']['invalid_search_string'] = true;
1432
+	if (!isset($search_params['search']) || $search_params['search'] == '') {
1433
+			$context['search_errors']['invalid_search_string'] = true;
1434
+	}
1380 1435
 
1381 1436
 	// Extract phrase parts first (e.g. some words "this is a phrase" some more words.)
1382 1437
 	preg_match_all('~(?:^|\s)([-]?)"([^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), $search_params['search'], $matches, PREG_PATTERN_ORDER);
@@ -1389,12 +1444,14 @@  discard block
 block discarded – undo
1389 1444
 	$excludedWords = array();
1390 1445
 
1391 1446
 	// .. first, we check for things like -"some words", but not "-some words".
1392
-	foreach ($matches[1] as $index => $word)
1393
-		if ($word == '-')
1447
+	foreach ($matches[1] as $index => $word) {
1448
+			if ($word == '-')
1394 1449
 		{
1395 1450
 			$word = $smcFunc['strtolower'](trim($searchArray[$index]));
1396
-			if (strlen($word) > 0)
1397
-				$excludedWords[] = $word;
1451
+	}
1452
+			if (strlen($word) > 0) {
1453
+							$excludedWords[] = $word;
1454
+			}
1398 1455
 			unset($searchArray[$index]);
1399 1456
 		}
1400 1457
 
@@ -1404,8 +1461,9 @@  discard block
 block discarded – undo
1404 1461
 		if (strpos(trim($word), '-') === 0)
1405 1462
 		{
1406 1463
 			$word = substr($smcFunc['strtolower']($word), 1);
1407
-			if (strlen($word) > 0)
1408
-				$excludedWords[] = $word;
1464
+			if (strlen($word) > 0) {
1465
+							$excludedWords[] = $word;
1466
+			}
1409 1467
 			unset($tempSearch[$index]);
1410 1468
 		}
1411 1469
 	}
@@ -1416,9 +1474,9 @@  discard block
 block discarded – undo
1416 1474
 	foreach ($searchArray as $index => $value)
1417 1475
 	{
1418 1476
 		$searchArray[$index] = $smcFunc['strtolower'](trim($value));
1419
-		if ($searchArray[$index] == '')
1420
-			unset($searchArray[$index]);
1421
-		else
1477
+		if ($searchArray[$index] == '') {
1478
+					unset($searchArray[$index]);
1479
+		} else
1422 1480
 		{
1423 1481
 			// Sort out entities first.
1424 1482
 			$searchArray[$index] = $smcFunc['htmlspecialchars']($searchArray[$index]);
@@ -1428,27 +1486,32 @@  discard block
 block discarded – undo
1428 1486
 
1429 1487
 	// Create an array of replacements for highlighting.
1430 1488
 	$context['mark'] = array();
1431
-	foreach ($searchArray as $word)
1432
-		$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
1489
+	foreach ($searchArray as $word) {
1490
+			$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
1491
+	}
1433 1492
 
1434 1493
 	// This contains *everything*
1435 1494
 	$searchWords = array_merge($searchArray, $excludedWords);
1436 1495
 
1437 1496
 	// Make sure at least one word is being searched for.
1438
-	if (empty($searchArray))
1439
-		$context['search_errors']['invalid_search_string'] = true;
1497
+	if (empty($searchArray)) {
1498
+			$context['search_errors']['invalid_search_string'] = true;
1499
+	}
1440 1500
 
1441 1501
 	// Sort out the search query so the user can edit it - if they want.
1442 1502
 	$context['search_params'] = $search_params;
1443
-	if (isset($context['search_params']['search']))
1444
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
1445
-	if (isset($context['search_params']['userspec']))
1446
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
1503
+	if (isset($context['search_params']['search'])) {
1504
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
1505
+	}
1506
+	if (isset($context['search_params']['userspec'])) {
1507
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
1508
+	}
1447 1509
 
1448 1510
 	// Now we have all the parameters, combine them together for pagination and the like...
1449 1511
 	$context['params'] = array();
1450
-	foreach ($search_params as $k => $v)
1451
-		$context['params'][] = $k . '|\'|' . $v;
1512
+	foreach ($search_params as $k => $v) {
1513
+			$context['params'][] = $k . '|\'|' . $v;
1514
+	}
1452 1515
 	$context['params'] = base64_encode(implode('|"|', $context['params']));
1453 1516
 
1454 1517
 	// Compile the subject query part.
@@ -1456,26 +1519,31 @@  discard block
 block discarded – undo
1456 1519
 
1457 1520
 	foreach ($searchWords as $index => $word)
1458 1521
 	{
1459
-		if ($word == '')
1460
-			continue;
1522
+		if ($word == '') {
1523
+					continue;
1524
+		}
1461 1525
 
1462
-		if ($search_params['subject_only'])
1463
-			$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
1464
-		else
1465
-			$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
1526
+		if ($search_params['subject_only']) {
1527
+					$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
1528
+		} else {
1529
+					$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
1530
+		}
1466 1531
 		$searchq_parameters['search_' . $index] = '%' . strtr($word, array('_' => '\\_', '%' => '\\%')) . '%';
1467 1532
 	}
1468 1533
 
1469 1534
 	$searchQuery = ' 1=1';
1470
-	if (!empty($andQueryParts))
1471
-		$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
1535
+	if (!empty($andQueryParts)) {
1536
+			$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
1537
+	}
1472 1538
 
1473 1539
 	// Age limits?
1474 1540
 	$timeQuery = '';
1475
-	if (!empty($search_params['minage']))
1476
-		$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
1477
-	if (!empty($search_params['maxage']))
1478
-		$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
1541
+	if (!empty($search_params['minage'])) {
1542
+			$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
1543
+	}
1544
+	if (!empty($search_params['maxage'])) {
1545
+			$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
1546
+	}
1479 1547
 
1480 1548
 	// If we have errors - return back to the first screen...
1481 1549
 	if (!empty($context['search_errors']))
@@ -1561,8 +1629,9 @@  discard block
 block discarded – undo
1561 1629
 			)
1562 1630
 		);
1563 1631
 		$real_pm_ids = array();
1564
-		while ($row = $smcFunc['db_fetch_assoc']($request))
1565
-			$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
1632
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
1633
+					$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
1634
+		}
1566 1635
 		$smcFunc['db_free_result']($request);
1567 1636
 	}
1568 1637
 
@@ -1592,8 +1661,9 @@  discard block
 block discarded – undo
1592 1661
 		);
1593 1662
 		while ($row = $smcFunc['db_fetch_assoc']($request))
1594 1663
 		{
1595
-			if ($context['folder'] == 'sent' || empty($row['bcc']))
1596
-				$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
1664
+			if ($context['folder'] == 'sent' || empty($row['bcc'])) {
1665
+							$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
1666
+			}
1597 1667
 
1598 1668
 			if ($row['id_member_to'] == $user_info['id'] && $context['folder'] != 'sent')
1599 1669
 			{
@@ -1614,12 +1684,14 @@  discard block
 block discarded – undo
1614 1684
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
1615 1685
 				{
1616 1686
 					$l_id = $row2['id_label'];
1617
-					if (isset($context['labels'][$l_id]))
1618
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
1687
+					if (isset($context['labels'][$l_id])) {
1688
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
1689
+					}
1619 1690
 
1620 1691
 					// Here we find the first label on a message - for linking to posts in results
1621
-					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1)
1622
-						$context['first_label'][$row['id_pm']] = $l_id;
1692
+					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1) {
1693
+											$context['first_label'][$row['id_pm']] = $l_id;
1694
+					}
1623 1695
 				}
1624 1696
 
1625 1697
 				$smcFunc['db_free_result']($request2);
@@ -1746,8 +1818,9 @@  discard block
 block discarded – undo
1746 1818
 		list ($postCount) = $smcFunc['db_fetch_row']($request);
1747 1819
 		$smcFunc['db_free_result']($request);
1748 1820
 
1749
-		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
1750
-			fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
1821
+		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour']) {
1822
+					fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
1823
+		}
1751 1824
 	}
1752 1825
 
1753 1826
 	// Quoting/Replying to a message?
@@ -1756,8 +1829,9 @@  discard block
 block discarded – undo
1756 1829
 		$pmsg = (int) $_REQUEST['pmsg'];
1757 1830
 
1758 1831
 		// Make sure this is yours.
1759
-		if (!isAccessiblePM($pmsg))
1760
-			fatal_lang_error('no_access', false);
1832
+		if (!isAccessiblePM($pmsg)) {
1833
+					fatal_lang_error('no_access', false);
1834
+		}
1761 1835
 
1762 1836
 		// Work out whether this is one you've received?
1763 1837
 		$request = $smcFunc['db_query']('', '
@@ -1794,8 +1868,9 @@  discard block
 block discarded – undo
1794 1868
 				'id_pm' => $pmsg,
1795 1869
 			)
1796 1870
 		);
1797
-		if ($smcFunc['db_num_rows']($request) == 0)
1798
-			fatal_lang_error('pm_not_yours', false);
1871
+		if ($smcFunc['db_num_rows']($request) == 0) {
1872
+					fatal_lang_error('pm_not_yours', false);
1873
+		}
1799 1874
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
1800 1875
 		$smcFunc['db_free_result']($request);
1801 1876
 
@@ -1806,9 +1881,9 @@  discard block
 block discarded – undo
1806 1881
 		// Add 'Re: ' to it....
1807 1882
 		if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
1808 1883
 		{
1809
-			if ($language === $user_info['language'])
1810
-				$context['response_prefix'] = $txt['response_prefix'];
1811
-			else
1884
+			if ($language === $user_info['language']) {
1885
+							$context['response_prefix'] = $txt['response_prefix'];
1886
+			} else
1812 1887
 			{
1813 1888
 				loadLanguage('index', $language, false);
1814 1889
 				$context['response_prefix'] = $txt['response_prefix'];
@@ -1817,22 +1892,25 @@  discard block
 block discarded – undo
1817 1892
 			cache_put_data('response_prefix', $context['response_prefix'], 600);
1818 1893
 		}
1819 1894
 		$form_subject = $row_quoted['subject'];
1820
-		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
1821
-			$form_subject = $context['response_prefix'] . $form_subject;
1895
+		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
1896
+					$form_subject = $context['response_prefix'] . $form_subject;
1897
+		}
1822 1898
 
1823 1899
 		if (isset($_REQUEST['quote']))
1824 1900
 		{
1825 1901
 			// Remove any nested quotes and <br>...
1826 1902
 			$form_message = preg_replace('~<br ?/?' . '>~i', "\n", $row_quoted['body']);
1827
-			if (!empty($modSettings['removeNestedQuotes']))
1828
-				$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
1829
-			if (empty($row_quoted['id_member']))
1830
-				$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
1831
-			else
1832
-				$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
1903
+			if (!empty($modSettings['removeNestedQuotes'])) {
1904
+							$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
1905
+			}
1906
+			if (empty($row_quoted['id_member'])) {
1907
+							$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
1908
+			} else {
1909
+							$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
1910
+			}
1911
+		} else {
1912
+					$form_message = '';
1833 1913
 		}
1834
-		else
1835
-			$form_message = '';
1836 1914
 
1837 1915
 		// Do the BBC thang on the message.
1838 1916
 		$row_quoted['body'] = parse_bbc($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']);
@@ -1853,8 +1931,7 @@  discard block
 block discarded – undo
1853 1931
 			'timestamp' => forum_time(true, $row_quoted['msgtime']),
1854 1932
 			'body' => $row_quoted['body']
1855 1933
 		);
1856
-	}
1857
-	else
1934
+	} else
1858 1935
 	{
1859 1936
 		$context['quoted_message'] = false;
1860 1937
 		$form_subject = '';
@@ -1873,11 +1950,12 @@  discard block
 block discarded – undo
1873 1950
 		if ($_REQUEST['u'] == 'all' && isset($row_quoted))
1874 1951
 		{
1875 1952
 			// Firstly, to reply to all we clearly already have $row_quoted - so have the original member from.
1876
-			if ($row_quoted['id_member'] != $user_info['id'])
1877
-				$context['recipients']['to'][] = array(
1953
+			if ($row_quoted['id_member'] != $user_info['id']) {
1954
+							$context['recipients']['to'][] = array(
1878 1955
 					'id' => $row_quoted['id_member'],
1879 1956
 					'name' => $smcFunc['htmlspecialchars']($row_quoted['real_name']),
1880 1957
 				);
1958
+			}
1881 1959
 
1882 1960
 			// Now to get the others.
1883 1961
 			$request = $smcFunc['db_query']('', '
@@ -1893,18 +1971,19 @@  discard block
 block discarded – undo
1893 1971
 					'not_bcc' => 0,
1894 1972
 				)
1895 1973
 			);
1896
-			while ($row = $smcFunc['db_fetch_assoc']($request))
1897
-				$context['recipients']['to'][] = array(
1974
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
1975
+							$context['recipients']['to'][] = array(
1898 1976
 					'id' => $row['id_member'],
1899 1977
 					'name' => $row['real_name'],
1900 1978
 				);
1979
+			}
1901 1980
 			$smcFunc['db_free_result']($request);
1902
-		}
1903
-		else
1981
+		} else
1904 1982
 		{
1905 1983
 			$_REQUEST['u'] = explode(',', $_REQUEST['u']);
1906
-			foreach ($_REQUEST['u'] as $key => $uID)
1907
-				$_REQUEST['u'][$key] = (int) $uID;
1984
+			foreach ($_REQUEST['u'] as $key => $uID) {
1985
+							$_REQUEST['u'][$key] = (int) $uID;
1986
+			}
1908 1987
 
1909 1988
 			$_REQUEST['u'] = array_unique($_REQUEST['u']);
1910 1989
 
@@ -1918,22 +1997,24 @@  discard block
 block discarded – undo
1918 1997
 					'limit' => count($_REQUEST['u']),
1919 1998
 				)
1920 1999
 			);
1921
-			while ($row = $smcFunc['db_fetch_assoc']($request))
1922
-				$context['recipients']['to'][] = array(
2000
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
2001
+							$context['recipients']['to'][] = array(
1923 2002
 					'id' => $row['id_member'],
1924 2003
 					'name' => $row['real_name'],
1925 2004
 				);
2005
+			}
1926 2006
 			$smcFunc['db_free_result']($request);
1927 2007
 		}
1928 2008
 
1929 2009
 		// Get a literal name list in case the user has JavaScript disabled.
1930 2010
 		$names = array();
1931
-		foreach ($context['recipients']['to'] as $to)
1932
-			$names[] = $to['name'];
2011
+		foreach ($context['recipients']['to'] as $to) {
2012
+					$names[] = $to['name'];
2013
+		}
1933 2014
 		$context['to_value'] = empty($names) ? '' : '&quot;' . implode('&quot;, &quot;', $names) . '&quot;';
2015
+	} else {
2016
+			$context['to_value'] = '';
1934 2017
 	}
1935
-	else
1936
-		$context['to_value'] = '';
1937 2018
 
1938 2019
 	// Set the defaults...
1939 2020
 	$context['subject'] = $form_subject;
@@ -2003,8 +2084,9 @@  discard block
 block discarded – undo
2003 2084
 
2004 2085
 	// validate with loadMemberData()
2005 2086
 	$memberResult = loadMemberData($user_info['id'], false);
2006
-	if (!$memberResult)
2007
-		fatal_lang_error('not_a_user', false);
2087
+	if (!$memberResult) {
2088
+			fatal_lang_error('not_a_user', false);
2089
+	}
2008 2090
 	list ($memID) = $memberResult;
2009 2091
 
2010 2092
 	// drafts is where the functions reside
@@ -2030,9 +2112,9 @@  discard block
 block discarded – undo
2030 2112
 		$context['sub_template'] = 'send';
2031 2113
 		loadJavaScriptFile('PersonalMessage.js', array('defer' => false, 'minimize' => true), 'smf_pms');
2032 2114
 		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
2115
+	} else {
2116
+			$context['sub_template'] = 'pm';
2033 2117
 	}
2034
-	else
2035
-		$context['sub_template'] = 'pm';
2036 2118
 
2037 2119
 	$context['page_title'] = $txt['send_message'];
2038 2120
 
@@ -2093,10 +2175,11 @@  discard block
 block discarded – undo
2093 2175
 		);
2094 2176
 		if ($smcFunc['db_num_rows']($request) == 0)
2095 2177
 		{
2096
-			if (!isset($_REQUEST['xml']))
2097
-				fatal_lang_error('pm_not_yours', false);
2098
-			else
2099
-				$error_types[] = 'pm_not_yours';
2178
+			if (!isset($_REQUEST['xml'])) {
2179
+							fatal_lang_error('pm_not_yours', false);
2180
+			} else {
2181
+							$error_types[] = 'pm_not_yours';
2182
+			}
2100 2183
 		}
2101 2184
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
2102 2185
 		$smcFunc['db_free_result']($request);
@@ -2143,14 +2226,16 @@  discard block
 block discarded – undo
2143 2226
 		$context['post_error'][$error_type] = true;
2144 2227
 		if (isset($txt['error_' . $error_type]))
2145 2228
 		{
2146
-			if ($error_type == 'long_message')
2147
-				$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
2229
+			if ($error_type == 'long_message') {
2230
+							$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
2231
+			}
2148 2232
 			$context['post_error']['messages'][] = $txt['error_' . $error_type];
2149 2233
 		}
2150 2234
 
2151 2235
 		// If it's not a minor error flag it as such.
2152
-		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject')))
2153
-			$context['error_type'] = 'serious';
2236
+		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject'))) {
2237
+					$context['error_type'] = 'serious';
2238
+		}
2154 2239
 	}
2155 2240
 
2156 2241
 	// We need to load the editor once more.
@@ -2208,8 +2293,9 @@  discard block
 block discarded – undo
2208 2293
 	require_once($sourcedir . '/Subs-Auth.php');
2209 2294
 
2210 2295
 	// PM Drafts enabled and needed?
2211
-	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft'])))
2212
-		require_once($sourcedir . '/Drafts.php');
2296
+	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft']))) {
2297
+			require_once($sourcedir . '/Drafts.php');
2298
+	}
2213 2299
 
2214 2300
 	loadLanguage('PersonalMessage', '', false);
2215 2301
 
@@ -2239,24 +2325,27 @@  discard block
 block discarded – undo
2239 2325
 
2240 2326
 		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
2241 2327
 		{
2242
-			if (!isset($_REQUEST['xml']))
2243
-				fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
2244
-			else
2245
-				$post_errors[] = 'pm_too_many_per_hour';
2328
+			if (!isset($_REQUEST['xml'])) {
2329
+							fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
2330
+			} else {
2331
+							$post_errors[] = 'pm_too_many_per_hour';
2332
+			}
2246 2333
 		}
2247 2334
 	}
2248 2335
 
2249 2336
 	// If your session timed out, show an error, but do allow to re-submit.
2250
-	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '')
2251
-		$post_errors[] = 'session_timeout';
2337
+	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '') {
2338
+			$post_errors[] = 'session_timeout';
2339
+	}
2252 2340
 
2253 2341
 	$_REQUEST['subject'] = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
2254 2342
 	$_REQUEST['to'] = empty($_POST['to']) ? (empty($_GET['to']) ? '' : $_GET['to']) : $_POST['to'];
2255 2343
 	$_REQUEST['bcc'] = empty($_POST['bcc']) ? (empty($_GET['bcc']) ? '' : $_GET['bcc']) : $_POST['bcc'];
2256 2344
 
2257 2345
 	// Route the input from the 'u' parameter to the 'to'-list.
2258
-	if (!empty($_POST['u']))
2259
-		$_POST['recipient_to'] = explode(',', $_POST['u']);
2346
+	if (!empty($_POST['u'])) {
2347
+			$_POST['recipient_to'] = explode(',', $_POST['u']);
2348
+	}
2260 2349
 
2261 2350
 	// Construct the list of recipients.
2262 2351
 	$recipientList = array();
@@ -2268,8 +2357,9 @@  discard block
 block discarded – undo
2268 2357
 		$recipientList[$recipientType] = array();
2269 2358
 		if (!empty($_POST['recipient_' . $recipientType]) && is_array($_POST['recipient_' . $recipientType]))
2270 2359
 		{
2271
-			foreach ($_POST['recipient_' . $recipientType] as $recipient)
2272
-				$recipientList[$recipientType][] = (int) $recipient;
2360
+			foreach ($_POST['recipient_' . $recipientType] as $recipient) {
2361
+							$recipientList[$recipientType][] = (int) $recipient;
2362
+			}
2273 2363
 		}
2274 2364
 
2275 2365
 		// Are there also literal names set?
@@ -2283,10 +2373,11 @@  discard block
 block discarded – undo
2283 2373
 
2284 2374
 			foreach ($namedRecipientList[$recipientType] as $index => $recipient)
2285 2375
 			{
2286
-				if (strlen(trim($recipient)) > 0)
2287
-					$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
2288
-				else
2289
-					unset($namedRecipientList[$recipientType][$index]);
2376
+				if (strlen(trim($recipient)) > 0) {
2377
+									$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
2378
+				} else {
2379
+									unset($namedRecipientList[$recipientType][$index]);
2380
+				}
2290 2381
 			}
2291 2382
 
2292 2383
 			if (!empty($namedRecipientList[$recipientType]))
@@ -2316,8 +2407,9 @@  discard block
 block discarded – undo
2316 2407
 		}
2317 2408
 
2318 2409
 		// Selected a recipient to be deleted? Remove them now.
2319
-		if (!empty($_POST['delete_recipient']))
2320
-			$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
2410
+		if (!empty($_POST['delete_recipient'])) {
2411
+					$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
2412
+		}
2321 2413
 
2322 2414
 		// Make sure we don't include the same name twice
2323 2415
 		$recipientList[$recipientType] = array_unique($recipientList[$recipientType]);
@@ -2327,8 +2419,9 @@  discard block
 block discarded – undo
2327 2419
 	$is_recipient_change = !empty($_POST['delete_recipient']) || !empty($_POST['to_submit']) || !empty($_POST['bcc_submit']);
2328 2420
 
2329 2421
 	// Check if there's at least one recipient.
2330
-	if (empty($recipientList['to']) && empty($recipientList['bcc']))
2331
-		$post_errors[] = 'no_to';
2422
+	if (empty($recipientList['to']) && empty($recipientList['bcc'])) {
2423
+			$post_errors[] = 'no_to';
2424
+	}
2332 2425
 
2333 2426
 	// Make sure that we remove the members who did get it from the screen.
2334 2427
 	if (!$is_recipient_change)
@@ -2342,28 +2435,31 @@  discard block
 block discarded – undo
2342 2435
 				// Since we already have a post error, remove the previous one.
2343 2436
 				$post_errors = array_diff($post_errors, array('no_to'));
2344 2437
 
2345
-				foreach ($namesNotFound[$recipientType] as $name)
2346
-					$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
2438
+				foreach ($namesNotFound[$recipientType] as $name) {
2439
+									$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
2440
+				}
2347 2441
 			}
2348 2442
 		}
2349 2443
 	}
2350 2444
 
2351 2445
 	// Did they make any mistakes?
2352
-	if ($_REQUEST['subject'] == '')
2353
-		$post_errors[] = 'no_subject';
2354
-	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '')
2355
-		$post_errors[] = 'no_message';
2356
-	elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength'])
2357
-		$post_errors[] = 'long_message';
2358
-	else
2446
+	if ($_REQUEST['subject'] == '') {
2447
+			$post_errors[] = 'no_subject';
2448
+	}
2449
+	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '') {
2450
+			$post_errors[] = 'no_message';
2451
+	} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength']) {
2452
+			$post_errors[] = 'long_message';
2453
+	} else
2359 2454
 	{
2360 2455
 		// Preparse the message.
2361 2456
 		$message = $_REQUEST['message'];
2362 2457
 		preparsecode($message);
2363 2458
 
2364 2459
 		// Make sure there's still some content left without the tags.
2365
-		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false))
2366
-			$post_errors[] = 'no_message';
2460
+		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false)) {
2461
+					$post_errors[] = 'no_message';
2462
+		}
2367 2463
 	}
2368 2464
 
2369 2465
 	// Wrong verification code?
@@ -2375,13 +2471,15 @@  discard block
 block discarded – undo
2375 2471
 		);
2376 2472
 		$context['require_verification'] = create_control_verification($verificationOptions, true);
2377 2473
 
2378
-		if (is_array($context['require_verification']))
2379
-			$post_errors = array_merge($post_errors, $context['require_verification']);
2474
+		if (is_array($context['require_verification'])) {
2475
+					$post_errors = array_merge($post_errors, $context['require_verification']);
2476
+		}
2380 2477
 	}
2381 2478
 
2382 2479
 	// If they did, give a chance to make ammends.
2383
-	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml']))
2384
-		return messagePostError($post_errors, $namedRecipientList, $recipientList);
2480
+	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml'])) {
2481
+			return messagePostError($post_errors, $namedRecipientList, $recipientList);
2482
+	}
2385 2483
 
2386 2484
 	// Want to take a second glance before you send?
2387 2485
 	if (isset($_REQUEST['preview']))
@@ -2412,8 +2510,9 @@  discard block
 block discarded – undo
2412 2510
 		foreach ($namesNotFound as $recipientType => $names)
2413 2511
 		{
2414 2512
 			$post_errors[] = 'bad_' . $recipientType;
2415
-			foreach ($names as $name)
2416
-				$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
2513
+			foreach ($names as $name) {
2514
+							$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
2515
+			}
2417 2516
 		}
2418 2517
 
2419 2518
 		return messagePostError(array(), $namedRecipientList, $recipientList);
@@ -2443,13 +2542,14 @@  discard block
 block discarded – undo
2443 2542
 	checkSubmitOnce('check');
2444 2543
 
2445 2544
 	// Do the actual sending of the PM.
2446
-	if (!empty($recipientList['to']) || !empty($recipientList['bcc']))
2447
-		$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
2448
-	else
2449
-		$context['send_log'] = array(
2545
+	if (!empty($recipientList['to']) || !empty($recipientList['bcc'])) {
2546
+			$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
2547
+	} else {
2548
+			$context['send_log'] = array(
2450 2549
 			'sent' => array(),
2451 2550
 			'failed' => array()
2452 2551
 		);
2552
+	}
2453 2553
 
2454 2554
 	// Mark the message as "replied to".
2455 2555
 	if (!empty($context['send_log']['sent']) && !empty($_REQUEST['replied_to']) && isset($_REQUEST['f']) && $_REQUEST['f'] == 'inbox')
@@ -2467,11 +2567,12 @@  discard block
 block discarded – undo
2467 2567
 	}
2468 2568
 
2469 2569
 	// If one or more of the recipient were invalid, go back to the post screen with the failed usernames.
2470
-	if (!empty($context['send_log']['failed']))
2471
-		return messagePostError($post_errors, $namesNotFound, array(
2570
+	if (!empty($context['send_log']['failed'])) {
2571
+			return messagePostError($post_errors, $namesNotFound, array(
2472 2572
 			'to' => array_intersect($recipientList['to'], $context['send_log']['failed']),
2473 2573
 			'bcc' => array_intersect($recipientList['bcc'], $context['send_log']['failed'])
2474 2574
 		));
2575
+	}
2475 2576
 
2476 2577
 	// Message sent successfully?
2477 2578
 	if (!empty($context['send_log']) && empty($context['send_log']['failed']))
@@ -2479,8 +2580,9 @@  discard block
 block discarded – undo
2479 2580
 		$context['current_label_redirect'] = $context['current_label_redirect'] . ';done=sent';
2480 2581
 
2481 2582
 		// If we had a PM draft for this one, then its time to remove it since it was just sent
2482
-		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft']))
2483
-			DeleteDraft($_POST['id_pm_draft']);
2583
+		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft'])) {
2584
+					DeleteDraft($_POST['id_pm_draft']);
2585
+		}
2484 2586
 	}
2485 2587
 
2486 2588
 	// Go back to the where they sent from, if possible...
@@ -2495,24 +2597,28 @@  discard block
 block discarded – undo
2495 2597
 
2496 2598
 	checkSession('request');
2497 2599
 
2498
-	if (isset($_REQUEST['del_selected']))
2499
-		$_REQUEST['pm_action'] = 'delete';
2600
+	if (isset($_REQUEST['del_selected'])) {
2601
+			$_REQUEST['pm_action'] = 'delete';
2602
+	}
2500 2603
 
2501 2604
 	if (isset($_REQUEST['pm_action']) && $_REQUEST['pm_action'] != '' && !empty($_REQUEST['pms']) && is_array($_REQUEST['pms']))
2502 2605
 	{
2503
-		foreach ($_REQUEST['pms'] as $pm)
2504
-			$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
2606
+		foreach ($_REQUEST['pms'] as $pm) {
2607
+					$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
2608
+		}
2505 2609
 	}
2506 2610
 
2507
-	if (empty($_REQUEST['pm_actions']))
2508
-		redirectexit($context['current_label_redirect']);
2611
+	if (empty($_REQUEST['pm_actions'])) {
2612
+			redirectexit($context['current_label_redirect']);
2613
+	}
2509 2614
 
2510 2615
 	// If we are in conversation, we may need to apply this to every message in the conversation.
2511 2616
 	if ($context['display_mode'] == 2 && isset($_REQUEST['conversation']))
2512 2617
 	{
2513 2618
 		$id_pms = array();
2514
-		foreach ($_REQUEST['pm_actions'] as $pm => $dummy)
2515
-			$id_pms[] = (int) $pm;
2619
+		foreach ($_REQUEST['pm_actions'] as $pm => $dummy) {
2620
+					$id_pms[] = (int) $pm;
2621
+		}
2516 2622
 
2517 2623
 		$request = $smcFunc['db_query']('', '
2518 2624
 			SELECT id_pm_head, id_pm
@@ -2523,8 +2629,9 @@  discard block
 block discarded – undo
2523 2629
 			)
2524 2630
 		);
2525 2631
 		$pm_heads = array();
2526
-		while ($row = $smcFunc['db_fetch_assoc']($request))
2527
-			$pm_heads[$row['id_pm_head']] = $row['id_pm'];
2632
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
2633
+					$pm_heads[$row['id_pm_head']] = $row['id_pm'];
2634
+		}
2528 2635
 		$smcFunc['db_free_result']($request);
2529 2636
 
2530 2637
 		$request = $smcFunc['db_query']('', '
@@ -2538,8 +2645,9 @@  discard block
 block discarded – undo
2538 2645
 		// Copy the action from the single to PM to the others.
2539 2646
 		while ($row = $smcFunc['db_fetch_assoc']($request))
2540 2647
 		{
2541
-			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]]))
2542
-				$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
2648
+			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]])) {
2649
+							$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
2650
+			}
2543 2651
 		}
2544 2652
 		$smcFunc['db_free_result']($request);
2545 2653
 	}
@@ -2550,22 +2658,21 @@  discard block
 block discarded – undo
2550 2658
 	$labels = array();
2551 2659
 	foreach ($_REQUEST['pm_actions'] as $pm => $action)
2552 2660
 	{
2553
-		if ($action === 'delete')
2554
-			$to_delete[] = (int) $pm;
2555
-		else
2661
+		if ($action === 'delete') {
2662
+					$to_delete[] = (int) $pm;
2663
+		} else
2556 2664
 		{
2557 2665
 			if (substr($action, 0, 4) == 'add_')
2558 2666
 			{
2559 2667
 				$type = 'add';
2560 2668
 				$action = substr($action, 4);
2561
-			}
2562
-			elseif (substr($action, 0, 4) == 'rem_')
2669
+			} elseif (substr($action, 0, 4) == 'rem_')
2563 2670
 			{
2564 2671
 				$type = 'rem';
2565 2672
 				$action = substr($action, 4);
2673
+			} else {
2674
+							$type = 'unk';
2566 2675
 			}
2567
-			else
2568
-				$type = 'unk';
2569 2676
 
2570 2677
 			if ($action == '-1' || (int) $action > 0)
2571 2678
 			{
@@ -2576,8 +2683,9 @@  discard block
 block discarded – undo
2576 2683
 	}
2577 2684
 
2578 2685
 	// Deleting, it looks like?
2579
-	if (!empty($to_delete))
2580
-		deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
2686
+	if (!empty($to_delete)) {
2687
+			deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
2688
+	}
2581 2689
 
2582 2690
 	// Are we labeling anything?
2583 2691
 	if (!empty($to_label) && $context['folder'] == 'inbox')
@@ -2643,8 +2751,7 @@  discard block
 block discarded – undo
2643 2751
 				}
2644 2752
 
2645 2753
 				$smcFunc['db_free_result']($request2);
2646
-			}
2647
-			elseif ($type == 'rem')
2754
+			} elseif ($type == 'rem')
2648 2755
 			{
2649 2756
 				// If we're removing from the inbox, see if we have at least one other label.
2650 2757
 				// This query is faster than the one above
@@ -2676,21 +2783,25 @@  discard block
 block discarded – undo
2676 2783
 			if ($to_label[$row['id_pm']] != '-1')
2677 2784
 			{
2678 2785
 				// If this label is in the list and we're not adding it, remove it
2679
-				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add')
2680
-					unset($labels[$to_label[$row['id_pm']]]);
2681
-				else if ($type !== 'rem')
2682
-					$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
2786
+				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add') {
2787
+									unset($labels[$to_label[$row['id_pm']]]);
2788
+				} else if ($type !== 'rem') {
2789
+									$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
2790
+				}
2683 2791
 			}
2684 2792
 
2685 2793
 			// Removing all labels or just removing the inbox label
2686
-			if ($type == 'rem' && empty($labels))
2687
-				$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
2794
+			if ($type == 'rem' && empty($labels)) {
2795
+							$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
2796
+			}
2688 2797
 			// Adding new labels, but removing inbox and applying new ones
2689
-			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels))
2690
-				$in_inbox = 0;
2798
+			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels)) {
2799
+							$in_inbox = 0;
2800
+			}
2691 2801
 			// Just adding it to the inbox
2692
-			else
2693
-				$in_inbox = 1;
2802
+			else {
2803
+							$in_inbox = 1;
2804
+			}
2694 2805
 
2695 2806
 			// Are we adding it to or removing it from the inbox?
2696 2807
 			if ($in_inbox != $row['in_inbox'])
@@ -2732,8 +2843,9 @@  discard block
 block discarded – undo
2732 2843
 			if (!empty($labels_to_apply))
2733 2844
 			{
2734 2845
 				$inserts = array();
2735
-				foreach ($labels_to_apply as $label)
2736
-					$inserts[] = array($row['id_pm'], $label);
2846
+				foreach ($labels_to_apply as $label) {
2847
+									$inserts[] = array($row['id_pm'], $label);
2848
+				}
2737 2849
 
2738 2850
 				$smcFunc['db_insert']('',
2739 2851
 					'{db_prefix}pm_labeled_messages',
@@ -2777,11 +2889,13 @@  discard block
 block discarded – undo
2777 2889
 	checkSession('get');
2778 2890
 
2779 2891
 	// If all then delete all messages the user has.
2780
-	if ($_REQUEST['f'] == 'all')
2781
-		deleteMessages(null, null);
2892
+	if ($_REQUEST['f'] == 'all') {
2893
+			deleteMessages(null, null);
2894
+	}
2782 2895
 	// Otherwise just the selected folder.
2783
-	else
2784
-		deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
2896
+	else {
2897
+			deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
2898
+	}
2785 2899
 
2786 2900
 	// Done... all gone.
2787 2901
 	redirectexit($context['current_label_redirect']);
@@ -2818,8 +2932,9 @@  discard block
 block discarded – undo
2818 2932
 				'msgtime' => $deleteTime,
2819 2933
 			)
2820 2934
 		);
2821
-		while ($row = $smcFunc['db_fetch_row']($request))
2822
-			$toDelete[] = $row[0];
2935
+		while ($row = $smcFunc['db_fetch_row']($request)) {
2936
+					$toDelete[] = $row[0];
2937
+		}
2823 2938
 		$smcFunc['db_free_result']($request);
2824 2939
 
2825 2940
 		// Select all messages in their inbox older than $deleteTime.
@@ -2836,8 +2951,9 @@  discard block
 block discarded – undo
2836 2951
 				'msgtime' => $deleteTime,
2837 2952
 			)
2838 2953
 		);
2839
-		while ($row = $smcFunc['db_fetch_assoc']($request))
2840
-			$toDelete[] = $row['id_pm'];
2954
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
2955
+					$toDelete[] = $row['id_pm'];
2956
+		}
2841 2957
 		$smcFunc['db_free_result']($request);
2842 2958
 
2843 2959
 		// Delete the actual messages.
@@ -2868,26 +2984,29 @@  discard block
 block discarded – undo
2868 2984
 {
2869 2985
 	global $user_info, $smcFunc;
2870 2986
 
2871
-	if ($owner === null)
2872
-		$owner = array($user_info['id']);
2873
-	elseif (empty($owner))
2874
-		return;
2875
-	elseif (!is_array($owner))
2876
-		$owner = array($owner);
2987
+	if ($owner === null) {
2988
+			$owner = array($user_info['id']);
2989
+	} elseif (empty($owner)) {
2990
+			return;
2991
+	} elseif (!is_array($owner)) {
2992
+			$owner = array($owner);
2993
+	}
2877 2994
 
2878 2995
 	if ($personal_messages !== null)
2879 2996
 	{
2880
-		if (empty($personal_messages) || !is_array($personal_messages))
2881
-			return;
2997
+		if (empty($personal_messages) || !is_array($personal_messages)) {
2998
+					return;
2999
+		}
2882 3000
 
2883
-		foreach ($personal_messages as $index => $delete_id)
2884
-			$personal_messages[$index] = (int) $delete_id;
3001
+		foreach ($personal_messages as $index => $delete_id) {
3002
+					$personal_messages[$index] = (int) $delete_id;
3003
+		}
2885 3004
 
2886 3005
 		$where = '
2887 3006
 				AND id_pm IN ({array_int:pm_list})';
3007
+	} else {
3008
+			$where = '';
2888 3009
 	}
2889
-	else
2890
-		$where = '';
2891 3010
 
2892 3011
 	if ($folder == 'sent' || $folder === null)
2893 3012
 	{
@@ -2922,17 +3041,19 @@  discard block
 block discarded – undo
2922 3041
 		// ...And update the statistics accordingly - now including unread messages!.
2923 3042
 		while ($row = $smcFunc['db_fetch_assoc']($request))
2924 3043
 		{
2925
-			if ($row['is_read'])
2926
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
2927
-			else
2928
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
3044
+			if ($row['is_read']) {
3045
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
3046
+			} else {
3047
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
3048
+			}
2929 3049
 
2930 3050
 			// If this is the current member we need to make their message count correct.
2931 3051
 			if ($user_info['id'] == $row['id_member'])
2932 3052
 			{
2933 3053
 				$user_info['messages'] -= $row['num_deleted_messages'];
2934
-				if (!($row['is_read']))
2935
-					$user_info['unread_messages'] -= $row['num_deleted_messages'];
3054
+				if (!($row['is_read'])) {
3055
+									$user_info['unread_messages'] -= $row['num_deleted_messages'];
3056
+				}
2936 3057
 			}
2937 3058
 		}
2938 3059
 		$smcFunc['db_free_result']($request);
@@ -3000,8 +3121,9 @@  discard block
 block discarded – undo
3000 3121
 		)
3001 3122
 	);
3002 3123
 	$remove_pms = array();
3003
-	while ($row = $smcFunc['db_fetch_assoc']($request))
3004
-		$remove_pms[] = $row['sender'];
3124
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
3125
+			$remove_pms[] = $row['sender'];
3126
+	}
3005 3127
 	$smcFunc['db_free_result']($request);
3006 3128
 
3007 3129
 	if (!empty($remove_pms))
@@ -3046,8 +3168,9 @@  discard block
 block discarded – undo
3046 3168
 {
3047 3169
 	global $user_info, $context, $smcFunc;
3048 3170
 
3049
-	if ($owner === null)
3050
-		$owner = $user_info['id'];
3171
+	if ($owner === null) {
3172
+			$owner = $user_info['id'];
3173
+	}
3051 3174
 
3052 3175
 	$in_inbox = '';
3053 3176
 
@@ -3071,8 +3194,7 @@  discard block
 block discarded – undo
3071 3194
 		}
3072 3195
 
3073 3196
 		$smcFunc['db_free_result']($get_messages);
3074
-	}
3075
-	elseif ($label = '-1')
3197
+	} elseif ($label = '-1')
3076 3198
 	{
3077 3199
 		// Marking all PMs in your inbox read
3078 3200
 		$in_inbox = '
@@ -3097,8 +3219,9 @@  discard block
 block discarded – undo
3097 3219
 	{
3098 3220
 		if ($owner == $user_info['id'])
3099 3221
 		{
3100
-			foreach ($context['labels'] as $label)
3101
-				$context['labels'][(int) $label['id']]['unread_messages'] = 0;
3222
+			foreach ($context['labels'] as $label) {
3223
+							$context['labels'][(int) $label['id']]['unread_messages'] = 0;
3224
+			}
3102 3225
 		}
3103 3226
 
3104 3227
 		$result = $smcFunc['db_query']('', '
@@ -3118,8 +3241,9 @@  discard block
 block discarded – undo
3118 3241
 		{
3119 3242
 			$total_unread += $row['num'];
3120 3243
 
3121
-			if ($owner != $user_info['id'] || empty($row['id_pm']))
3122
-				continue;
3244
+			if ($owner != $user_info['id'] || empty($row['id_pm'])) {
3245
+							continue;
3246
+			}
3123 3247
 
3124 3248
 			$this_labels = array();
3125 3249
 
@@ -3143,11 +3267,13 @@  discard block
 block discarded – undo
3143 3267
 
3144 3268
 			$smcFunc['db_free_result']($result2);
3145 3269
 
3146
-			foreach ($this_labels as $this_label)
3147
-				$context['labels'][$this_label]['unread_messages'] += $row['num'];
3270
+			foreach ($this_labels as $this_label) {
3271
+							$context['labels'][$this_label]['unread_messages'] += $row['num'];
3272
+			}
3148 3273
 
3149
-			if ($row['in_inbox'] == 1)
3150
-				$context['labels'][-1]['unread_messages'] += $row['num'];
3274
+			if ($row['in_inbox'] == 1) {
3275
+							$context['labels'][-1]['unread_messages'] += $row['num'];
3276
+			}
3151 3277
 		}
3152 3278
 		$smcFunc['db_free_result']($result);
3153 3279
 
@@ -3156,8 +3282,9 @@  discard block
 block discarded – undo
3156 3282
 		updateMemberData($owner, array('unread_messages' => $total_unread));
3157 3283
 
3158 3284
 		// If it was for the current member, reflect this in the $user_info array too.
3159
-		if ($owner == $user_info['id'])
3160
-			$user_info['unread_messages'] = $total_unread;
3285
+		if ($owner == $user_info['id']) {
3286
+					$user_info['unread_messages'] = $total_unread;
3287
+		}
3161 3288
 	}
3162 3289
 }
3163 3290
 
@@ -3185,8 +3312,9 @@  discard block
 block discarded – undo
3185 3312
 	// Add all existing labels to the array to save, slashing them as necessary...
3186 3313
 	foreach ($context['labels'] as $label)
3187 3314
 	{
3188
-		if ($label['id'] != -1)
3189
-			$the_labels[$label['id']] = $label['name'];
3315
+		if ($label['id'] != -1) {
3316
+					$the_labels[$label['id']] = $label['name'];
3317
+		}
3190 3318
 	}
3191 3319
 
3192 3320
 	if (isset($_POST[$context['session_var']]))
@@ -3205,8 +3333,9 @@  discard block
 block discarded – undo
3205 3333
 		{
3206 3334
 			$_POST['label'] = strtr($smcFunc['htmlspecialchars'](trim($_POST['label'])), array(',' => '&#044;'));
3207 3335
 
3208
-			if ($smcFunc['strlen']($_POST['label']) > 30)
3209
-				$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
3336
+			if ($smcFunc['strlen']($_POST['label']) > 30) {
3337
+							$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
3338
+			}
3210 3339
 			if ($_POST['label'] != '')
3211 3340
 			{
3212 3341
 				$the_labels[] = $_POST['label'];
@@ -3227,23 +3356,24 @@  discard block
 block discarded – undo
3227 3356
 		{
3228 3357
 			foreach ($the_labels as $id => $name)
3229 3358
 			{
3230
-				if ($id == -1)
3231
-					continue;
3232
-				elseif (isset($_POST['label_name'][$id]))
3359
+				if ($id == -1) {
3360
+									continue;
3361
+				} elseif (isset($_POST['label_name'][$id]))
3233 3362
 				{
3234 3363
 					$_POST['label_name'][$id] = trim(strtr($smcFunc['htmlspecialchars']($_POST['label_name'][$id]), array(',' => '&#044;')));
3235 3364
 
3236
-					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30)
3237
-						$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
3365
+					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30) {
3366
+											$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
3367
+					}
3238 3368
 					if ($_POST['label_name'][$id] != '')
3239 3369
 					{
3240 3370
 						// Changing the name of this label?
3241
-						if ($the_labels[$id] != $_POST['label_name'][$id])
3242
-							$label_updates[$id] = $_POST['label_name'][$id];
3371
+						if ($the_labels[$id] != $_POST['label_name'][$id]) {
3372
+													$label_updates[$id] = $_POST['label_name'][$id];
3373
+						}
3243 3374
 
3244 3375
 						$the_labels[(int) $id] = $_POST['label_name'][$id];
3245
-					}
3246
-					else
3376
+					} else
3247 3377
 					{
3248 3378
 						unset($the_labels[(int) $id]);
3249 3379
 						$labels_to_remove[] = $id;
@@ -3257,8 +3387,9 @@  discard block
 block discarded – undo
3257 3387
 		if (!empty($labels_to_add))
3258 3388
 		{
3259 3389
 			$inserts = array();
3260
-			foreach ($labels_to_add AS $label)
3261
-				$inserts[] = array($user_info['id'], $label);
3390
+			foreach ($labels_to_add AS $label) {
3391
+							$inserts[] = array($user_info['id'], $label);
3392
+			}
3262 3393
 
3263 3394
 			$smcFunc['db_insert']('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array());
3264 3395
 		}
@@ -3348,8 +3479,9 @@  discard block
 block discarded – undo
3348 3479
 				// Each action...
3349 3480
 				foreach ($rule['actions'] as $k2 => $action)
3350 3481
 				{
3351
-					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove))
3352
-						continue;
3482
+					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove)) {
3483
+											continue;
3484
+					}
3353 3485
 
3354 3486
 					$rule_changes[] = $rule['id'];
3355 3487
 
@@ -3364,8 +3496,8 @@  discard block
 block discarded – undo
3364 3496
 		{
3365 3497
 			$rule_changes = array_unique($rule_changes);
3366 3498
 			// Update/delete as appropriate.
3367
-			foreach ($rule_changes as $k => $id)
3368
-				if (!empty($context['rules'][$id]['actions']))
3499
+			foreach ($rule_changes as $k => $id) {
3500
+							if (!empty($context['rules'][$id]['actions']))
3369 3501
 				{
3370 3502
 					$smcFunc['db_query']('', '
3371 3503
 						UPDATE {db_prefix}pm_rules
@@ -3378,12 +3510,13 @@  discard block
 block discarded – undo
3378 3510
 							'actions' => $smcFunc['json_encode']($context['rules'][$id]['actions']),
3379 3511
 						)
3380 3512
 					);
3513
+			}
3381 3514
 					unset($rule_changes[$k]);
3382 3515
 				}
3383 3516
 
3384 3517
 			// Anything left here means it's lost all actions...
3385
-			if (!empty($rule_changes))
3386
-				$smcFunc['db_query']('', '
3518
+			if (!empty($rule_changes)) {
3519
+							$smcFunc['db_query']('', '
3387 3520
 					DELETE FROM {db_prefix}pm_rules
3388 3521
 					WHERE id_rule IN ({array_int:rule_list})
3389 3522
 							AND id_member = {int:current_member}',
@@ -3392,6 +3525,7 @@  discard block
 block discarded – undo
3392 3525
 						'rule_list' => $rule_changes,
3393 3526
 					)
3394 3527
 				);
3528
+			}
3395 3529
 		}
3396 3530
 
3397 3531
 		// Make sure we're not caching this!
@@ -3461,8 +3595,9 @@  discard block
 block discarded – undo
3461 3595
 		// Save the fields.
3462 3596
 		saveProfileFields();
3463 3597
 
3464
-		if (!empty($profile_vars))
3465
-			updateMemberData($user_info['id'], $profile_vars);
3598
+		if (!empty($profile_vars)) {
3599
+					updateMemberData($user_info['id'], $profile_vars);
3600
+		}
3466 3601
 	}
3467 3602
 
3468 3603
 	setupProfileContext(
@@ -3487,13 +3622,15 @@  discard block
 block discarded – undo
3487 3622
 	global $user_info, $language, $modSettings, $smcFunc;
3488 3623
 
3489 3624
 	// Check that this feature is even enabled!
3490
-	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg']))
3491
-		fatal_lang_error('no_access', false);
3625
+	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg'])) {
3626
+			fatal_lang_error('no_access', false);
3627
+	}
3492 3628
 
3493 3629
 	$pmsg = (int) $_REQUEST['pmsg'];
3494 3630
 
3495
-	if (!isAccessiblePM($pmsg, 'inbox'))
3496
-		fatal_lang_error('no_access', false);
3631
+	if (!isAccessiblePM($pmsg, 'inbox')) {
3632
+			fatal_lang_error('no_access', false);
3633
+	}
3497 3634
 
3498 3635
 	$context['pm_id'] = $pmsg;
3499 3636
 	$context['page_title'] = $txt['pm_report_title'];
@@ -3515,8 +3652,9 @@  discard block
 block discarded – undo
3515 3652
 			)
3516 3653
 		);
3517 3654
 		$context['admins'] = array();
3518
-		while ($row = $smcFunc['db_fetch_assoc']($request))
3519
-			$context['admins'][$row['id_member']] = $row['real_name'];
3655
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
3656
+					$context['admins'][$row['id_member']] = $row['real_name'];
3657
+		}
3520 3658
 		$smcFunc['db_free_result']($request);
3521 3659
 
3522 3660
 		// How many admins in total?
@@ -3545,8 +3683,9 @@  discard block
 block discarded – undo
3545 3683
 			)
3546 3684
 		);
3547 3685
 		// Can only be a hacker here!
3548
-		if ($smcFunc['db_num_rows']($request) == 0)
3549
-			fatal_lang_error('no_access', false);
3686
+		if ($smcFunc['db_num_rows']($request) == 0) {
3687
+					fatal_lang_error('no_access', false);
3688
+		}
3550 3689
 		list ($subject, $body, $time, $memberFromID, $memberFromName) = $smcFunc['db_fetch_row']($request);
3551 3690
 		$smcFunc['db_free_result']($request);
3552 3691
 
@@ -3570,15 +3709,17 @@  discard block
 block discarded – undo
3570 3709
 		while ($row = $smcFunc['db_fetch_assoc']($request))
3571 3710
 		{
3572 3711
 			// If it's hidden still don't reveal their names - privacy after all ;)
3573
-			if ($row['bcc'])
3574
-				$hidden_recipients++;
3575
-			else
3576
-				$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
3712
+			if ($row['bcc']) {
3713
+							$hidden_recipients++;
3714
+			} else {
3715
+							$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
3716
+			}
3577 3717
 		}
3578 3718
 		$smcFunc['db_free_result']($request);
3579 3719
 
3580
-		if ($hidden_recipients)
3581
-			$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
3720
+		if ($hidden_recipients) {
3721
+					$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
3722
+		}
3582 3723
 
3583 3724
 		// Now let's get out and loop through the admins.
3584 3725
 		$request = $smcFunc['db_query']('', '
@@ -3594,8 +3735,9 @@  discard block
 block discarded – undo
3594 3735
 		);
3595 3736
 
3596 3737
 		// Maybe we shouldn't advertise this?
3597
-		if ($smcFunc['db_num_rows']($request) == 0)
3598
-			fatal_lang_error('no_access', false);
3738
+		if ($smcFunc['db_num_rows']($request) == 0) {
3739
+					fatal_lang_error('no_access', false);
3740
+		}
3599 3741
 
3600 3742
 		$memberFromName = un_htmlspecialchars($memberFromName);
3601 3743
 
@@ -3614,8 +3756,9 @@  discard block
 block discarded – undo
3614 3756
 				// Make the body.
3615 3757
 				$report_body = str_replace(array('{REPORTER}', '{SENDER}'), array(un_htmlspecialchars($user_info['name']), $memberFromName), $txt['pm_report_pm_user_sent']);
3616 3758
 				$report_body .= "\n" . '[b]' . $_POST['reason'] . '[/b]' . "\n\n";
3617
-				if (!empty($recipients))
3618
-					$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
3759
+				if (!empty($recipients)) {
3760
+									$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
3761
+				}
3619 3762
 				$report_body .= $txt['pm_report_pm_unedited_below'] . "\n" . '[quote author=' . (empty($memberFromID) ? '&quot;' . $memberFromName . '&quot;' : $memberFromName . ' link=action=profile;u=' . $memberFromID . ' date=' . $time) . ']' . "\n" . un_htmlspecialchars($body) . '[/quote]';
3620 3763
 
3621 3764
 				// Plonk it in the array ;)
@@ -3635,12 +3778,14 @@  discard block
 block discarded – undo
3635 3778
 		$smcFunc['db_free_result']($request);
3636 3779
 
3637 3780
 		// Send a different email for each language.
3638
-		foreach ($messagesToSend as $lang => $message)
3639
-			sendpm($message['recipients'], $message['subject'], $message['body']);
3781
+		foreach ($messagesToSend as $lang => $message) {
3782
+					sendpm($message['recipients'], $message['subject'], $message['body']);
3783
+		}
3640 3784
 
3641 3785
 		// Give the user their own language back!
3642
-		if (!empty($modSettings['userLanguage']))
3643
-			loadLanguage('PersonalMessage', '', false);
3786
+		if (!empty($modSettings['userLanguage'])) {
3787
+					loadLanguage('PersonalMessage', '', false);
3788
+		}
3644 3789
 
3645 3790
 		// Leave them with a template.
3646 3791
 		$context['sub_template'] = 'report_message_complete';
@@ -3686,8 +3831,9 @@  discard block
 block discarded – undo
3686 3831
 	while ($row = $smcFunc['db_fetch_assoc']($request))
3687 3832
 	{
3688 3833
 		// Hide hidden groups!
3689
-		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
3690
-			continue;
3834
+		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) {
3835
+					continue;
3836
+		}
3691 3837
 
3692 3838
 		$context['groups'][$row['id_group']] = $row['group_name'];
3693 3839
 	}
@@ -3713,9 +3859,10 @@  discard block
 block discarded – undo
3713 3859
 			$context['rule'] = $context['rules'][$context['rid']];
3714 3860
 			$members = array();
3715 3861
 			// Need to get member names!
3716
-			foreach ($context['rule']['criteria'] as $k => $criteria)
3717
-				if ($criteria['t'] == 'mid' && !empty($criteria['v']))
3862
+			foreach ($context['rule']['criteria'] as $k => $criteria) {
3863
+							if ($criteria['t'] == 'mid' && !empty($criteria['v']))
3718 3864
 					$members[(int) $criteria['v']] = $k;
3865
+			}
3719 3866
 
3720 3867
 			if (!empty($members))
3721 3868
 			{
@@ -3727,19 +3874,20 @@  discard block
 block discarded – undo
3727 3874
 						'member_list' => array_keys($members),
3728 3875
 					)
3729 3876
 				);
3730
-				while ($row = $smcFunc['db_fetch_assoc']($request))
3731
-					$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
3877
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
3878
+									$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
3879
+				}
3732 3880
 				$smcFunc['db_free_result']($request);
3733 3881
 			}
3734
-		}
3735
-		else
3736
-			$context['rule'] = array(
3882
+		} else {
3883
+					$context['rule'] = array(
3737 3884
 				'id' => '',
3738 3885
 				'name' => '',
3739 3886
 				'criteria' => array(),
3740 3887
 				'actions' => array(),
3741 3888
 				'logic' => 'and',
3742 3889
 			);
3890
+		}
3743 3891
 	}
3744 3892
 	// Saving?
3745 3893
 	elseif (isset($_GET['save']))
@@ -3749,22 +3897,25 @@  discard block
 block discarded – undo
3749 3897
 
3750 3898
 		// Name is easy!
3751 3899
 		$ruleName = $smcFunc['htmlspecialchars'](trim($_POST['rule_name']));
3752
-		if (empty($ruleName))
3753
-			fatal_lang_error('pm_rule_no_name', false);
3900
+		if (empty($ruleName)) {
3901
+					fatal_lang_error('pm_rule_no_name', false);
3902
+		}
3754 3903
 
3755 3904
 		// Sanity check...
3756
-		if (empty($_POST['ruletype']) || empty($_POST['acttype']))
3757
-			fatal_lang_error('pm_rule_no_criteria', false);
3905
+		if (empty($_POST['ruletype']) || empty($_POST['acttype'])) {
3906
+					fatal_lang_error('pm_rule_no_criteria', false);
3907
+		}
3758 3908
 
3759 3909
 		// Let's do the criteria first - it's also hardest!
3760 3910
 		$criteria = array();
3761 3911
 		foreach ($_POST['ruletype'] as $ind => $type)
3762 3912
 		{
3763 3913
 			// Check everything is here...
3764
-			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]])))
3765
-				continue;
3766
-			elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind]))
3767
-				continue;
3914
+			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]]))) {
3915
+							continue;
3916
+			} elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind])) {
3917
+							continue;
3918
+			}
3768 3919
 
3769 3920
 			// Members need to be found.
3770 3921
 			if ($type == 'mid')
@@ -3788,13 +3939,13 @@  discard block
 block discarded – undo
3788 3939
 				$smcFunc['db_free_result']($request);
3789 3940
 
3790 3941
 				$criteria[] = array('t' => 'mid', 'v' => $memID);
3942
+			} elseif ($type == 'bud') {
3943
+							$criteria[] = array('t' => 'bud', 'v' => 1);
3944
+			} elseif ($type == 'gid') {
3945
+							$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
3946
+			} elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '') {
3947
+							$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
3791 3948
 			}
3792
-			elseif ($type == 'bud')
3793
-				$criteria[] = array('t' => 'bud', 'v' => 1);
3794
-			elseif ($type == 'gid')
3795
-				$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
3796
-			elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '')
3797
-				$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
3798 3949
 		}
3799 3950
 
3800 3951
 		// Also do the actions!
@@ -3804,26 +3955,29 @@  discard block
 block discarded – undo
3804 3955
 		foreach ($_POST['acttype'] as $ind => $type)
3805 3956
 		{
3806 3957
 			// Picking a valid label?
3807
-			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]])))
3808
-				continue;
3958
+			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]]))) {
3959
+							continue;
3960
+			}
3809 3961
 
3810 3962
 			// Record what we're doing.
3811
-			if ($type == 'del')
3812
-				$doDelete = 1;
3813
-			elseif ($type == 'lab')
3814
-				$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
3963
+			if ($type == 'del') {
3964
+							$doDelete = 1;
3965
+			} elseif ($type == 'lab') {
3966
+							$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
3967
+			}
3815 3968
 		}
3816 3969
 
3817
-		if (empty($criteria) || (empty($actions) && !$doDelete))
3818
-			fatal_lang_error('pm_rule_no_criteria', false);
3970
+		if (empty($criteria) || (empty($actions) && !$doDelete)) {
3971
+					fatal_lang_error('pm_rule_no_criteria', false);
3972
+		}
3819 3973
 
3820 3974
 		// What are we storing?
3821 3975
 		$criteria = $smcFunc['json_encode']($criteria);
3822 3976
 		$actions = $smcFunc['json_encode']($actions);
3823 3977
 
3824 3978
 		// Create the rule?
3825
-		if (empty($context['rid']))
3826
-			$smcFunc['db_insert']('',
3979
+		if (empty($context['rid'])) {
3980
+					$smcFunc['db_insert']('',
3827 3981
 				'{db_prefix}pm_rules',
3828 3982
 				array(
3829 3983
 					'id_member' => 'int', 'rule_name' => 'string', 'criteria' => 'string', 'actions' => 'string',
@@ -3834,8 +3988,8 @@  discard block
 block discarded – undo
3834 3988
 				),
3835 3989
 				array('id_rule')
3836 3990
 			);
3837
-		else
3838
-			$smcFunc['db_query']('', '
3991
+		} else {
3992
+					$smcFunc['db_query']('', '
3839 3993
 				UPDATE {db_prefix}pm_rules
3840 3994
 				SET rule_name = {string:rule_name}, criteria = {string:criteria}, actions = {string:actions},
3841 3995
 					delete_pm = {int:delete_pm}, is_or = {int:is_or}
@@ -3851,6 +4005,7 @@  discard block
 block discarded – undo
3851 4005
 					'actions' => $actions,
3852 4006
 				)
3853 4007
 			);
4008
+		}
3854 4009
 
3855 4010
 		redirectexit('action=pm;sa=manrules');
3856 4011
 	}
@@ -3859,11 +4014,12 @@  discard block
 block discarded – undo
3859 4014
 	{
3860 4015
 		checkSession();
3861 4016
 		$toDelete = array();
3862
-		foreach ($_POST['delrule'] as $k => $v)
3863
-			$toDelete[] = (int) $k;
4017
+		foreach ($_POST['delrule'] as $k => $v) {
4018
+					$toDelete[] = (int) $k;
4019
+		}
3864 4020
 
3865
-		if (!empty($toDelete))
3866
-			$smcFunc['db_query']('', '
4021
+		if (!empty($toDelete)) {
4022
+					$smcFunc['db_query']('', '
3867 4023
 				DELETE FROM {db_prefix}pm_rules
3868 4024
 				WHERE id_rule IN ({array_int:delete_list})
3869 4025
 					AND id_member = {int:current_member}',
@@ -3872,6 +4028,7 @@  discard block
 block discarded – undo
3872 4028
 					'delete_list' => $toDelete,
3873 4029
 				)
3874 4030
 			);
4031
+		}
3875 4032
 
3876 4033
 		redirectexit('action=pm;sa=manrules');
3877 4034
 	}
@@ -3890,8 +4047,9 @@  discard block
 block discarded – undo
3890 4047
 	loadRules();
3891 4048
 
3892 4049
 	// No rules?
3893
-	if (empty($context['rules']))
3894
-		return;
4050
+	if (empty($context['rules'])) {
4051
+			return;
4052
+	}
3895 4053
 
3896 4054
 	// Just unread ones?
3897 4055
 	$ruleQuery = $all_messages ? '' : ' AND pmr.is_new = 1';
@@ -3921,8 +4079,9 @@  discard block
 block discarded – undo
3921 4079
 			// Loop through all the criteria hoping to make a match.
3922 4080
 			foreach ($rule['criteria'] as $criterium)
3923 4081
 			{
3924
-				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false))
3925
-					$match = true;
4082
+				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false)) {
4083
+									$match = true;
4084
+				}
3926 4085
 				// If we're adding and one criteria don't match then we stop!
3927 4086
 				elseif ($rule['logic'] == 'and')
3928 4087
 				{
@@ -3934,17 +4093,18 @@  discard block
 block discarded – undo
3934 4093
 			// If we have a match the rule must be true - act!
3935 4094
 			if ($match)
3936 4095
 			{
3937
-				if ($rule['delete'])
3938
-					$actions['deletes'][] = $row['id_pm'];
3939
-				else
4096
+				if ($rule['delete']) {
4097
+									$actions['deletes'][] = $row['id_pm'];
4098
+				} else
3940 4099
 				{
3941 4100
 					foreach ($rule['actions'] as $ruleAction)
3942 4101
 					{
3943 4102
 						if ($ruleAction['t'] == 'lab')
3944 4103
 						{
3945 4104
 							// Get a basic pot started!
3946
-							if (!isset($actions['labels'][$row['id_pm']]))
3947
-								$actions['labels'][$row['id_pm']] = array();
4105
+							if (!isset($actions['labels'][$row['id_pm']])) {
4106
+															$actions['labels'][$row['id_pm']] = array();
4107
+							}
3948 4108
 							$actions['labels'][$row['id_pm']][] = $ruleAction['v'];
3949 4109
 						}
3950 4110
 					}
@@ -3955,8 +4115,9 @@  discard block
 block discarded – undo
3955 4115
 	$smcFunc['db_free_result']($request);
3956 4116
 
3957 4117
 	// Deletes are easy!
3958
-	if (!empty($actions['deletes']))
3959
-		deleteMessages($actions['deletes']);
4118
+	if (!empty($actions['deletes'])) {
4119
+			deleteMessages($actions['deletes']);
4120
+	}
3960 4121
 
3961 4122
 	// Relabel?
3962 4123
 	if (!empty($actions['labels']))
@@ -3983,8 +4144,7 @@  discard block
 block discarded – undo
3983 4144
 								'current_member' => $user_info['id'],
3984 4145
 							)
3985 4146
 						);
3986
-					}
3987
-					else
4147
+					} else
3988 4148
 					{
3989 4149
 						$realLabels[] = $label['id'];
3990 4150
 					}
@@ -3993,8 +4153,9 @@  discard block
 block discarded – undo
3993 4153
 
3994 4154
 			$inserts = array();
3995 4155
 			// Now we insert the label info
3996
-			foreach ($realLabels as $a_label)
3997
-				$inserts[] = array($pm, $a_label);
4156
+			foreach ($realLabels as $a_label) {
4157
+							$inserts[] = array($pm, $a_label);
4158
+			}
3998 4159
 
3999 4160
 			$smcFunc['db_insert']('ignore',
4000 4161
 				'{db_prefix}pm_labeled_messages',
@@ -4015,8 +4176,9 @@  discard block
 block discarded – undo
4015 4176
 {
4016 4177
 	global $user_info, $context, $smcFunc;
4017 4178
 
4018
-	if (isset($context['rules']) && !$reload)
4019
-		return;
4179
+	if (isset($context['rules']) && !$reload) {
4180
+			return;
4181
+	}
4020 4182
 
4021 4183
 	$request = $smcFunc['db_query']('', '
4022 4184
 		SELECT
@@ -4040,8 +4202,9 @@  discard block
 block discarded – undo
4040 4202
 			'logic' => $row['is_or'] ? 'or' : 'and',
4041 4203
 		);
4042 4204
 
4043
-		if ($row['delete_pm'])
4044
-			$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
4205
+		if ($row['delete_pm']) {
4206
+					$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
4207
+		}
4045 4208
 	}
4046 4209
 	$smcFunc['db_free_result']($request);
4047 4210
 }
Please login to merge, or discard this patch.