elkarte / Elkarte

sources/subs/MentionType/MentionMessageAbstract.php

Braces +6 added lines, -2 removed lines

@@ -235,7 +235,9 @@ 
 		if (!empty($lang_files) && $lang !== $user_info['language'])
 		{
 			foreach ($lang_files as $file)
-				loadLanguage($file);
+			{
+							loadLanguage($file);
+			}
 		}
 
 		return $langtxt;
@@ -273,7 +275,9 @@ 
 		);
 		$existing = array();
 		while ($row = $this->_db->fetch_assoc($request))
-			$existing[] = $row['id_member'];
+		{
+					$existing[] = $row['id_member'];
+		}
 		$this->_db->free_result($request);
 
 		$actually_mentioned = array();

sources/subs/ManageFeatures.subs.php

Braces +78 added lines, -28 removed lines

@@ -94,7 +94,9 @@ 
 		$update_sigs = getSignatureFromMembers($applied_sigs);
 
 		if (empty($update_sigs))
-			$done = true;
+		{
+					$done = true;
+		}
 
 		foreach ($update_sigs as $row)
 		{
@@ -103,7 +105,9 @@ 
 
 			// Max characters...
 			if (!empty($sig_limits[1]))
-				$sig = Util::substr($sig, 0, $sig_limits[1]);
+			{
+							$sig = Util::substr($sig, 0, $sig_limits[1]);
+			}
 
 			// Max lines...
 			if (!empty($sig_limits[2]))
@@ -116,7 +120,9 @@ 
 					{
 						$count++;
 						if ($count >= $sig_limits[2])
-							$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+						{
+													$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+						}
 					}
 				}
 			}
@@ -140,16 +146,26 @@ 
 
 					// Attempt to allow all sizes of abuse, so to speak.
 					if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-						$limit_broke = $sig_limits[7] . 'px';
+					{
+											$limit_broke = $sig_limits[7] . 'px';
+					}
 					elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-						$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+					{
+											$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+					}
 					elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-						$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
+					{
+											$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
+					}
 					elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-						$limit_broke = 'large';
+					{
+											$limit_broke = 'large';
+					}
 
 					if ($limit_broke)
-						$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+					{
+											$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+					}
 				}
 			}
 
@@ -213,15 +229,18 @@ 
 									}
 								}
 							}
-							else
-								$replaces[$image] = '';
+							else {
+															$replaces[$image] = '';
+							}
 
 							continue;
 						}
 
 						// Does it have predefined restraints? Width first.
 						if ($matches[6][$key])
-							$matches[2][$key] = $matches[6][$key];
+						{
+													$matches[2][$key] = $matches[6][$key];
+						}
 
 						if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 						{
@@ -229,17 +248,23 @@ 
 							$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
 						}
 						elseif ($matches[2][$key])
-							$width = $matches[2][$key];
+						{
+													$width = $matches[2][$key];
+						}
 
 						// ... and height.
 						if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
 						{
 							$height = $sig_limits[6];
 							if ($width != -1)
-								$width = $width * ($height / $matches[4][$key]);
+							{
+															$width = $width * ($height / $matches[4][$key]);
+							}
 						}
 						elseif ($matches[4][$key])
-							$height = $matches[4][$key];
+						{
+													$height = $matches[4][$key];
+						}
 
 						// If the dimensions are still not fixed - we need to check the actual image.
 						if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
@@ -262,24 +287,32 @@ 
 								{
 									$height = $sig_limits[6];
 									if ($width == -1)
-										$width = $sizes[0];
+									{
+																			$width = $sizes[0];
+									}
 									$width = $width * ($height / $sizes[1]);
 								}
 								elseif ($width != -1)
-									$height = $sizes[1];
+								{
+																	$height = $sizes[1];
+								}
 							}
 						}
 
 						// Did we come up with some changes? If so remake the string.
 						if ($width != -1 || $height != -1)
-							$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+						{
+													$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+						}
 
 						// Record that we got one.
 						$image_count_holder[$image] = isset($image_count_holder[$image]) ? $image_count_holder[$image] + 1 : 1;
 					}
 
 					if (!empty($replaces))
-						$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+					{
+											$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+					}
 				}
 			}
 
@@ -293,19 +326,25 @@ 
 			$sig = strtr($sig, array("\n" => '<br />'));
 			call_integration_hook('integrate_apply_signature_settings', array(&$sig, $sig_limits, $disabledTags));
 			if ($sig != $row['signature'])
-				$changes[$row['id_member']] = $sig;
+			{
+							$changes[$row['id_member']] = $sig;
+			}
 		}
 
 		// Do we need to delete what we have?
 		if (!empty($changes))
 		{
 			foreach ($changes as $id => $sig)
-				updateSignature($id, $sig);
+			{
+							updateSignature($id, $sig);
+			}
 		}
 
 		$applied_sigs += 50;
 		if (!$done)
-			pauseSignatureApplySettings($applied_sigs);
+		{
+					pauseSignatureApplySettings($applied_sigs);
+		}
 	}
 }
 
@@ -334,13 +373,15 @@ 
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();
 
 		foreach ($standard_fields as $field)
-			$list[] = array(
+		{
+					$list[] = array(
 				'id' => $field,
 				'label' => isset($txt['standard_profile_field_' . $field]) ? $txt['standard_profile_field_' . $field] : (isset($txt[$field]) ? $txt[$field] : $field),
 				'disabled' => in_array($field, $disabled_fields),
 				'on_register' => in_array($field, $registration_fields) && !in_array($field, $fields_no_registration),
 				'can_show_register' => !in_array($field, $fields_no_registration),
 			);
+		}
 	}
 	else
 	{
@@ -469,9 +510,12 @@ 
 			)
 		);
 		if ($db->num_rows($request) == 0)
-			$unique = true;
-		else
-			$colname = $initial_colname . $i;
+		{
+					$unique = true;
+		}
+		else {
+					$colname = $initial_colname . $i;
+		}
 			$db->free_result($request);
 	}
 
@@ -831,7 +875,9 @@ 
 	{
 		$options = $class_name::frontPageOptions();
 		if (!empty($options))
-			$config_vars = array_merge($config_vars, $options);
+		{
+					$config_vars = array_merge($config_vars, $options);
+		}
 	}
 
 	return $config_vars;
@@ -859,14 +905,18 @@ 
 			$class_name = $file->getBasename('.controller.php') . '_Controller';
 
 			if (!class_exists($class_name))
-				continue;
+			{
+							continue;
+			}
 		}
 
 		if (is_subclass_of($class_name, 'Action_Controller') && $class_name::canFrontPage())
 		{
 			// Temporary
 			if (!isset($txt[$class_name]))
-				continue;
+			{
+							continue;
+			}
 
 			$types[$class_name] = $txt[$class_name];
 		}

Spacing +1 added lines, -1 removed lines

@@ -703,7 +703,7 @@
 			'not_owner_only' => 2,
 			'not_admin_only' => 3,
 		),
