All this to get rid of that skip logic

Signed-off-by: Matt Friedman <[email protected]>

Author: iMattPro

includes/qi_populate.php

@@ -223,26 +223,10 @@ private function create_management()
 			return;
 		}
 
-		$admin_group = $mod_group = 0;
-
 		// Get group id for admins and moderators.
-		$sql = 'SELECT group_id, group_name
-				FROM ' . GROUPS_TABLE . "
-				WHERE group_name = 'ADMINISTRATORS'
-				OR group_name = 'GLOBAL_MODERATORS'";
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if ($row['group_name'] == 'ADMINISTRATORS')
-			{
-				$admin_group = (int) $row['group_id'];
-			}
-			else if ($row['group_name'] == 'GLOBAL_MODERATORS')
-			{
-				$mod_group = (int) $row['group_id'];
-			}
-		}
-		$db->sql_freeresult($result);
+		$user_groups = $this->get_groups();
+		$admin_group = (int) array_search('ADMINISTRATORS', $user_groups, true);
+		$mod_group = (int) array_search('GLOBAL_MODERATORS', $user_groups, true);;
 
 		if (file_exists("{$phpbb_root_path}language/" . $settings->get_config('default_lang') . "/common.$phpEx"))
 		{
@@ -668,25 +652,10 @@ private function save_users()
 			$password = phpbb_hash('123456');
 		}
 
-		$registered_group = $newly_registered_group = 0;
 		// Get the group id for registered users and newly registered.
-		$sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE . '
-			WHERE group_name = \'REGISTERED\'
-			OR group_name = \'NEWLY_REGISTERED\'';
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if ($row['group_name'] == 'REGISTERED')
-			{
-				$registered_group = (int) $row['group_id'];
-			}
-			else
-			{
-				$newly_registered_group = (int) $row['group_id'];
-			}
-		}
-		$db->sql_freeresult($result);
+		$user_groups = $this->get_groups();
+		$registered_group = (int) array_search('REGISTERED', $user_groups, true);
+		$newly_registered_group = (int) array_search('NEWLY_REGISTERED', $user_groups, true);
 
 		$s_chunks = ($this->num_users > $this->user_chunks) ? true : false;
 		$end = $this->num_users + 1;
@@ -767,24 +736,21 @@ private function save_users()
 		unset($sql_ary);
 
 		// Put them in groups.
-		$chunk_cnt = $skip = 0;
+		$chunk_cnt = 0;
 
-		// Don't add the first users to the newly registered group if a moderator and/or an admin is needed.
-		$skip = ($this->create_mod) ? $skip + 1 : $skip;
-		$skip = ($this->create_admin) ? $skip + 1 : $skip;
+		// This is to skip adding mods and admins to the newly registered user group
+		$managers = array_intersect($user_groups, ['ADMINISTRATORS', 'GLOBAL_MODERATORS']);
 
 		// First the registered group.
 		foreach ($this->user_arr as $user)
 		{
 			$sql_ary[] = array(
 				'user_id'		=> (int) $user['user_id'],
-				'group_id'		=> $this->num_new_group && $user['user_posts'] < 1 && $skip < 1 ? $newly_registered_group : $registered_group,
+				'group_id'		=> $this->num_new_group && $user['user_posts'] < 1 && !array_key_exists($user['group_id'], $managers) ? $newly_registered_group : $registered_group,
 				'group_leader'	=> 0, // No group leaders.
 				'user_pending'	=> 0, // User is not pending.
 			);
 
-			$skip--;
-
 			if ($s_chunks && $chunk_cnt >= $this->user_chunks)
 			{
 				// throw the array to the users table
@@ -958,4 +924,25 @@ private function update_start_date()
 
 		$db->sql_transaction('commit');
 	}
+
+	/**
+	 * Get an array of the user groups
+	 * @return array group_id => group_name
+	 */
+	private function get_groups()
+	{
+		global $db;
+
+		$groups = [];
+
+		$sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE;
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$groups[$row['group_id']] = $row['group_name'];
+		}
+		$db->sql_freeresult($result);
+
+		return $groups;
+	}
 }