elkarte / Elkarte

sources/subs/PersonalMessage.subs.php

Braces +248 added lines, -91 removed lines

@@ -32,7 +32,9 @@ 
 
 	$message_limit = 0;
 	if ($user_info['is_admin'])
-		$message_limit = 0;
+	{
+			$message_limit = 0;
+	}
 	elseif (!Cache::instance()->getVar($message_limit, 'msgLimit:' . $user_info['id'], 360))
 	{
 		$request = $db->query('', '
@@ -173,25 +175,36 @@ 
 	$db = database();
 
 	if ($owner === null)
-		$owner = array($user_info['id']);
+	{
+			$owner = array($user_info['id']);
+	}
 	elseif (empty($owner))
-		return;
+	{
+			return;
+	}
 	elseif (!is_array($owner))
-		$owner = array($owner);
+	{
+			$owner = array($owner);
+	}
 
 	if ($personal_messages !== null)
 	{
 		if (empty($personal_messages) || !is_array($personal_messages))
-			return;
+		{
+					return;
+		}
 
 		foreach ($personal_messages as $index => $delete_id)
-			$personal_messages[$index] = (int) $delete_id;
+		{
+					$personal_messages[$index] = (int) $delete_id;
+		}
 
 		$where = '
 				AND id_pm IN ({array_int:pm_list})';
 	}
-	else
-		$where = '';
+	else {
+			$where = '';
+	}
 
 	if ($folder == 'sent' || $folder === null)
 	{
@@ -229,16 +242,21 @@ 
 		while ($row = $db->fetch_assoc($request))
 		{
 			if ($row['is_read'])
-				updateMemberData($row['id_member'], array('personal_messages' => $where == '' ? 0 : 'personal_messages - ' . $row['num_deleted_messages']));
-			else
-				updateMemberData($row['id_member'], array('personal_messages' => $where == '' ? 0 : 'personal_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			{
+							updateMemberData($row['id_member'], array('personal_messages' => $where == '' ? 0 : 'personal_messages - ' . $row['num_deleted_messages']));
+			}
+			else {
+							updateMemberData($row['id_member'], array('personal_messages' => $where == '' ? 0 : 'personal_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			}
 
 			// If this is the current member we need to make their message count correct.
 			if ($user_info['id'] == $row['id_member'])
 			{
 				$user_info['messages'] -= $row['num_deleted_messages'];
 				if (!($row['is_read']))
-					$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				{
+									$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				}
 			}
 		}
 		$db->free_result($request);
@@ -276,7 +294,9 @@ 
 	);
 	$remove_pms = array();
 	while ($row = $db->fetch_assoc($request))
-		$remove_pms[] = $row['sender'];
+	{
+			$remove_pms[] = $row['sender'];
+	}
 	$db->free_result($request);
 
 	if (!empty($remove_pms))
@@ -317,10 +337,14 @@ 
 	$db = database();
 
 	if ($owner === null)
-		$owner = $user_info['id'];
+	{
+			$owner = $user_info['id'];
+	}
 
 	if (!is_null($personal_messages) && !is_array($personal_messages))
-		$personal_messages = array($personal_messages);
+	{
+			$personal_messages = array($personal_messages);
+	}
 
 	$db->query('', '
 		UPDATE {db_prefix}pm_recipients
@@ -338,8 +362,10 @@ 
 
 	// If something wasn't marked as read, get the number of unread messages remaining.
 	if ($db->affected_rows() > 0)
-		updatePMMenuCounts($owner);
-}
+	{
+			updatePMMenuCounts($owner);
+	}
+	}
 
 /**
  * Mark the specified personal messages as unread.
@@ -354,10 +380,14 @@ 
 	$db = database();
 
 	if (empty($personal_messages))
-		return;
+	{
+			return;
+	}
 
 	if (!is_array($personal_messages))
-		$personal_messages = array($personal_messages);
+	{
+			$personal_messages = array($personal_messages);
+	}
 
 	$owner = $user_info['id'];
 
@@ -376,8 +406,10 @@ 
 
 	// If something was marked unread, update the number of unread messages remaining.
 	if ($db->affected_rows() > 0)
-		updatePMMenuCounts($owner);
-}
+	{
+			updatePMMenuCounts($owner);
+	}
+	}
 
 /**
  * Updates the number of unread messages for a user
@@ -396,7 +428,9 @@ 
 	if ($owner == $user_info['id'])
 	{
 		foreach ($context['labels'] as $label)
-			$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+		{
+					$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+		}
 	}
 
 	$result = $db->query('', '
@@ -418,11 +452,15 @@ 
 		$total_unread += $row['num'];
 
 		if ($owner != $user_info['id'])
-			continue;
+		{
+					continue;
+		}
 
 		$this_labels = explode(',', $row['labels']);
 		foreach ($this_labels as $this_label)
-			$context['labels'][(int) $this_label]['unread_messages'] += $row['num'];
+		{
+					$context['labels'][(int) $this_label]['unread_messages'] += $row['num'];
+		}
 	}
 	$db->free_result($result);
 
@@ -433,8 +471,10 @@ 
 
 	// If it was for the current member, reflect this in the $user_info array too.
 	if ($owner == $user_info['id'])
-		$user_info['unread_messages'] = $total_unread;
-}
+	{
+			$user_info['unread_messages'] = $total_unread;
+	}
+	}
 
 /**
  * Check if the PM is available to the current user.
@@ -522,14 +562,17 @@ 
 	);
 
 	if ($from === null)
-		$from = array(
+	{
+			$from = array(
 			'id' => $user_info['id'],
 			'name' => $user_info['name'],
 			'username' => $user_info['username']
 		);
+	}
 	// Probably not needed.  /me something should be of the typer.
-	else
-		$user_info['name'] = $from['name'];
+	else {
+			$user_info['name'] = $from['name'];
+	}
 
 	// Integrated PMs
 	call_integration_hook('integrate_personal_message', array(&$recipients, &$from, &$subject, &$message));
@@ -539,11 +582,15 @@ 
 	preparsecode($htmlmessage);
 	$htmlsubject = strtr(Util::htmlspecialchars($subject), array("\r" => '', "\n" => '', "\t" => ''));
 	if (Util::strlen($htmlsubject) > 100)
-		$htmlsubject = Util::substr($htmlsubject, 0, 100);
+	{
+			$htmlsubject = Util::substr($htmlsubject, 0, 100);
+	}
 
 	// Make sure is an array
 	if (!is_array($recipients))
-		$recipients = array($recipients);
+	{
+			$recipients = array($recipients);
+	}
 
 	// Get a list of usernames and convert them to IDs.
 	$usernames = array();
@@ -571,8 +618,10 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			if (isset($usernames[Util::strtolower($row['member_name'])]))
+		{
+					if (isset($usernames[Util::strtolower($row['member_name'])]))
 				$usernames[Util::strtolower($row['member_name'])] = $row['id_member'];
+		}
 		$db->free_result($request);
 
 		// Replace the usernames with IDs. Drop usernames that couldn't be found.
@@ -581,10 +630,14 @@ 
 			foreach ($rec as $id => $member)
 			{
 				if (is_numeric($recipients[$rec_type][$id]))
-					continue;
+				{
+									continue;
+				}
 
 				if (!empty($usernames[$member]))
-					$recipients[$rec_type][$id] = $usernames[$member];
+				{
+									$recipients[$rec_type][$id] = $usernames[$member];
+				}
 				else
 				{
 					$log['failed'][$id] = sprintf($txt['pm_error_user_not_found'], $recipients[$rec_type][$id]);
@@ -626,7 +679,9 @@ 
 		foreach ($criteria as $criterium)
 		{
 			if (($criterium['t'] == 'mid' && $criterium['v'] == $from['id']) || ($criterium['t'] == 'gid' && in_array($criterium['v'], $user_info['groups'])) || ($criterium['t'] == 'sub' && strpos($subject, $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($message, $criterium['v']) !== false))
-				$delete = true;
+			{
+							$delete = true;
+			}
 			// If we're adding and one criteria don't match then we stop!
 			elseif (!$row['is_or'])
 			{
@@ -635,7 +690,9 @@ 
 			}
 		}
 		if ($delete)
-			$deletes[$row['id_member']] = 1;
+		{
+					$deletes[$row['id_member']] = 1;
+		}
 	}
 	$db->free_result($request);
 
@@ -651,7 +708,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		{
+					$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		}
 		$db->free_result($request);
 	}
 
@@ -672,15 +731,20 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (empty($row['add_deny']))
-			$disallowed_groups[] = $row['id_group'];
-		else
-			$allowed_groups[] = $row['id_group'];
+		{
+					$disallowed_groups[] = $row['id_group'];
+		}
+		else {
+					$allowed_groups[] = $row['id_group'];
+		}
 	}
 
 	$db->free_result($request);
 
 	if (empty($modSettings['permission_enable_deny']))
-		$disallowed_groups = array();
+	{
+			$disallowed_groups = array();
+	}
 
 	$request = $db->query('', '
 		SELECT
@@ -709,7 +773,9 @@ 
 	{
 		// Don't do anything for members to be deleted!
 		if (isset($deletes[$row['id_member']]))
-			continue;
+		{
+					continue;
+		}
 
 		// We need to know this members groups.
 		$groups = explode(',', $row['additional_groups']);
@@ -724,7 +790,9 @@ 
 			foreach ($groups as $id)
 			{
 				if (isset($message_limit_cache[$id]) && $message_limit != 0 && $message_limit < $message_limit_cache[$id])
-					$message_limit = $message_limit_cache[$id];
+				{
+									$message_limit = $message_limit_cache[$id];
+				}
 			}
 
 			if ($message_limit > 0 && $message_limit <= $row['personal_messages'])
@@ -761,7 +829,9 @@ 
 
 		// Send a notification, if enabled - taking the buddy list into account.
 		if (!empty($row['email_address']) && ($row['pm_email_notify'] == 1 || ($row['pm_email_notify'] > 1 && (!empty($modSettings['enable_buddylist']) && $row['is_buddy']))) && $row['is_activated'] == 1)
-			$notifications[empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile']][] = $row['email_address'];
+		{
+					$notifications[empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile']][] = $row['email_address'];
+		}
 
 		$log['sent'][$row['id_member']] = sprintf(isset($txt['pm_successfully_sent']) ? $txt['pm_successfully_sent'] : '', $row['real_name']);
 	}
@@ -769,11 +839,15 @@ 
 
 	// Only 'send' the message if there are any recipients left.
 	if (empty($all_to))
-		return $log;
+	{
+			return $log;
+	}
 
 	// Track the pm count for our stats
 	if (!empty($modSettings['trackStats']))
-		trackStats(array('pm' => '+'));
+	{
+			trackStats(array('pm' => '+'));
+	}
 
 	// Insert the message itself and then grab the last insert id.
 	$db->insert('',
@@ -796,7 +870,8 @@ 
 	{
 		// If this is new we need to set it part of it's own conversation.
 		if (empty($pm_head))
-			$db->query('', '
+		{
+					$db->query('', '
 				UPDATE {db_prefix}personal_messages
 				SET id_pm_head = {int:id_pm_head}
 				WHERE id_pm = {int:id_pm_head}',
@@ -804,6 +879,7 @@ 
 					'id_pm_head' => $id_pm,
 				)
 			);
+		}
 
 		// Some people think manually deleting personal_messages is fun... it's not. We protect against it though :)
 		$db->query('', '
@@ -819,7 +895,9 @@ 
 		{
 			$insertRows[] = array($id_pm, $to, in_array($to, $recipients['bcc']) ? 1 : 0, isset($deletes[$to]) ? 1 : 0, 1);
 			if (!in_array($to, $recipients['bcc']))
-				$to_list[] = $to;
+			{
+							$to_list[] = $to;
+			}
 		}
 
 		$db->insert('insert',
@@ -852,7 +930,9 @@ 
 		require_once(SUBSDIR . '/Members.subs.php');
 		$result = getBasicMemberData($to_list);
 		foreach ($result as $row)
-			$to_names[] = un_htmlspecialchars($row['real_name']);
+		{
+					$to_names[] = un_htmlspecialchars($row['real_name']);
+		}
 	}
 
 	$replacements = array(
@@ -901,7 +981,9 @@ 
 	foreach ($all_to as $k => $id)
 	{
 		if (isset($deletes[$id]))
-			unset($all_to[$k]);
+		{
+					unset($all_to[$k]);
+		}
 	}
 
 	if (!empty($all_to))
@@ -969,7 +1051,9 @@ 
 			);
 			$sub_pms = array();
 			while ($row = $db->fetch_assoc($sub_request))
-				$sub_pms[$row['id_pm_head']] = $row['sort_param'];
+			{
+							$sub_pms[$row['id_pm_head']] = $row['sort_param'];
+			}
 			$db->free_result($sub_request);
 
 			// Now we use those results in the next query
@@ -1062,7 +1146,9 @@ 
 		if (!isset($recipients[$row['id_pm']]))
 		{
 			if (isset($row['id_member_from']))
-				$posters[$row['id_pm']] = $row['id_member_from'];
+			{
+							$posters[$row['id_pm']] = $row['id_member_from'];
+			}
 
 			$pms[$row['id_pm']] = $row['id_pm'];
 
@@ -1074,10 +1160,12 @@ 
 
 		// Keep track of the last message so we know what the head is without another query!
 		if ((empty($pm_options['pmid']) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pm_options['pmid']) && $pm_options['pmid'] == $row['id_pm']))
-			$lastData = array(
+		{
+					$lastData = array(
 				'id' => $row['id_pm'],
 				'head' => $row['id_pm_head'],
 			);
+		}
 	}
 	$db->free_result($request);
 
@@ -1132,7 +1220,9 @@ 
 
 	// No rules?
 	if (empty($context['rules']))
-		return;
+	{
+			return;
+	}
 
 	// Just unread ones?
 	$ruleQuery = $all_messages ? '' : ' AND pmr.is_new = 1';
@@ -1164,7 +1254,9 @@ 
 			foreach ($rule['criteria'] as $criterium)
 			{
 				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))
-					$match = true;
+				{
+									$match = true;
+				}
 				// If we're adding and one criteria don't match then we stop!
 				elseif ($rule['logic'] == 'and')
 				{
@@ -1177,7 +1269,9 @@ 
 			if ($match)
 			{
 				if ($rule['delete'])
-					$actions['deletes'][] = $row['id_pm'];
+				{
+									$actions['deletes'][] = $row['id_pm'];
+				}
 				else
 				{
 					foreach ($rule['actions'] as $ruleAction)
@@ -1186,7 +1280,9 @@ 
 						{
 							// Get a basic pot started!
 							if (!isset($actions['labels'][$row['id_pm']]))
-								$actions['labels'][$row['id_pm']] = empty($row['labels']) ? array() : explode(',', $row['labels']);
+							{
+															$actions['labels'][$row['id_pm']] = empty($row['labels']) ? array() : explode(',', $row['labels']);
+							}
 
 							$actions['labels'][$row['id_pm']][] = $ruleAction['v'];
 						}
@@ -1199,7 +1295,9 @@ 
 
 	// Deletes are easy!
 	if (!empty($actions['deletes']))
-		deleteMessages($actions['deletes']);
+	{
+			deleteMessages($actions['deletes']);
+	}
 
 	// Re-label?
 	if (!empty($actions['labels']))
@@ -1209,8 +1307,10 @@ 
 			// Quickly check each label is valid!
 			$realLabels = array();
 			foreach ($context['labels'] as $label)
-				if (in_array($label['id'], $labels) && ($label['id'] != -1 || empty($options['pm_remove_inbox_label'])))
+			{
+							if (in_array($label['id'], $labels) && ($label['id'] != -1 || empty($options['pm_remove_inbox_label'])))
 					$realLabels[] = $label['id'];
+			}
 
 			$db->query('', '
 				UPDATE {db_prefix}pm_recipients
@@ -1240,7 +1340,9 @@ 
 	$db = database();
 
 	if (isset($context['rules']) && !$reload)
-		return;
+	{
+			return;
+	}
 
 	// This is just a simple list of "all" known rules
 	$context['known_rules'] = array(
@@ -1279,7 +1381,9 @@ 
 		);
 
 		if ($row['delete_pm'])
-			$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		{
+					$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		}
 	}
 	$db->free_result($request);
 }
@@ -1332,7 +1436,9 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if ($row['id_group'] != 1)
-			$groups[$row['id_group']] = $row;
+		{
+					$groups[$row['id_group']] = $row;
+		}
 	}
 	$db->free_result($request);
 
@@ -1360,7 +1466,9 @@ 
 	);
 	$pm_heads = array();
 	while ($row = $db->fetch_assoc($request))
-		$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+	{
+			$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+	}
 	$db->free_result($request);
 
 	return $pm_heads;
@@ -1388,7 +1496,9 @@ 
 	);
 	// Copy the action from the single to PM to the others.
 	while ($row = $db->fetch_assoc($request))
-		$pms[$row['id_pm']] = $row['id_pm_head'];
+	{
+			$pms[$row['id_pm']] = $row['id_pm_head'];
+	}
 	$db->free_result($request);
 
 	return $pms;
@@ -1432,24 +1542,34 @@ 
 		$id_label = array_search($to_label[$row['id_pm']], $labels);
 
 		if ($id_label !== false && $label_type[$row['id_pm']] !== 'add')
-			unset($labels[$id_label]);
+		{
+					unset($labels[$id_label]);
+		}
 		elseif ($label_type[$row['id_pm']] !== 'rem')
-			$labels[] = $to_label[$row['id_pm']];
+		{
+					$labels[] = $to_label[$row['id_pm']];
+		}
 
 		if (!empty($options['pm_remove_inbox_label']) && $to_label[$row['id_pm']] != '-1' && ($key = array_search('-1', $labels)) !== false)
-			unset($labels[$key]);
+		{
+					unset($labels[$key]);
+		}
 
 		$set = implode(',', array_unique($labels));
 		if ($set == '')
-			$set = '-1';
+		{
+					$set = '-1';
+		}
 
 		$to_update[$row['id_pm']] = $set;
 	}
 	$db->free_result($request);
 
 	if (!empty($to_update))
-		return updatePMLabels($to_update, $user_id);
-}
+	{
+			return updatePMLabels($to_update, $user_id);
+	}
+	}
 
 /**
  * Detects personal messages which need a new label.
@@ -1487,22 +1607,29 @@ 
 			if (in_array($value, $searchArray))
 			{
 				if (isset($new_labels[$value]))
-					$toChange[$key] = $new_labels[$value];
-				else
-					unset($toChange[$key]);
+				{
+									$toChange[$key] = $new_labels[$value];
+				}
+				else {
+									unset($toChange[$key]);
+				}
 			}
 		}
 
 		if (empty($toChange))
-			$toChange[] = '-1';
+		{
+					$toChange[] = '-1';
+		}
 
 		$to_update[$row['id_pm']] = implode(',', array_unique($toChange));
 	}
 	$db->free_result($request);
 
 	if (!empty($to_update))
-		return updatePMLabels($to_update, $user_id);
-}
+	{
+			return updatePMLabels($to_update, $user_id);
+	}
+	}
 
 /**
  * Updates PMs with their new label.
@@ -1576,7 +1703,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_row($request))
-		$pm_ids[] = $row[0];
+	{
+			$pm_ids[] = $row[0];
+	}
 	$db->free_result($request);
 
 	// This is the inbox
@@ -1595,7 +1724,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_row($request))
-		$pm_ids[] = $row[0];
+	{
+			$pm_ids[] = $row[0];
+	}
 	$db->free_result($request);
 
 	return $pm_ids;
@@ -1770,15 +1901,21 @@ 
 	{
 		// This is, frankly, a joke. We will put in a workaround for people sending to themselves - yawn!
 		if ($folder == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1)
-			continue;
+		{
+					continue;
+		}
 		elseif (($row['id_member'] == $user_info['id']) && $row['deleted'] == 1)
-			continue;
+		{
+					continue;
+		}
 
 		if (!isset($recipients[$row['id_pm']]))
-			$recipients[$row['id_pm']] = array(
+		{
+					$recipients[$row['id_pm']] = array(
 				'to' => array(),
 				'bcc' => array()
 			);
+		}
 
 		$display_pms[] = $row['id_pm'];
 		$posters[$row['id_pm']] = $row['id_member_from'];
@@ -1805,7 +1942,9 @@ 
 
 	// Make it an array if its not
 	if (!is_array($pms))
-		$pms = array($pms);
+	{
+			$pms = array($pms);
+	}
 
 	// Find the heads for this group of PM's
 	$request = $db->query('', '
@@ -1819,7 +1958,9 @@ 
 	);
 	$head_pms = array();
 	while ($row = $db->fetch_assoc($request))
-		$head_pms[$row['id_pm_head']] = $row['id_pm'];
+	{
+			$head_pms[$row['id_pm_head']] = $row['id_pm'];
+	}
 	$db->free_result($request);
 
 	// Find any unread PM's this member has under these head pm id's
@@ -1896,7 +2037,9 @@ 
 	{
 		// Sent folder recipients
 		if ($folder === 'sent' || empty($row['bcc']))
-			$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>';
+		{
+					$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>';
+		}
 
 		// Don't include bcc-recipients if its your inbox, you're not supposed to know :P
 		if ($row['id_member_to'] == $user_info['id'] && $folder !== 'sent')
@@ -1910,11 +2053,15 @@ 
 			foreach ($row['labels'] as $v)
 			{
 				if (isset($context['labels'][(int) $v]))
-					$message_labels[$row['id_pm']][(int) $v] = array('id' => $v, 'name' => $context['labels'][(int) $v]['name']);
+				{
+									$message_labels[$row['id_pm']][(int) $v] = array('id' => $v, 'name' => $context['labels'][(int) $v]['name']);
+				}
 
 				// Here we find the first label on a message - used for linking to posts
 				if ($search && (!isset($message_first_label[$row['id_pm']]) && !in_array('-1', $row['labels'])))
-					$message_first_label[$row['id_pm']] = (int) $v;
+				{
+									$message_first_label[$row['id_pm']] = (int) $v;
+				}
 			}
 		}
 	}
@@ -2093,7 +2240,9 @@ 
 	{
 		// If it's hidden we still don't reveal their names
 		if ($bcc_count && $row['bcc'])
-			$hidden_recipients++;
+		{
+					$hidden_recipients++;
+		}
 
 		$recipients[] = array(
 			'id' => $row['id_member'],
@@ -2104,11 +2253,13 @@ 
 
 	// If bcc count was requested, we return the number of bcc members, but not the names
 	if ($bcc_count)
-		$recipients[] = array(
+	{
+			$recipients[] = array(
 			'id' => 'bcc',
 			'name' => sprintf($txt['pm_report_pm_hidden'], $hidden_recipients),
 			'link' => sprintf($txt['pm_report_pm_hidden'], $hidden_recipients)
 		);
+	}
 
 	$db->free_result($request);
 
@@ -2154,7 +2305,9 @@ 
 	);
 	// Can only be a hacker here!
 	if ($db->num_rows($request) == 0)
-		throw new Elk_Exception('no_access', false);
+	{
+			throw new Elk_Exception('no_access', false);
+	}
 	$pm_details = $db->fetch_row($request);
 	$db->free_result($request);
 
@@ -2285,7 +2438,9 @@ 
 	);
 	$real_pm_ids = array();
 	while ($row = $db->fetch_assoc($request))
-		$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+	{
+			$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+	}
 	$db->free_result($request);
 
 	return $real_pm_ids;
@@ -2316,7 +2471,9 @@ 
 	);
 	$search_results = array();
 	while ($row = $db->fetch_assoc($request))
-		$search_results[] = $row;
+	{
+			$search_results[] = $row;
+	}
 	$db->free_result($request);
 
 	return $search_results;

sources/subs/Html2Md.class.php

Braces +9 added lines, -4 removed lines

@@ -444,9 +444,12 @@ 
 			case 'ol':
 			case 'ul':
 				if ($this->_has_parent_list($node, $this->_parser))
-					$markdown = trim($this->_get_value($node));
-				else
-					$markdown = $this->line_end . $this->_get_value($node) . $this->line_end;
+				{
+									$markdown = trim($this->_get_value($node));
+				}
+				else {
+									$markdown = $this->line_end . $this->_get_value($node) . $this->line_end;
+				}
 				break;
 			case 'li':
 				$markdown = $this->_convert_list($node);
@@ -541,7 +544,9 @@ 
 		global $txt;
 
 		if ($node->getAttribute('data-lightboximage') || $node->getAttribute('data-lightboxmessage'))
-			return '~`skip`~';
+		{
+					return '~`skip`~';
+		}
 
 		$href = str_replace('\_', '_', htmlspecialchars_decode($node->getAttribute('href')));
 		$title = $node->getAttribute('title');

Spacing +3 added lines, -3 removed lines

@@ -271,7 +271,7 @@ 
 
 		// Strip the chaff and any excess blank lines we may have produced
 		$this->markdown = trim($this->markdown);
-		$this->markdown = preg_replace("~(?:\s?\n\s?){3,6}~", "\n\n", $this->markdown);	}
+		$this->markdown = preg_replace("~(?:\s?\n\s?){3,6}~", "\n\n", $this->markdown); }
 
 	/**
 	 * Looks for the text inside <body> and then <html>, returning just the inner
@@ -577,7 +577,7 @@ 
 		}
 		else
 		{
-			$markdown = '[' . ($value === $txt['link'] ? 'X' : $value) . ']('  . $href . ' "' . $txt['link'] . '")';
+			$markdown = '[' . ($value === $txt['link'] ? 'X' : $value) . '](' . $href . ' "' . $txt['link'] . '")';
 		}
 
 		$this->_check_line_length($markdown, $this->get_buffer($node));
@@ -1231,7 +1231,7 @@ 
 		$re = '/((?<!\\\\\( |]\()https?:\/\/|(?<!\\\\\( |]\(|:\/\/)www)[-\p{L}0-9+&@#\/%?=~_|!:,.;]*[\p{L}0-9+&@#\/%=~_|]/ui';
 		$count = 0;
 		$text = preg_replace_callback($re,
-			function ($matches) {
+			function($matches) {
 				return $this->_plaintxt_callback($matches);
 			}, $text, -1, $count);
 

sources/subs/UnTgz.class.php

Braces +93 added lines, -34 removed lines

@@ -140,7 +140,9 @@ 
 
 		// This class sorta needs gzinflate!
 		if (!function_exists('gzinflate'))
-			throw new Elk_Exception('package_no_zlib', 'critical');
+		{
+					throw new Elk_Exception('package_no_zlib', 'critical');
+		}
 
 		// Make sure we have this loaded.
 		loadLanguage('Packages');
@@ -151,7 +153,9 @@ 
 		// The destination needs exist and be writable or we are doomed
 		umask(0);
 		if ($this->destination !== null && !file_exists($this->destination) && !$this->single_file)
-			mktree($this->destination, 0777);
+		{
+					mktree($this->destination, 0777);
+		}
 	}
 
 	/**
@@ -163,31 +167,44 @@ 
 	{
 		// Snif test that this is a .tgz tar.gz file
 		if (empty($this->_header) && $this->check_valid_tgz() === false)
-			return false;
+		{
+					return false;
+		}
 
 		// The tgz information for this archive
 		if ($this->_read_header_tgz() === false)
-			return false;
+		{
+					return false;
+		}
 
 		// With the offset found, read and deflate the archive data
 		if ($this->_ungzip_data() === false)
-			return false;
+		{
+					return false;
+		}
 
 		// With the archive data in hand, we need to un tarball it
 		$this->_process_files();
 
 		// Looking for a single file and this is it
 		if ($this->_found && $this->single_file)
-			return $this->_crc_check ? $this->_found : false;
+		{
+					return $this->_crc_check ? $this->_found : false;
+		}
 
 		// Wanted many files then we need to clean up
 		if ($this->destination !== null && !$this->single_file)
-			package_flush_cache();
+		{
+					package_flush_cache();
+		}
 
 		if ($this->single_file)
-			return false;
-		else
-			return $this->return;
+		{
+					return false;
+		}
+		else {
+					return $this->return;
+		}
 	}
 
 	/**
@@ -199,7 +216,9 @@ 
 	{
 		// No signature?
 		if (strlen($this->data) < 10)
-			return false;
+		{
+					return false;
+		}
 
 		// Unpack the 10 byte signature so we can see what we have
 		$this->_header = unpack('H2a/H2b/Ct/Cf/Vmtime/Cxtra/Cos', substr($this->data, 0, 10));
@@ -232,7 +251,9 @@ 
 	{
 		// Compression method needs to be 8 = deflate!
 		if ($this->_header['t'] !== 8)
-			return false;
+		{
+					return false;
+		}
 
 		// Each bit of this byte represents a processing flag as follows
 		// 0 fTEXT, 1 fHCRC, 2 fEXTRA, 3 fNAME, 4 fCOMMENT, 5 fENCRYPT, 6-7 reserved
@@ -253,7 +274,9 @@ 
 		{
 			$this->_header['filename'] = '';
 			while ($this->data[$this->_offset] !== "\0")
-				$this->_header['filename'] .= $this->data[$this->_offset++];
+			{
+							$this->_header['filename'] .= $this->data[$this->_offset++];
+			}
 			$this->_offset++;
 		}
 
@@ -262,13 +285,17 @@ 
 		{
 			$this->_header['comment'] = '';
 			while ($this->data[$this->_offset] !== "\0")
-				$this->_header['comment'] .= $this->data[$this->_offset++];
+			{
+							$this->_header['comment'] .= $this->data[$this->_offset++];
+			}
 			$this->_offset++;
 		}
 
 		// "Read" the header CRC $crc16 = unpack('vcrc16', substr($data, $this->_offset, 2));
 		if ($flags & 2)
-			$this->_offset += 2;
+		{
+					$this->_offset += 2;
+		}
 	}
 
 	/**
@@ -287,7 +314,9 @@ 
 
 		// Check the crc and the data size
 		if (!$this->_check_crc() || (strlen($this->data) !== $check['isize']))
-			return false;
+		{
+					return false;
+		}
 	}
 
 	/**
@@ -316,7 +345,9 @@ 
 
 			// If its a directory, lets make sure it ends in a /
 			if ($this->_current['type'] == 5 && substr($this->_current['filename'], -1) !== '/')
-				$this->_current['filename'] .= '/';
+			{
+							$this->_current['filename'] .= '/';
+			}
 
 			// Figure out what we will do with the data once we have it
 			$this->_determine_write_this();
@@ -332,10 +363,14 @@ 
 				$this->_write_this_file();
 
 				if ($this->_skip)
-					continue;
+				{
+									continue;
+				}
 
 				if ($this->_found)
-					return;
+				{
+									return;
+				}
 			}
 
 			if (substr($this->_current['filename'], -1) !== '/')
@@ -392,13 +427,16 @@ 
 				if (!empty($value) && is_numeric($value))
 				{
 					if (($value % 10) >= 8)
-						$value = decoct($value);
+					{
+											$value = decoct($value);
+					}
 					$value = octdec($value);
 				}
 				$this->_current[$key] = $value;
 			}
-			else
-				$this->_current[$key] = trim($value);
+			else {
+							$this->_current[$key] = trim($value);
+			}
 		}
 	}
 
@@ -409,10 +447,14 @@ 
 	{
 		// Not a directory and doesn't exist already...
 		if (substr($this->_current['filename'], -1) !== '/' && !file_exists($this->destination . '/' . $this->_current['filename']))
-			$this->_write_this = true;
+		{
+					$this->_write_this = true;
+		}
 		// File exists... check if it is newer.
 		elseif (substr($this->_current['filename'], -1) !== '/')
-			$this->_write_this = $this->overwrite || filemtime($this->destination . '/' . $this->_current['filename']) < $this->_current['mtime'];
+		{
+					$this->_write_this = $this->overwrite || filemtime($this->destination . '/' . $this->_current['filename']) < $this->_current['mtime'];
+		}
 		// Folder... create.
 		elseif ($this->destination !== null && !$this->single_file)
 		{
@@ -420,11 +462,14 @@ 
 			$this->_current['filename'] = strtr($this->_current['filename'], array('../' => '', '/..' => ''));
 
 			if (!file_exists($this->destination . '/' . $this->_current['filename']))
-				mktree($this->destination . '/' . $this->_current['filename'], 0777);
+			{
+							mktree($this->destination . '/' . $this->_current['filename'], 0777);
+			}
 			$this->_write_this = false;
 		}
-		else
-			$this->_write_this = false;
+		else {
+					$this->_write_this = false;
+		}
 	}
 
 	/**
@@ -440,21 +485,31 @@ 
 
 		// A directory may need to be created
 		if (strpos($this->_current['filename'], '/') !== false && !$this->single_file)
-			mktree($this->destination . '/' . dirname($this->_current['filename']), 0777);
+		{
+					mktree($this->destination . '/' . dirname($this->_current['filename']), 0777);
+		}
 
 		// Is this the file we're looking for?
 		if ($this->single_file && ($this->destination === $this->_current['filename'] || $this->destination === '*/' . basename($this->_current['filename'])))
-			$this->_found = $this->_current['data'];
+		{
+					$this->_found = $this->_current['data'];
+		}
 		// If we're looking for another file, keep going.
 		elseif ($this->single_file)
-			$this->_skip = true;
+		{
+					$this->_skip = true;
+		}
 		// Looking for restricted files?
 		elseif ($this->files_to_extract !== null && !in_array($this->_current['filename'], $this->files_to_extract))
-			$this->_skip = true;
+		{
+					$this->_skip = true;
+		}
 
 		// Write it out then
 		if ($this->_check_header_crc() && $this->_skip === false && $this->_found === false)
-			package_put_contents($this->destination . '/' . $this->_current['filename'], $this->_current['data']);
+		{
+					package_put_contents($this->destination . '/' . $this->_current['filename'], $this->_current['data']);
+		}
 	}
 
 	/**
@@ -478,9 +533,13 @@ 
 
 		// Build the checksum for this header and make sure it matches what it claims
 		for ($i = 0; $i < 148; $i++)
-			$this->_crc += ord($this->_header[$i]);
+		{
+					$this->_crc += ord($this->_header[$i]);
+		}
 		for ($i = 156; $i < 512; $i++)
-			$this->_crc += ord($this->_header[$i]);
+		{
+					$this->_crc += ord($this->_header[$i]);
+		}
 
 		$this->_crc_check = $this->_current['checksum'] === $this->_crc;
 

sources/subs/MessageIcons.subs.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 	static $icons;
 
 	if (isset($icons))
-		return $icons;
+	{
+			return $icons;
+	}
 
 	$db = database();
 

sources/subs/Subscriptions-Authorize.class.php

Braces +18 added lines, -6 removed lines

@@ -137,15 +137,21 @@ 
 
 		// Is it even on?
 		if (empty($modSettings['authorize_id']) || empty($modSettings['authorize_transid']))
-			return false;
+		{
+					return false;
+		}
 
 		// We got a hash?
 		if (empty($_POST['x_MD5_Hash']))
-			return false;
+		{
+					return false;
+		}
 
 		// Do we have an invoice number?
 		if (empty($_POST['x_invoice_num']))
-			return false;
+		{
+					return false;
+		}
 
 		// And a response?
 		return !empty($_POST['x_response_code']);
@@ -162,18 +168,24 @@ 
 
 		// Is this the right hash?
 		if ($_POST['x_MD5_Hash'] != strtoupper(md5($modSettings['authorize_id'] . $_POST['x_trans_id'] . $_POST['x_amount'])))
-			exit;
+		{
+					exit;
+		}
 
 		// Can't exist if it doesn't contain anything.
 		if (empty($_POST['x_invoice_num']))
-			exit;
+		{
+					exit;
+		}
 
 		// Verify the currency
 		$currency = $_POST['x_currency_code'];
 
 		// Verify the currency!
 		if (strtolower($currency) != $modSettings['currency_code'])
-			exit;
+		{
+					exit;
+		}
 
 		// Return the ID_SUB/ID_MEMBER
 		return explode('+', $_POST['x_invoice_num']);

sources/subs/TopicsMerge.class.php

Braces +42 added lines, -17 removed lines

@@ -227,18 +227,25 @@ 
 
 			// Keep checking the length.
 			if (Util::strlen($target_subject) > 100)
-				$target_subject = Util::substr($target_subject, 0, 100);
+			{
+							$target_subject = Util::substr($target_subject, 0, 100);
+			}
 
 			// Nothing left - odd but pick the first topics subject.
 			if ($target_subject == '')
-				$target_subject = $this->topic_data[$this->firstTopic]['subject'];
+			{
+							$target_subject = $this->topic_data[$this->firstTopic]['subject'];
+			}
 		}
 		// A subject was selected from the list.
 		elseif (!empty($this->topic_data[(int) $details['subject']]['subject']))
-			$target_subject = $this->topic_data[(int) $details['subject']]['subject'];
+		{
+					$target_subject = $this->topic_data[(int) $details['subject']]['subject'];
+		}
 		// Nothing worked? Just take the subject of the first message.
-		else
-			$target_subject = $this->topic_data[$this->firstTopic]['subject'];
+		else {
+					$target_subject = $this->topic_data[$this->firstTopic]['subject'];
+		}
 
 		// Get the first and last message and the number of messages....
 		$request = $this->_db->query('', '
@@ -301,9 +308,12 @@ 
 
 		// Fix the topic count stuff depending on what the new one counts as.
 		if ($topic_approved)
-			$this->_boardTotals[$target_board]['num_topics']--;
-		else
-			$this->_boardTotals[$target_board]['unapproved_topics']--;
+		{
+					$this->_boardTotals[$target_board]['num_topics']--;
+		}
+		else {
+					$this->_boardTotals[$target_board]['unapproved_topics']--;
+		}
 
 		$this->_boardTotals[$target_board]['unapproved_posts'] -= $num_unapproved;
 		$this->_boardTotals[$target_board]['num_posts'] -= $topic_approved ? $num_replies + 1 : $num_replies;
@@ -326,7 +336,9 @@ 
 
 		// First and last message are the same, so only row was returned.
 		if ($member_updated === null)
-			$member_updated = $member_started;
+		{
+					$member_updated = $member_started;
+		}
 
 		$this->_db->free_result($request);
 
@@ -382,7 +394,9 @@ 
 	{
 		// Cycle through each board...
 		foreach ($this->_boardTotals as $id_board => $stats)
-			decrementBoard($id_board, $stats);
+		{
+					decrementBoard($id_board, $stats);
+		}
 
 		// Determine the board the final topic resides in
 		$topic_info = getTopicInfo($id_topic);
@@ -409,7 +423,9 @@ 
 		$search = new \ElkArte\Search\Search;
 		$searchAPI = $search->findSearchAPI();
 		if (is_callable(array($searchAPI, 'topicMerge')))
-			$searchAPI->topicMerge($id_topic, $this->_topics, $affected_msgs, empty($enforce_subject) ? null : array($response_prefix, $target_subject));
+		{
+					$searchAPI->topicMerge($id_topic, $this->_topics, $affected_msgs, empty($enforce_subject) ? null : array($response_prefix, $target_subject));
+		}
 	}
 
 	/**
@@ -422,7 +438,9 @@ 
 
 		// Joy of all joys, make sure they're not pi**ing about with unapproved topics they can't see :P
 		if ($modSettings['postmod_active'])
-			$can_approve_boards = !empty($user_info['mod_cache']['ap']) ? $user_info['mod_cache']['ap'] : boardsAllowedTo('approve_posts');
+		{
+					$can_approve_boards = !empty($user_info['mod_cache']['ap']) ? $user_info['mod_cache']['ap'] : boardsAllowedTo('approve_posts');
+		}
 
 		// Get info about the topics and polls that will be merged.
 		$request = $this->_db->query('', '
@@ -467,11 +485,16 @@ 
 
 			// We can't see unapproved topics here?
 			if ($modSettings['postmod_active'] && !$row['approved'] && $can_approve_boards != array(0) && in_array($row['id_board'], $can_approve_boards))
-				continue;
+			{
+							continue;
+			}
 			elseif (!$row['approved'])
-				$this->_boardTotals[$row['id_board']]['unapproved_topics']++;
-			else
-				$this->_boardTotals[$row['id_board']]['num_topics']++;
+			{
+							$this->_boardTotals[$row['id_board']]['unapproved_topics']++;
+			}
+			else {
+							$this->_boardTotals[$row['id_board']]['num_topics']++;
+			}
 
 			$this->_boardTotals[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 			$this->_boardTotals[$row['id_board']]['num_posts'] += $row['num_replies'] + ($row['approved'] ? 1 : 0);
@@ -502,7 +525,9 @@ 
 
 			// If there's no poll, id_poll == 0...
 			if ($row['id_poll'] > 0)
-				$this->_polls[] = $row['id_poll'];
+			{
+							$this->_polls[] = $row['id_poll'];
+			}
 
 			// Store the id_topic with the lowest id_first_msg.
 			if (empty($this->firstTopic))

sources/subs/Priority.class.php

Braces +3 added lines, -1 removed lines

@@ -251,12 +251,14 @@
 					{
 						$priority_threshold = $all_entities[$reference];
 						foreach ($all_entities as $key => $val)
-							switch ($where)
+						{
+													switch ($where)
 							{
 								case 'after':
 									if ($val <= $priority_threshold)
 									{
 										$all_entities[$key] -= $inc;
+						}
 									}
 									break;
 								case 'before':

sources/subs/News.subs.php

Braces +45 added lines, -19 removed lines

@@ -31,11 +31,13 @@ 
 
 	// Ready the current news.
 	foreach (explode("\n", $modSettings['news']) as $id => $line)
-		$admin_current_news[$id] = array(
+	{
+			$admin_current_news[$id] = array(
 			'id' => $id,
 			'unparsed' => un_preparsecode($line),
 			'parsed' => preg_replace('~<([/]?)form[^>]*?[>]*>~i', '<em class="smalltext">&lt;$1form&gt;</em>', $bbc_parser->parseNews($line)),
 		);
+	}
 
 	$admin_current_news['last'] = array(
 		'id' => 'last',
@@ -75,7 +77,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$excludes[] = $row['id_member'];
+	{
+			$excludes[] = $row['id_member'];
+	}
 	$db->free_result($request);
 
 	$request = $db->query('', '
@@ -111,7 +115,9 @@ 
 			$condition_array_params
 		);
 		while ($row = $db->fetch_assoc($request))
-			$excludes[] = $row['id_member'];
+		{
+					$excludes[] = $row['id_member'];
+		}
 		$db->free_result($request);
 	}
 
@@ -140,7 +146,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$mods[] = $row['identifier'];
+	{
+			$mods[] = $row['identifier'];
+	}
 	$db->free_result($request);
 
 	return $mods;
@@ -182,7 +190,9 @@ 
 		))
 	);
 	while ($row = $db->fetch_assoc($result))
-		$recipients[] = $row;
+	{
+			$recipients[] = $row;
+	}
 	$db->free_result($result);
 
 	return $recipients;
@@ -242,19 +252,25 @@ 
 			$db->free_result($request);
 
 			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			{
+							unset($context['optimize_msg']['lowest']);
+			}
+			else {
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			}
 
 			$context['optimize_msg']['highest'] = 'm.id_msg <= t.id_last_msg';
 			$loops++;
 		}
-		else
-			$done = true;
+		else {
+					$done = true;
+		}
 	}
 	$data = array();
 	while ($row = $db->fetch_assoc($request))
-		$data[] = $row;
+	{
+			$data[] = $row;
+	}
 
 	$db->free_result($request);
 
@@ -304,23 +320,31 @@ 
 			$db->free_result($request);
 
 			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			{
+							unset($context['optimize_msg']['lowest']);
+			}
+			else {
+							$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			}
 
 			$loops++;
 		}
-		else
-			$done = true;
+		else {
+					$done = true;
+		}
 	}
 	$messages = array();
 	while ($row = $db->fetch_assoc($request))
-		$messages[] = $row['id_msg'];
+	{
+			$messages[] = $row['id_msg'];
+	}
 	$db->free_result($request);
 
 	// No messages found, then return nothing
 	if (empty($messages))
-		return array();
+	{
+			return array();
+	}
 
 	// Find the most recent posts from our message list that this user can see.
 	$request = $db->query('', '
@@ -348,7 +372,9 @@ 
 	);
 	$data = array();
 	while ($row = $db->fetch_assoc($request))
-		$data[] = $row;
+	{
+			$data[] = $row;
+	}
 
 	$db->free_result($request);
 

sources/subs/Recent.class.php

Braces +12 added lines, -5 removed lines

@@ -125,7 +125,9 @@ 
 			AND m.id_msg >= {int:max_id_msg}';
 
 		if (!empty($recycle))
-			$this->_query_parameters['recycle_board'] = $msg_id;
+		{
+					$this->_query_parameters['recycle_board'] = $msg_id;
+		}
 
 		$this->_query_parameters['max_id_msg'] = $msg_id;
 	}
@@ -190,14 +192,18 @@ 
 
 				// If 0 is the only thing in the array, they can do it everywhere!
 				if (!empty($boards) && $boards[0] == 0)
-					$boards = array_keys($this->_board_ids[$type]);
+				{
+									$boards = array_keys($this->_board_ids[$type]);
+				}
 
 				// Go through the boards, and look for posts they can do this on.
 				foreach ($boards as $board_id)
 				{
 					// Hmm, they have permission, but there are no topics from that board on this page.
 					if (!isset($this->_board_ids[$type][$board_id]))
-						continue;
+					{
+											continue;
+					}
 
 					// Okay, looks like they can do it for these posts.
 					foreach ($this->_board_ids[$type][$board_id] as $counter)
@@ -252,8 +258,9 @@ 
 				$this->_cache_results = true;
 				unset($this->_query_parameters['max_id_msg']);
 			}
-			else
-				$done = true;
+			else {
+							$done = true;
+			}
 		}
 		$this->_messages = array();
 		while ($row = $this->_db->fetch_assoc($request))