-		function ($row)
+		function($row)
 		{
 			return array(
 				'colname' => strtr($row['col_name'], array('|' => '', ';' => '')),

sources/subs/Members.subs.php

Braces +313 added lines, -122 removed lines

@@ -53,29 +53,39 @@ 
 
 	// If it's not an array, make it so!
 	if (!is_array($users))
-		$users = array($users);
-	else
-		$users = array_unique($users);
+	{
+			$users = array($users);
+	}
+	else {
+			$users = array_unique($users);
+	}
 
 	// Make sure there's no void user in here.
 	$users = array_diff($users, array(0));
 
 	// How many are they deleting?
 	if (empty($users))
-		return;
+	{
+			return;
+	}
 	elseif (count($users) == 1)
 	{
 		list ($user) = $users;
 
 		if ($user == $user_info['id'])
-			isAllowedTo('profile_remove_own');
-		else
-			isAllowedTo('profile_remove_any');
+		{
+					isAllowedTo('profile_remove_own');
+		}
+		else {
+					isAllowedTo('profile_remove_any');
+		}
 	}
 	else
 	{
 		foreach ($users as $k => $v)
-			$users[$k] = (int) $v;
+		{
+					$users[$k] = (int) $v;
+		}
 
 		// Deleting more than one?  You can't have more than one account...
 		isAllowedTo('profile_remove_any');
@@ -98,26 +108,34 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if ($row['is_admin'])
-			$admins[] = $row['id_member'];
+		{
+					$admins[] = $row['id_member'];
+		}
 		$user_log_details[$row['id_member']] = array($row['id_member'], $row['member_name']);
 		$emails[] = $row['email_address'];
 	}
 	$db->free_result($request);
 
 	if (empty($user_log_details))
-		return;
+	{
+			return;
+	}
 
 	// Make sure they aren't trying to delete administrators if they aren't one.  But don't bother checking if it's just themselves.
 	if (!empty($admins) && ($check_not_admin || (!allowedTo('admin_forum') && (count($users) != 1 || $users[0] != $user_info['id']))))
 	{
 		$users = array_diff($users, $admins);
 		foreach ($admins as $id)
-			unset($user_log_details[$id]);
+		{
+					unset($user_log_details[$id]);
+		}
 	}
 
 	// No one left?
 	if (empty($users))
-		return;
+	{
+			return;
+	}
 
 	// Log the action - regardless of who is deleting it.
 	$log_changes = array();
@@ -493,9 +511,12 @@ 
 	if (empty($regOptions['auth_method']) || !in_array($regOptions['auth_method'], array('password', 'openid')))
 	{
 		if (!empty($regOptions['openid']))
-			$regOptions['auth_method'] = 'openid';
-		else
-			$regOptions['auth_method'] = 'password';
+		{
+					$regOptions['auth_method'] = 'openid';
+		}
+		else {
+					$regOptions['auth_method'] = 'password';
+		}
 	}
 
 	// Spaces and other odd characters are evil...
@@ -503,7 +524,9 @@ 
 
 	// Valid emails only
 	if (!Data_Validator::is_valid($regOptions, array('email' => 'valid_email|required|max_length[255]'), array('email' => 'trim')))
-		$reg_errors->addError('bad_email');
+	{
+			$reg_errors->addError('bad_email');
+	}
 
 	validateUsername(0, $regOptions['username'], $ErrorContext, !empty($regOptions['check_reserved_name']));
 
@@ -512,15 +535,20 @@ 
 
 	// Does the first password match the second?
 	if ($regOptions['password'] != $regOptions['password_check'] && $regOptions['auth_method'] == 'password')
-		$reg_errors->addError('passwords_dont_match');
+	{
+			$reg_errors->addError('passwords_dont_match');
+	}
 
 	// That's kind of easy to guess...
 	if ($regOptions['password'] == '')
 	{
 		if ($regOptions['auth_method'] == 'password')
-			$reg_errors->addError('no_password');
-		else
-			$regOptions['password'] = sha1(mt_rand());
+		{
+					$reg_errors->addError('no_password');
+		}
+		else {
+					$regOptions['password'] = sha1(mt_rand());
+		}
 	}
 
 	// Now perform hard password validation as required.
@@ -530,13 +558,17 @@ 
 
 		// Password isn't legal?
 		if ($passwordError !== null)
-			$reg_errors->addError('profile_error_password_' . $passwordError);
+		{
+					$reg_errors->addError('profile_error_password_' . $passwordError);
+		}
 	}
 
 	// @todo move to controller
 	// You may not be allowed to register this email.
 	if (!empty($regOptions['check_email_ban']))
-		isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	{
+			isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	}
 
 	// Check if the email address is in use.
 	if (userByEmail($regOptions['email'], $regOptions['username']))
@@ -549,7 +581,9 @@ 
 
 	// If there's any errors left return them at once!
 	if ($reg_errors->hasErrors())
-		return false;
+	{
+			return false;
+	}
 
 	$reservedVars = array(
 		'actual_theme_url',
@@ -572,7 +606,9 @@ 
 
 	// Can't change reserved vars.
 	if (isset($regOptions['theme_vars']) && count(array_intersect(array_keys($regOptions['theme_vars']), $reservedVars)) != 0)
-		throw new Elk_Exception('no_theme');
+	{
+			throw new Elk_Exception('no_theme');
+	}
 
 	$tokenizer = new Token_Hash();
 
@@ -625,13 +661,18 @@ 
 	}
 	// Maybe it can be activated right away?
 	elseif ($regOptions['require'] == 'nothing')
-		$regOptions['register_vars']['is_activated'] = 1;
+	{
+			$regOptions['register_vars']['is_activated'] = 1;
+	}
 	// Maybe it must be activated by email?
 	elseif ($regOptions['require'] == 'activation')
-		$regOptions['register_vars']['is_activated'] = 0;
+	{
+			$regOptions['register_vars']['is_activated'] = 0;
+	}
 	// Otherwise it must be awaiting approval!
-	else
-		$regOptions['register_vars']['is_activated'] = 3;
+	else {
+			$regOptions['register_vars']['is_activated'] = 3;
+	}
 
 	if (isset($regOptions['memberGroup']))
 	{
@@ -644,19 +685,25 @@ 
 		$unassignableGroups = getUnassignableGroups(allowedTo('admin_forum'));
 
 		if (in_array($regOptions['register_vars']['id_group'], $unassignableGroups))
-			$regOptions['register_vars']['id_group'] = 0;
+		{
+					$regOptions['register_vars']['id_group'] = 0;
+		}
 	}
 
 	// Integrate optional member settings to be set.
 	if (!empty($regOptions['extra_register_vars']))
-		foreach ($regOptions['extra_register_vars'] as $var => $value)
+	{
+			foreach ($regOptions['extra_register_vars'] as $var => $value)
 			$regOptions['register_vars'][$var] = $value;
+	}
 
 	// Integrate optional user theme options to be set.
 	$theme_vars = array();
 	if (!empty($regOptions['theme_vars']))
-		foreach ($regOptions['theme_vars'] as $var => $value)
+	{
+			foreach ($regOptions['theme_vars'] as $var => $value)
 			$theme_vars[$var] = $value;
+	}
 
 	// Right, now let's prepare for insertion.
 	$knownInts = array(
@@ -678,11 +725,17 @@ 
 	{
 		$type = 'string';
 		if (in_array($var, $knownInts))
-			$type = 'int';
+		{
+					$type = 'int';
+		}
 		elseif (in_array($var, $knownFloats))
-			$type = 'float';
+		{
+					$type = 'float';
+		}
 		elseif ($var == 'birthdate')
-			$type = 'date';
+		{
+					$type = 'date';
+		}
 
 		$column_names[$var] = $type;
 		$values[$var] = $val;
@@ -699,9 +752,12 @@ 
 
 	// Update the number of members and latest member's info - and pass the name, but remove the 's.
 	if ($regOptions['register_vars']['is_activated'] == 1)
-		updateMemberStats($memberID, $regOptions['register_vars']['real_name']);
-	else
-		updateMemberStats();
+	{
+			updateMemberStats($memberID, $regOptions['register_vars']['real_name']);
+	}
+	else {
+			updateMemberStats();
+	}
 
 	// @todo there's got to be a method that does this
 	// Theme variables too?
@@ -709,7 +765,9 @@ 
 	{
 		$inserts = array();
 		foreach ($theme_vars as $var => $val)
-			$inserts[] = array($memberID, $var, $val);
+		{
+					$inserts[] = array($memberID, $var, $val);
+		}
 		$db->insert('insert',
 			'{db_prefix}themes',
 			array('id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
@@ -740,9 +798,13 @@ 
 	if ($regOptions['interface'] == 'admin')
 	{
 		if ($regOptions['require'] == 'activation')
-			$email_message = 'admin_register_activate';
+		{
+					$email_message = 'admin_register_activate';
+		}
 		elseif (!empty($regOptions['send_welcome_email']))
-			$email_message = 'admin_register_immediate';
+		{
+					$email_message = 'admin_register_immediate';
+		}
 
 		if (isset($email_message))
 		{
@@ -855,38 +917,51 @@ 
 		foreach ($reservedNames as $reserved)
 		{
 			if ($reserved == '')
-				continue;
+			{
+							continue;
+			}
 
 			// The admin might've used entities too, level the playing field.
 			$reservedCheck = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'replaceEntities__callback', $reserved);
 
 			// Case sensitive name?
 			if (empty($modSettings['reserveCase']))
-				$reservedCheck = Util::strtolower($reservedCheck);
+			{
+							$reservedCheck = Util::strtolower($reservedCheck);
+			}
 
 			// If it's not just entire word, check for it in there somewhere...
 			if ($checkMe == $reservedCheck || (Util::strpos($checkMe, $reservedCheck) !== false && empty($modSettings['reserveWord'])))
-				if ($fatal)
+			{
+							if ($fatal)
 					throw new Elk_Exception('username_reserved', 'password', array($reserved));
-				else
-					return true;
+			}
+				else {
+									return true;
+				}
 		}
 
 		$censor_name = $name;
 		if (censor($censor_name) != $name)
-			if ($fatal)
+		{
+					if ($fatal)
 				throw new Elk_Exception('name_censored', 'password', array($name));
-			else
-				return true;
+		}
+			else {
+							return true;
+			}
 	}
 
 	// Characters we just shouldn't allow, regardless.
 	foreach (array('*') as $char)
-		if (strpos($checkName, $char) !== false)
+	{
+			if (strpos($checkName, $char) !== false)
 			if ($fatal)
 				throw new Elk_Exception('username_reserved', 'password', array($char));
-			else
-				return true;
+	}
+			else {
+							return true;
+			}
 
 	// Get rid of any SQL parts of the reserved name...
 	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%'));
@@ -972,7 +1047,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		{
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$db->free_result($request);
 	}
 
@@ -981,18 +1058,23 @@ 
 	{
 		// First get the profile of the given board.
 		if (isset($board_info['id']) && $board_info['id'] == $board_id)
-			$profile_id = $board_info['profile'];
+		{
+					$profile_id = $board_info['profile'];
+		}
 		elseif ($board_id !== 0)
 		{
 			require_once(SUBSDIR . '/Boards.subs.php');
 			$board_data = fetchBoardsInfo(array('boards' => $board_id), array('selects' => 'permissions'));
 
 			if (empty($board_data))
-				throw new Elk_Exception('no_board');
+			{
+							throw new Elk_Exception('no_board');
+			}
 			$profile_id = $board_data[$board_id]['id_profile'];
 		}
-		else
-			$profile_id = 1;
+		else {
+					$profile_id = 1;
+		}
 
 		$request = $db->query('', '
 			SELECT bp.id_group, bp.add_deny
@@ -1005,7 +1087,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		{
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$db->free_result($request);
 	}
 
@@ -1117,9 +1201,13 @@ 
 
 	$query_parts = array();
 	if (!empty($email))
-		$query_parts[] = 'poster_email = {string:email_address}';
+	{
+			$query_parts[] = 'poster_email = {string:email_address}';
+	}
 	if (!empty($membername))
-		$query_parts[] = 'poster_name = {string:member_name}';
+	{
+			$query_parts[] = 'poster_name = {string:member_name}';
+	}
 	$query = implode(' AND ', $query_parts);
 
 	// Finally, update the posts themselves!
@@ -1182,7 +1270,9 @@ 
 
 	// If we want duplicates pass the members array off.
 	if ($get_duplicates)
-		populateDuplicateMembers($members);
+	{
+			populateDuplicateMembers($members);
+	}
 
 	return $members;
 }
@@ -1202,7 +1292,9 @@ 
 
 	// We know how many members there are in total.
 	if (empty($where) || $where == '1=1')
-		$num_members = $modSettings['totalMembers'];
+	{
+			$num_members = $modSettings['totalMembers'];
+	}
 
 	// The database knows the amount when there are extra conditions.
 	else
@@ -1240,15 +1332,21 @@ 
 
 		// Store the IPs.
 		if (!empty($member['member_ip']))
-			$ips[] = $member['member_ip'];
+		{
+					$ips[] = $member['member_ip'];
+		}
 		if (!empty($member['member_ip2']))
-			$ips[] = $member['member_ip2'];
+		{
+					$ips[] = $member['member_ip2'];
+		}
 	}
 
 	$ips = array_unique($ips);
 
 	if (empty($ips))
-		return false;
+	{
+			return false;
+	}
 
 	// Fetch all members with this IP address, we'll filter out the current ones in a sec.
 	$potential_dupes = membersByIP($ips, 'exact', true);
@@ -1269,9 +1367,13 @@ 
 		);
 
 		if (in_array($row['member_ip'], $ips))
-			$duplicate_members[$row['member_ip']][] = $member_context;
+		{
+					$duplicate_members[$row['member_ip']][] = $member_context;
+		}
 		if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips))
-			$duplicate_members[$row['member_ip2']][] = $member_context;
+		{
+					$duplicate_members[$row['member_ip2']][] = $member_context;
+		}
 	}
 
 	// Also try to get a list of messages using these ips.
@@ -1294,7 +1396,9 @@ 
 	{
 		// Don't collect lots of the same.
 		if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']]))
-			continue;
+		{
+					continue;
+		}
 		$had_ips[$row['poster_ip']][] = $row['id_member'];
 
 		$duplicate_members[$row['poster_ip']][] = array(
@@ -1314,9 +1418,13 @@ 
 		foreach ($members as $key => $member)
 		{
 			if (isset($duplicate_members[$member['member_ip']]))
-				$members[$key]['duplicate_members'] = $duplicate_members[$member['member_ip']];
+			{
+							$members[$key]['duplicate_members'] = $duplicate_members[$member['member_ip']];
+			}
 			if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']]))
-				$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
+			{
+							$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
+			}
 
 			// Check we don't have lots of the same member.
 			$member_track = array($member['id_member']);
@@ -1352,10 +1460,14 @@ 
 	foreach (array($ip1, $ip2) as $id => $ip)
 	{
 		if ($ip === false)
-			continue;
+		{
+					continue;
+		}
 
 		if ($match === 'exact')
-			$ip_params['ips'] = array_merge($ip_params['ips'], (array) $ip);
+		{
+					$ip_params['ips'] = array_merge($ip_params['ips'], (array) $ip);
+		}
 		else
 		{
 			$ip = (array) $ip;
@@ -1372,15 +1484,19 @@ 
 	{
 		$where = 'member_ip IN ({array_string:ips})';
 		if ($ip2 !== false)
-			$where .= '
+		{
+					$where .= '
 			OR member_ip2 IN ({array_string:ips})';
+		}
 	}
 	else
 	{
 		$where = 'member_ip ' . implode(' OR member_ip', $ip_query);
 		if ($ip2 !== false)
-			$where .= '
+		{
+					$where .= '
 			OR member_ip2 ' . implode(' OR member_ip', $ip_query);
+		}
 	}
 
 	return $db->fetchQuery('
@@ -1451,13 +1567,17 @@ 
 	if ($details)
 	{
 		while ($row = $db->fetch_assoc($request))
-			$members[$row['id_member']] = $row;
+		{
+					$members[$row['id_member']] = $row;
+		}
 	}
 	// Or just a int[] of found member id's
 	else
 	{
 		while ($row = $db->fetch_assoc($request))
-			$members[] = $row['id_member'];
+		{
+					$members[] = $row['id_member'];
+		}
 	}
 	$db->free_result($request);
 
@@ -1538,9 +1658,12 @@ 
 				foreach ($query_conditions as $condition => $query_condition)
 				{
 					if ($query_condition == 'member_names')
-						$query_parts[$condition === 'or' ? 'or' : 'and'][] = $allowed_conditions[$query_condition]($query_params);
-					else
-						$query_parts[$condition === 'or' ? 'or' : 'and'][] = isset($allowed_conditions[$query_condition]) ? $allowed_conditions[$query_condition] : $query_condition;
+					{
+											$query_parts[$condition === 'or' ? 'or' : 'and'][] = $allowed_conditions[$query_condition]($query_params);
+					}
+					else {
+											$query_parts[$condition === 'or' ? 'or' : 'and'][] = isset($allowed_conditions[$query_condition]) ? $allowed_conditions[$query_condition] : $query_condition;
+					}
 				}
 			}
 			elseif ($query_conditions == 'member_names')
@@ -1554,7 +1677,9 @@ 
 		}
 
 		if (!empty($query_parts['or']))
-			$query_parts['and'][] = implode("\n\t\t\tOR ", $query_parts['or']);
+		{
+					$query_parts['and'][] = implode("\n\t\t\tOR ", $query_parts['or']);
+		}
 
 		$query_where = implode("\n\t\t\tAND ", $query_parts['and']);
 	}
@@ -1562,17 +1687,23 @@ 
 	elseif (isset($allowed_conditions[$query]))
 	{
 		if ($query == 'member_names')
-			$query_where = $allowed_conditions[$query]($query_params);
-		else
-			$query_where = $allowed_conditions[$query];
+		{
+					$query_where = $allowed_conditions[$query]($query_params);
+		}
+		else {
+					$query_where = $allowed_conditions[$query];
+		}
 	}
 	// Something else, be careful ;)
-	else
-		$query_where = $query;
+	else {
+			$query_where = $query;
+	}
 
 	// Lazy loading, our favorite
 	if (empty($query_where))
-		return false;
+	{
+			return false;
+	}
 
 	// Only want active members
 	if ($only_active)
@@ -1613,7 +1744,9 @@ 
 
 	$admins = array();
 	while ($row = $db->fetch_assoc($request))
-		$admins[$row['id_member']] = array($row['real_name'], $row['lngfile']);
+	{
+			$admins[$row['id_member']] = array($row['real_name'], $row['lngfile']);
+	}
 	$db->free_result($request);
 
 	return $admins;
@@ -1663,7 +1796,9 @@ 
 	$members = array();
 
 	if (empty($member_ids))
-		return false;
+	{
+			return false;
+	}
 
 	if (!is_array($member_ids))
 	{
@@ -1703,12 +1838,17 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (empty($row['lngfile']))
-			$row['lngfile'] = $language;
+		{
+					$row['lngfile'] = $language;
+		}
 
 		if (!empty($single))
-			$members = $row;
-		else
-			$members[$row['id_member']] = $row;
+		{
+					$members = $row;
+		}
+		else {
+					$members[$row['id_member']] = $row;
+		}
 	}
 	$db->free_result($request);
 
@@ -1738,7 +1878,9 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$inactive_members[$row['is_activated']] = $row['total_members'];
+	{
+			$inactive_members[$row['is_activated']] = $row['total_members'];
+	}
 	$db->free_result($request);
 
 	return $inactive_members;
@@ -1769,7 +1911,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		return false;
+	{
+			return false;
+	}
 	$member = $db->fetch_assoc($request);
 	$db->free_result($request);
 
@@ -1873,16 +2017,22 @@ 
 
 	$query_cond = array();
 	foreach ($conditions as $key => $dummy)
-		if (isset($available_conditions[$key]))
+	{
+			if (isset($available_conditions[$key]))
 			$query_cond[] = $available_conditions[$key];
+	}
 
 	if (isset($conditions['group_list']))
-		$conditions['additional_group_list'] = implode(', additional_groups) != 0 OR FIND_IN_SET(', $conditions['group_list']);
+	{
+			$conditions['additional_group_list'] = implode(', additional_groups) != 0 OR FIND_IN_SET(', $conditions['group_list']);
+	}
 
 	$data = array();
 
 	if (!isset($conditions['order_by']))
-		$conditions['order_by'] = 'lngfile';
+	{
+			$conditions['order_by'] = 'lngfile';
+	}
 
 	$limit = (isset($conditions['limit'])) ? '
 		LIMIT {int:limit}' : '';
@@ -1899,7 +2049,9 @@ 
 	$data['member_count'] = $db->num_rows($request);
 
 	if ($data['member_count'] == 0)
-		return $data;
+	{
+			return $data;
+	}
 
 	// Fill the info array.
 	while ($row = $db->fetch_assoc($request))
@@ -1951,7 +2103,9 @@ 
 		if (isset($available_conditions[$key]))
 		{
 			if ($key === 'time_before')
-				$query = true;
+			{
+							$query = true;
+			}
 			$query_cond[] = $available_conditions[$key];
 		}
 	}
@@ -1961,7 +2115,9 @@ 
 		$data = retrieveMemberData($conditions);
 		$members_id = array();
 		foreach ($data['member_info'] as $member)
-			$members_id[] = $member['username'];
+		{
+					$members_id[] = $member['username'];
+		}
 	}
 	else
 	{
@@ -1981,7 +2137,9 @@ 
 
 	// Let the integration know that they've been activated!
 	foreach ($members_id as $member_id)
-		call_integration_hook('integrate_activate', array($member_id, $conditions['activated_status'], $conditions['is_activated']));
+	{
+			call_integration_hook('integrate_activate', array($member_id, $conditions['activated_status'], $conditions['is_activated']));
+	}
 
 	return $conditions['is_activated'];
 }
@@ -2232,16 +2390,22 @@ 
 				$row['additional_groups'] = $group_changes[$row['id_member']]['add'];
 				$row['primary_group'] = $group_changes[$row['id_member']]['primary'];
 			}
-			else
-				$row['additional_groups'] = explode(',', $row['additional_groups']);
+			else {
+							$row['additional_groups'] = explode(',', $row['additional_groups']);
+			}
 				// Don't have it already?
 			if ($row['primary_group'] == $row['id_group'] || in_array($row['id_group'], $row['additional_groups']))
-				continue;
+			{
+							continue;
+			}
 				// Should it become their primary?
 			if ($row['primary_group'] == 0 && $row['hidden'] == 0)
-				$row['primary_group'] = $row['id_group'];
-			else
-				$row['additional_groups'][] = $row['id_group'];
+			{
+							$row['primary_group'] = $row['id_group'];
+			}
+			else {
+							$row['additional_groups'][] = $row['id_group'];
+			}
 
 			// Add them to the group master list.
 			$group_changes[$row['id_member']] = array(
@@ -2252,7 +2416,8 @@ 
 
 		// Add required information to email them.
 		if ($row['notify_types'] != 4)
-			$email_details[] = array(
+		{
+					$email_details[] = array(
 				'rid' => $row['id_request'],
 				'member_id' => $row['id_member'],
 				'member_name' => $row['member_name'],
@@ -2261,6 +2426,7 @@ 
 				'email' => $row['email_address'],
 				'language' => $row['lngfile'],
 			);
+		}
 	}
 	$db->free_result($request);
 
@@ -2300,17 +2466,24 @@ 
 
 	// 0 = all members
 	if ($receive_from == 0)
-		return true;
+	{
+			return true;
+	}
 	// 1 = all except ignore
 	elseif ($receive_from == 1)
-		return !(!empty($ignore_list) && in_array($user_info['id'], $ignore_list));
+	{
+			return !(!empty($ignore_list) && in_array($user_info['id'], $ignore_list));
+	}
 	// 2 = buddies and admin
 	elseif ($receive_from == 2)
-		return ($user_info['is_admin'] || (!empty($buddy_list) && in_array($user_info['id'], $buddy_list)));
+	{
+			return ($user_info['is_admin'] || (!empty($buddy_list) && in_array($user_info['id'], $buddy_list)));
+	}
 	// 3 = admin only
-	else
-		return (bool) $user_info['is_admin'];
-}
+	else {
+			return (bool) $user_info['is_admin'];
+	}
+	}
 
 /**
  * This function updates the latest member, the total membercount, and the
@@ -2458,7 +2631,9 @@ 
 		$parameters['members'] = $members;
 	}
 	elseif ($members === null)
-		$condition = '1=1';
+	{
+			$condition = '1=1';
+	}
 	else
 	{
 		$condition = 'id_member = {int:member}';
@@ -2501,7 +2676,9 @@ 
 		{
 			// Fetch a list of member_names if necessary
 			if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members)))
-				$member_names = array($user_info['username']);
+			{
+							$member_names = array($user_info['username']);
+			}
 			else
 			{
 				$member_names = $db->fetchQueryCallback('
@@ -2517,8 +2694,10 @@ 
 			}
 
 			if (!empty($member_names))
-				foreach ($vars_to_integrate as $var)
+			{
+							foreach ($vars_to_integrate as $var)
 					call_integration_hook('integrate_change_member_data', array($member_names, &$var, &$data[$var], &$knownInts, &$knownFloats));
+			}
 		}
 	}
 
@@ -2528,11 +2707,17 @@ 
 		$type = 'string';
 
 		if (in_array($var, $knownInts))
-			$type = 'int';
+		{
+					$type = 'int';
+		}
 		elseif (in_array($var, $knownFloats))
-			$type = 'float';
+		{
+					$type = 'float';
+		}
 		elseif ($var == 'birthdate')
-			$type = 'date';
+		{
+					$type = 'date';
+		}
 
 		// Doing an increment?
 		if ($type == 'int' && ($val === '+' || $val === '-'))
@@ -2547,7 +2732,9 @@ 
 			if (preg_match('~^' . $var . ' (\+ |- |\+ -)([\d]+)~', $val, $match))
 			{
 				if ($match[1] != '+ ')
-					$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				{
+									$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				}
 				$type = 'raw';
 			}
 		}
@@ -2572,7 +2759,9 @@ 
 	if ($cache->levelHigherThan(1) && !empty($members))
 	{
 		if (!is_array($members))
-			$members = array($members);
+		{
+					$members = array($members);
+		}
 
 		foreach ($members as $member)
 		{
@@ -2611,7 +2800,9 @@ 
 	);
 	$ips = array();
 	while ($row = $db->fetch_assoc($request))
-		$ips[$row['member_ip']][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	{
+			$ips[$row['member_ip']][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	}
 	$db->free_result($request);
 
 	ksort($ips);

Spacing +5 added lines, -5 removed lines

@@ -430,7 +430,7 @@ 
 			'pm_ignore_list' => implode(', pm_ignore_list) != 0 OR FIND_IN_SET(', $users),
 			'buddy_list' => implode(', buddy_list) != 0 OR FIND_IN_SET(', $users),
 		),
-		function ($row) use ($users)
+		function($row) use ($users)
 		{
 			updateMemberData($row['id_member'], array(
 				'pm_ignore_list' => implode(',', array_diff(explode(',', $row['pm_ignore_list']), $users)),
@@ -1054,7 +1054,7 @@ 
 			'member_group_allowed_implode' => implode(', mem.additional_groups) != 0 OR FIND_IN_SET(', $member_groups['allowed']),
 			'member_group_denied_implode' => implode(', mem.additional_groups) != 0 OR FIND_IN_SET(', $member_groups['denied']),
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_member'];
 		}
@@ -1509,7 +1509,7 @@ 
 {
 	$allowed_conditions = array(
 		'member_ids'   => 'id_member IN ({array_int:member_ids})',
-		'member_names' => function (&$members)
+		'member_names' => function(&$members)
 		{
 			$mem_query = array();
 
@@ -1811,7 +1811,7 @@ 
 			'activation_status' => array(1, 12),
 			'limit' => Util::strlen($search) <= 2 ? 100 : 200,
 		),
-		function ($row)
+		function($row)
 		{
 			$row['real_name'] = strtr($row['real_name'], array('&amp;' => '&#038;', '&lt;' => '&#060;', '&gt;' => '&#062;', '&quot;' => '&#034;'));
 
@@ -2509,7 +2509,7 @@ 
 					FROM {db_prefix}members
 					WHERE ' . $condition,
 					$parameters,
-					function ($row)
+					function($row)
 					{
 						return $row['member_name'];
 					}

sources/subs/Attachments.subs.php

Braces +320 added lines, -126 removed lines

@@ -30,11 +30,17 @@ 
 	// Not pretty, but since we don't want folders created for every post.
 	// It'll do unless a better solution can be found.
 	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin')
-		$doit = true;
+	{
+			$doit = true;
+	}
 	elseif (empty($modSettings['automanage_attachments']))
-		return;
+	{
+			return;
+	}
 	elseif (!isset($_FILES))
-		return;
+	{
+			return;
+	}
 	elseif (isset($_FILES['attachment']))
 	{
 		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
@@ -48,7 +54,9 @@ 
 	}
 
 	if (!isset($doit))
-		return;
+	{
+			return;
+	}
 
 	// Get our date and random numbers for the directory choices
 	$year = date('Y');
@@ -61,21 +69,30 @@ 
 	if (!empty($modSettings['attachment_basedirectories']) && !empty($modSettings['use_subdirectories_for_attachments']))
 	{
 		if (!is_array($modSettings['attachment_basedirectories']))
-			$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
+		{
+					$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
+		}
 
 		$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
 	}
-	else
-		$base_dir = 0;
+	else {
+			$base_dir = 0;
+	}
 
 	if ($modSettings['automanage_attachments'] == 1)
 	{
 		if (!isset($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = array();
+		{
+					$modSettings['last_attachments_directory'] = array();
+		}
 		if (!is_array($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = Util::unserialize($modSettings['last_attachments_directory']);
+		{
+					$modSettings['last_attachments_directory'] = Util::unserialize($modSettings['last_attachments_directory']);
+		}
 		if (!isset($modSettings['last_attachments_directory'][$base_dir]))
-			$modSettings['last_attachments_directory'][$base_dir] = 0;
+		{
+					$modSettings['last_attachments_directory'][$base_dir] = 0;
+		}
 	}
 
 	$basedirectory = (!empty($modSettings['use_subdirectories_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : BOARDDIR);
@@ -106,12 +123,18 @@ 
 	}
 
 	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+	{
+			$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+	}
 
 	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir))
-		$outputCreation = automanage_attachments_create_directory($updir);
+	{
+			$outputCreation = automanage_attachments_create_directory($updir);
+	}
 	elseif (in_array($updir, $modSettings['attachmentUploadDir']))
-		$outputCreation = true;
+	{
+			$outputCreation = true;
+	}
 
 	if ($outputCreation)
 	{
@@ -153,7 +176,9 @@ 
 
 		$directory = !empty($tree) ? attachments_init_dir($tree, $count) : false;
 		if ($directory === false)
-			return false;
+		{
+					return false;
+		}
 	}
 
 	$directory .= DIRECTORY_SEPARATOR . array_shift($tree);
@@ -194,7 +219,9 @@ 
 
 	// Everything seems fine...let's create the .htaccess
 	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess'))
-		secureDirectory($updir, true);
+	{
+			secureDirectory($updir, true);
+	}
 
 	$sep = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? '\/' : DIRECTORY_SEPARATOR;
 	$updir = rtrim($updir, $sep);
@@ -231,7 +258,9 @@ 
 	global $modSettings;
 
 	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1))
-		return;
+	{
+			return;
+	}
 
 	$basedirectory = (!empty($modSettings['use_subdirectories_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : BOARDDIR);
 
@@ -245,12 +274,15 @@ 
 		$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
 		$base_dir = !empty($modSettings['automanage_attachments']) ? $base_dir : 0;
 	}
-	else
-		$base_dir = 0;
+	else {
+			$base_dir = 0;
+	}
 
 	// Get the last attachment directory for that base directory
 	if (empty($modSettings['last_attachments_directory'][$base_dir]))
-		$modSettings['last_attachments_directory'][$base_dir] = 0;
+	{
+			$modSettings['last_attachments_directory'][$base_dir] = 0;
+	}
 
 	// And increment it.
 	$modSettings['last_attachments_directory'][$base_dir]++;
@@ -269,9 +301,10 @@ 
 
 		return true;
 	}
-	else
-		return false;
-}
+	else {
+			return false;
+	}
+	}
 
 /**
  * Finds the current directory tree for the supplied base directory
@@ -290,11 +323,15 @@ 
 			* while in linux should be safe to explode only for / (aka DIRECTORY_SEPARATOR)
 	*/
 	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
-		$tree = preg_split('#[\\\/]#', $directory);
+	{
+			$tree = preg_split('#[\\\/]#', $directory);
+	}
 	else
 	{
 		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR)
-			return false;
+		{
+					return false;
+		}
 
 		$tree = explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR));
 	}
