albertlast / SMF2.1

Sources/ManageMembers.php

Braces +163 added lines, -122 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the Manage Members screen.
@@ -62,16 +63,18 @@ 
 	$context['activation_numbers'] = array();
 	$context['awaiting_activation'] = 0;
 	$context['awaiting_approval'] = 0;
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['activation_numbers'][$row['is_activated']] = $row['total_members'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['activation_numbers'][$row['is_activated']] = $row['total_members'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	foreach ($context['activation_numbers'] as $activation_type => $total_members)
 	{
-		if (in_array($activation_type, array(0, 2)))
-			$context['awaiting_activation'] += $total_members;
-		elseif (in_array($activation_type, array(3, 4, 5)))
-			$context['awaiting_approval'] += $total_members;
+		if (in_array($activation_type, array(0, 2))) {
+					$context['awaiting_activation'] += $total_members;
+		} elseif (in_array($activation_type, array(3, 4, 5))) {
+					$context['awaiting_approval'] += $total_members;
+		}
 	}
 
 	// For the page header... do we show activation?
@@ -124,8 +127,9 @@ 
 	}
 	if (!$context['show_approve'] && ($_REQUEST['sa'] != 'browse' || $_REQUEST['type'] != 'approve'))
 	{
-		if (!$context['show_activate'] && ($_REQUEST['sa'] != 'browse' || $_REQUEST['type'] != 'activate'))
-			$context['tabs']['search']['is_last'] = true;
+		if (!$context['show_activate'] && ($_REQUEST['sa'] != 'browse' || $_REQUEST['type'] != 'activate')) {
+					$context['tabs']['search']['is_last'] = true;
+		}
 		unset($context['tabs']['approve']);
 	}
 
@@ -157,8 +161,9 @@ 
 		foreach ($_POST['delete'] as $key => $value)
 		{
 			// Don't delete yourself, idiot.
-			if ($value != $user_info['id'])
-				$delete[$key] = (int) $value;
+			if ($value != $user_info['id']) {
+							$delete[$key] = (int) $value;
+			}
 		}
 
 		if (!empty($delete))
@@ -194,17 +199,18 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['min_posts'] == -1)
-				$context['membergroups'][] = array(
+			if ($row['min_posts'] == -1) {
+							$context['membergroups'][] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 					'can_be_additional' => true
 				);
-			else
-				$context['postgroups'][] = array(
+			} else {
+							$context['postgroups'][] = array(
 					'id' => $row['id_group'],
 					'name' => $row['group_name']
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -276,14 +282,15 @@ 
 		call_integration_hook('integrate_view_members_params', array(&$params));
 
 		$search_params = array();
-		if ($context['sub_action'] == 'query' && !empty($_REQUEST['params']) && empty($_POST['types']))
-			$search_params = $smcFunc['json_decode'](base64_decode($_REQUEST['params']), true);
-		elseif (!empty($_POST))
+		if ($context['sub_action'] == 'query' && !empty($_REQUEST['params']) && empty($_POST['types'])) {
+					$search_params = $smcFunc['json_decode'](base64_decode($_REQUEST['params']), true);
+		} elseif (!empty($_POST))
 		{
 			$search_params['types'] = $_POST['types'];
-			foreach ($params as $param_name => $param_info)
-				if (isset($_POST[$param_name]))
+			foreach ($params as $param_name => $param_info) {
+							if (isset($_POST[$param_name]))
 					$search_params[$param_name] = $_POST[$param_name];
+			}
 		}
 
 		$search_url_params = isset($search_params) ? base64_encode($smcFunc['json_encode']($search_params)) : null;
@@ -296,34 +303,38 @@ 
 		foreach ($params as $param_name => $param_info)
 		{
 			// Not filled in?
-			if (!isset($search_params[$param_name]) || $search_params[$param_name] === '')
-				continue;
+			if (!isset($search_params[$param_name]) || $search_params[$param_name] === '') {
+							continue;
+			}
 
 			// Make sure numeric values are really numeric.
-			if (in_array($param_info['type'], array('int', 'age')))
-				$search_params[$param_name] = (int) $search_params[$param_name];
+			if (in_array($param_info['type'], array('int', 'age'))) {
+							$search_params[$param_name] = (int) $search_params[$param_name];
+			}
 			// Date values have to match the specified format.
 			elseif ($param_info['type'] == 'date')
 			{
 				// Check if this date format is valid.
-				if (preg_match('/^\d{4}-\d{1,2}-\d{1,2}$/', $search_params[$param_name]) == 0)
-					continue;
+				if (preg_match('/^\d{4}-\d{1,2}-\d{1,2}$/', $search_params[$param_name]) == 0) {
+									continue;
+				}
 
 				$search_params[$param_name] = strtotime($search_params[$param_name]);
-			}
-			elseif ($param_info['type'] == 'inet')
+			} elseif ($param_info['type'] == 'inet')
 			{
 				$search_params[$param_name] = ip2range($search_params[$param_name]);
-				if (empty($search_params[$param_name]))
-					continue;
+				if (empty($search_params[$param_name])) {
+									continue;
+				}
 			}
 
 			// Those values that are in some kind of range (<, <=, =, >=, >).
 			if (!empty($param_info['range']))
 			{
 				// Default to '=', just in case...
-				if (empty($range_trans[$search_params['types'][$param_name]]))
-					$search_params['types'][$param_name] = '=';
+				if (empty($range_trans[$search_params['types'][$param_name]])) {
+									$search_params['types'][$param_name] = '=';
+				}
 
 				// Handle special case 'age'.
 				if ($param_info['type'] == 'age')
@@ -351,16 +362,17 @@ 
 				elseif ($param_info['type'] == 'date' && $search_params['types'][$param_name] == '=')
 				{
 					$query_parts[] = $param_info['db_fields'][0] . ' > ' . $search_params[$param_name] . ' AND ' . $param_info['db_fields'][0] . ' < ' . ($search_params[$param_name] + 86400);
+				} else {
+									$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
 				}
-				else
-					$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
 			}
 			// Checkboxes.
 			elseif ($param_info['type'] == 'checkbox')
 			{
 				// Each checkbox or no checkbox at all is checked -> ignore.
-				if (!is_array($search_params[$param_name]) || count($search_params[$param_name]) == 0 || count($search_params[$param_name]) == count($param_info['values']))
-					continue;
+				if (!is_array($search_params[$param_name]) || count($search_params[$param_name]) == 0 || count($search_params[$param_name]) == count($param_info['values'])) {
+									continue;
+				}
 
 				$query_parts[] = ($param_info['db_fields'][0]) . ' IN ({array_string:' . $param_name . '_check})';
 				$where_params[$param_name . '_check'] = $search_params[$param_name];
@@ -372,24 +384,23 @@ 
 				{
 					$query_parts[] = '(' . $param_info['db_fields'][0] . ' = {inet:' . $param_name . '})';
 					$where_params[$param_name] = $search_params[$param_name][0];
-				}
-				elseif (count($search_params[$param_name]) === 2)
+				} elseif (count($search_params[$param_name]) === 2)
 				{
 					$query_parts[] = '(' . $param_info['db_fields'][0] . ' <= {inet:' . $param_name . '_high} and ' . $param_info['db_fields'][0] . ' >= {inet:' . $param_name . '_low})';
 					$where_params[$param_name.'_low'] = $search_params[$param_name]['low'];
 					$where_params[$param_name.'_high'] = $search_params[$param_name]['high'];
 				}
 				
-			}
-			elseif ($param_info['type'] != 'groups')
+			} elseif ($param_info['type'] != 'groups')
 			{
 				// Replace the wildcard characters ('*' and '?') into MySQL ones.
 				$parameter = strtolower(strtr($smcFunc['htmlspecialchars']($search_params[$param_name], ENT_QUOTES), array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_')));
 
-				if ($smcFunc['db_case_sensitive'])
-					$query_parts[] = '(LOWER(' . implode(') LIKE {string:' . $param_name . '_normal} OR LOWER(', $param_info['db_fields']) . ') LIKE {string:' . $param_name . '_normal})';
-				else
-					$query_parts[] = '(' . implode(' LIKE {string:' . $param_name . '_normal} OR ', $param_info['db_fields']) . ' LIKE {string:' . $param_name . '_normal})';
+				if ($smcFunc['db_case_sensitive']) {
+									$query_parts[] = '(LOWER(' . implode(') LIKE {string:' . $param_name . '_normal} OR LOWER(', $param_info['db_fields']) . ') LIKE {string:' . $param_name . '_normal})';
+				} else {
+									$query_parts[] = '(' . implode(' LIKE {string:' . $param_name . '_normal} OR ', $param_info['db_fields']) . ' LIKE {string:' . $param_name . '_normal})';
+				}
 				$where_params[$param_name . '_normal'] = '%' . $parameter . '%';
 			}
 		}
@@ -405,16 +416,18 @@ 
 		}
 
 		// Additional membergroups (these are only relevant if not all primary groups where selected!).
-		if (!empty($search_params['membergroups'][2]) && (empty($search_params['membergroups'][1]) || count($context['membergroups']) != count($search_params['membergroups'][1])))
-			foreach ($search_params['membergroups'][2] as $mg)
+		if (!empty($search_params['membergroups'][2]) && (empty($search_params['membergroups'][1]) || count($context['membergroups']) != count($search_params['membergroups'][1]))) {
+					foreach ($search_params['membergroups'][2] as $mg)
 			{
 				$mg_query_parts[] = 'FIND_IN_SET({int:add_group_' . $mg . '}, mem.additional_groups) != 0';
+		}
 				$where_params['add_group_' . $mg] = $mg;
 			}
 
 		// Combine the one or two membergroup parts into one query part linked with an OR.
-		if (!empty($mg_query_parts))
-			$query_parts[] = '(' . implode(' OR ', $mg_query_parts) . ')';
+		if (!empty($mg_query_parts)) {
+					$query_parts[] = '(' . implode(' OR ', $mg_query_parts) . ')';
+		}
 
 		// Get all selected post count related membergroups.
 		if (!empty($search_params['postgroups']) && count($search_params['postgroups']) != count($context['postgroups']))
@@ -426,9 +439,9 @@ 
 		// Construct the where part of the query.
 		$where = empty($query_parts) ? '1=1' : implode('
 			AND ', $query_parts);
+	} else {
+			$search_url_params = null;
 	}
-	else
-		$search_url_params = null;
 
 	// Construct the additional URL part with the query info in it.
 	$context['params_url'] = $context['sub_action'] == 'query' ? ';sa=query;params=' . $search_url_params : '';
@@ -551,28 +564,32 @@ 
 					'function' => function($rowData) use ($txt)
 					{
 						// Calculate number of days since last online.
-						if (empty($rowData['last_login']))
-							$difference = $txt['never'];
-						else
+						if (empty($rowData['last_login'])) {
+													$difference = $txt['never'];
+						} else
 						{
 							$num_days_difference = jeffsdatediff($rowData['last_login']);
 
 							// Today.
-							if (empty($num_days_difference))
-								$difference = $txt['viewmembers_today'];
+							if (empty($num_days_difference)) {
+															$difference = $txt['viewmembers_today'];
+							}
 
 							// Yesterday.
-							elseif ($num_days_difference == 1)
-								$difference = sprintf('1 %1$s', $txt['viewmembers_day_ago']);
+							elseif ($num_days_difference == 1) {
+															$difference = sprintf('1 %1$s', $txt['viewmembers_day_ago']);
+							}
 
 							// X days ago.
-							else
-								$difference = sprintf('%1$d %2$s', $num_days_difference, $txt['viewmembers_days_ago']);
+							else {
+															$difference = sprintf('%1$d %2$s', $num_days_difference, $txt['viewmembers_days_ago']);
+							}
 						}
 
 						// Show it in italics if they're not activated...
-						if ($rowData['is_activated'] % 10 != 1)
-							$difference = sprintf('<em title="%1$s">%2$s</em>', $txt['not_activated'], $difference);
+						if ($rowData['is_activated'] % 10 != 1) {
+													$difference = sprintf('<em title="%1$s">%2$s</em>', $txt['not_activated'], $difference);
+						}
 
 						return $difference;
 					},
@@ -624,8 +641,9 @@ 
 	);
 
 	// Without enough permissions, don't show 'delete members' checkboxes.
