diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-09-07 14:01:18 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-09-07 14:01:18 +0000 |
| commit | c8ecf341b909f901bfef997fb5d753011303f716 (patch) | |
| tree | a1055a32981d18bf0975967168ad11636c800525 /phpBB | |
| parent | a74fe8a8113f9b20fa8bb16b16d07592d54b7186 (diff) | |
| download | forums-c8ecf341b909f901bfef997fb5d753011303f716.tar forums-c8ecf341b909f901bfef997fb5d753011303f716.tar.gz forums-c8ecf341b909f901bfef997fb5d753011303f716.tar.bz2 forums-c8ecf341b909f901bfef997fb5d753011303f716.tar.xz forums-c8ecf341b909f901bfef997fb5d753011303f716.zip | |
Maybe - just maybe - it might a good idea to only allow users actually allowed to change permissions to do so.
git-svn-id: file:///svn/phpbb/trunk@8083 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 10 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 1aef98c36b..77d3c59a6f 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -171,10 +171,12 @@ <dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt> <dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd> </dl> - <dl> - <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> - <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd> - </dl> + <!-- IF S_CAN_COPY_PERMISSIONS --> + <dl> + <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> + <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd> + </dl> + <!-- ENDIF --> </fieldset> <div id="forum_cat_options"> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 63bf32773f..616ceb3098 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -202,6 +202,7 @@ p a { <li>[Fix] Do not use register_shutdown_function within cron.php if handling the queue and the mail function being used (Bug #14321)</li> <li>[Fix] Fixing private message on-hold code if moving messages into folder based on rules (Bug #14309)</li> <li>[Fix] Allow the merge selection screen to work (Bug #14363)</li> + <li>[Change] Require additional permissions for copying permission when editing forums </li> </ul> </div> diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 41991fdae0..8ac3f2cec7 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -163,7 +163,8 @@ class acp_forums $forum_perm_from = request_var('forum_perm_from', 0); // Copy permissions? - if ($forum_perm_from && !empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id']) + if ($forum_perm_from && !empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] && + (($action != 'edit') || $auth->acl_get('acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth'))) { // if we edit a forum delete current permissions first if ($action == 'edit') @@ -656,6 +657,7 @@ class acp_forums 'S_PRUNE_STICKY' => ($forum_data['forum_flags'] & FORUM_FLAG_PRUNE_STICKY) ? true : false, 'S_DISPLAY_ACTIVE_TOPICS' => ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS) ? true : false, 'S_ENABLE_POST_REVIEW' => ($forum_data['forum_flags'] & FORUM_FLAG_POST_REVIEW) ? true : false, + 'S_CAN_COPY_PERMISSIONS' => (($action != 'edit') || $auth->acl_get('acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth')), ) ); |