diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-28 17:10:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-28 17:10:07 +0000 |
| commit | 7e47a8ddb023b3851d9f2d1dd153e535cb41172d (patch) | |
| tree | 5968fe5a259b63d7f3330c808a6f5026625d3f8f /phpBB/includes/acp | |
| parent | fe9590cf5a3946260d61748cfc2ac0e13f10c23b (diff) | |
| download | forums-7e47a8ddb023b3851d9f2d1dd153e535cb41172d.tar forums-7e47a8ddb023b3851d9f2d1dd153e535cb41172d.tar.gz forums-7e47a8ddb023b3851d9f2d1dd153e535cb41172d.tar.bz2 forums-7e47a8ddb023b3851d9f2d1dd153e535cb41172d.tar.xz forums-7e47a8ddb023b3851d9f2d1dd153e535cb41172d.zip | |
added ability to hide coppa groups (mainly applied to permission screens)
git-svn-id: file:///svn/phpbb/trunk@5744 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 4c002357bd..912e9c9af3 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -74,6 +74,7 @@ class acp_board 'coppa_enable' => array('lang' => 'ENABLE_COPPA', 'type' => 'radio:yes_no', 'explain' => true), 'coppa_mail' => array('lang' => 'COPPA_MAIL', 'type' => 'textarea:5:40', 'explain' => true), 'coppa_fax' => array('lang' => 'COPPA_FAX', 'type' => 'text:25:100', 'explain' => false), + 'coppa_hide_groups' => array('lang' => 'COPPA_HIDE_GROUPS', 'type' => 'radio:yes_no', 'explain' => true), 'legend3' => 'REGISTRATION', 'require_activation'=> array('lang' => 'ACC_ACTIVATION', 'type' => 'custom', 'method' => 'select_acc_activation', 'explain' => true), diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index f190f151c9..aad8997395 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -564,7 +564,10 @@ class acp_groups $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); $leader = $member = 0; - $group_data = array(); + $group_data = array( + 'leader' => array(), + 'member' => array(), + ); while ($row = $db->sql_fetchrow($result)) { diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index b146e09a91..2d855c0c08 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -51,9 +51,12 @@ class acp_permissions if ($select_all_groups) { // Add default groups to selection + $sql_and = ($config['coppa_hide_groups']) ? " AND group_name NOT IN ('INACTIVE_COPPA', 'REGISTERED_COPPA')" : ''; + $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' - WHERE group_type = ' . GROUP_SPECIAL; + WHERE group_type = ' . GROUP_SPECIAL . " + $sql_and"; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) |