-	if (!allowedTo('profile_remove_any'))
-		unset($listOptions['cols']['check'], $listOptions['form'], $listOptions['additional_rows']);
+	if (!allowedTo('profile_remove_any')) {
+			unset($listOptions['cols']['check'], $listOptions['form'], $listOptions['additional_rows']);
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 	createList($listOptions);
@@ -668,17 +686,18 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['min_posts'] == -1)
-			$context['membergroups'][] = array(
+		if ($row['min_posts'] == -1) {
+					$context['membergroups'][] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name'],
 				'can_be_additional' => true
 			);
-		else
-			$context['postgroups'][] = array(
+		} else {
+					$context['postgroups'][] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name']
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -705,8 +724,9 @@ 
 	$context['page_title'] = $txt['admin_members'];
 	$context['sub_template'] = 'admin_browse';
 	$context['browse_type'] = isset($_REQUEST['type']) ? $_REQUEST['type'] : (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1 ? 'activate' : 'approve');
-	if (isset($context['tabs'][$context['browse_type']]))
-		$context['tabs'][$context['browse_type']]['is_selected'] = true;
+	if (isset($context['tabs'][$context['browse_type']])) {
+			$context['tabs'][$context['browse_type']]['is_selected'] = true;
+	}
 
 	// Allowed filters are those we can have, in theory.
 	$context['allowed_filters'] = $context['browse_type'] == 'approve' ? array(3, 4, 5) : array(0, 2);
@@ -717,18 +737,20 @@ 
 	foreach ($context['activation_numbers'] as $type => $amount)
 	{
 		// We have some of these...
-		if (in_array($type, $context['allowed_filters']) && $amount > 0)
-			$context['available_filters'][] = array(
+		if (in_array($type, $context['allowed_filters']) && $amount > 0) {
+					$context['available_filters'][] = array(
 				'type' => $type,
 				'amount' => $amount,
 				'desc' => isset($txt['admin_browse_filter_type_' . $type]) ? $txt['admin_browse_filter_type_' . $type] : '?',
 				'selected' => $type == $context['current_filter']
 			);
+		}
 	}
 
 	// If the filter was not sent, set it to whatever has people in it!
-	if ($context['current_filter'] == -1 && !empty($context['available_filters'][0]['amount']))
-		$context['current_filter'] = $context['available_filters'][0]['type'];
+	if ($context['current_filter'] == -1 && !empty($context['available_filters'][0]['amount'])) {
+			$context['current_filter'] = $context['available_filters'][0]['type'];
+	}
 
 	// This little variable is used to determine if we should flag where we are looking.
 	$context['show_filter'] = ($context['current_filter'] != 0 && $context['current_filter'] != 3) || count($context['available_filters']) > 1;
@@ -743,44 +765,47 @@ 
 	);
 
 	// Are we showing duplicate information?
-	if (isset($_GET['showdupes']))
-		$_SESSION['showdupes'] = (int) $_GET['showdupes'];
+	if (isset($_GET['showdupes'])) {
+			$_SESSION['showdupes'] = (int) $_GET['showdupes'];
+	}
 	$context['show_duplicates'] = !empty($_SESSION['showdupes']);
 
 	// Determine which actions we should allow on this page.
 	if ($context['browse_type'] == 'approve')
 	{
 		// If we are approving deleted accounts we have a slightly different list... actually a mirror ;)
-		if ($context['current_filter'] == 4)
-			$context['allowed_actions'] = array(
+		if ($context['current_filter'] == 4) {
+					$context['allowed_actions'] = array(
 				'reject' => $txt['admin_browse_w_approve_deletion'],
 				'ok' => $txt['admin_browse_w_reject'],
 			);
-		else
-			$context['allowed_actions'] = array(
+		} else {
+					$context['allowed_actions'] = array(
 				'ok' => $txt['admin_browse_w_approve'],
 				'okemail' => $txt['admin_browse_w_approve'] . ' ' . $txt['admin_browse_w_email'],
 				'require_activation' => $txt['admin_browse_w_approve_require_activate'],
 				'reject' => $txt['admin_browse_w_reject'],
 				'rejectemail' => $txt['admin_browse_w_reject'] . ' ' . $txt['admin_browse_w_email'],
 			);
-	}
-	elseif ($context['browse_type'] == 'activate')
-		$context['allowed_actions'] = array(
+		}
+	} elseif ($context['browse_type'] == 'activate') {
+			$context['allowed_actions'] = array(
 			'ok' => $txt['admin_browse_w_activate'],
 			'okemail' => $txt['admin_browse_w_activate'] . ' ' . $txt['admin_browse_w_email'],
 			'delete' => $txt['admin_browse_w_delete'],
 			'deleteemail' => $txt['admin_browse_w_delete'] . ' ' . $txt['admin_browse_w_email'],
 			'remind' => $txt['admin_browse_w_remind'] . ' ' . $txt['admin_browse_w_email'],
 		);
+	}
 
 	// Create an option list for actions allowed to be done with selected members.
 	$allowed_actions = '
 			<option selected value="">' . $txt['admin_browse_with_selected'] . ':</option>
 			<option value="" disabled>-----------------------------</option>';
-	foreach ($context['allowed_actions'] as $key => $desc)
-		$allowed_actions .= '
+	foreach ($context['allowed_actions'] as $key => $desc) {
+			$allowed_actions .= '
 			<option value="' . $key . '">' . $desc . '</option>';
+	}
 
 	// Setup the Javascript function for selecting an action for the list.
 	$javascript = '
@@ -792,15 +817,16 @@ 
 			var message = "";';
 
 	// We have special messages for approving deletion of accounts - it's surprisingly logical - honest.
-	if ($context['current_filter'] == 4)
-		$javascript .= '
+	if ($context['current_filter'] == 4) {
+			$javascript .= '
 			if (document.forms.postForm.todo.value.indexOf("reject") != -1)
 				message = "' . $txt['admin_browse_w_delete'] . '";
 			else
 				message = "' . $txt['admin_browse_w_reject'] . '";';
+	}
 	// Otherwise a nice standard message.
-	else
-		$javascript .= '
+	else {
+			$javascript .= '
 			if (document.forms.postForm.todo.value.indexOf("delete") != -1)
 				message = "' . $txt['admin_browse_w_delete'] . '";
 			else if (document.forms.postForm.todo.value.indexOf("reject") != -1)
@@ -809,6 +835,7 @@ 
 				message = "' . $txt['admin_browse_w_remind'] . '";
 			else
 				message = "' . ($context['browse_type'] == 'approve' ? $txt['admin_browse_w_approve'] : $txt['admin_browse_w_activate']) . '";';
+	}
 	$javascript .= '
 			if (confirm(message + " ' . $txt['admin_browse_warn'] . '"))
 				document.forms.postForm.submit();
@@ -941,10 +968,11 @@ 
 						$member_links = array();
 						foreach ($rowData['duplicate_members'] as $member)
 						{
-							if ($member['id'])
-								$member_links[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '" ' . (!empty($member['is_banned']) ? 'class="red"' : '') . '>' . $member['name'] . '</a>';
-							else
-								$member_links[] = $member['name'] . ' (' . $txt['guest'] . ')';
+							if ($member['id']) {
+															$member_links[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '" ' . (!empty($member['is_banned']) ? 'class="red"' : '') . '>' . $member['name'] . '</a>';
+							} else {
+															$member_links[] = $member['name'] . ' (' . $txt['guest'] . ')';
+							}
 						}
 						return implode(', ', $member_links);
 					},
@@ -993,14 +1021,16 @@ 
 	);
 
 	// Pick what column to actually include if we're showing duplicates.
-	if ($context['show_duplicates'])
-		unset($listOptions['columns']['email']);
-	else
-		unset($listOptions['columns']['duplicates']);
+	if ($context['show_duplicates']) {
+			unset($listOptions['columns']['email']);
+	} else {
+			unset($listOptions['columns']['duplicates']);
+	}
 
 	// Only show hostname on duplicates as it takes a lot of time.
-	if (!$context['show_duplicates'] || !empty($modSettings['disableHostnameLookup']))
-		unset($listOptions['columns']['hostname']);
+	if (!$context['show_duplicates'] || !empty($modSettings['disableHostnameLookup'])) {
+			unset($listOptions['columns']['hostname']);
+	}
 
 	// Is there any need to show filters?
 	if (isset($context['available_filters']) && count($context['available_filters']) > 1)
@@ -1008,9 +1038,10 @@ 
 		$filterOptions = '
 			<strong>' . $txt['admin_browse_filter_by'] . ':</strong>
 			<select name="filter" onchange="this.form.submit();">';
-		foreach ($context['available_filters'] as $filter)
-			$filterOptions .= '
+		foreach ($context['available_filters'] as $filter) {
+					$filterOptions .= '
 				<option value="' . $filter['type'] . '"' . ($filter['selected'] ? ' selected' : '') . '>' . $filter['desc'] . ' - ' . $filter['amount'] . ' ' . ($filter['amount'] == 1 ? $txt['user'] : $txt['users']) . '</option>';
+		}
 		$filterOptions .= '
 			</select>
 			<noscript><input type="submit" value="' . $txt['go'] . '" name="filter" class="button"></noscript>';
@@ -1022,12 +1053,13 @@ 
 	}
 
 	// What about if we only have one filter, but it's not the "standard" filter - show them what they are looking at.
-	if (!empty($context['show_filter']) && !empty($context['available_filters']))
-		$listOptions['additional_rows'][] = array(
+	if (!empty($context['show_filter']) && !empty($context['available_filters'])) {
+			$listOptions['additional_rows'][] = array(
 			'position' => 'above_column_headers',
 			'value' => '<strong>' . $txt['admin_browse_filter_show'] . ':</strong> ' . $context['available_filters'][0]['desc'],
 			'class' => 'smalltext floatright',
 		);
+	}
 
 	// Now that we have all the options, create the list.
 	require_once($sourcedir . '/Subs-List.php');
@@ -1057,12 +1089,14 @@ 
 	$current_filter = (int) $_REQUEST['orig_filter'];
 
 	// If we are applying a filter do just that - then redirect.
-	if (isset($_REQUEST['filter']) && $_REQUEST['filter'] != $_REQUEST['orig_filter'])
-		redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $_REQUEST['filter'] . ';start=' . $_REQUEST['start']);
+	if (isset($_REQUEST['filter']) && $_REQUEST['filter'] != $_REQUEST['orig_filter']) {
+			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $_REQUEST['filter'] . ';start=' . $_REQUEST['start']);
+	}
 
 	// Nothing to do?
-	if (!isset($_POST['todoAction']) && !isset($_POST['time_passed']))
-		redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	if (!isset($_POST['todoAction']) && !isset($_POST['time_passed'])) {
+			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	}
 
 	// Are we dealing with members who have been waiting for > set amount of time?
 	if (isset($_POST['time_passed']))
@@ -1075,8 +1109,9 @@ 
 	else
 	{
 		$members = array();
-		foreach ($_POST['todoAction'] as $id)
-			$members[] = (int) $id;
+		foreach ($_POST['todoAction'] as $id) {
+					$members[] = (int) $id;
+		}
 		$condition = '
 			AND id_member IN ({array_int:members})';
 	}
@@ -1097,8 +1132,9 @@ 
 	$member_count = $smcFunc['db_num_rows']($request);
 
 	// If no results then just return!
-	if ($member_count == 0)
-		redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	if ($member_count == 0) {
+			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
+	}
 
 	$member_info = array();
 	$members = array();
@@ -1137,8 +1173,9 @@ 
 		// Do we have to let the integration code know about the activations?
 		if (!empty($modSettings['integrate_activate']))
 		{
-			foreach ($member_info as $member)
-				call_integration_hook('integrate_activate', array($member['username']));
+			foreach ($member_info as $member) {
+							call_integration_hook('integrate_activate', array($member['username']));
+			}
 		}
 
 		// Check for email.
@@ -1268,20 +1305,23 @@ 
 		$log_action = $_POST['todo'] == 'remind' ? 'remind_member' : 'approve_member';
 
 		require_once($sourcedir . '/Logging.php');
-		foreach ($member_info as $member)
-			logAction($log_action, array('member' => $member['id']), 'admin');
+		foreach ($member_info as $member) {
+					logAction($log_action, array('member' => $member['id']), 'admin');
+		}
 	}
 
 	// Although updateStats *may* catch this, best to do it manually just in case (Doesn't always sort out unapprovedMembers).
-	if (in_array($current_filter, array(3, 4, 5)))
-		updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > $member_count ? $modSettings['unapprovedMembers'] - $member_count : 0)));
+	if (in_array($current_filter, array(3, 4, 5))) {
+			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > $member_count ? $modSettings['unapprovedMembers'] - $member_count : 0)));
+	}
 
 	// Update the member's stats. (but, we know the member didn't change their name.)
 	updateStats('member', false);
 
 	// If they haven't been deleted, update the post group statistics on them...
-	if (!in_array($_POST['todo'], array('delete', 'deleteemail', 'reject', 'rejectemail', 'remind')))
-		updateStats('postgroups', $members);
+	if (!in_array($_POST['todo'], array('delete', 'deleteemail', 'reject', 'rejectemail', 'remind'))) {
+			updateStats('postgroups', $members);
+	}
 
 	redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
 }
@@ -1306,10 +1346,11 @@ 
 	$dis = time() - $old;
 
 	// Before midnight?
-	if ($dis < $sinceMidnight)
-		return 0;
-	else
-		$dis -= $sinceMidnight;
+	if ($dis < $sinceMidnight) {
+			return 0;
+	} else {
+			$dis -= $sinceMidnight;
+	}
 
 	// Divide out the seconds in a day to get the number of days.
 	return ceil($dis / (24 * 60 * 60));