aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-10-30 19:51:56 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-10-30 19:51:56 +0000
commit12c75a0991a59eecd274eb2b03476e80ae608eaa (patch)
treeca3acbedd1a8c67f3abb02587dcc2badd46f0189 /phpBB/language
parentc44f6ca080c944b57dc912de8708e5239c1543a2 (diff)
downloadforums-12c75a0991a59eecd274eb2b03476e80ae608eaa.tar
forums-12c75a0991a59eecd274eb2b03476e80ae608eaa.tar.gz
forums-12c75a0991a59eecd274eb2b03476e80ae608eaa.tar.bz2
forums-12c75a0991a59eecd274eb2b03476e80ae608eaa.tar.xz
forums-12c75a0991a59eecd274eb2b03476e80ae608eaa.zip
- temporarily disable x-sendfile support (we need to look into methods of checking if it is enabled/disabled or introducing a switch)
- finally allow custom permission settings files (in acp/ as well as in mods/) git-svn-id: file:///svn/phpbb/trunk@6539 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php51
1 files changed, 30 insertions, 21 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index ddadceac7a..df2d9e8c6f 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -1,14 +1,11 @@
<?php
/**
-*
* acp_permissions (phpBB Permission Set) [English]
*
* @package language
* @version $Id$
* @copyright (c) 2005 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-* @todo You are able to put your permission sets into a seperate file too by prefixing it with permissions_ and putting it into the acp language folder.
*/
/**
@@ -31,22 +28,35 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-/*
- MODDERS PLEASE NOTE
-
- Please add your permission settings this way:
-
- // Adding new category
- $lang['permission_cat']['bugs'] = 'Bugs';
-
- // Adding new permission set
- $lang['permission_type']['bug_'] = 'Bug Permissions';
-
- // Adding the permissions
- $lang = array_merge($lang, array(
- 'acl_bug_view' => array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
- 'acl_bug_post' => array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
- ));
+/**
+* MODDERS PLEASE NOTE
+*
+* You are able to put your permission sets into a seperate file too by
+* prefixing the new file with permissions_ and putting it into the acp
+* language folder.
+*
+* An example of how the file could look like:
+*
+* <code>
+*
+* if (empty($lang) || !is_array($lang))
+* {
+* $lang = array();
+* }
+*
+* // Adding new category
+* $lang['permission_cat']['bugs'] = 'Bugs';
+*
+* // Adding new permission set
+* $lang['permission_type']['bug_'] = 'Bug Permissions';
+*
+* // Adding the permissions
+* $lang = array_merge($lang, array(
+* 'acl_bug_view' => array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
+* 'acl_bug_post' => array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
+* ));
+*
+* </code>
*/
// Define categories and permission types
@@ -214,8 +224,7 @@ $lang = array_merge($lang, array(
'acl_a_email' => array('lang' => 'Can send mass email', 'cat' => 'misc'),
'acl_a_bots' => array('lang' => 'Can manage bots', 'cat' => 'misc'),
'acl_a_reasons' => array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
- 'acl_a_backup' => array('lang' => 'Can backup database', 'cat' => 'misc'),
-# 'acl_a_restore' => array('lang' => 'Can restore database', 'cat' => 'misc'),
+ 'acl_a_backup' => array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
'acl_a_search' => array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
));