Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

! Include COPPA accounts in the count of unapproved members (fixes #1385)

Signed-off-by: Michael Eshom <[email protected]>
Michael Eshom 10 years ago
parent
3011df06e6
commit
9449bd8d8f
3 changed files with 40 additions and 17 deletions
Split View Show Diff Stats
  1. 1 1
      Sources/ManageMembers.php
  2. 1 1
      Sources/Profile-Actions.php
  3. 38 15
      Sources/Subs.php

+ 1 - 1
Sources/ManageMembers.php
View File 

@@ -1257,7 +1257,7 @@ function AdminApprove()
 
 	}
 
 
 	// 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)))
 
+	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.)

+ 1 - 1
Sources/Profile-Actions.php
View File 

@@ -48,7 +48,7 @@ function activateAccount($memID)
 
 		logAction('approve_member', array('member' => $memID), 'admin');
 
 
 		// If we are doing approval, update the stats for the member just in case.
 
-		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 13, 14)))
 
+		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15)))
 
 			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
 
 
 		// Make sure we update the stats too.

+ 38 - 15
Sources/Subs.php
View File 

@@ -89,23 +89,46 @@ function updateStats($type, $parameter1 = null, $parameter2 = null)
 
 			list ($changes['latestRealName']) = $smcFunc['db_fetch_row']($result);
 
 			$smcFunc['db_free_result']($result);
 
 
-			// Are we using registration approval?
 
-			if ((!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 2) || !empty($modSettings['approveAccountDeletion']))
 
+			if (!empty($modSettings['registration_method']))
 
 			{
 
-				// Update the amount of members awaiting approval - ignoring COPPA accounts, as you can't approve them until you get permission.
 
-				$result = $smcFunc['db_query']('', '
 
-					SELECT COUNT(*)
 
-					FROM {db_prefix}members
 
-					WHERE is_activated IN ({array_int:activation_status})',
 
-					array(
 
-						'activation_status' => array(3, 4),
 
-					)
 
-				);
 
-				list ($changes['unapprovedMembers']) = $smcFunc['db_fetch_row']($result);
 
-				$smcFunc['db_free_result']($result);
 
+				// Are we using registration approval?
 
+				if ($modSettings['registration_method'] == 2 || !empty($modSettings['approveAccountDeletion']))
 
+				{
 
+					// Update the amount of members awaiting approval
 
+					$result = $smcFunc['db_query']('', '
 
+						SELECT COUNT(*)
 
+						FROM {db_prefix}members
 
+						WHERE is_activated IN ({array_int:activation_status})',
 
+						array(
 
+							'activation_status' => array(3, 4),
 
+						)
 
+					);
 
+					list ($changes['unapprovedMembers']) = $smcFunc['db_fetch_row']($result);
 
+					$smcFunc['db_free_result']($result);
 
+				}
 
+
 
+				// What about unapproved COPPA registrations?
 
+				if (!empty($modSettings['coppaType']) && $modSettings['coppaType'] != 1)
 
+				{
 
+					$result = $smcFunc['db_query']('', '
 
+						SELECT COUNT(*)
 
+						FROM {db_prefix}members
 
+						WHERE is_activated = {int:coppa_approval}',
 
+						array(
 
+							'coppa_approval' => 5,
 
+						)
 
+					);
 
+					list ($coppa_approvals) = $smcFunc['db_fetch_row']($result);
 
+					$smcFunc['db_free_result']($result);
 
+
 
+					// Add this to the number of unapproved members
 
+					if (!empty($changes['unapprovedMembers']))
 
+						$changes['unapprovedMembers'] += $coppa_approvals;
 
+					else
 
+						$changes['unapprovedMembers'] = $coppa_approvals;
 
+				}
 
 			}
 
 		}
 
-
 
 		updateSettings($changes);
 
 		break;
 
 
@@ -2869,7 +2892,7 @@ function setupThemeContext($forceload = false)
 
 		$_SESSION['unread_messages'] = $user_info['unread_messages'];
 
 
 		if (allowedTo('moderate_forum'))
 
-			$context['unapproved_members'] = (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 2) || !empty($modSettings['approveAccountDeletion']) ? $modSettings['unapprovedMembers'] : 0;
 
+			$context['unapproved_members'] = (!empty($modSettings['registration_method']) && ($modSettings['registration_method'] == 2 || (!empty($modSettings['coppaType']) && $modSettings['coppaType'] == 2))) || !empty($modSettings['approveAccountDeletion']) ? $modSettings['unapprovedMembers'] : 0;
 
 
 		$context['user']['avatar'] = array();