@@ -324,9 +361,12 @@ 
 		// ...even if, I should check this in the admin page...isn't it?
 		// ...NHAAA Let's leave space for users' complains! :P
 		if (preg_match('/^[a-z]:$/i', $tree[0]))
-			$directory = array_shift($tree);
-		else
-			return false;
+		{
+					$directory = array_shift($tree);
+		}
+		else {
+					return false;
+		}
 
 		$count--;
 	}
@@ -356,7 +396,9 @@ 
 
 	// Make sure we're uploading to the right place.
 	if (!empty($modSettings['automanage_attachments']))
-		automanage_attachments_check_directory();
+	{
+			automanage_attachments_check_directory();
+	}
 
 	if (!is_array($modSettings['attachmentUploadDir']))
 	{
@@ -371,7 +413,9 @@ 
 
 	// Is the attachments folder actually there?
 	if (!empty($context['dir_creation_error']))
-		$initial_error = $context['dir_creation_error'];
+	{
+			$initial_error = $context['dir_creation_error'];
+	}
 	elseif (!is_dir($context['attach_dir']))
 	{
 		$initial_error = 'attach_folder_warning';
@@ -382,7 +426,9 @@ 
 	{
 		// If this isn't a new post, check the current attachments.
 		if (!empty($id_msg))
-			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = attachmentsSizeForMessage($id_msg);
+		{
+					list ($context['attachments']['quantity'], $context['attachments']['total_size']) = attachmentsSizeForMessage($id_msg);
+		}
 		else
 		{
 			$context['attachments']['quantity'] = 0;
@@ -416,7 +462,9 @@ 
 			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 			{
 				if (strpos($attachID, 'post_tmp_' . $user_info['id'] . '_') !== false)
-					@unlink($attachment['tmp_name']);
+				{
+									@unlink($attachment['tmp_name']);
+				}
 			}
 
 			$attach_errors->activate()->addError('temp_attachments_flushed');
@@ -425,25 +473,33 @@ 
 	}
 
 	if (!isset($_FILES['attachment']['name']))
-		$_FILES['attachment']['tmp_name'] = array();
+	{
+			$_FILES['attachment']['tmp_name'] = array();
+	}
 
 	if (!isset($_SESSION['temp_attachments']))
-		$_SESSION['temp_attachments'] = array();
+	{
+			$_SESSION['temp_attachments'] = array();
+	}
 
 	// Remember where we are at. If it's anywhere at all.
 	if (!$ignore_temp)
-		$_SESSION['temp_attachments']['post'] = array(
+	{
+			$_SESSION['temp_attachments']['post'] = array(
 			'msg' => !empty($id_msg) ? $id_msg : 0,
 			'last_msg' => !empty($_REQUEST['last_msg']) ? $_REQUEST['last_msg'] : 0,
 			'topic' => !empty($topic) ? $topic : 0,
 			'board' => !empty($board) ? $board : 0,
 		);
+	}
 
 	// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 	foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 	{
 		if ($_FILES['attachment']['name'][$n] == '')
-			continue;
+		{
+					continue;
+		}
 
 		// If we have an initial error, lets just display it.
 		if (!empty($initial_error) && $added_initial_error === false)
@@ -464,7 +520,9 @@ 
 			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 			{
 				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				{
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
 			$_FILES['attachment']['tmp_name'] = array();
@@ -493,12 +551,16 @@ 
 
 			// Move the file to the attachments folder with a temp name for now.
 			if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-				@chmod($destName, 0644);
+			{
+							@chmod($destName, 0644);
+			}
 			else
 			{
 				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
 				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				{
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 		}
 		// Upload error(s) were detected, flag the error, remove the file
@@ -511,12 +573,16 @@ 
 			);
 
 			if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-				unlink($_FILES['attachment']['tmp_name'][$n]);
+			{
+							unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 		}
 
 		// If there were no errors to this point, we apply some additional checks
 		if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-			attachmentChecks($attachID);
+		{
+					attachmentChecks($attachID);
+		}
 
 		// Want to correct for phonetographer photos?
 		if (!empty($modSettings['attachment_autorotate']) && empty($_SESSION['temp_attachments'][$attachID]['errors']) && substr($_SESSION['temp_attachments'][$attachID]['type'], 0, 5) === 'image')
@@ -548,8 +614,9 @@ 
 						unset($_SESSION['temp_attachments'][$attachID]);
 					}
 				}
-				else
-					$attach_errors->addError(array($error[0], $error[1]));
+				else {
+									$attach_errors->addError(array($error[0], $error[1]));
+				}
 			}
 		}
 	}
@@ -589,8 +656,9 @@ 
 				return true;
 			}
 			// Nope can't delete it if we can't find it
