aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2009-06-21 14:31:00 +0000
committerHenry Sudhof <kellanved@phpbb.com>2009-06-21 14:31:00 +0000
commit794e122cfa01539e912786455da59e25d459a56f (patch)
treeac5b8dbb3a82837c501d8930c2d4f03ab7229bce /phpBB/includes/session.php
parentc2c79d8297369fa461976061e0b7b95dd8c8a721 (diff)
downloadforums-794e122cfa01539e912786455da59e25d459a56f.tar
forums-794e122cfa01539e912786455da59e25d459a56f.tar.gz
forums-794e122cfa01539e912786455da59e25d459a56f.tar.bz2
forums-794e122cfa01539e912786455da59e25d459a56f.tar.xz
forums-794e122cfa01539e912786455da59e25d459a56f.zip
add quicktool to remove users from the newly registered special group.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9646 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php41
1 files changed, 5 insertions, 36 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 4dc6933236..f74a7c5acc 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -2253,51 +2253,20 @@ class user extends session
return false;
}
- if (!function_exists('group_user_del'))
+ if (!function_exists('remove_newly_registered'))
{
global $phpbb_root_path, $phpEx;
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
}
-
- $sql = 'SELECT group_id
- FROM ' . GROUPS_TABLE . "
- WHERE group_name = 'NEWLY_REGISTERED'
- AND group_type = " . GROUP_SPECIAL;
- $result = $db->sql_query($sql);
- $group_id = (int) $db->sql_fetchfield('group_id');
- $db->sql_freeresult($result);
-
- if (!$group_id)
+ if ($group = remove_newly_registered($this->data['user_id'], $this->data))
{
- return false;
+ $this->data['group_id'] = $group;
+
}
-
- // We need to call group_user_del here, because this function makes sure everything is correctly changed.
- // A downside for a call within the session handler is that the language is not set up yet - so no log entry
- group_user_del($group_id, $this->data['user_id']);
-
- // Set user_new to 0 to let this not be triggered again
- $sql = 'UPDATE ' . USERS_TABLE . '
- SET user_new = 0
- WHERE user_id = ' . $this->data['user_id'];
- $db->sql_query($sql);
-
$this->data['user_permissions'] = '';
$this->data['user_new'] = 0;
-
- // The new users group was the users default group?
- if ($this->data['group_id'] == $group_id)
- {
- // Which group is now the users default one?
- $sql = 'SELECT group_id
- FROM ' . USERS_TABLE . '
- WHERE user_id = ' . $this->data['user_id'];
- $result = $db->sql_query($sql);
- $this->data['group_id'] = $db->sql_fetchfield('group_id');
- $db->sql_freeresult($result);
- }
-
+
return true;
}
}