diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_prune_forums.html | 5 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 16 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions.php | 1 |
4 files changed, 21 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 00710ccb4f..a59fa4ceff 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -41,8 +41,11 @@ <fieldset> <legend>{L_SELECT_FORUM}</legend> + <p>{L_LOOK_UP_FORUMS_EXPLAIN}</p> <dl> - <dd class="full"><select name="f[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></dd> + <dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt> + <dd><select name="f[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></dd> + <dd><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</dd> </dl> <p class="quick"> diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index 484c936be5..49c68beef1 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -46,9 +46,25 @@ class acp_prune global $db, $user, $auth, $template, $cache; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; + $all_forums = request_var('all_forums', 0); $forum_id = request_var('f', array(0)); $submit = (isset($_POST['submit'])) ? true : false; + if ($all_forums) + { + $sql = 'SELECT forum_id + FROM ' . FORUMS_TABLE . ' + ORDER BY left_id'; + $result = $db->sql_query($sql); + + $forum_id = array(); + while ($row = $db->sql_fetchrow($result)) + { + $forum_id[] = $row['forum_id']; + } + $db->sql_freeresult($result); + } + if ($submit) { $prune_posted = request_var('prune_days', 0); diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 15c98672fb..1f8b473ba4 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -232,6 +232,7 @@ $lang = array_merge($lang, array( 'LOGIN_ADMIN_CONFIRM' => 'To administer the board you must re-authenticate yourself.', 'LOGIN_ADMIN_SUCCESS' => 'You have successfully authenticated and will now be redirected to the Administration Control Panel', 'LOOK_UP_FORUM' => 'Select a forum', + 'LOOK_UP_FORUMS_EXPLAIN'=> 'You are able to select more than one forum', 'MANAGE' => 'Manage', 'MOVE_DOWN' => 'Move down', diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index 70226c0684..31ded03e38 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -118,7 +118,6 @@ $lang = array_merge($lang, array( 'GROUPS_NOT_ASSIGNED' => 'No group assigned to this role', - 'LOOK_UP_FORUMS_EXPLAIN' => 'You are able to select more than one forum', 'LOOK_UP_GROUP' => 'Look up usergroup', 'LOOK_UP_USER' => 'Look up user', |