-			else
-				return 'attachment_not_found';
+			else {
+							return 'attachment_not_found';
+			}
 		}
 	}
 
@@ -642,18 +710,25 @@ 
 
 	// Permissions: only temporary attachments
 	if (substr($id_attach, 0, 8) !== 'post_tmp')
-		throw new \Exception('no_access');
+	{
+			throw new \Exception('no_access');
+	}
 
 	// Permissions: only author is allowed.
 	$pieces = explode('_', substr($id_attach, 9));
 
 	if (!isset($pieces[0]) || $pieces[0] != $user_info['id'])
-		throw new \Exception('no_access');
+	{
+			throw new \Exception('no_access');
+	}
 
 	if (is_array($modSettings['attachmentUploadDir']))
-		$dirs = $modSettings['attachmentUploadDir'];
-	else
-		$dirs = unserialize($modSettings['attachmentUploadDir']);
+	{
+			$dirs = $modSettings['attachmentUploadDir'];
+	}
+	else {
+			$dirs = unserialize($modSettings['attachmentUploadDir']);
+	}
 
 	$attach_dir = $dirs[$modSettings['currentAttachmentUploadDir']];
 
@@ -687,21 +762,30 @@ 
 	{
 		// The file exceeds the max_filesize directive in php.ini
 		if ($_FILES['attachment']['error'][$attachID] == 1)
-			$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+		{
+					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+		}
 		// The uploaded file exceeds the MAX_FILE_SIZE directive in the HTML form.
 		elseif ($_FILES['attachment']['error'][$attachID] == 2)
-			$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+		{
+					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+		}
 		// Missing or a full a temp directory on the server
 		elseif ($_FILES['attachment']['error'][$attachID] == 6)
-			Errors::instance()->log_error($_FILES['attachment']['name'][$attachID] . ': ' . $txt['php_upload_error_6'], 'critical');
+		{
+					Errors::instance()->log_error($_FILES['attachment']['name'][$attachID] . ': ' . $txt['php_upload_error_6'], 'critical');
+		}
 		// One of many errors such as (3)partially uploaded, (4)empty file,
-		else
-			Errors::instance()->log_error($_FILES['attachment']['name'][$attachID] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$attachID]]);
+		else {
+					Errors::instance()->log_error($_FILES['attachment']['name'][$attachID] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$attachID]]);
+		}
 
 		// If we did not set an user error (3,4,6,7,8) to show then give them a generic one as there is
 		// no need to provide back specifics of a server error, those are logged
 		if (empty($errors))
-			$errors[] = 'attach_php_error';
+		{
+					$errors[] = 'attach_php_error';
+		}
 	}
 
 	return $errors;
@@ -731,17 +815,27 @@ 
 
 	// No data or missing data .... Not necessarily needed, but in case a mod author missed something.
 	if (empty($_SESSION['temp_attachments'][$attachID]))
-		$error = '$_SESSION[\'temp_attachments\'][$attachID]';
+	{
+			$error = '$_SESSION[\'temp_attachments\'][$attachID]';
+	}
 	elseif (empty($attachID))
-		$error = '$attachID';
+	{
+			$error = '$attachID';
+	}
 	elseif (empty($context['attachments']))
