diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-07 16:55:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-07 16:55:20 +0000 |
| commit | d1e839625ee9b0ca796f83ff55404af4c6307561 (patch) | |
| tree | 6f9f4ec262aa908150d261e51f862874b7fbfeca /phpBB/includes/ucp/ucp_groups.php | |
| parent | 4eac4b268b98ec65b7432685de147d76618e479d (diff) | |
| download | forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.gz forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.bz2 forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.xz forums-d1e839625ee9b0ca796f83ff55404af4c6307561.zip | |
- fix some group specific bugs
- correctly determining terrafrost's birthday mod
git-svn-id: file:///svn/phpbb/trunk@7143 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_groups.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index ea5acf346f..55eb4ec0bc 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -143,8 +143,22 @@ class ucp_groups case 'join': - if (group_memberships($group_id, $user->data['user_id'], true)) + $sql = 'SELECT ug.*, u.username, u.username_clean, u.user_email + FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u + WHERE ug.user_id = u.user_id + AND ug.group_id = ' . $group_id . ' + AND ug.user_id = ' . $user->data['user_id']; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if ($row) { + if ($row['user_pending']) + { + trigger_error($user->lang['ALREADY_IN_GROUP_PENDING'] . $return_page); + } + trigger_error($user->lang['ALREADY_IN_GROUP'] . $return_page); } @@ -817,7 +831,7 @@ class ucp_groups // Approve, demote or promote group_user_attributes('approve', $group_id, $mark_ary, false, ($group_id) ? $group_row['group_name'] : false); - trigger_error($user->lang['USERS_APPROVED'] . $return_page); + trigger_error($user->lang['USERS_APPROVED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&action=list&g=' . $group_id . '">', '</a>')); break; @@ -881,7 +895,7 @@ class ucp_groups $user->add_lang('acp/groups'); - trigger_error($user->lang['GROUP_DEFS_UPDATED'] . $return_page); + trigger_error($user->lang['GROUP_DEFS_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&action=list&g=' . $group_id . '">', '</a>')); } else { @@ -924,10 +938,10 @@ class ucp_groups if ($error) { - trigger_error($user->lang[$error] . $return_page); + trigger_error($user->lang[$error] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&action=list&g=' . $group_id . '">', '</a>')); } - trigger_error($user->lang['GROUP_USERS_REMOVE'] . $return_page); + trigger_error($user->lang['GROUP_USERS_REMOVE'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&action=list&g=' . $group_id . '">', '</a>')); } else { @@ -980,7 +994,7 @@ class ucp_groups trigger_error($user->lang[$error] . $return_page); } - trigger_error($user->lang['GROUP_USERS_ADDED'] . $return_page); + trigger_error($user->lang['GROUP_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&action=list&g=' . $group_id . '">', '</a>')); break; |