aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-01-29 11:29:35 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-01-29 11:29:35 +0000
commit9c2cde7dfde6c11616aadbaf519c997ebb56026d (patch)
treeaeb34b7eabed4876b02bed2515b4ffdbfb727e97 /phpBB/includes/functions_user.php
parentda674eae0c382fdd6060f31e4522c2e0cbf1793a (diff)
downloadforums-9c2cde7dfde6c11616aadbaf519c997ebb56026d.tar
forums-9c2cde7dfde6c11616aadbaf519c997ebb56026d.tar.gz
forums-9c2cde7dfde6c11616aadbaf519c997ebb56026d.tar.bz2
forums-9c2cde7dfde6c11616aadbaf519c997ebb56026d.tar.xz
forums-9c2cde7dfde6c11616aadbaf519c997ebb56026d.zip
put user into appropiate group after activating his account
git-svn-id: file:///svn/phpbb/trunk@5086 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php18
1 files changed, 14 insertions, 4 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 9791490cf6..076d617e6b 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -249,10 +249,20 @@ function user_active_flip($user_id, $user_type, $user_actkey = false, $username
AND group_id = " . $group_id_ary[$group_name];
$db->sql_query($sql);
- $sql_update = ($group_id == $group_id_ary[$group_name]) ? ", group_id = $new_group_id" : '';
- $sql_update .= ($user_actkey) ? ", user_actkey = '$user_actkey'" : '';
- $sql = 'UPDATE ' . USERS_TABLE . '
- SET user_type = ' . (($user_type == USER_NORMAL) ? USER_INACTIVE : USER_NORMAL) . "$sql_update
+ $sql_ary = array(
+ 'user_type' => ($user_type == USER_NORMAL) ? USER_INACTIVE : USER_NORMAL
+ );
+
+ if ($group_id == $group_id_ary[$group_name])
+ {
+ $sql_ary['group_id'] = $new_group_id;
+ }
+
+ if ($user_actkey !== false)
+ {
+ $sql_ary['user_actkey'] = $user_actkey;
+ }
+ $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
WHERE user_id = $user_id";
$db->sql_query($sql);