mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

- temporarily disable x-sendfile support (we need to look into methods of checking if it is enabled/disabled or introducing a switch)

Browse Source 
- 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
This commit is contained in:
Meik Sievertsen
2006-10-30 19:51:56 +00:00
parent c44f6ca080
commit 12c75a0991
8 changed files with 97 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_permission_roles.php
View File

@@ -26,7 +26,7 @@ class acp_permission_roles
$auth_admin = new auth_admin();
$user->add_lang('acp/permissions');
$user->add_lang('acp/permissions_phpbb');
add_permission_language();
$this->tpl_name = 'acp_permission_roles';

2
phpBB/includes/acp/acp_permissions.php
View File

@@ -27,7 +27,7 @@ class acp_permissions
$auth_admin = new auth_admin();
$user->add_lang('acp/permissions');
$user->add_lang('acp/permissions_phpbb');
add_permission_language();
$this->tpl_name = 'acp_permissions';

2
phpBB/includes/acp/acp_users.php
View File

@@ -1959,7 +1959,7 @@ class acp_users
$auth_admin = new auth_admin();
$user->add_lang('acp/permissions');
$user->add_lang('acp/permissions_phpbb');
add_permission_language();
// Select auth options
$sql = 'SELECT auth_option, is_local, is_global

41
phpBB/includes/functions_admin.php
View File

@@ -2608,9 +2608,46 @@ function tidy_database()
{
global $db;
set_config('database_last_gc', time(), true);
}
/**
* Add permission language - this will make sure custom files will be included
*/
function add_permission_language()
{
global $user, $phpEx;
// First of all, our own file.
$user->add_lang('acp/permissions_phpbb');
$files_to_add = array();
// Now search in acp and mods folder for permissions_ files.
foreach (array('acp/', 'mods/') as $path)
{
$dh = opendir($user->lang_path . $path);
if ($dh !== false)
{
while (($file = readdir($dh)) !== false)
{
if (strpos($file, 'permissions_') === 0 && strpos($file, 'permissions_phpbb') === false && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx)
{
$files_to_add[] = $path . substr($file, 0, -(strlen($phpEx) + 1));
}
}
closedir($dh);
}
}
if (!sizeof($files_to_add))
{
return false;
}
$user->add_lang($files_to_add);
return true;
}
?>

15
phpBB/includes/utf/utf_tools.php
View File

@@ -111,16 +111,13 @@ if (extension_loaded('mbstring'))
*
* Notes:
* - offset for mb_strrpos was added in 5.2.0, we emulate if it is lower
*
* @author Harry Fuecks
* @param string haystack
* @param string needle
* @param integer (optional) offset (from left)
* @return mixed integer position or FALSE on failure
* @ignore
*/
if (version_compare(phpversion(), '5.2.0', '>='))
{
/**
* UTF-8 aware alternative to strrpos
* @ignore
*/
function utf8_strrpos($str, $needle, $offset = null)
{
// Emulate behaviour of strrpos rather than raising warning
@@ -134,6 +131,10 @@ if (extension_loaded('mbstring'))
}
else
{
/**
* UTF-8 aware alternative to strrpos
* @ignore
*/
function utf8_strrpos($str, $needle, $offset = null)
{
// offset for mb_strrpos was added in 5.2.0