-		$error = '$context[\'attachments\']';
+	{
+			$error = '$context[\'attachments\']';
+	}
 	elseif (empty($context['attach_dir']))
-		$error = '$context[\'attach_dir\']';
+	{
+			$error = '$context[\'attach_dir\']';
+	}
 
 	// Let's get their attention.
 	if (!empty($error))
-		throw new Elk_Exception('attach_check_nag', 'debug', array($error));
+	{
+			throw new Elk_Exception('attach_check_nag', 'debug', array($error));
+	}
 
 	// Just in case this slipped by the first checks, we stop it here and now
 	if ($_SESSION['temp_attachments'][$attachID]['size'] == 0)
@@ -859,41 +953,55 @@ 
 				else
 				{
 					if (isset($context['dir_creation_error']))
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
-					else
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					{
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
+					}
+					else {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					}
 				}
 			}
-			else
-				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+			else {
+							$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+			}
 		}
 	}
 
 	// Is the file too big?
 	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	{
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	}
 
 	// Check the total upload size for this post...
 	$context['attachments']['total_size'] += $_SESSION['temp_attachments'][$attachID]['size'];
 	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	{
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	}
 
 	// Have we reached the maximum number of files we are allowed?
 	$context['attachments']['quantity']++;
 
 	// Set a max limit if none exists
 	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50)
-		$modSettings['attachmentNumPerPostLimit'] = 50;
+	{
+			$modSettings['attachmentNumPerPostLimit'] = 50;
+	}
 
 	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit'])
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	{
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	}
 
 	// File extension check
 	if (!empty($modSettings['attachmentCheckExtensions']))
 	{
 		$allowed = explode(',', strtolower($modSettings['attachmentExtensions']));
 		foreach ($allowed as $k => $dummy)
-			$allowed[$k] = trim($dummy);
+		{
+					$allowed[$k] = trim($dummy);
+		}
 
 		if (!in_array(strtolower(substr(strrchr($_SESSION['temp_attachments'][$attachID]['name'], '.'), 1)), $allowed))
 		{
@@ -906,9 +1014,13 @@ 
 	if (!empty($_SESSION['temp_attachments'][$attachID]['errors']))
 	{
 		if (isset($context['dir_size']))
-			$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
+		{
+					$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
+		}
 		if (isset($context['dir_files']))
-			$context['dir_files']--;
+		{
+					$context['dir_files']--;
+		}
 
 		$context['attachments']['total_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
 		$context['attachments']['quantity']--;
@@ -970,14 +1082,18 @@ 
 
 	// Get the hash if no hash has been given yet.
 	if (empty($attachmentOptions['file_hash']))
-		$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], 0, null, true);
+	{
+			$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], 0, null, true);
+	}
 
 	// Assuming no-one set the extension let's take a look at it.
 	if (empty($attachmentOptions['fileext']))
 	{
 		$attachmentOptions['fileext'] = strtolower(strrpos($attachmentOptions['name'], '.') !== false ? substr($attachmentOptions['name'], strrpos($attachmentOptions['name'], '.') + 1) : '');
 		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name'])
-			$attachmentOptions['fileext'] = '';
+		{
+					$attachmentOptions['fileext'] = '';
+		}
 	}
 
 	$db->insert('',
@@ -998,7 +1114,9 @@ 
 
 	// @todo Add an error here maybe?
 	if (empty($attachmentOptions['id']))
-		return false;
+	{
+			return false;
+	}
 
 	// Now that we have the attach id, let's rename this and finish up.
 	$attachmentOptions['destination'] = getAttachmentFilename(basename($attachmentOptions['name']), $attachmentOptions['id'], $attachmentOptions['id_folder'], false, $attachmentOptions['file_hash']);
@@ -1006,7 +1124,8 @@ 
 
 	// If it's not approved then add to the approval queue.
 	if (!$attachmentOptions['approved'])
-		$db->insert('',
+	{
+			$db->insert('',
 			'{db_prefix}approval_queue',
 			array(
 				'id_attach' => 'int', 'id_msg' => 'int',
@@ -1016,9 +1135,12 @@ 
 			),
 			array()
 		);
+	}
 
 	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height'])))
-		return true;
+	{
+			return true;
+	}
 
 	// Like thumbnails, do we?
 	if (!empty($modSettings['attachmentThumbWidth']) && !empty($modSettings['attachmentThumbHeight']) && ($attachmentOptions['width'] > $modSettings['attachmentThumbWidth'] || $attachmentOptions['height'] > $modSettings['attachmentThumbHeight']))
@@ -1123,7 +1245,9 @@ 
 	// Use our cache when possible
 	$cache = array();
 	if (Cache::instance()->getVar($cache, 'getAvatar_id-' . $id_attach))
-		$avatarData = $cache;
+	{
+			$avatarData = $cache;
+	}
 	else
 	{
 		$request = $db->query('', '
@@ -1139,7 +1263,9 @@ 
 		);
 		$avatarData = array();
 		if ($db->num_rows($request) != 0)
-			$avatarData = $db->fetch_row($request);
+		{
+					$avatarData = $db->fetch_row($request);
+		}
 		$db->free_result($request);
 
 		Cache::instance()->put('getAvatar_id-' . $id_attach, $avatarData, 900);
@@ -1365,7 +1491,9 @@ 
 
 	// Just making sure there is a non-zero member.
 	if (empty($memID))
-		return false;
+	{
+			return false;
+	}
 
 	require_once(SUBSDIR . '/Graphics.subs.php');
 	require_once(SUBSDIR . '/ManageAttachments.subs.php');
@@ -1441,8 +1569,9 @@ 
 			);
 			return true;
 		}
-		else
-			return false;
+		else {
+					return false;
+		}
 	}
 	else
 	{
@@ -1481,7 +1610,9 @@ 
 	// Can we pull this from the cache... please please?
 	$temp = array();
 	if (Cache::instance()->getVar($temp, 'url_image_size-' . md5($url), 240))
-		return $temp;
+	{
+			return $temp;
+	}
 
 	$t = microtime(true);
 
@@ -1490,9 +1621,13 @@ 
 
 	// Can't figure it out, just try the image size.
 	if ($url == '' || $url == 'http://' || $url == 'https://')
-		return false;
+	{
+			return false;
+	}
 	elseif (!isset($match[1]))
-		$size = elk_getimagesize($url, false);
+	{
+			$size = elk_getimagesize($url, false);
+	}
 	else
 	{
 		// Try to connect to the server... give it half a second.
@@ -1533,11 +1668,15 @@ 
 
 	// If we didn't get it, we failed.
 	if (!isset($size))
-		$size = false;
+	{
+			$size = false;
+	}
 
 	// If this took a long time, we may never have to do it again, but then again we might...
 	if (microtime(true) - $t > 0.8)
-		Cache::instance()->put('url_image_size-' . md5($url), $size, 240);
+	{
+			Cache::instance()->put('url_image_size-' . md5($url), $size, 240);
+	}
 
 	// Didn't work.
 	return $size;
@@ -1561,7 +1700,9 @@ 
 
 	// Make sure this thing exists and it is unserialized
 	if (empty($modSettings['attachmentUploadDir']))
-		$attachmentDir = BOARDDIR . '/attachments';
+	{
+			$attachmentDir = BOARDDIR . '/attachments';
+	}
 	elseif (!empty($modSettings['currentAttachmentUploadDir']) && !is_array($modSettings['attachmentUploadDir']) && (@unserialize($modSettings['attachmentUploadDir']) !== false))
 	{
 		// @todo this is here to prevent the package manager to die when complete the installation of the patch (the new Util class has not yet been loaded so we need the normal one)
@@ -1574,8 +1715,9 @@ 
 			$attachmentDir = unserialize($modSettings['attachmentUploadDir']);
 		}
 	}
-	else
-		$attachmentDir = $modSettings['attachmentUploadDir'];
+	else {
+			$attachmentDir = $modSettings['attachmentUploadDir'];
+	}
 
 	return is_array($attachmentDir) ? $attachmentDir[$modSettings['currentAttachmentUploadDir']] : $attachmentDir;
 }
@@ -1628,10 +1770,13 @@ 
 
 	// Little utility function for the endless $id_folder computation for avatars.
 	if (!empty($modSettings['custom_avatar_enabled']))
