diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-02-22 15:48:29 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-02-22 15:48:29 +0000 |
| commit | 95b69cfa7f66e721cea3f8a5d62ad1cb2b822cfc (patch) | |
| tree | d603f3dcb7e1a2172478fe0a043cd27be221604f /phpBB/modules/ucp/ucp_groups.php | |
| parent | 794c5749696c9fa2595ed3a1d7c836a0d984e11c (diff) | |
| download | forums-95b69cfa7f66e721cea3f8a5d62ad1cb2b822cfc.tar forums-95b69cfa7f66e721cea3f8a5d62ad1cb2b822cfc.tar.gz forums-95b69cfa7f66e721cea3f8a5d62ad1cb2b822cfc.tar.bz2 forums-95b69cfa7f66e721cea3f8a5d62ad1cb2b822cfc.tar.xz forums-95b69cfa7f66e721cea3f8a5d62ad1cb2b822cfc.zip | |
$auth-> to phpbb::$acl->
git-svn-id: file:///svn/phpbb/trunk@9335 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/modules/ucp/ucp_groups.php')
| -rw-r--r-- | phpBB/modules/ucp/ucp_groups.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/modules/ucp/ucp_groups.php b/phpBB/modules/ucp/ucp_groups.php index 3935ac86c2..83b9cf42f0 100644 --- a/phpBB/modules/ucp/ucp_groups.php +++ b/phpBB/modules/ucp/ucp_groups.php @@ -78,7 +78,7 @@ class ucp_groups trigger_error(phpbb::$user->lang['ALREADY_DEFAULT_GROUP'] . $return_page); } - if (!$auth->acl_get('u_chggrp')) + if (!phpbb::$acl->acl_get('u_chggrp')) { trigger_error(phpbb::$user->lang['NOT_AUTHORISED'] . $return_page); } @@ -113,7 +113,7 @@ class ucp_groups case 'resign': // User tries to resign from default group but is not allowed to change it? - if ($group_id == phpbb::$user->data['group_id'] && !$auth->acl_get('u_chggrp')) + if ($group_id == phpbb::$user->data['group_id'] && !phpbb::$acl->acl_get('u_chggrp')) { trigger_error(phpbb::$user->lang['NOT_RESIGN_FROM_DEFAULT_GROUP'] . $return_page); } @@ -341,7 +341,7 @@ class ucp_groups $db->sql_freeresult($result); // Hide hidden groups unless user is an admin with group privileges - $sql_and = ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? '<> ' . GROUP_SPECIAL : 'NOT IN (' . GROUP_SPECIAL . ', ' . GROUP_HIDDEN . ')'; + $sql_and = (phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? '<> ' . GROUP_SPECIAL : 'NOT IN (' . GROUP_SPECIAL . ', ' . GROUP_HIDDEN . ')'; $sql = 'SELECT group_id, group_name, group_colour, group_desc, group_desc_uid, group_desc_bitfield, group_desc_options, group_type, group_founder_manage FROM ' . GROUPS_TABLE . ' @@ -380,7 +380,7 @@ class ucp_groups 'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'], 'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : phpbb::$user->lang['GROUP_IS_SPECIAL'], 'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true, - 'GROUP_CLOSED' => ($row['group_type'] <> GROUP_CLOSED || $auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true, + 'GROUP_CLOSED' => ($row['group_type'] <> GROUP_CLOSED || phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true, 'GROUP_STATUS' => phpbb::$user->lang['GROUP_IS_' . $group_status], 'S_CAN_JOIN' => ($row['group_type'] == GROUP_OPEN || $row['group_type'] == GROUP_FREE) ? true : false, 'GROUP_COLOUR' => $row['group_colour'], @@ -391,7 +391,7 @@ class ucp_groups $db->sql_freeresult($result); $template->assign_vars(array( - 'S_CHANGE_DEFAULT' => ($auth->acl_get('u_chggrp')) ? true : false, + 'S_CHANGE_DEFAULT' => (phpbb::$acl->acl_get('u_chggrp')) ? true : false, 'S_LEADER_COUNT' => $leader_count, 'S_MEMBER_COUNT' => $member_count, 'S_PENDING_COUNT' => $pending_count, |