aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-06-09 13:06:14 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-06-09 13:06:14 +0000
commitd7a217c28cbe4a91cecbb0b0e329402527463ca8 (patch)
tree77fe407f6940d1d8b3e18543215443fdefc7a226 /phpBB/includes/functions_user.php
parent8f3c085f7fedc0dd9b098b2d6aa499068f0ca628 (diff)
downloadforums-d7a217c28cbe4a91cecbb0b0e329402527463ca8.tar
forums-d7a217c28cbe4a91cecbb0b0e329402527463ca8.tar.gz
forums-d7a217c28cbe4a91cecbb0b0e329402527463ca8.tar.bz2
forums-d7a217c28cbe4a91cecbb0b0e329402527463ca8.tar.xz
forums-d7a217c28cbe4a91cecbb0b0e329402527463ca8.zip
#16124
git-svn-id: file:///svn/phpbb/trunk@8635 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php18
1 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 67266a5ec9..59fdc0a0f5 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2838,7 +2838,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
if (!sizeof($user_id_ary) || $result !== false)
{
- return false;
+ return 'NO_USERS';
}
if (!$group_name)
@@ -2850,9 +2850,23 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
{
case 'demote':
case 'promote':
+
+ $sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . "
+ WHERE group_id = $group_id
+ AND user_pending = 1
+ AND " . $db->sql_in_set('user_id', $user_id_ary);
+ $result = $db->sql_query_limit($sql, 1);
+ $not_empty = ($db->sql_fetchrow($result));
+ $db->sql_freeresult($result);
+ if ($not_empty)
+ {
+ return 'NO_VALID_USERS';
+ }
+
$sql = 'UPDATE ' . USER_GROUP_TABLE . '
SET group_leader = ' . (($action == 'promote') ? 1 : 0) . "
WHERE group_id = $group_id
+ AND user_pending = 0
AND " . $db->sql_in_set('user_id', $user_id_ary);
$db->sql_query($sql);
@@ -2946,7 +2960,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
group_update_listings($group_id);
- return true;
+ return false;
}
/**