1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

- adding ability to assign moderator specific ban options

- fixing destroying of sql caches
- fixing referencing of sql cached queries if more than one are active on one page
- other fixes


git-svn-id: file:///svn/phpbb/trunk@5633 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-03-15 13:03:57 +00:00
parent 8c3f94f9ae
commit d907d066f2
22 changed files with 440 additions and 133 deletions

View File

@@ -209,7 +209,7 @@ class p_master
/**
* Check module authorisation
* @todo implement $this->is_module_id
* @todo Have a look at the eval statement and replace with other code...
*/
function module_auth($module_auth)
{
@@ -291,7 +291,7 @@ class p_master
*/
function load_active($mode = false)
{
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID;
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $user;
$module_path = $phpbb_root_path . 'includes/' . $this->p_class;
$icat = request_var('icat', '');
@@ -322,7 +322,14 @@ class p_master
$this->module = new $instance($this);
// We pre-define the action parameter we are using all over the place
$this->module->u_action = "{$phpbb_admin_path}index.$phpEx$SID" . (($icat) ? '&icat=' . $icat : '') . "&i={$this->p_id}&mode={$this->p_mode}";
if (defined('IN_ADMIN'))
{
$this->module->u_action = "{$phpbb_admin_path}index.$phpEx$SID" . (($icat) ? '&icat=' . $icat : '') . "&i={$this->p_id}&mode={$this->p_mode}";
}
else
{
$this->module->u_action = "{$phpbb_root_path}{$user->page['page_dir']}{$user->page['page_name']}$SID" . (($icat) ? '&icat=' . $icat : '') . "&i={$this->p_id}&mode={$this->p_mode}";
}
// Execute the main method for the new instance, we send the module
// id and mode as parameters