SimpleMachines / SMF2.1

Sources/ManagePermissions.php

Braces +312 added lines, -223 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Dispatches to the right function based on the given subaction.
@@ -176,8 +177,9 @@ 
 		// If it's inherited, just add it as a child.
 		if ($row['id_parent'] != -2)
 		{
-			if (isset($context['groups'][$row['id_parent']]))
-				$context['groups'][$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			if (isset($context['groups'][$row['id_parent']])) {
+							$context['groups'][$row['id_parent']]['children'][$row['id_group']] = $row['group_name'];
+			}
 			continue;
 		}
 
@@ -202,10 +204,11 @@ 
 			'access' => false,
 		);
 
-		if ($row['min_posts'] == -1)
-			$normalGroups[$row['id_group']] = $row['id_group'];
-		else
-			$postGroups[$row['id_group']] = $row['id_group'];
+		if ($row['min_posts'] == -1) {
+					$normalGroups[$row['id_group']] = $row['id_group'];
+		} else {
+					$postGroups[$row['id_group']] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($query);
 
@@ -221,8 +224,9 @@ 
 				'post_group_list' => $postGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -238,8 +242,9 @@ 
 				'normal_group_list' => $normalGroups,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 
 		// This one is slower, but it's okay... careful not to count twice!
@@ -256,15 +261,17 @@ 
 				'blank_string' => '',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$context['groups'][$row['id_group']]['num_members'] += $row['num_members'];
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
 	foreach ($context['groups'] as $id => $data)
 	{
-		if ($data['href'] != '')
-			$context['groups'][$id]['link'] = '<a href="' . $data['href'] . '">' . $data['num_members'] . '</a>';
+		if ($data['href'] != '') {
+					$context['groups'][$id]['link'] = '<a href="' . $data['href'] . '">' . $data['num_members'] . '</a>';
+		}
 	}
 
 	if (empty($_REQUEST['pid']))
@@ -278,9 +285,10 @@ 
 				'hidden_permissions' => !empty($context['hidden_permissions']) ? $context['hidden_permissions'] : array(),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
 				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] = $row['num_permissions'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Get the "default" profile permissions too.
@@ -297,17 +305,18 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
-				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1)) {
+							$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		$_REQUEST['pid'] = (int) $_REQUEST['pid'];
 
-		if (!isset($context['profiles'][$_REQUEST['pid']]))
-			fatal_lang_error('no_access', false);
+		if (!isset($context['profiles'][$_REQUEST['pid']])) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Change the selected tab to better reflect that this really is a board profile.
 		$context[$context['admin_menu_name']]['current_subsection'] = 'profiles';
@@ -323,8 +332,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
-				$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			if (isset($context['groups'][(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1)) {
+							$context['groups'][(int) $row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -366,8 +376,8 @@ 
 
 		if (!empty($changes))
 		{
-			foreach ($changes as $profile => $boards)
-				$smcFunc['db_query']('', '
+			foreach ($changes as $profile => $boards) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET id_profile = {int:current_profile}
 					WHERE id_board IN ({array_int:board_list})',
@@ -376,6 +386,7 @@ 
 						'current_profile' => $profile,
 					)
 				);
+			}
 		}
 
 		$context['edit_all'] = false;
@@ -400,8 +411,9 @@ 
 		);
 		foreach ($boardList[$catid] as $boardid)
 		{
-			if (!isset($context['profiles'][$boards[$boardid]['profile']]))
-				$boards[$boardid]['profile'] = 1;
+			if (!isset($context['profiles'][$boards[$boardid]['profile']])) {
+							$boards[$boardid]['profile'] = 1;
+			}
 
 			$context['categories'][$catid]['boards'][$boardid] = array(
 				'id' => &$boards[$boardid]['id'],
@@ -433,64 +445,74 @@ 
 	loadIllegalGuestPermissions();
 
 	// Make sure only one of the quick options was selected.
-	if ((!empty($_POST['predefined']) && ((isset($_POST['copy_from']) && $_POST['copy_from'] != 'empty') || !empty($_POST['permissions']))) || (!empty($_POST['copy_from']) && $_POST['copy_from'] != 'empty' && !empty($_POST['permissions'])))
-		fatal_lang_error('permissions_only_one_option', false);
+	if ((!empty($_POST['predefined']) && ((isset($_POST['copy_from']) && $_POST['copy_from'] != 'empty') || !empty($_POST['permissions']))) || (!empty($_POST['copy_from']) && $_POST['copy_from'] != 'empty' && !empty($_POST['permissions']))) {
+			fatal_lang_error('permissions_only_one_option', false);
+	}
 
-	if (empty($_POST['group']) || !is_array($_POST['group']))
-		$_POST['group'] = array();
+	if (empty($_POST['group']) || !is_array($_POST['group'])) {
+			$_POST['group'] = array();
+	}
 
 	// Only accept numeric values for selected membergroups.
-	foreach ($_POST['group'] as $id => $group_id)
-		$_POST['group'][$id] = (int) $group_id;
+	foreach ($_POST['group'] as $id => $group_id) {
+			$_POST['group'][$id] = (int) $group_id;
+	}
 	$_POST['group'] = array_unique($_POST['group']);
 
-	if (empty($_REQUEST['pid']))
-		$_REQUEST['pid'] = 0;
-	else
-		$_REQUEST['pid'] = (int) $_REQUEST['pid'];
+	if (empty($_REQUEST['pid'])) {
+			$_REQUEST['pid'] = 0;
+	} else {
+			$_REQUEST['pid'] = (int) $_REQUEST['pid'];
+	}
 
 	// Fix up the old global to the new default!
 	$bid = max(1, $_REQUEST['pid']);
 
 	// No modifying the predefined profiles.
-	if ($_REQUEST['pid'] > 1 && $_REQUEST['pid'] < 5)
-		fatal_lang_error('no_access', false);
+	if ($_REQUEST['pid'] > 1 && $_REQUEST['pid'] < 5) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Clear out any cached authority.
 	updateSettings(array('settings_updated' => time()));
 
 	// No groups where selected.
-	if (empty($_POST['group']))
-		redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+	if (empty($_POST['group'])) {
+			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+	}
 
 	// Set a predefined permission profile.
 	if (!empty($_POST['predefined']))
 	{
 		// Make sure it's a predefined permission set we expect.
-		if (!in_array($_POST['predefined'], array('restrict', 'standard', 'moderator', 'maintenance')))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!in_array($_POST['predefined'], array('restrict', 'standard', 'moderator', 'maintenance'))) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		foreach ($_POST['group'] as $group_id)
 		{
-			if (!empty($_REQUEST['pid']))
-				setPermissionLevel($_POST['predefined'], $group_id, $_REQUEST['pid']);
-			else
-				setPermissionLevel($_POST['predefined'], $group_id);
+			if (!empty($_REQUEST['pid'])) {
+							setPermissionLevel($_POST['predefined'], $group_id, $_REQUEST['pid']);
+			} else {
+							setPermissionLevel($_POST['predefined'], $group_id);
+			}
 		}
 	}
 	// Set a permission profile based on the permissions of a selected group.
 	elseif ($_POST['copy_from'] != 'empty')
 	{
 		// Just checking the input.
-		if (!is_numeric($_POST['copy_from']))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!is_numeric($_POST['copy_from'])) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		// Make sure the group we're copying to is never included.
 		$_POST['group'] = array_diff($_POST['group'], array($_POST['copy_from']));
 
 		// No groups left? Too bad.
-		if (empty($_POST['group']))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (empty($_POST['group'])) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		if (empty($_REQUEST['pid']))
 		{
@@ -504,22 +526,26 @@ 
 				)
 			);
 			$target_perm = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$target_perm[$row['permission']] = $row['add_deny'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$target_perm[$row['permission']] = $row['add_deny'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$inserts = array();
-			foreach ($_POST['group'] as $group_id)
-				foreach ($target_perm as $perm => $add_deny)
+			foreach ($_POST['group'] as $group_id) {
+							foreach ($target_perm as $perm => $add_deny)
 				{
 					// No dodgy permissions please!
 					if (!empty($context['illegal_permissions']) && in_array($perm, $context['illegal_permissions']))
 						continue;
-					if ($group_id == -1 && in_array($perm, $context['non_guest_permissions']))
-						continue;
+			}
+					if ($group_id == -1 && in_array($perm, $context['non_guest_permissions'])) {
+											continue;
+					}
 
-					if ($group_id != 1 && $group_id != 3)
-						$inserts[] = array($perm, $group_id, $add_deny);
+					if ($group_id != 1 && $group_id != 3) {
+											$inserts[] = array($perm, $group_id, $add_deny);
+					}
 				}
 
 			// Delete the previous permissions...
@@ -559,17 +585,19 @@ 
 			)
 		);
 		$target_perm = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$target_perm[$row['permission']] = $row['add_deny'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$target_perm[$row['permission']] = $row['add_deny'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$inserts = array();
-		foreach ($_POST['group'] as $group_id)
-			foreach ($target_perm as $perm => $add_deny)
+		foreach ($_POST['group'] as $group_id) {
+					foreach ($target_perm as $perm => $add_deny)
 			{
 				// Are these for guests?
 				if ($group_id == -1 && in_array($perm, $context['non_guest_permissions']))
 					continue;
+		}
 
 				$inserts[] = array($perm, $group_id, $bid, $add_deny);
 			}
@@ -607,13 +635,14 @@ 
 		list ($permissionType, $permission) = explode('/', $_POST['permissions']);
 
 		// Check whether our input is within expected range.
-		if (!in_array($_POST['add_remove'], array('add', 'clear', 'deny')) || !in_array($permissionType, array('membergroup', 'board')))
-			redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		if (!in_array($_POST['add_remove'], array('add', 'clear', 'deny')) || !in_array($permissionType, array('membergroup', 'board'))) {
+					redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		if ($_POST['add_remove'] == 'clear')
 		{
-			if ($permissionType == 'membergroup')
-				$smcFunc['db_query']('', '
+			if ($permissionType == 'membergroup') {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND permission = {string:current_permission}
@@ -624,8 +653,8 @@ 
 						'illegal_permissions' => !empty($context['illegal_permissions']) ? $context['illegal_permissions'] : array(),
 					)
 				);
-			else
-				$smcFunc['db_query']('', '
+			} else {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}board_permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND id_profile = {int:current_profile}
@@ -636,6 +665,7 @@ 
 						'current_permission' => $permission,
 					)
 				);
+			}
 		}
 		// Add a permission (either 'set' or 'deny').
 		else
@@ -644,32 +674,36 @@ 
 			$permChange = array();
 			foreach ($_POST['group'] as $groupID)
 			{
-				if ($groupID == -1 && in_array($permission, $context['non_guest_permissions']))
-					continue;
+				if ($groupID == -1 && in_array($permission, $context['non_guest_permissions'])) {
+									continue;
+				}
 
-				if ($permissionType == 'membergroup' && $groupID != 1 && $groupID != 3 && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions'])))
-					$permChange[] = array($permission, $groupID, $add_deny);
-				elseif ($permissionType != 'membergroup')
-					$permChange[] = array($permission, $groupID, $bid, $add_deny);
+				if ($permissionType == 'membergroup' && $groupID != 1 && $groupID != 3 && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions']))) {
+									$permChange[] = array($permission, $groupID, $add_deny);
+				} elseif ($permissionType != 'membergroup') {
+									$permChange[] = array($permission, $groupID, $bid, $add_deny);
+				}
 			}
 
 			if (!empty($permChange))
 			{
-				if ($permissionType == 'membergroup')
-					$smcFunc['db_insert']('replace',
+				if ($permissionType == 'membergroup') {
+									$smcFunc['db_insert']('replace',
 						'{db_prefix}permissions',
 						array('permission' => 'string', 'id_group' => 'int', 'add_deny' => 'int'),
 						$permChange,
 						array('permission', 'id_group')
 					);
+				}
 				// Board permissions go into the other table.
-				else
-					$smcFunc['db_insert']('replace',
+				else {
+									$smcFunc['db_insert']('replace',
 						'{db_prefix}board_permissions',
 						array('permission' => 'string', 'id_group' => 'int', 'id_profile' => 'int', 'add_deny' => 'int'),
 						$permChange,
 						array('permission', 'id_group', 'id_profile')
 					);
+				}
 			}
 		}
 
@@ -687,14 +721,16 @@ 
 {
 	global $context, $txt, $smcFunc, $modSettings;
 
-	if (!isset($_GET['group']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['group'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['group']['id'] = (int) $_GET['group'];
 
 	// It's not likely you'd end up here with this setting disabled.
-	if ($_GET['group'] == 1)
-		redirectexit('action=admin;area=permissions');
+	if ($_GET['group'] == 1) {
+			redirectexit('action=admin;area=permissions');
+	}
 
 	loadAllPermissions();
 	loadPermissionProfiles();
@@ -715,13 +751,14 @@ 
 		$smcFunc['db_free_result']($result);
 
 		// Cannot edit an inherited group!
-		if ($parent != -2)
-			fatal_lang_error('cannot_edit_permissions_inherited');
+		if ($parent != -2) {
+					fatal_lang_error('cannot_edit_permissions_inherited');
+		}
+	} elseif ($context['group']['id'] == -1) {
+			$context['group']['name'] = $txt['membergroups_guests'];
+	} else {
+			$context['group']['name'] = $txt['membergroups_members'];
 	}
-	elseif ($context['group']['id'] == -1)
-		$context['group']['name'] = $txt['membergroups_guests'];
-	else
-		$context['group']['name'] = $txt['membergroups_members'];
 
 	$context['profile']['id'] = empty($_GET['pid']) ? 0 : (int) $_GET['pid'];
 
@@ -767,8 +804,9 @@ 
 				'current_group' => $_GET['group'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$permissions['membergroup'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$permissions['membergroup'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -783,8 +821,9 @@ 
 			'current_profile' => $context['permission_type'] == 'membergroup' ? 1 : $context['profile']['id'],
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$permissions['board'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$permissions['board'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
+	}
 	$smcFunc['db_free_result']($result);
 
 	// Loop through each permission and set whether it's checked.
@@ -803,9 +842,9 @@ 
 					{
 						$curPerm['any']['select'] = in_array($perm['id'] . '_any', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_any', $permissions[$permissionType]['denied']) ? 'deny' : 'off');
 						$curPerm['own']['select'] = in_array($perm['id'] . '_own', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_own', $permissions[$permissionType]['denied']) ? 'deny' : 'off');
+					} else {
+											$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'deny' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
 					}
-					else
-						$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'deny' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
 
 						// Keep the last value if it's hidden.
 						if ($perm['hidden'] || $permissionArray['hidden'])
@@ -822,13 +861,13 @@ 
 									$perm['any']['id'],
 									$curPerm['any']['select'] == 'deny' && !empty($modSettings['permission_enable_deny']) ? 'deny' : $curPerm['any']['select'],
 								);
-							}
-							else
-								$context['hidden_perms'][] = array(
+							} else {
+															$context['hidden_perms'][] = array(
 									$permissionType,
 									$perm['id'],
 									$curPerm['select'] == 'deny' && !empty($modSettings['permission_enable_deny']) ? 'deny' : $curPerm['select'],
 								);
+							}
 						}
 				}
 			}
@@ -856,13 +895,14 @@ 
 	$_GET['pid'] = (int) $_GET['pid'];
 
 	// Cannot modify predefined profiles.
-	if ($_GET['pid'] > 1 && $_GET['pid'] < 5)
-		fatal_lang_error('no_access', false);
+	if ($_GET['pid'] > 1 && $_GET['pid'] < 5) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Verify this isn't inherited.
-	if ($_GET['group'] == -1 || $_GET['group'] == 0)
-		$parent = -2;
-	else
+	if ($_GET['group'] == -1 || $_GET['group'] == 0) {
+			$parent = -2;
+	} else
 	{
 		$result = $smcFunc['db_query']('', '
 			SELECT id_parent
@@ -877,8 +917,9 @@ 
 		$smcFunc['db_free_result']($result);
 	}
 
-	if ($parent != -2)
-		fatal_lang_error('cannot_edit_permissions_inherited');
+	if ($parent != -2) {
+			fatal_lang_error('cannot_edit_permissions_inherited');
+	}
 
 	$givePerms = array('membergroup' => array(), 'board' => array());
 
@@ -896,12 +937,13 @@ 
 		{
 			if (is_array($perm_array))
 			{
-				foreach ($perm_array as $permission => $value)
-					if ($value == 'on' || $value == 'deny')
+				foreach ($perm_array as $permission => $value) {
+									if ($value == 'on' || $value == 'deny')
 					{
 						// Don't allow people to escalate themselves!
 						if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions']))
 							continue;
+				}
 
 						$givePerms[$perm_type][] = array($_GET['group'], $permission, $value == 'deny' ? 0 : 1);
 					}
@@ -946,8 +988,9 @@ 
 	);
 	if (!empty($givePerms['board']))
 	{
-		foreach ($givePerms['board'] as $k => $v)
-			$givePerms['board'][$k][] = $profileid;
+		foreach ($givePerms['board'] as $k => $v) {
+					$givePerms['board'][$k][] = $profileid;
+		}
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}board_permissions',
 			array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int', 'id_profile' => 'int'),
@@ -988,8 +1031,9 @@ 
 
 	call_integration_hook('integrate_modify_permission_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['permission_settings_title'];
 	$context['sub_template'] = 'show_settings';
@@ -1040,8 +1084,9 @@ 
 					'min_posts' => -1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$post_groups[] = $row['id_group'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$post_groups[] = $row['id_group'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Remove'em.
@@ -1250,16 +1295,19 @@ 
 	// Make sure we're not granting someone too many permissions!
 	foreach ($groupLevels['global'][$level] as $k => $permission)
 	{
-		if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions']))
-			unset($groupLevels['global'][$level][$k]);
+		if (!empty($context['illegal_permissions']) && in_array($permission, $context['illegal_permissions'])) {
+					unset($groupLevels['global'][$level][$k]);
+		}
 
-		if ($group == -1 && in_array($permission, $context['non_guest_permissions']))
-			unset($groupLevels['global'][$level][$k]);
+		if ($group == -1 && in_array($permission, $context['non_guest_permissions'])) {
+					unset($groupLevels['global'][$level][$k]);
+		}
 	}
-	if ($group == -1)
-		foreach ($groupLevels['board'][$level] as $k => $permission)
+	if ($group == -1) {
+			foreach ($groupLevels['board'][$level] as $k => $permission)
 			if (in_array($permission, $context['non_guest_permissions']))
 				unset($groupLevels['board'][$level][$k]);
+	}
 
 	// Reset all cached permissions.
 	updateSettings(array('settings_updated' => time()));
@@ -1269,8 +1317,9 @@ 
 	{
 		$group = (int) $group;
 
-		if (empty($groupLevels['global'][$level]))
-			return;
+		if (empty($groupLevels['global'][$level])) {
+					return;
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}permissions
@@ -1292,8 +1341,9 @@ 
 		);
 
 		$groupInserts = array();
-		foreach ($groupLevels['global'][$level] as $permission)
-			$groupInserts[] = array($group, $permission);
+		foreach ($groupLevels['global'][$level] as $permission) {
+					$groupInserts[] = array($group, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}permissions',
@@ -1303,8 +1353,9 @@ 
 		);
 
 		$boardInserts = array();
-		foreach ($groupLevels['board'][$level] as $permission)
-			$boardInserts[] = array(1, $group, $permission);
+		foreach ($groupLevels['board'][$level] as $permission) {
+					$boardInserts[] = array(1, $group, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}board_permissions',
@@ -1335,8 +1386,9 @@ 
 		if (!empty($groupLevels['board'][$level]))
 		{
 			$boardInserts = array();
-			foreach ($groupLevels['board'][$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			foreach ($groupLevels['board'][$level] as $permission) {
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1359,8 +1411,9 @@ 
 			)
 		);
 
-		if (empty($boardLevels[$level]))
-			return;
+		if (empty($boardLevels[$level])) {
+					return;
+		}
 
 		// Get all the groups...
 		$query = $smcFunc['db_query']('', '
@@ -1378,8 +1431,9 @@ 
 			$group = $row[0];
 
 			$boardInserts = array();
-			foreach ($boardLevels[$level] as $permission)
-				$boardInserts[] = array($profile, $group, $permission);
+			foreach ($boardLevels[$level] as $permission) {
+							$boardInserts[] = array($profile, $group, $permission);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1392,8 +1446,9 @@ 
 
 		// Add permissions for ungrouped members.
 		$boardInserts = array();
-		foreach ($boardLevels[$level] as $permission)
-			$boardInserts[] = array($profile, 0, $permission);
+		foreach ($boardLevels[$level] as $permission) {
+					$boardInserts[] = array($profile, 0, $permission);
+		}
 
 		$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
@@ -1403,9 +1458,10 @@ 
 			);
 	}
 	// $profile and $group are both null!
-	else
-		fatal_lang_error('no_access', false);
-}
+	else {
+			fatal_lang_error('no_access', false);
+	}
+	}
 
 /**
  * Load permissions into $context['permissions'].
@@ -1606,15 +1662,17 @@ 
 		foreach ($permissionList as $permission => $permissionArray)
 		{
 			// If this is a guest permission we don't do it if it's the guest group.
-			if (isset($context['group']['id']) && $context['group']['id'] == -1 && in_array($permission, $context['non_guest_permissions']))
-				continue;
+			if (isset($context['group']['id']) && $context['group']['id'] == -1 && in_array($permission, $context['non_guest_permissions'])) {
+							continue;
+			}
 
 			// What groups will this permission be in?
 			$own_group = $permissionArray[1];
 
 			// First, Do these groups actually exist - if not add them.
-			if (!isset($permissionGroups[$permissionType][$own_group]))
-				$permissionGroups[$permissionType][$own_group] = true;
+			if (!isset($permissionGroups[$permissionType][$own_group])) {
+							$permissionGroups[$permissionType][$own_group] = true;
+			}
 
 			// What column should this be located into?
 			$position = !in_array($own_group, $leftPermissionGroups) ? 1 : 0;
@@ -1622,8 +1680,8 @@ 
 			// If the groups have not yet been created be sure to create them.
 			$bothGroups = array('own' => $own_group);
 
-			foreach ($bothGroups as $group)
-				if (!isset($context['permissions'][$permissionType]['columns'][$position][$group]))
+			foreach ($bothGroups as $group) {
+							if (!isset($context['permissions'][$permissionType]['columns'][$position][$group]))
 					$context['permissions'][$permissionType]['columns'][$position][$group] = array(
 						'type' => $permissionType,
 						'id' => $group,
@@ -1633,6 +1691,7 @@ 
 						'hidden' => false,
 						'permissions' => array()
 					);
+			}
 
 			$context['permissions'][$permissionType]['columns'][$position][$own_group]['permissions'][$permission] = array(
 				'id' => $permission,
@@ -1657,27 +1716,30 @@ 
 				{
 					$context['hidden_permissions'][] = $permission . '_own';
 					$context['hidden_permissions'][] = $permission . '_any';
+				} else {
+									$context['hidden_permissions'][] = $permission;
 				}
-				else
-					$context['hidden_permissions'][] = $permission;
 			}
 		}
 		ksort($context['permissions'][$permissionType]['columns']);
 
 		// Check we don't leave any empty groups - and mark hidden ones as such.
-		foreach ($context['permissions'][$permissionType]['columns'] as $column => $groups)
-			foreach ($groups as $id => $group)
+		foreach ($context['permissions'][$permissionType]['columns'] as $column => $groups) {
+					foreach ($groups as $id => $group)
 			{
 				if (empty($group['permissions']))
 					unset($context['permissions'][$permissionType]['columns'][$column][$id]);
+		}
 				else
 				{
 					$foundNonHidden = false;
-					foreach ($group['permissions'] as $permission)
-						if (empty($permission['hidden']))
+					foreach ($group['permissions'] as $permission) {
+											if (empty($permission['hidden']))
 							$foundNonHidden = true;
-					if (!$foundNonHidden)
-						$context['permissions'][$permissionType]['columns'][$column][$id]['hidden'] = true;
+					}
+					if (!$foundNonHidden) {
+											$context['permissions'][$permissionType]['columns'][$column][$id]['hidden'] = true;
+					}
 				}
 			}
 	}
@@ -1704,12 +1766,13 @@ 
 	$context['can_change_permissions'] = allowedTo('manage_permissions');
 
 	// Nothing to initialize here.
-	if (!$context['can_change_permissions'])
-		return;
+	if (!$context['can_change_permissions']) {
+			return;
+	}
 
 	// Load the permission settings for guests
-	foreach ($permissions as $permission)
-		$context[$permission] = array(
+	foreach ($permissions as $permission) {
+			$context[$permission] = array(
 			-1 => array(
 				'id' => -1,
 				'name' => $txt['membergroups_guests'],
@@ -1723,6 +1786,7 @@ 
 				'status' => 'off',
 			),
 		);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_group, CASE WHEN add_deny = {int:denied} THEN {string:deny} ELSE {string:on} END AS status, permission
@@ -1736,8 +1800,9 @@ 
 			'on' => 'on',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context[$row['permission']][$row['id_group']]['status'] = $row['status'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context[$row['permission']][$row['id_group']]['status'] = $row['status'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1758,14 +1823,15 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Initialize each permission as being 'off' until proven otherwise.
-		foreach ($permissions as $permission)
-			if (!isset($context[$permission][$row['id_group']]))
+		foreach ($permissions as $permission) {
+					if (!isset($context[$permission][$row['id_group']]))
 				$context[$permission][$row['id_group']] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 					'is_postgroup' => $row['min_posts'] != -1,
 					'status' => 'off',
 				);
+		}
 
 		$context[$row['permission']][$row['id_group']]['status'] = empty($row['status']) ? 'deny' : ($row['status'] == 1 ? 'on' : 'off');
 	}
@@ -1779,8 +1845,9 @@ 
 	{
 		foreach ($permissions as $permission)
 		{
-			if (isset($context[$permission][$group]))
-				unset($context[$permission][$group]);
+			if (isset($context[$permission][$group])) {
+							unset($context[$permission][$group]);
+			}
 		}
 	}
 
@@ -1788,8 +1855,9 @@ 
 	$non_guest_perms = array_intersect(str_replace(array('_any', '_own'), '', $permissions), $context['non_guest_permissions']);
 	foreach ($non_guest_perms as $permission)
 	{
-		if (isset($context[$permission][-1]))
-			unset($context[$permission][-1]);
+		if (isset($context[$permission][-1])) {
+					unset($context[$permission][-1]);
+		}
 	}
 
 	// Create the token for the separate inline permission verification.
@@ -1824,8 +1892,9 @@ 
 	global $context, $smcFunc;
 
 	// No permissions? Not a great deal to do here.
-	if (!allowedTo('manage_permissions'))
-		return;
+	if (!allowedTo('manage_permissions')) {
+			return;
+	}
 
 	// Almighty session check, verify our ways.
 	checkSession();
@@ -1837,13 +1906,15 @@ 
 	$insertRows = array();
 	foreach ($permissions as $permission)
 	{
-		if (!isset($_POST[$permission]))
-			continue;
+		if (!isset($_POST[$permission])) {
+					continue;
+		}
 
 		foreach ($_POST[$permission] as $id_group => $value)
 		{
-			if (in_array($value, array('on', 'deny')) && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions'])))
-				$insertRows[] = array((int) $id_group, $permission, $value == 'on' ? 1 : 0);
+			if (in_array($value, array('on', 'deny')) && (empty($context['illegal_permissions']) || !in_array($permission, $context['illegal_permissions']))) {
+							$insertRows[] = array((int) $id_group, $permission, $value == 'on' ? 1 : 0);
+			}
 		}
 	}
 
@@ -1859,13 +1930,14 @@ 
 	);
 
 	// ...and replace them with new ones.
-	if (!empty($insertRows))
-		$smcFunc['db_insert']('insert',
+	if (!empty($insertRows)) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}permissions',
 			array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 			$insertRows,
 			array('id_group', 'permission')
 		);
+	}
 
 	// Do a full child update.
 	updateChildPermissions(array(), -1);
@@ -1892,10 +1964,11 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Format the label nicely.
-		if (isset($txt['permissions_profile_' . $row['profile_name']]))
-			$name = $txt['permissions_profile_' . $row['profile_name']];
-		else
-			$name = $row['profile_name'];
+		if (isset($txt['permissions_profile_' . $row['profile_name']])) {
+					$name = $txt['permissions_profile_' . $row['profile_name']];
+		} else {
+					$name = $row['profile_name'];
+		}
 
 		$context['profiles'][$row['id_profile']] = array(
 			'id' => $row['id_profile'],
@@ -1950,17 +2023,19 @@ 
 			)
 		);
 		$inserts = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$inserts[] = array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$inserts[] = array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($inserts))
-			$smcFunc['db_insert']('insert',
+		if (!empty($inserts)) {
+					$smcFunc['db_insert']('insert',
 				'{db_prefix}board_permissions',
 				array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 				$inserts,
 				array('id_profile', 'id_group', 'permission')
 			);
+		}
 	}
 	// Renaming?
 	elseif (isset($_POST['rename']))
@@ -1969,16 +2044,16 @@ 
 		validateToken('admin-mpp');
 
 		// Just showing the boxes?
-		if (!isset($_POST['rename_profile']))
-			$context['show_rename_boxes'] = true;
-		else
+		if (!isset($_POST['rename_profile'])) {
+					$context['show_rename_boxes'] = true;
+		} else
 		{
 			foreach ($_POST['rename_profile'] as $id => $value)
 			{
 				$value = $smcFunc['htmlspecialchars']($value);
 
-				if (trim($value) != '' && $id > 4)
-					$smcFunc['db_query']('', '
+				if (trim($value) != '' && $id > 4) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}permission_profiles
 						SET profile_name = {string:profile_name}
 						WHERE id_profile = {int:current_profile}',
@@ -1987,6 +2062,7 @@ 
 							'profile_name' => $value,
 						)
 					);
+				}
 			}
 		}
 	}
@@ -1997,9 +2073,10 @@ 
 		validateToken('admin-mpp');
 
 		$profiles = array();
-		foreach ($_POST['delete_profile'] as $profile)
-			if ($profile > 4)
+		foreach ($_POST['delete_profile'] as $profile) {
+					if ($profile > 4)
 				$profiles[] = (int) $profile;
+		}
 
 		// Verify it's not in use...
 		$request = $smcFunc['db_query']('', '
@@ -2011,8 +2088,9 @@ 
 				'profile_list' => $profiles,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('no_access', false);
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Oh well, delete.
@@ -2036,10 +2114,11 @@ 
 		array(
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (isset($context['profiles'][$row['id_profile']]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (isset($context['profiles'][$row['id_profile']]))
 		{
 			$context['profiles'][$row['id_profile']]['in_use'] = true;
+	}
 			$context['profiles'][$row['id_profile']]['boards'] = $row['board_count'];
 			$context['profiles'][$row['id_profile']]['boards_text'] = $row['board_count'] > 1 ? sprintf($txt['permissions_profile_used_by_many'], $row['board_count']) : $txt['permissions_profile_used_by_' . ($row['board_count'] ? 'one' : 'none')];
 		}
@@ -2051,8 +2130,9 @@ 
 	{
 		// Can't delete special ones.
 		$context['profiles'][$id]['can_edit'] = isset($txt['permissions_profile_' . $profile['unformatted_name']]) ? false : true;
-		if ($context['profiles'][$id]['can_edit'])
-			$context['can_edit_something'] = true;
+		if ($context['profiles'][$id]['can_edit']) {
+					$context['can_edit_something'] = true;
+		}
 
 		// You can only delete it if you can edit it AND it's not in use.
 		$context['profiles'][$id]['can_delete'] = $context['profiles'][$id]['can_edit'] && empty($profile['in_use']) ? true : false;
@@ -2073,8 +2153,9 @@ 
 	global $smcFunc;
 
 	// All the parent groups to sort out.
-	if (!is_array($parents))
-		$parents = array($parents);
+	if (!is_array($parents)) {
+			$parents = array($parents);
+	}
 
 	// Find all the children of this group.
 	$request = $smcFunc['db_query']('', '
@@ -2101,8 +2182,9 @@ 
 	$parents = array_unique($parents);
 
 	// Not a sausage, or a child?
-	if (empty($children))
-		return false;
+	if (empty($children)) {
+			return false;
+	}
 
 	// First off, are we doing general permissions?
 	if ($profile < 1 || $profile === null)
@@ -2117,9 +2199,10 @@ 
 			)
 		);
 		$permissions = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			foreach ($children[$row['id_group']] as $child)
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					foreach ($children[$row['id_group']] as $child)
 				$permissions[] = array($child, $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
 		$smcFunc['db_query']('', '
@@ -2159,9 +2242,10 @@ 
 			)
 		);
 		$permissions = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			foreach ($children[$row['id_group']] as $child)
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					foreach ($children[$row['id_group']] as $child)
 				$permissions[] = array($child, $row['id_profile'], $row['permission'], $row['add_deny']);
+		}
 		$smcFunc['db_free_result']($request);
 
 		$smcFunc['db_query']('', '
@@ -2195,12 +2279,15 @@ 
 	global $context;
 
 	$context['illegal_permissions'] = array();
-	if (!allowedTo('admin_forum'))
-		$context['illegal_permissions'][] = 'admin_forum';
-	if (!allowedTo('manage_membergroups'))
-		$context['illegal_permissions'][] = 'manage_membergroups';
-	if (!allowedTo('manage_permissions'))
-		$context['illegal_permissions'][] = 'manage_permissions';
+	if (!allowedTo('admin_forum')) {
+			$context['illegal_permissions'][] = 'admin_forum';
+	}
+	if (!allowedTo('manage_membergroups')) {
+			$context['illegal_permissions'][] = 'manage_membergroups';
+	}
+	if (!allowedTo('manage_permissions')) {
+			$context['illegal_permissions'][] = 'manage_permissions';
+	}
 
 	call_integration_hook('integrate_load_illegal_permissions');
 }
@@ -2349,16 +2436,17 @@ 
 				'attachment' => 'disallow',
 				'children' => array(),
 			);
+		} elseif (isset($context['profile_groups'][$row['id_parent']])) {
+					$context['profile_groups'][$row['id_parent']]['children'][] = $row['group_name'];
 		}
-		elseif (isset($context['profile_groups'][$row['id_parent']]))
-			$context['profile_groups'][$row['id_parent']]['children'][] = $row['group_name'];
 	}
 	$smcFunc['db_free_result']($request);
 
 	// What are the permissions we are querying?
 	$all_permissions = array();
-	foreach ($mappings as $perm_set)
-		$all_permissions = array_merge($all_permissions, $perm_set);
+	foreach ($mappings as $perm_set) {
+			$all_permissions = array_merge($all_permissions, $perm_set);
+	}
 
 	// If we're saving the changes then do just that - save them.
 	if (!empty($_POST['save_changes']) && ($context['current_profile'] == 1 || $context['current_profile'] > 4))
@@ -2373,8 +2461,7 @@ 
 			{
 				// Turning it on. This seems easy enough.
 				updateSettings(array('postmod_active' => 1));
-			}
-			else
+			} else
 			{
 				// Turning it off. Not so straightforward. We have to turn off warnings to moderation level, and make everything approved.
 				updateSettings(array(
@@ -2385,8 +2472,7 @@ 
 				require_once($sourcedir . '/PostModeration.php');
 				approveAllData();
 			}
-		}
-		elseif ($modSettings['postmod_active'])
+		} elseif ($modSettings['postmod_active'])
 		{
 			// We're not saving a new setting - and if it's still enabled we have more work to do.
 
@@ -2416,21 +2502,22 @@ 
 							// Give them both sets for fun.
 							$new_permissions[] = array($context['current_profile'], $group['id'], $data[0], 1);
 							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
+						} elseif ($_POST[$index][$group['id']] == 'moderate') {
+													$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
 						}
-						elseif ($_POST[$index][$group['id']] == 'moderate')
-							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
 					}
 				}
 			}
 
 			// Insert new permissions.
-			if (!empty($new_permissions))
-				$smcFunc['db_insert']('',
+			if (!empty($new_permissions)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}board_permissions',
 					array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$new_permissions,
 					array('id_profile', 'id_group', 'permission')
 				);
+			}
 		}
 	}
 
@@ -2459,11 +2546,13 @@ 
 					if ($row['add_deny'])
 					{
 						// Full allowance?
-						if ($index == 0)
-							$context['profile_groups'][$row['id_group']][$key] = 'allow';
+						if ($index == 0) {
+													$context['profile_groups'][$row['id_group']][$key] = 'allow';
+						}
 						// Otherwise only bother with moderate if not on allow.
-						elseif ($context['profile_groups'][$row['id_group']][$key] != 'allow')
-							$context['profile_groups'][$row['id_group']][$key] = 'moderate';
+						elseif ($context['profile_groups'][$row['id_group']][$key] != 'allow') {
+													$context['profile_groups'][$row['id_group']][$key] = 'moderate';
+						}
 					}
 				}
 			}

Sources/Subs-Recent.php

Braces +5 added lines, -3 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get the latest posts of a forum.
@@ -59,8 +60,9 @@ 
 		censorText($row['body']);
 
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-		if ($smcFunc['strlen']($row['body']) > 128)
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		if ($smcFunc['strlen']($row['body']) > 128) {
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		}
 
 		// Build the array.
 		$posts[] = array(

Sources/Help.php

Braces +29 added lines, -22 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Redirect to the user help ;).
@@ -95,12 +96,13 @@ 
 	);
 
 	// Have we got a localized one?
-	if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt'))
-		$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
-	elseif (file_exists($boarddir . '/agreement.txt'))
-		$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
-	else
-		$context['agreement'] = '';
+	if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) {
+			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
+	} elseif (file_exists($boarddir . '/agreement.txt')) {
+			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
+	} else {
+			$context['agreement'] = '';
+	}
 
 	// Nothing to show, so let's get out of here
 	if (empty($context['agreement']))
@@ -128,18 +130,21 @@ 
 {
 	global $txt, $helptxt, $context, $scripturl;
 
-	if (!isset($_GET['help']) || !is_string($_GET['help']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['help']) || !is_string($_GET['help'])) {
+			fatal_lang_error('no_access', false);
+	}
 
-	if (!isset($helptxt))
-		$helptxt = array();
+	if (!isset($helptxt)) {
+			$helptxt = array();
+	}
 
 	// Load the admin help language file and template.
 	loadLanguage('Help');
 
 	// Permission specific help?
-	if (isset($_GET['help']) && substr($_GET['help'], 0, 14) == 'permissionhelp')
-		loadLanguage('ManagePermissions');
+	if (isset($_GET['help']) && substr($_GET['help'], 0, 14) == 'permissionhelp') {
+			loadLanguage('ManagePermissions');
+	}
 
 	loadTemplate('Help');
 
@@ -154,16 +159,18 @@ 
 	$context['sub_template'] = 'popup';
 
 	// What help string should be used?
-	if (isset($helptxt[$_GET['help']]))
-		$context['help_text'] = $helptxt[$_GET['help']];
-	elseif (isset($txt[$_GET['help']]))
-		$context['help_text'] = $txt[$_GET['help']];
-	else
-		$context['help_text'] = $_GET['help'];
+	if (isset($helptxt[$_GET['help']])) {
+			$context['help_text'] = $helptxt[$_GET['help']];
+	} elseif (isset($txt[$_GET['help']])) {
+			$context['help_text'] = $txt[$_GET['help']];
+	} else {
+			$context['help_text'] = $_GET['help'];
+	}
 
 	// Does this text contain a link that we should fill in?
-	if (preg_match('~%([0-9]+\$)?s\?~', $context['help_text'], $match))
-		$context['help_text'] = sprintf($context['help_text'], $scripturl, $context['session_id'], $context['session_var']);
-}
+	if (preg_match('~%([0-9]+\$)?s\?~', $context['help_text'], $match)) {
+			$context['help_text'] = sprintf($context['help_text'], $scripturl, $context['session_id'], $context['session_var']);
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/ManageRegistration.php

Braces +27 added lines, -19 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entrance point for the registration center, it checks permissions and forwards
@@ -31,8 +32,9 @@ 
 	global $context, $txt;
 
 	// Old templates might still request this.
-	if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'browse')
-		redirectexit('action=admin;area=viewmembers;sa=browse' . (isset($_REQUEST['type']) ? ';type=' . $_REQUEST['type'] : ''));
+	if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'browse') {
+			redirectexit('action=admin;area=viewmembers;sa=browse' . (isset($_REQUEST['type']) ? ';type=' . $_REQUEST['type'] : ''));
+	}
 
 	$subActions = array(
 		'register' => array('AdminRegister', 'moderate_forum'),
@@ -99,9 +101,10 @@ 
 		checkSession();
 		validateToken('admin-regc');
 
-		foreach ($_POST as $key => $value)
-			if (!is_array($_POST[$key]))
+		foreach ($_POST as $key => $value) {
+					if (!is_array($_POST[$key]))
 				$_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key]));
+		}
 
 		$regOptions = array(
 			'interface' => 'admin',
@@ -161,12 +164,13 @@ 
 			)
 		);
 		$context['member_groups'] = array(0 => $txt['admin_register_group_none']);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['member_groups'][$row['id_group']] = $row['group_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['member_groups'][$row['id_group']] = $row['group_name'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$context['member_groups'] = array();
 	}
-	else
-		$context['member_groups'] = array();
 
 	// Basic stuff.
 	$context['sub_template'] = 'admin_register';
@@ -207,8 +211,9 @@ 
 		{
 			$context['editable_agreements']['.' . $lang['filename']] = $lang['name'];
 			// Are we editing this?
-			if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename'])
-				$context['current_agreement'] = '.' . $lang['filename'];
+			if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename']) {
+							$context['current_agreement'] = '.' . $lang['filename'];
+			}
 		}
 	}
 
@@ -223,10 +228,11 @@ 
 
 		updateSettings(array('requireAgreement' => !empty($_POST['requireAgreement'])));
 
-		if ($bytes == strlen($to_write))
-			$context['saved_successful'] = true;
-		else
-			$context['could_not_save'] = true;
+		if ($bytes == strlen($to_write)) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['could_not_save'] = true;
+		}
 	}
 
 	$context['agreement'] = file_exists($boarddir . '/agreement' . $context['current_agreement'] . '.txt') ? $smcFunc['htmlspecialchars'](file_get_contents($boarddir . '/agreement' . $context['current_agreement'] . '.txt')) : '';
@@ -310,8 +316,9 @@ 
 
 	call_integration_hook('integrate_modify_registration_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template
 	$context['sub_template'] = 'show_settings';
@@ -322,8 +329,9 @@ 
 		checkSession();
 
 		// Are there some contacts missing?
-		if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax']))
-			fatal_lang_error('admin_setting_coppa_require_contact');
+		if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax'])) {
+					fatal_lang_error('admin_setting_coppa_require_contact');
+		}
 
 		// Post needs to take into account line breaks.
 		$_POST['coppaPost'] = str_replace("\n", '<br>', empty($_POST['coppaPost']) ? '' : $_POST['coppaPost']);

Sources/ReportedContent.php

Braces +61 added lines, -46 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Sets and call a function based on the given subaction. Acts as a dispatcher function.
@@ -54,8 +55,9 @@ 
 	);
 
 	// This comes under the umbrella of moderating posts.
-	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1')
-		isAllowedTo('moderate_forum');
+	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1') {
+			isAllowedTo('moderate_forum');
+	}
 
 	$subActions = array(
 		'show' => 'ShowReports',
@@ -70,11 +72,11 @@ 
 	call_integration_hook('integrate_reported_' . $context['report_type'], array(&$subActions));
 
 	// By default we call the open sub-action.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
-
-	else
-		$context['sub_action'] = 'show';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
+	} else {
+			$context['sub_action'] = 'show';
+	}
 
 	// Hi Ho Silver Away!
 	call_helper($subActions[$context['sub_action']]);
@@ -116,11 +118,13 @@ 
 
 		// All the ones to update...
 		$toClose = array();
-		foreach ($_POST['close'] as $rid)
-			$toClose[] = (int) $rid;
+		foreach ($_POST['close'] as $rid) {
+					$toClose[] = (int) $rid;
+		}
 
-		if (!empty($toClose))
-			updateReport('closed', 1, $toClose);
+		if (!empty($toClose)) {
+					updateReport('closed', 1, $toClose);
+		}
 
 		// Set the confirmation message.
 		$_SESSION['rc_confirmation'] = 'close_all';
@@ -175,8 +179,9 @@ 
 	global $context, $sourcedir, $scripturl, $txt;
 
 	// Have to at least give us something to work with.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please
 	$report_id = (int) $_REQUEST['rid'];
@@ -184,8 +189,9 @@ 
 	// Get the report details.
 	$report = getReportDetails($report_id);
 
-	if (!$report)
-		fatal_lang_error('mc_no_modreport_found');
+	if (!$report) {
+			fatal_lang_error('mc_no_modreport_found');
+	}
 
 	// Build the report data - basic details first, then extra stuff based on the type
 	$context['report'] = array(
@@ -211,8 +217,7 @@ 
 				'href' => $scripturl . '?action=profile;u=' . $report['id_user'],
 			),
 		);
-	}
-	else
+	} else
 	{
 		$extraDetails = array(
 			'topic_id' => $report['id_topic'],
@@ -235,8 +240,9 @@ 
 
 	$reportComments = getReportComments($report_id);
 
-	if (!empty($reportComments))
-		$context['report'] = array_merge($context['report'], $reportComments);
+	if (!empty($reportComments)) {
+			$context['report'] = array_merge($context['report'], $reportComments);
+	}
 
 	// What have the other moderators done to this message?
 	require_once($sourcedir . '/Modlog.php');
@@ -257,8 +263,7 @@ 
 			1,
 			true,
 		);
-	}
-	else
+	} else
 	{
 		$params = array(
 			'lm.id_topic = {int:id_topic}
@@ -358,16 +363,16 @@ 
 	createList($listOptions);
 
 	// Make sure to get the correct tab selected.
-	if ($context['report']['closed'])
-		$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	if ($context['report']['closed']) {
+			$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	}
 
 	// Finally we are done :P
 	if ($context['report_type'] == 'members')
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmemberreport'], $context['report']['user']['name']);
 		$context['sub_template'] = 'viewmemberreport';
-	}
-	else
+	} else
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmodreport'], $context['report']['subject'], $context['report']['author']['name']);
 		$context['sub_template'] = 'viewmodreport';
@@ -390,8 +395,9 @@ 
 	global $smcFunc, $scripturl, $user_info, $context;
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please.
 	$report_id = (int) $_REQUEST['rid'];
@@ -416,8 +422,9 @@ 
 		checkSession('get');
 		validateToken('mod-reportC-delete', 'get');
 
-		if (empty($_REQUEST['mid']))
-			fatal_lang_error('mc_reportedp_comment_none_found');
+		if (empty($_REQUEST['mid'])) {
+					fatal_lang_error('mc_reportedp_comment_none_found');
+		}
 
 		$comment_id = (int) $_REQUEST['mid'];
 
@@ -425,15 +432,17 @@ 
 		$comment = getCommentModDetails($comment_id);
 
 		// Perhaps somebody else already deleted this fine gem...
-		if (empty($comment))
-			fatal_lang_error('report_action_message_delete_issue');
+		if (empty($comment)) {
+					fatal_lang_error('report_action_message_delete_issue');
+		}
 
 		// Can you actually do this?
 		$comment_owner = $user_info['id'] == $comment['id_member'];
 
 		// Nope! sorry.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_delete_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_delete_cannot');
+		}
 
 		// All good!
 		deleteModComment($comment_id);
@@ -458,11 +467,13 @@ 
 	checkSession(isset($_REQUEST['save']) ? 'post' : 'get');
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
-	if (empty($_REQUEST['mid']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($_REQUEST['mid'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Integers only please.
 	$context['report_id'] = (int) $_REQUEST['rid'];
@@ -470,8 +481,9 @@ 
 
 	$context['comment'] = getCommentModDetails($context['comment_id']);
 
-	if (empty($context['comment']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($context['comment'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Set up the comforting bits...
 	$context['page_title'] = $txt['mc_reported_posts'];
@@ -482,15 +494,17 @@ 
 		validateToken('mod-reportC-edit');
 
 		// Make sure there is some data to edit on the DB.
-		if (empty($context['comment']))
-			fatal_lang_error('report_action_message_edit_issue');
+		if (empty($context['comment'])) {
+					fatal_lang_error('report_action_message_edit_issue');
+		}
 
 		// Still there, good, now lets see if you can actually edit it...
 		$comment_owner = $user_info['id'] == $context['comment']['id_member'];
 
 		// So, you aren't neither an admin or the comment owner huh? that's too bad.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_edit_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_edit_cannot');
+		}
 
 		// All good!
 		$edited_comment = trim($smcFunc['htmlspecialchars']($_POST['mod_comment']));
@@ -516,8 +530,9 @@ 
 	checkSession('get');
 
 	// We need to do something!
-	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed'])))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed']))) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// What are we gonna do?
 	$action = isset($_GET['ignore']) ? 'ignore' : 'closed';

Sources/Attachments.php

Braces +102 added lines, -75 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class Attachments
 {
@@ -70,16 +71,18 @@ 
 
 		$this->_sa = !empty($_REQUEST['sa']) ? $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($_REQUEST['sa'])) : false;
 
-		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions))
-			$this->{$this->_sa}();
+		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions)) {
+					$this->{$this->_sa}();
+		}
 
 		// Just send a generic message.
-		else
-			$this->setResponse(array(
+		else {
+					$this->setResponse(array(
 				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Back to the future, oh, to the browser!
 		$this->sendResponse();
@@ -95,12 +98,13 @@ 
 		$attachID = !empty($_REQUEST['attach']) && is_numeric($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : 0;
 
 		// Need something to work with.
-		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID])))
-			return $this->setResponse(array(
+		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID]))) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Lets pass some params and see what happens :P
 		$affectedMessage = removeAttachments(array('id_attach' => $attachID), '', true, true);
@@ -119,19 +123,21 @@ 
 	public function add()
 	{
 		// You gotta be able to post attachments.
-		if (!$this->_canPostAttachment)
-			return $this->setResponse(array(
+		if (!$this->_canPostAttachment) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_cannot',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Process them at once!
 		$this->processAttachments();
 
 		// The attachments was created and moved the the right folder, time to update the DB.
-		if (!empty($_SESSION['temp_attachments']))
-			$this->createAtttach();
+		if (!empty($_SESSION['temp_attachments'])) {
+					$this->createAtttach();
+		}
 
 		// Set the response.
 		$this->setResponse();
@@ -144,8 +150,9 @@ 
 	{
 		global $context, $modSettings, $smcFunc, $user_info, $txt;
 
-		if (!isset($_FILES['attachment']['name']))
-			$_FILES['attachment']['tmp_name'] = array();
+		if (!isset($_FILES['attachment']['name'])) {
+					$_FILES['attachment']['tmp_name'] = array();
+		}
 
 		// If there are attachments, calculate the total size and how many.
 		$context['attachments']['total_size'] = 0;
@@ -155,25 +162,30 @@ 
 		if (isset($_REQUEST['msg']))
 		{
 			$context['attachments']['quantity'] = count($context['current_attachments']);
-			foreach ($context['current_attachments'] as $attachment)
-				$context['attachments']['total_size'] += $attachment['size'];
+			foreach ($context['current_attachments'] as $attachment) {
+							$context['attachments']['total_size'] += $attachment['size'];
+			}
 		}
 
 		// A bit of house keeping first.
-		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
-			unset($_SESSION['temp_attachments']);
+		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
+					unset($_SESSION['temp_attachments']);
+		}
 
 		// Our infamous SESSION var, we are gonna have soo much fun with it!
-		if (!isset($_SESSION['temp_attachments']))
-			$_SESSION['temp_attachments'] = array();
+		if (!isset($_SESSION['temp_attachments'])) {
+					$_SESSION['temp_attachments'] = array();
+		}
 
 		// Make sure we're uploading to the right place.
-		if (!empty($modSettings['automanage_attachments']))
-			automanage_attachments_check_directory();
+		if (!empty($modSettings['automanage_attachments'])) {
+					automanage_attachments_check_directory();
+		}
 
 		// Is the attachments folder actually there?
-		if (!empty($context['dir_creation_error']))
-			$this->_generalErrors[] = $context['dir_creation_error'];
+		if (!empty($context['dir_creation_error'])) {
+					$this->_generalErrors[] = $context['dir_creation_error'];
+		}
 
 		// The current attach folder ha some issues...
 		elseif (!is_dir($this->_attchDir))
@@ -198,13 +210,12 @@ 
 			);
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-
-		else
-			$context['attachments'] = array(
+		} else {
+					$context['attachments'] = array(
 				'quantity' => 0,
 				'total_size' => 0,
 			);
+		}
 
 		// Check for other general errors here.
 
@@ -212,9 +223,10 @@ 
 		if (!empty($this->_generalErrors))
 		{
 			// And delete the files 'cos they ain't going nowhere.
-			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+							if (file_exists($_FILES['attachment']['tmp_name'][$n]))
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 
 			$_FILES['attachment']['tmp_name'] = array();
 
@@ -225,26 +237,29 @@ 
 		// 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;
+			if ($_FILES['attachment']['name'][$n] == '') {
+							continue;
+			}
 
 			// First, let's first check for PHP upload errors.
 			$errors = array();
 			if (!empty($_FILES['attachment']['error'][$n]))
 			{
-				if ($_FILES['attachment']['error'][$n] == 2)
-					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
-
-				else
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				if ($_FILES['attachment']['error'][$n] == 2) {
+									$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+				} else {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				}
 
 				// Log this one, because...
-				if ($_FILES['attachment']['error'][$n] == 6)
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				if ($_FILES['attachment']['error'][$n] == 6) {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				}
 
 				// Weird, no errors were cached, still fill out a generic one.
-				if (empty($errors))
-					$errors[] = 'attach_php_error';
+				if (empty($errors)) {
+									$errors[] = 'attach_php_error';
+				}
 			}
 
 			// Try to move and rename the file before doing any more checks on it.
@@ -256,8 +271,9 @@ 
 			{
 				// The reported MIME type of the attachment might not be reliable.
 				// Fortunately, PHP 5.3+ lets us easily verify the real MIME type.
-				if (function_exists('mime_content_type'))
-					$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				if (function_exists('mime_content_type')) {
+									$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				}
 
 				$_SESSION['temp_attachments'][$attachID] = array(
 					'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -269,16 +285,18 @@ 
 				);
 
 				// Move the file to the attachments folder with a temp name for now.
-				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-					smf_chmod($destName, 0644);
+				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+									smf_chmod($destName, 0644);
+				}
 
 				// This is madness!!
 				else
 				{
 					// File couldn't be moved.
 					$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
-					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-						unlink($_FILES['attachment']['tmp_name'][$n]);
+					if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+											unlink($_FILES['attachment']['tmp_name'][$n]);
+					}
 				}
 			}
 
@@ -291,13 +309,15 @@ 
 					'errors' => $errors,
 				);
 
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
 			// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-			if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-				attachmentChecks($attachID);
+			if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+							attachmentChecks($attachID);
+			}
 		}
 
 		// Mod authors, finally a hook to hang an alternate attachment upload system upon
@@ -344,14 +364,15 @@ 
 
 					$_SESSION['already_attached'][$attachmentOptions['attachID']] = $attachmentOptions['attachID'];
 
-					if (!empty($attachmentOptions['thumb']))
-						$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					if (!empty($attachmentOptions['thumb'])) {
+											$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					}
 
-					if ($this->_msg)
-						assignAttachments($_SESSION['already_attached'], $this->_msg);
+					if ($this->_msg) {
+											assignAttachments($_SESSION['already_attached'], $this->_msg);
+					}
 				}
-			}
-			else
+			} else
 			{
 				// Sort out the errors for display and delete any associated files.
 				$log_these = array('attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file');
@@ -363,14 +384,16 @@ 
 					if (!is_array($error))
 					{
 						$attachmentOptions['errors'][] = $txt[$error];
-						if (in_array($error, $log_these))
-							log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						if (in_array($error, $log_these)) {
+													log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						}
+					} else {
+											$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 					}
-					else
-						$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 				}
-				if (file_exists($attachment['tmp_name']))
-					unlink($attachment['tmp_name']);
+				if (file_exists($attachment['tmp_name'])) {
+									unlink($attachment['tmp_name']);
+				}
 			}
 
 			// Regardless of errors, pass the results.
@@ -378,8 +401,9 @@ 
 		}
 
 		// Temp save this on the db.
-		if (!empty($_SESSION['already_attached']))
-			$this->_attachSuccess = $_SESSION['already_attached'];
+		if (!empty($_SESSION['already_attached'])) {
+					$this->_attachSuccess = $_SESSION['already_attached'];
+		}
 
 		unset($_SESSION['temp_attachments']);
 	}
@@ -399,14 +423,16 @@ 
 		if ($this->_sa == 'add')
 		{
 			// Is there any generic errors? made some sense out of them!
-			if ($this->_generalErrors)
-				foreach ($this->_generalErrors as $k => $v)
+			if ($this->_generalErrors) {
+							foreach ($this->_generalErrors as $k => $v)
 					$this->_generalErrors[$k] = (is_array($v) ? vsprintf($txt[$v[0]], $v[1]) : $txt[$v]);
+			}
 
 			// Gotta urlencode the filename.
-			if ($this->_attachResults)
-				foreach ($this->_attachResults as $k => $v)
+			if ($this->_attachResults) {
+							foreach ($this->_attachResults as $k => $v)
 					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
+			}
 
 			$this->_response = array(
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -415,9 +441,10 @@ 
 		}
 
 		// Rest of us mere mortals gets no special treatment...
-		elseif (!empty($data))
-			if (!empty($data['text']) && !empty($txt[$data['text']]))
+		elseif (!empty($data)) {
+					if (!empty($data['text']) && !empty($txt[$data['text']]))
 				$this->_response['text'] = $txt[$data['text']];
+		}
 	}
 
 	protected function sendResponse()
@@ -426,11 +453,11 @@ 
 
 		ob_end_clean();
 
-		if (!empty($modSettings['CompressedOutput']))
-			@ob_start('ob_gzhandler');
-
-		else
-			ob_start();
+		if (!empty($modSettings['CompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
 		// Set the header.
 		header('Content-Type: application/json; charset='. $context['character_set'] .'');

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
 		// Just send a generic message.
 		else
 			$this->setResponse(array(
-				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
+				'text' => $this->_sa == 'add' ? 'attach_error_title' : 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
@@ -406,7 +406,7 @@ 
 			// Gotta urlencode the filename.
 			if ($this->_attachResults)
 				foreach ($this->_attachResults as $k => $v)
-					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
+					$this->_attachResults[$k]['name'] = urlencode($this->_attachResults[$k]['name']);
 
 			$this->_response = array(
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -433,7 +433,7 @@ 
 			ob_start();
 
 		// Set the header.
-		header('Content-Type: application/json; charset='. $context['character_set'] .'');
+		header('Content-Type: application/json; charset=' . $context['character_set'] . '');
 
 		echo $smcFunc['json_encode']($this->_response ? $this->_response : array());
 

Sources/Topic.php

Braces +31 added lines, -21 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Locks a topic... either by way of a moderator or the topic starter.
@@ -32,8 +33,9 @@ 
 	global $topic, $user_info, $sourcedir, $board, $smcFunc;
 
 	// Just quit if there's no topic to lock.
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -55,23 +57,28 @@ 
 
 	// Can you lock topics here, mister?
 	$user_lock = !allowedTo('lock_any');
-	if ($user_lock && $starter == $user_info['id'])
-		isAllowedTo('lock_own');
-	else
-		isAllowedTo('lock_any');
+	if ($user_lock && $starter == $user_info['id']) {
+			isAllowedTo('lock_own');
+	} else {
+			isAllowedTo('lock_any');
+	}
 
 	// Locking with high privileges.
-	if ($locked == '0' && !$user_lock)
-		$locked = '1';
+	if ($locked == '0' && !$user_lock) {
+			$locked = '1';
+	}
 	// Locking with low privileges.
-	elseif ($locked == '0')
-		$locked = '2';
+	elseif ($locked == '0') {
+			$locked = '2';
+	}
 	// Unlocking - make sure you don't unlock what you can't.
-	elseif ($locked == '2' || ($locked == '1' && !$user_lock))
-		$locked = '0';
+	elseif ($locked == '2' || ($locked == '1' && !$user_lock)) {
+			$locked = '0';
+	}
 	// You cannot unlock this!
-	else
-		fatal_lang_error('locked_by_admin', 'user');
+	else {
+			fatal_lang_error('locked_by_admin', 'user');
+	}
 
 	// Actually lock the topic in the database with the new value.
 	$smcFunc['db_query']('', '
@@ -85,8 +92,9 @@ 
 	);
 
 	// If they are allowed a "moderator" permission, log it in the moderator log.
-	if (!$user_lock)
-		logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	if (!$user_lock) {
+			logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	}
 	// Notify people that this topic has been locked?
 	sendNotifications($topic, empty($locked) ? 'unlock' : 'lock');
 
@@ -112,8 +120,9 @@ 
 	isAllowedTo('make_sticky');
 
 	// You can't sticky a board or something!
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -147,8 +156,9 @@ 
 	// Log this sticky action - always a moderator thing.
 	logAction(empty($is_sticky) ? 'sticky' : 'unsticky', array('topic' => $topic, 'board' => $board));
 	// Notify people that this topic has been stickied?
-	if (empty($is_sticky))
-		sendNotifications($topic, 'sticky');
+	if (empty($is_sticky)) {
+			sendNotifications($topic, 'sticky');
+	}
 
 	// Take them back to the now stickied topic.
 	redirectexit('topic=' . $topic . '.' . $_REQUEST['start'] . ';moderate');

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main admin handling function.<br>
@@ -444,8 +445,9 @@ 
 		foreach ($admin_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -457,24 +459,27 @@ 
 	unset($admin_areas);
 
 	// Nothing valid?
-	if ($admin_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($admin_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin',
 		'name' => $txt['admin_center'],
 	);
-	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['label'],
 		);
-	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 		);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['admin_menu_id'] = $context['max_menu_id'];
@@ -484,16 +489,18 @@ 
 	$context['admin_area'] = $admin_include_data['current_area'];
 
 	// Now - finally - call the right place!
-	if (isset($admin_include_data['file']))
-		require_once($sourcedir . '/' . $admin_include_data['file']);
+	if (isset($admin_include_data['file'])) {
+			require_once($sourcedir . '/' . $admin_include_data['file']);
+	}
 
 	// Get the right callable.
 	$call = call_helper($admin_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call);
-}
+	if (!empty($call)) {
+			call_user_func($call);
+	}
+	}
 
 /**
  * The main administration section.
@@ -547,13 +554,14 @@ 
 
 	$context['sub_template'] = $context['admin_area'] == 'credits' ? 'credits' : 'admin';
 	$context['page_title'] = $context['admin_area'] == 'credits' ? $txt['support_credits_title'] : $txt['admin_center'];
-	if ($context['admin_area'] != 'credits')
-		$context[$context['admin_menu_name']]['tab_data'] = array(
+	if ($context['admin_area'] != 'credits') {
+			$context[$context['admin_menu_name']]['tab_data'] = array(
 			'title' => $txt['admin_center'],
 			'help' => '',
 			'description' => '<strong>' . $txt['hello_guest'] . ' ' . $context['user']['name'] . '!</strong>
 						' . sprintf($txt['admin_main_welcome'], $txt['admin_center'], $txt['help'], $txt['help']),
 		);
+	}
 
 	// Lastly, fill in the blanks in the support resources paragraphs.
 	$txt['support_resources_p1'] = sprintf($txt['support_resources_p1'],
@@ -571,9 +579,10 @@ 
 		'https://www.simplemachines.org/redirect/customize_support'
 	);
 
-	if ($context['admin_area'] == 'admin')
-		loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
-}
+	if ($context['admin_area'] == 'admin') {
+			loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
+	}
+	}
 
 /**
  * Get one of the admin information files from Simple Machines.
@@ -584,8 +593,9 @@ 
 
 	setMemoryLimit('32M');
 
-	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Strip off the forum cache part or we won't find it...
 	$_REQUEST['filename'] = str_replace($modSettings['browser_cache'], '', $_REQUEST['filename']);
@@ -600,27 +610,30 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	}
 
 	list ($file_data, $filetype) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// @todo Temp
 	// Figure out if sesc is still being used.
-	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
-		$file_data = '
+	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') {
+			$file_data = '
 if (!(\'smfForum_sessionvar\' in window))
 	window.smfForum_sessionvar = \'sesc\';
 ' . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'='));
+	}
 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		@ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			@ob_start();
+	}
 
 	// Make sure they know what type of file we are.
 	header('Content-Type: ' . $filetype);
@@ -660,11 +673,12 @@ 
 		updateAdminPreferences();
 	}
 
-	if (trim($context['search_term']) == '')
-		$context['search_results'] = array();
-	else
-		call_helper($subActions[$context['search_type']]);
-}
+	if (trim($context['search_term']) == '') {
+			$context['search_results'] = array();
+	} else {
+			call_helper($subActions[$context['search_type']]);
+	}
+	}
 
 /**
  * A complicated but relatively quick internal search.
@@ -728,8 +742,9 @@ 
 
 	loadLanguage(implode('+', $language_files));
 
-	foreach ($include_files as $file)
-		require_once($sourcedir . '/' . $file . '.php');
+	foreach ($include_files as $file) {
+			require_once($sourcedir . '/' . $file . '.php');
+	}
 
 	/* This is the huge array that defines everything... it's a huge array of items formatted as follows:
 		0 = Language index (Can be array of indexes) to search through for this setting.
@@ -753,11 +768,12 @@ 
 		foreach ($section['areas'] as $menu_key => $menu_item)
 		{
 			$search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key);
-			if (!empty($menu_item['subsections']))
-				foreach ($menu_item['subsections'] as $key => $sublabel)
+			if (!empty($menu_item['subsections'])) {
+							foreach ($menu_item['subsections'] as $key => $sublabel)
 				{
 					if (isset($sublabel['label']))
 						$search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key);
+			}
 				}
 		}
 	}
@@ -767,9 +783,10 @@ 
 		// Get a list of their variables.
 		$config_vars = $setting_area[0](true);
 
-		foreach ($config_vars as $var)
-			if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
+		foreach ($config_vars as $var) {
+					if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
 				$search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1]);
+		}
 	}
 
 	$context['page_title'] = $txt['admin_search_results'];
@@ -782,8 +799,9 @@ 
 		foreach ($data as $item)
 		{
 			$found = false;
-			if (!is_array($item[0]))
-				$item[0] = array($item[0]);
+			if (!is_array($item[0])) {
+							$item[0] = array($item[0]);
+			}
 			foreach ($item[0] as $term)
 			{
 				if (stripos($term, $search_term) !== false || (isset($txt[$term]) && stripos($txt[$term], $search_term) !== false) || (isset($txt['setting_' . $term]) && stripos($txt['setting_' . $term], $search_term) !== false))
@@ -841,8 +859,9 @@ 
 	$postVars = explode(' ', $context['search_term']);
 
 	// Encode the search data.
-	foreach ($postVars as $k => $v)
-		$postVars[$k] = urlencode($v);
+	foreach ($postVars as $k => $v) {
+			$postVars[$k] = urlencode($v);
+	}
 
 	// This is what we will send.
 	$postVars = implode('+', $postVars);
@@ -854,8 +873,9 @@ 
 	$search_results = fetch_web_data($context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars);
 
 	// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
-	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true)
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	$search_results = $matches[1];
 
@@ -867,8 +887,9 @@ 
 	$results = new xmlArray($search_results, false);
 
 	// Move through the api layer.
-	if (!$results->exists('api'))
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$results->exists('api')) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	// Are there actually some results?
 	if ($results->exists('api/query/search/p'))
@@ -904,8 +925,9 @@ 
 	);
 
 	// If it's not got a sa set it must have come here for first time, pretend error log should be reversed.
-	if (!isset($_REQUEST['sa']))
-		$_REQUEST['desc'] = true;
+	if (!isset($_REQUEST['sa'])) {
+			$_REQUEST['desc'] = true;
+	}
 
 	// Setup some tab stuff.
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -955,9 +977,10 @@ 
 	unset($_SESSION['admin_time']);
 
 	// Clean any admin tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-admin') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-admin') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Sources/CacheAPI-apcu.php

Braces +10 added lines, -7 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -27,8 +28,9 @@ 
 	{
 		$supported = function_exists('apcu_fetch') && function_exists('apcu_store');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -50,10 +52,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// An extended key is needed to counteract a bug in APC.
-		if ($value === null)
-			return apcu_delete($key . 'smf');
-		else
-			return apcu_store($key . 'smf', $value, $ttl);
+		if ($value === null) {
+					return apcu_delete($key . 'smf');
+		} else {
+					return apcu_store($key . 'smf', $value, $ttl);
+		}
 	}
 
 	/**