-		return 1;
-	else
-		return getAttachmentPathID();
-}
+	{
+			return 1;
+	}
+	else {
+			return getAttachmentPathID();
+	}
+	}
 
 /**
  * Get all attachments associated with a set of posts.
@@ -1670,12 +1815,16 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!$row['approved'] && !$includeUnapproved && (empty($filter) || !call_user_func($filter, $row, $all_posters)))
-			continue;
+		{
+					continue;
+		}
 
 		$temp[$row['id_attach']] = $row;
 
 		if (!isset($attachments[$row['id_msg']]))
-			$attachments[$row['id_msg']] = array();
+		{
+					$attachments[$row['id_msg']] = array();
+		}
 	}
 	$db->free_result($request);
 
@@ -1683,7 +1832,9 @@ 
 	ksort($temp);
 
 	foreach ($temp as $row)
-		$attachments[$row['id_msg']][] = $row;
+	{
+			$attachments[$row['id_msg']][] = $row;
+	}
 
 	return $attachments;
 }
@@ -1732,17 +1883,24 @@ 
 	$files = array();
 
 	if (!$dir)
-		return array();
+	{
+			return array();
+	}
 
 	while ($line = $dir->read())
 	{
 		if (in_array($line, array('.', '..', 'blank.png', 'index.php')))
-			continue;
+		{
+					continue;
+		}
 
 		if (is_dir($modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line))
-			$dirs[] = $line;
-		else
-			$files[] = $line;
+		{
+					$dirs[] = $line;
+		}
+		else {
+					$files[] = $line;
+		}
 	}
 	$dir->close();
 
@@ -1764,13 +1922,15 @@ 
 	{
 		$tmp = getServerStoredAvatars($directory . (!empty($directory) ? '/' : '') . $line, $level + 1);
 		if (!empty($tmp))
-			$result[] = array(
+		{
+					$result[] = array(
 				'filename' => htmlspecialchars($line, ENT_COMPAT, 'UTF-8'),
 				'checked' => strpos($context['member']['avatar']['server_pic'], $line . '/') !== false,
 				'name' => '[' . htmlspecialchars(str_replace('_', ' ', $line), ENT_COMPAT, 'UTF-8') . ']',
 				'is_dir' => true,
 				'files' => $tmp
 		);
+		}
 		unset($tmp);
 	}
 
@@ -1781,7 +1941,9 @@ 
 
 		// Make sure it is an image.
 		if (getValidMimeImageType($extension) === '')
-			continue;
+		{
+					continue;
+		}
 
 		$result[] = array(
 			'filename' => htmlspecialchars($line, ENT_COMPAT, 'UTF-8'),
@@ -1790,7 +1952,9 @@ 
 			'is_dir' => false
 		);
 		if ($level == 1)
-			$context['avatar_list'][] = $directory . '/' . $line;
+		{
+					$context['avatar_list'][] = $directory . '/' . $line;
+		}
 	}
 
 	return $result;
@@ -1960,10 +2124,14 @@ 
 
 			// If something is unapproved we'll note it so we can sort them.
 			if (!$attachment['approved'])
-				$have_unapproved = true;
+			{
+							$have_unapproved = true;
+			}
 
 			if (!$attachmentData[$i]['is_image'])
-				continue;
+			{
+							continue;
+			}
 
 			$attachmentData[$i]['real_width'] = $attachment['width'];
 			$attachmentData[$i]['width'] = $attachment['width'];
@@ -1977,9 +2145,11 @@ 
 				if (empty($attachment['id_thumb'])
 					|| $attachment['thumb_width'] > $modSettings['attachmentThumbWidth']
 					|| $attachment['thumb_height'] > $modSettings['attachmentThumbHeight'])
-					//|| ($attachment['thumb_width'] < $modSettings['attachmentThumbWidth'] && $attachment['thumb_height'] < $modSettings['attachmentThumbHeight']))
+				{
+									//|| ($attachment['thumb_width'] < $modSettings['attachmentThumbWidth'] && $attachment['thumb_height'] < $modSettings['attachmentThumbHeight']))
 				{
 					$filename = getAttachmentFilename($attachment['filename'], $attachment['id_attach'], $attachment['id_folder'], false, $attachment['file_hash']);
+				}
 					$attachment = array_merge($attachment, updateAttachmentThumbnail($filename, $attachment['id_attach'], $id_msg, $attachment['id_thumb'], $attachment['filename']));
 				}
 
@@ -2022,19 +2192,26 @@ 
 				// If the image is too large to show inline, make it a popup.
 				// @todo this needs to be removed or depreciated
 				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height'])))
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
-				else
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				{
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
+				}
+				else {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				}
 			}
 
 			if (!$attachmentData[$i]['thumbnail']['has_thumb'])
-				$attachmentData[$i]['downloads']++;
+			{
+							$attachmentData[$i]['downloads']++;
+			}
 		}
 	}
 
 	// Do we need to instigate a sort?
 	if ($have_unapproved)
-		usort($attachmentData, 'approved_attach_sort');
+	{
+			usort($attachmentData, 'approved_attach_sort');
+	}
 
 	return $attachmentData;
 }
@@ -2050,7 +2227,9 @@ 
 function approved_attach_sort($a, $b)
 {
 	if ($a['is_approved'] == $b['is_approved'])
-		return 0;
+	{
+			return 0;
+	}
 
 	return $a['is_approved'] > $b['is_approved'] ? -1 : 1;
 }
@@ -2096,24 +2275,34 @@ 
 	$clean_name = preg_replace('~\.[\.]+~', '.', $clean_name);
 
 	if (empty($attachment_id) || ($new && empty($modSettings['attachmentEncryptFilenames'])))
-		return $clean_name;
+	{
+			return $clean_name;
+	}
 	elseif ($new)
-		return $enc_name;
+	{
+			return $enc_name;
+	}
 
 	// Are we using multiple directories?
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
 		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		{
+					$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		}
 		$path = $modSettings['attachmentUploadDir'][$dir];
 	}
-	else
-		$path = $modSettings['attachmentUploadDir'];
+	else {
+			$path = $modSettings['attachmentUploadDir'];
+	}
 
 	if (file_exists($path . '/' . $enc_name))
-		$filename = $path . '/' . $enc_name;
-	else
-		$filename = $path . '/' . $clean_name;
+	{
+			$filename = $path . '/' . $enc_name;
+	}
+	else {
+			$filename = $path . '/' . $clean_name;
+	}
 
 	return $filename;
 }
@@ -2164,7 +2353,9 @@ 
 
 	// Just make up a nice hash...
 	if ($new)
-		return hash('sha1', hash('md5', $filename . time()) . mt_rand());
+	{
+			return hash('sha1', hash('md5', $filename . time()) . mt_rand());
+	}
 
 	// In case of files from the old system, do a legacy call.
 	if (empty($file_hash))
@@ -2176,11 +2367,14 @@ 
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
 		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		{
+					$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		}
 		$path = isset($modSettings['attachmentUploadDir'][$dir]) ? $modSettings['attachmentUploadDir'][$dir] : $modSettings['basedirectory_for_attachments'];
 	}
-	else
-		$path = $modSettings['attachmentUploadDir'];
+	else {
+			$path = $modSettings['attachmentUploadDir'];
+	}
 
 	return $path . '/' . $attachment_id . '_' . $file_hash . '.elk';
 }

sources/subs/Post.subs.php

Braces +171 added lines, -61 removed lines

@@ -82,7 +82,9 @@ 
 
 	// We need to know if the topic is approved. If we're told that's great - if not find out.
 	if (!$modSettings['postmod_active'])
-		$topicOptions['is_approved'] = true;
+	{
+			$topicOptions['is_approved'] = true;
+	}
 	elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
 	{
 		require_once(SUBSDIR . '/Topic.subs.php');
@@ -175,7 +177,9 @@ 
 
 	// Something went wrong creating the message...
 	if (empty($msgOptions['id']))
-		return false;
+	{
+			return false;
+	}
 
 	// What if we want to export new posts out to a CMS?
 	call_integration_hook('integrate_create_post', array($msgOptions, $topicOptions, $posterOptions, $message_columns, $message_parameters));
@@ -269,21 +273,28 @@ 
 		);
 
 		if ($msgOptions['approved'])
-			$topics_columns = array(
+		{
+					$topics_columns = array(
 				'id_member_updated = {int:poster_id}',
 				'id_last_msg = {int:id_msg}',
 				'num_replies = num_replies + {int:counter_increment}',
 			);
-		else
-			$topics_columns = array(
+		}
+		else {
+					$topics_columns = array(
 				'unapproved_posts = unapproved_posts + {int:counter_increment}',
 			);
+		}
 
 		if ($topicOptions['lock_mode'] !== null)
-			$topics_columns[] = 'locked = {int:locked}';
+		{
+					$topics_columns[] = 'locked = {int:locked}';
+		}
 
 		if ($topicOptions['sticky_mode'] !== null)
-			$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		{
+					$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
 
 		call_integration_hook('integrate_before_modify_topic', array(&$topics_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions));
 
@@ -314,7 +325,8 @@ 
 
 	// Increase the number of posts and topics on the board.
 	if ($msgOptions['approved'])
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + 1' . ($new_topic ? ', num_topics = num_topics + 1' : '') . '
 			WHERE id_board = {int:id_board}',
@@ -322,6 +334,7 @@ 
 				'id_board' => $topicOptions['board'],
 			)
 		);
+	}
 	else
 	{
 		$db->query('', '
@@ -378,14 +391,18 @@ 
 	$search = new \ElkArte\Search\Search;
 	$searchAPI = $search->findSearchAPI();
 	if (is_callable(array($searchAPI, 'postCreated')))
-		$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	{
+			$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	// Increase the post counter for the user that created the post.
 	if (!empty($posterOptions['update_post_count']) && !empty($posterOptions['id']) && $msgOptions['approved'])
 	{
 		// Are you the one that happened to create this post?
 		if ($user_info['id'] == $posterOptions['id'])
-			$user_info['posts']++;
+		{
+					$user_info['posts']++;
+		}
 
 		require_once(SUBSDIR . '/Members.subs.php');
 		updateMemberData($posterOptions['id'], array('posts' => '+'));
@@ -396,7 +413,9 @@ 
 
 	// Better safe than sorry.
 	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']]))
-		$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	{
+			$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	}
 
 	// Update all the stats so everyone knows about this new topic and message.
 	require_once(SUBSDIR . '/Messages.subs.php');
@@ -404,7 +423,9 @@ 
 
 	// Update the last message on the board assuming it's approved AND the topic is.
 	if ($msgOptions['approved'])
-		updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	{
+			updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	}
 
 	// Alright, done now... we can abort now, I guess... at least this much is done.
 	ignore_user_abort($previous_ignore_user_abort);
@@ -435,13 +456,21 @@ 
 	// This is longer than it has to be, but makes it so we only set/change what we have to.
 	$messages_columns = array();
 	if (isset($posterOptions['name']))
-		$messages_columns['poster_name'] = $posterOptions['name'];
+	{
+			$messages_columns['poster_name'] = $posterOptions['name'];
+	}
 	if (isset($posterOptions['email']))
-		$messages_columns['poster_email'] = $posterOptions['email'];
+	{
+			$messages_columns['poster_email'] = $posterOptions['email'];
+	}
 	if (isset($msgOptions['icon']))
-		$messages_columns['icon'] = $msgOptions['icon'];
+	{
+			$messages_columns['icon'] = $msgOptions['icon'];
+	}
 	if (isset($msgOptions['subject']))
-		$messages_columns['subject'] = $msgOptions['subject'];
+	{
+			$messages_columns['subject'] = $msgOptions['subject'];
+	}
 	if (isset($msgOptions['body']))
 	{
 		$messages_columns['body'] = $msgOptions['body'];
@@ -461,7 +490,9 @@ 
 		$messages_columns['id_msg_modified'] = $modSettings['maxMsgID'];
 	}
 	if (isset($msgOptions['smileys_enabled']))
-		$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	{
+			$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	}
 
 	// Which columns need to be ints?
 	$messageInts = array('modified_time', 'id_msg_modified', 'smileys_enabled');
@@ -479,7 +510,9 @@ 
 
 	// Nothing to do?
 	if (empty($messages_columns))
-		return true;
+	{
+			return true;
+	}
 
 	// Change the post.
 	$db->query('', '
@@ -492,15 +525,23 @@ 
 	$attributes = array();
 	// Lock and or sticky the post.
 	if ($topicOptions['sticky_mode'] !== null)
-		$attributes['is_sticky'] = $topicOptions['sticky_mode'];
+	{
+			$attributes['is_sticky'] = $topicOptions['sticky_mode'];
+	}
 	if ($topicOptions['lock_mode'] !== null)
-		$attributes['locked'] = $topicOptions['lock_mode'];
+	{
+			$attributes['locked'] = $topicOptions['lock_mode'];
+	}
 	if ($topicOptions['poll'] !== null)
-		$attributes['id_poll'] = $topicOptions['poll'];
+	{
+			$attributes['id_poll'] = $topicOptions['poll'];
+	}
 
 	// If anything to do, do it.
 	if (!empty($attributes))
-		setTopicAttribute($topicOptions['id'], $attributes);
+	{
+			setTopicAttribute($topicOptions['id'], $attributes);
+	}
 
 	// Mark the edited post as read.
 	if (!empty($topicOptions['mark_as_read']) && !$user_info['is_guest'])
@@ -531,7 +572,9 @@ 
 	$search = new \ElkArte\Search\Search;
 	$searchAPI = $search->findSearchAPI();
 	if (is_callable(array($searchAPI, 'postModified')))
-		$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	{
+			$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	if (isset($msgOptions['subject']))
 	{
@@ -555,7 +598,9 @@ 
 
 	// Finally, if we are setting the approved state we need to do much more work :(
 	if ($modSettings['postmod_active'] && isset($msgOptions['approved']))
-		approvePosts($msgOptions['id'], $msgOptions['approved']);
+	{
+			approvePosts($msgOptions['id'], $msgOptions['approved']);
+	}
 
 	return true;
 }
@@ -575,10 +620,14 @@ 
 	$db = database();
 
 	if (!is_array($msgs))
-		$msgs = array($msgs);
+	{
+			$msgs = array($msgs);
+	}
 
 	if (empty($msgs))
-		return false;
+	{
+			return false;
+	}
 
 	// May as well start at the beginning, working out *what* we need to change.
 	$request = $db->query('', '
@@ -611,19 +660,23 @@ 
 
 		// Ensure our change array exists already.
 		if (!isset($topic_changes[$row['id_topic']]))
-			$topic_changes[$row['id_topic']] = array(
+		{
+					$topic_changes[$row['id_topic']] = array(
 				'id_last_msg' => $row['id_last_msg'],
 				'approved' => $row['topic_approved'],
 				'replies' => 0,
 				'unapproved_posts' => 0,
 			);
+		}
 		if (!isset($board_changes[$row['id_board']]))
-			$board_changes[$row['id_board']] = array(
+		{
+					$board_changes[$row['id_board']] = array(
 				'posts' => 0,
 				'topics' => 0,
 				'unapproved_posts' => 0,
 				'unapproved_topics' => 0,
 			);
+		}
 
 		// If it's the first message then the topic state changes!
 		if ($row['id_msg'] == $row['id_first_msg'])
@@ -651,7 +704,8 @@ 
 
 			// This will be a post... but don't notify unless it's not followed by approved ones.
 			if ($row['id_msg'] > $row['id_last_msg'])
-				$notification_posts[$row['id_topic']][] = array(
+			{
+							$notification_posts[$row['id_topic']][] = array(
 					'id' => $row['id_msg'],
 					'body' => $row['body'],
 					'subject' => $row['subject'],
@@ -659,15 +713,20 @@ 
 					'topic' => $row['id_topic'],
 					'signature' => $row['signature'],
 				);
+			}
 		}
 
 		// If this is being approved and id_msg is higher than the current id_last_msg then it changes.
 		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg'])
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		{
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		}
 		// If this is being unapproved, and it's equal to the id_last_msg we need to find a new one!
 		elseif (!$approve)
-			// Default to the first message and then we'll override in a bit ;)
+		{
+					// Default to the first message and then we'll override in a bit ;)
 			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_first_msg'];
+		}
 
 		$topic_changes[$row['id_topic']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['unapproved_posts'] += $approve ? -1 : 1;
@@ -675,12 +734,16 @@ 
 
 		// Post count for the user?
 		if ($row['id_member'] && empty($row['count_posts']))
-			$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		{
+					$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		}
 	}
 	$db->free_result($request);
 
 	if (empty($msgs))
-		return;
+	{
+			return;
+	}
 
 	// Now we have the differences make the changes, first the easy one.
 	$db->query('', '
@@ -708,13 +771,16 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		{
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		}
 		$db->free_result($request);
 	}
 
 	// ... next the topics...
 	foreach ($topic_changes as $id => $changes)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}topics
 			SET
 				approved = {int:approved},
@@ -730,10 +796,12 @@ 
 				'id_topic' => $id,
 			)
 		);
+	}
 
 	// ... finally the boards...
 	foreach ($board_changes as $id => $changes)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}boards
 			SET
 				num_posts = num_posts + {int:num_posts},
@@ -749,6 +817,7 @@ 
 				'id_board' => $id,
 			)
 		);
+	}
 
 	// Finally, least importantly, notifications!
 	if ($approve)
@@ -756,10 +825,14 @@ 
 		require_once(SUBSDIR . '/Notification.subs.php');
 
 		if (!empty($notification_topics))
-			sendBoardNotifications($notification_topics);
+		{
+					sendBoardNotifications($notification_topics);
+		}
 
 		if (!empty($notification_posts))
-			sendApprovalNotifications($notification_posts);
+		{
+					sendApprovalNotifications($notification_posts);
+		}
 
 		$db->query('', '
 			DELETE FROM {db_prefix}approval_queue
@@ -776,7 +849,9 @@ 
 	{
 		$msgInserts = array();
 		foreach ($msgs as $msg)
-			$msgInserts[] = array($msg);
+		{
+					$msgInserts[] = array($msg);
+		}
 
 		$db->insert('ignore',
 			'{db_prefix}approval_queue',
@@ -800,7 +875,9 @@ 
 	{
 		require_once(SUBSDIR . '/Members.subs.php');
 		foreach ($member_post_changes as $id_member => $count_change)
-			updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+		{
+					updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+		}
 	}
 
 	return true;
@@ -827,10 +904,14 @@ 
 
 	// Please - let's be sane.
 	if (empty($setboards))
-		return false;
+	{
+			return false;
+	}
 
 	if (!is_array($setboards))
-		$setboards = array($setboards);
+	{
+			$setboards = array($setboards);
+	}
 
 	$lastMsg = array();
 
@@ -850,14 +931,18 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$lastMsg[$row['id_board']] = $row['id_msg'];
+		{
+					$lastMsg[$row['id_board']] = $row['id_msg'];
+		}
 		$db->free_result($request);
 	}
 	else
 	{
 		// Just to note - there should only be one board passed if we are doing this.
 		foreach ($setboards as $id_board)
-			$lastMsg[$id_board] = $id_msg;
+		{
+					$lastMsg[$id_board] = $id_msg;
+		}
 	}
 
 	$parent_boards = array();
@@ -875,9 +960,12 @@ 
 		}
 
 		if (!empty($board) && $id_board == $board)
-			$parents = $board_info['parent_boards'];
-		else
-			$parents = getBoardParents($id_board);
+		{
+					$parents = $board_info['parent_boards'];
+		}
+		else {
+					$parents = getBoardParents($id_board);
+		}
 
 		// Ignore any parents on the top child level.
 		foreach ($parents as $id => $parent)
@@ -886,9 +974,13 @@ 
 			{
 				// If we're already doing this one as a board, is this a higher last modified?
 				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id])
-					$lastModified[$id] = $lastModified[$id_board];
+				{
+									$lastModified[$id] = $lastModified[$id_board];
+				}
 				elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board]))
-					$parent_boards[$id] = $lastModified[$id_board];
+				{
+									$parent_boards[$id] = $lastModified[$id_board];
+				}
 			}
 		}
 	}
@@ -902,22 +994,28 @@ 
 	foreach ($parent_boards as $id => $msg)
 	{
 		if (!isset($parent_updates[$msg]))
-			$parent_updates[$msg] = array($id);
-		else
-			$parent_updates[$msg][] = $id;
+		{
+					$parent_updates[$msg] = array($id);
+		}
+		else {
+					$parent_updates[$msg][] = $id;
+		}
 	}
 
 	foreach ($lastMsg as $id => $msg)
 	{
 		if (!isset($board_updates[$msg . '-' . $lastModified[$id]]))
-			$board_updates[$msg . '-' . $lastModified[$id]] = array(
+		{
+					$board_updates[$msg . '-' . $lastModified[$id]] = array(
 				'id' => $msg,
 				'updated' => $lastModified[$id],
 				'boards' => array($id)
 			);
+		}
 
-		else
-			$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		else {
+					$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		}
 	}
 
 	// Now commit the changes!
@@ -980,7 +1078,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		return array();
+	{
+			return array();
+	}
 	$row = $db->fetch_assoc($request);
 	$db->free_result($request);
 
@@ -1044,14 +1144,18 @@ 
 
 			// The message they were trying to edit was most likely deleted.
 			if ($message === false)
-				return false;
+			{
+							return false;
+			}
 
 			$errors = checkMessagePermissions($message['message']);
 
 			prepareMessageContext($message);
 
 			if (!empty($errors))
-				$message['errors'] = $errors;
+			{
+							$message['errors'] = $errors;
+			}
 
 			return $message;
 		// Posting a quoted reply?
@@ -1074,14 +1178,18 @@ 
 				)
 			);
 			if ($db->num_rows($request) == 0)
-				throw new Elk_Exception('quoted_post_deleted', false);
+			{
+							throw new Elk_Exception('quoted_post_deleted', false);
+			}
 			list ($form_subject, $mname, $mdate, $form_message) = $db->fetch_row($request);
 			$db->free_result($request);
 
 			// Add 'Re: ' to the front of the quoted subject.
 			$response_prefix = response_prefix();
 			if (trim($response_prefix) != '' && Util::strpos($form_subject, trim($response_prefix)) !== 0)
-				$form_subject = $response_prefix . $form_subject;
+			{
+							$form_subject = $response_prefix . $form_subject;
+			}
 
 			// Censor the message and subject.
 			$form_message = censor($form_message);
@@ -1102,7 +1210,9 @@ 
 			// Add 'Re: ' to the front of the subject.
 			$response_prefix = response_prefix();
 			if (trim($response_prefix) != '' && $form_subject != '' && Util::strpos($form_subject, trim($response_prefix)) !== 0)
-				$form_subject = $response_prefix . $form_subject;
+			{
+							$form_subject = $response_prefix . $form_subject;
+			}
 
 			// Censor the subject.
 			$form_subject = censor($form_subject);

sources/subs/ScheduledTasks.subs.php

Braces +97 added lines, -39 removed lines

@@ -27,15 +27,20 @@ 
 	$task_query = '';
 
 	if (!is_array($tasks))
-		$tasks = array($tasks);
+	{
+			$tasks = array($tasks);
+	}
 
 	// Actually have something passed?
 	if (!empty($tasks))
 	{
 		if (!isset($tasks[0]) || is_numeric($tasks[0]))
-			$task_query = ' AND id_task IN ({array_int:tasks})';
-		else
-			$task_query = ' AND task IN ({array_string:tasks})';
+		{
+					$task_query = ' AND id_task IN ({array_int:tasks})';
+		}
+		else {
+					$task_query = ' AND task IN ({array_string:tasks})';
+		}
 	}
 
 	$nextTaskTime = empty($tasks) ? time() + 86400 : $modSettings['next_task_time'];
@@ -57,25 +62,34 @@ 
 	{
 		// scheduleTaskImmediate is a way to speed up scheduled tasks and fire them as fast as possible
 		if (!empty($scheduleTaskImmediate) && isset($scheduleTaskImmediate[$row['task']]))
-			$next_time = next_time(1, '', rand(0, 60), true);
-		else
-			$next_time = next_time($row['time_regularity'], $row['time_unit'], $row['time_offset']);
+		{
+					$next_time = next_time(1, '', rand(0, 60), true);
+		}
+		else {
+					$next_time = next_time($row['time_regularity'], $row['time_unit'], $row['time_offset']);
+		}
 
 		// Only bother moving the task if it's out of place or we're forcing it!
 		if ($forceUpdate || $next_time < $row['next_time'] || $row['next_time'] < time())
-			$tasks[$row['id_task']] = $next_time;
-		else
-			$next_time = $row['next_time'];
+		{
+					$tasks[$row['id_task']] = $next_time;
+		}
+		else {
+					$next_time = $row['next_time'];
+		}
 
 		// If this is sooner than the current next task, make this the next task.
 		if ($next_time < $nextTaskTime)
-			$nextTaskTime = $next_time;
+		{
+					$nextTaskTime = $next_time;
+		}
 	}
 	$db->free_result($request);
 
 	// Now make the changes!
 	foreach ($tasks as $id => $time)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}scheduled_tasks
 			SET next_time = {int:next_time}
 			WHERE id_task = {int:id_task}',
@@ -84,11 +98,14 @@ 
 				'id_task' => $id,
 			)
 		);
+	}
 
 	// If the next task is now different update.
 	if ($modSettings['next_task_time'] != $nextTaskTime)
-		updateSettings(array('next_task_time' => $nextTaskTime));
-}
+	{
+			updateSettings(array('next_task_time' => $nextTaskTime));
+	}
+	}
 
 /**
  * Returns a time stamp of the next instance of these time parameters.
@@ -104,13 +121,17 @@ 
 {
 	// Just in case!
 	if ($regularity == 0)
-		$regularity = 2;
+	{
+			$regularity = 2;
+	}
 
 	$curMin = date('i', time());
 
 	// If we have scheduleTaskImmediate running, then it's 10 seconds
 	if (empty($unit) && $immediate)
-		$next_time = time() + 10;
+	{
+			$next_time = time() + 10;
+	}
 	// If the unit is minutes only check regularity in minutes.
 	elseif ($unit == 'm')
 	{
@@ -118,14 +139,18 @@ 
 
 		// If it's now just pretend it ain't,
 		if ($off == $curMin)
-			$next_time = time() + $regularity;
+		{
+					$next_time = time() + $regularity;
+		}
 		else
 		{
 			// Make sure that the offset is always in the past.
 			$off = $off > $curMin ? $off - 60 : $off;
 
 			while ($off <= $curMin)
-				$off += $regularity;
+			{
+							$off += $regularity;
+			}
 
 			// Now we know when the time should be!
 			$next_time = time() + 60 * ($off - $curMin);
@@ -138,24 +163,32 @@ 
 
 		// Make the time offset in the past!
 		if ($next_time > time())
-			$next_time -= 86400;
+		{
+					$next_time -= 86400;
+		}
 
 		// Default we'll jump in hours.
 		$applyOffset = 3600;
 
 		// 24 hours = 1 day.
 		if ($unit == 'd')
-			$applyOffset = 86400;
+		{
+					$applyOffset = 86400;
+		}
 
 		// Otherwise a week.
 		if ($unit == 'w')
-			$applyOffset = 604800;
+		{
+					$applyOffset = 604800;
+		}
 
 		$applyOffset *= $regularity;
 
 		// Just add on the offset.
 		while ($next_time <= time())
-			$next_time += $applyOffset;
+		{
+					$next_time += $applyOffset;
+		}
 	}
 
 	return $next_time;
@@ -183,7 +216,9 @@ 
 	);
 	$task = array();
 	while ($row = $db->fetch_assoc($request))
-		$task[$row['id_task']] = $row['task'];
+	{
+			$task[$row['id_task']] = $row['task'];
+	}
 	$db->free_result($request);
 
 	return $task;
@@ -294,8 +329,10 @@ 
 
 	$updates = array();
 	foreach ($sets as $key => $set)
-		if (isset($$key))
+	{
+			if (isset($$key))
 			$updates[] = $set;
+	}
 
 	$db->query('', '
 		UPDATE {db_prefix}scheduled_tasks
@@ -340,7 +377,9 @@ 
 	);
 	// Should never, ever, happen!
 	if ($db->num_rows($request) == 0)
-		throw new Elk_Exception('no_access', false);
+	{
+			throw new Elk_Exception('no_access', false);
+	}
 	while ($row = $db->fetch_assoc($request))
 	{
 		$task = array(
@@ -433,7 +472,8 @@ 
 	);
 	$log_entries = array();
 	while ($row = $db->fetch_assoc($request))
-		$log_entries[] = array(
+	{
+			$log_entries[] = array(
 			'id' => $row['id_log'],
 			'name' => isset($txt['scheduled_task_' . $row['task']]) ? $txt['scheduled_task_' . $row['task']] : $row['task'],
 			'time_run' => $row['time_run'],
@@ -441,6 +481,7 @@ 
 			'time_taken' => $row['time_taken'] == -1 ? 0 : $row['time_taken'],
 			'task_completed' => $row['time_taken'] != -1,
 		);
+	}
 	$db->free_result($request);
 
 	return $log_entries;
@@ -518,17 +559,27 @@ 
 		// How long in seconds is the gap?
 		$duration = $row['time_regularity'];
 		if ($row['time_unit'] == 'm')
-			$duration *= 60;
+		{
+					$duration *= 60;
+		}
 		elseif ($row['time_unit'] == 'h')
-			$duration *= 3600;
+		{
+					$duration *= 3600;
+		}
 		elseif ($row['time_unit'] == 'd')
-			$duration *= 86400;
+		{
+					$duration *= 86400;
+		}
 		elseif ($row['time_unit'] == 'w')
-			$duration *= 604800;
+		{
+					$duration *= 604800;
+		}
 
 		// If we were really late running this task actually skip the next one.
 		if (time() + ($duration / 2) > $next_time)
-			$next_time += $duration;
+		{
+					$next_time += $duration;
+		}
 
 		// Update it now, so no others run this!
 		$db->query('', '
@@ -582,8 +633,9 @@ 
 
 		$completed = $task->run();
 	}
-	else
-		$completed = run_this_task_compat($task_name);
+	else {
+			$completed = run_this_task_compat($task_name);
+	}
 
 	$scheduleTaskImmediate = !empty($modSettings['scheduleTaskImmediate']) ? Util::unserialize($modSettings['scheduleTaskImmediate']) : array();
 	// Log that we did it ;)
@@ -595,9 +647,12 @@ 
 			$scheduleTaskImmediate[$task_name]++;
 
 			if ($scheduleTaskImmediate[$task_name] > 9)
-				removeScheduleTaskImmediate($task_name, false);
-			else
-				updateSettings(array('scheduleTaskImmediate' => serialize($scheduleTaskImmediate)));
+			{
+							removeScheduleTaskImmediate($task_name, false);
+			}
+			else {
+							updateSettings(array('scheduleTaskImmediate' => serialize($scheduleTaskImmediate)));
+			}
 		}
 
 		$total_time = round(microtime(true) - $time_start, 3);
@@ -673,9 +728,12 @@ 
 	);
 	// No new task scheduled?
 	if ($db->num_rows($request) === 0)
-		$result = false;
-	else
-		list ($result) = $db->fetch_row($request);
+	{
+			$result = false;
+	}
+	else {
+			list ($result) = $db->fetch_row($request);
+	}
 
 	$db->free_result($request);
 

sources/subs/Action.class.php

Braces +42 added lines, -18 removed lines

@@ -96,17 +96,23 @@ 
 	public function initialize(&$subactions, $default = '', $requestParam = 'sa')
 	{
 		if ($this->_name !== null)
-			call_integration_hook('integrate_sa_' . $this->_name, array(&$subactions));
+		{
+					call_integration_hook('integrate_sa_' . $this->_name, array(&$subactions));
+		}
 
 		$this->_subActions = array();
 
 		if (!is_array($subactions))
-			$subactions = array($subactions);
+		{
+					$subactions = array($subactions);
+		}
 
 		$this->_subActions = $subactions;
 
 		if (isset($subactions[$default]))
-			$this->_default = $default;
+		{
+					$this->_default = $default;
+		}
 
 		return isset($_REQUEST[$requestParam]) && isset($this->_subActions[$_REQUEST[$requestParam]]) ? $_REQUEST[$requestParam] : $this->_default;
 	}
@@ -133,23 +139,31 @@ 
 
 		// Unless it's disabled, then we redirect to the default action
 		if (isset($subAction['enabled']) && !$subAction['enabled'])
-			if (!empty($this->_default))
+		{
+					if (!empty($this->_default))
 				$subAction = $this->_subActions[$this->_default];
-			else
-				// No dice
+		}
+			else {
+							// No dice
 				throw new Elk_Exception('error_sa_not_set');
+			}
 
 		// Are you even permitted to?
 		if (isset($subAction['permission']))
-			isAllowedTo($subAction['permission']);
+		{
+					isAllowedTo($subAction['permission']);
+		}
 
 		// Is it in a file we need to load?
 		if (isset($subAction['file']))
 		{
 			if (isset($subAction['dir']))
-				require_once($subAction['dir'] . '/' . $subAction['file']);
-			else
-				require_once(ADMINDIR . '/' . $subAction['file']);
+			{
+							require_once($subAction['dir'] . '/' . $subAction['file']);
+			}
+			else {
+							require_once(ADMINDIR . '/' . $subAction['file']);
+			}
 
 			// A brand new controller... so be it.
 			if (isset($subAction['controller']))
@@ -173,7 +187,9 @@ 
 			{
 				// An OOP controller, call it over
 				if (is_object($subAction['controller']))
-					$subAction['controller']->{$subAction['function']}();
+				{
+									$subAction['controller']->{$subAction['function']}();
+				}
 				else
 				{
 					$controller = new $subAction['controller'](new Event_Manager());
@@ -192,9 +208,12 @@ 
 			{
 				// A function
 				if (isset($subAction['function']))
-					$subAction['function']();
-				else
-					$subAction();
+				{
+									$subAction['function']();
+				}
+				else {
+									$subAction();
+				}
 			}
 		}
 	}
@@ -220,10 +239,13 @@ 
 		if (isset($subAction['enabled']) && !$subAction['enabled'])
 		{
 			if (!empty($this->_default))
-				$sa = $this->_default;
-			else
-				// No dice
+			{
+							$sa = $this->_default;
+			}
+			else {
+							// No dice
 				throw new Elk_Exception('error_sa_not_set');
+			}
 		}
 
 		return $sa;
@@ -249,7 +271,9 @@ 
 		if (is_array($this->_subActions) && array_key_exists($sa, $this->_subActions))
 		{
 			if (isset($this->_subActions[$sa]['permission']))
-				isAllowedTo($this->_subActions[$sa]['permission']);
+			{
+							isAllowedTo($this->_subActions[$sa]['permission']);
+			}
 
 			return true;
 		}

sources/subs/TopicUtil.class.php

Braces +15 added lines, -7 removed lines

@@ -42,7 +42,9 @@ 
 		$topics = array();
 		$preview_length = (int) $preview_length;
 		if (empty($preview_length))
-			$preview_length = 128;
+		{
+					$preview_length = 128;
+		}
 
 		$messages_per_page = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
 		$topicseen = $topicseen ? ';topicseen' : '';
@@ -62,7 +64,9 @@ 
 
 				// No reply then they are the same, no need to process it again
 				if ($row['num_replies'] == 0)
-					$row['last_body'] = $row['first_body'];
+				{
+									$row['last_body'] = $row['first_body'];
+				}
 				else
 				{
 					$row['last_body'] = strtr($parser->parseMessage($row['last_body'], $row['last_smileys']), array('<br />' => "\n", '&nbsp;' => ' '));
@@ -92,9 +96,12 @@ 
 				$row['first_subject'] = censor($row['first_subject']);
 
 				if ($row['id_first_msg'] == $row['id_last_msg'])
-					$row['last_subject'] = $row['first_subject'];
-				else
-					$row['last_subject'] = censor($row['last_subject']);
+				{
+									$row['last_subject'] = $row['first_subject'];
+				}
+				else {
+									$row['last_subject'] = censor($row['last_subject']);
+				}
 			}
 
 			// Decide how many pages the topic should have.
@@ -106,8 +113,9 @@ 
 				$show_all = !empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages'];
 				$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d' . $topicseen, $start, $topic_length, $messages_per_page, true, array('prev_next' => false, 'all' => $show_all));
 			}
-			else
-				$pages = '';
+			else {
+							$pages = '';
+			}
 
 			if ($user_info['is_guest'])
 			{

sources/subs/AddonSettings.subs.php

Braces +27 added lines, -10 removed lines

@@ -37,7 +37,9 @@ 
 		foreach ($iterator as $file)
 		{
 			if ($file->isFile())
-				$files[] = array('dir' => $file->getPath(), 'name' => $file->getFilename());
+			{
+							$files[] = array('dir' => $file->getPath(), 'name' => $file->getFilename());
+			}
 		}
 	}
 	catch (UnexpectedValueException $e)
@@ -108,9 +110,12 @@ 
 							$real_path = parse_path(trim($hook_name));
 
 							if ($real_path == $hook_name)
-								$hook_status[$hook][$hook_name]['exists'] = false;
-							else
-								$hook_status[$hook][$hook_name]['exists'] = file_exists(parse_path(ltrim($real_path, '|')));
+							{
+															$hook_status[$hook][$hook_name]['exists'] = false;
+							}
+							else {
+															$hook_status[$hook][$hook_name]['exists'] = file_exists(parse_path(ltrim($real_path, '|')));
+							}
 
 							// I need to know if there is at least one function called in this file.
 							$temp_data['include'][basename($function)] = array('hook' => $hook, 'function' => $function);
@@ -175,10 +180,14 @@ 
 				// Checking all the functions within this particular file
 				// if any of them is enable then the file *must* be included and the integrate_*_include hook cannot be disabled
 				foreach ($temp_data['function'][$hook_status[$hook][$function]['in_file']] as $func)
-					$enabled = $enabled || strstr($func, ']') !== false;
+				{
+									$enabled = $enabled || strstr($func, ']') !== false;
+				}
 
 				if (!$enabled && !empty($current_hook))
-					$hook_status[$current_hook['hook']][$current_hook['function']]['enabled'] = true;
+				{
+									$hook_status[$current_hook['hook']][$current_hook['function']]['enabled'] = true;
+				}
 			}
 		}
 	}
@@ -241,9 +250,13 @@ 
 	foreach ($temp_data as $data)
 	{
 		if (++$counter < $start)
-			continue;
+		{
+					continue;
+		}
 		elseif ($counter == $start + $items_per_page)
-			break;
+		{
+					break;
+		}
 
 		$hooks_data[] = $data;
 	}
@@ -270,7 +283,9 @@ 
 	foreach ($hooks as $hook => $functions)
 	{
 		if (empty($filter) || ($filter == $hook))
-			$hooks_count += count($functions);
+		{
+					$hooks_count += count($functions);
+		}
 	}
 
 	return $hooks_count;
@@ -298,7 +313,9 @@ 
 		foreach ($modSettings as $key => $value)
 		{
 			if (!empty($value) && substr($key, 0, 10) === 'integrate_')
-				$integration_hooks[$key] = explode(',', $value);
+			{
+							$integration_hooks[$key] = explode(',', $value);
+			}
 		}
 	}