1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

- fix some tiny bugs

- fix module system (sometimes the layout is broken due to falsly deactivated categories)
- auth updates (setting permissions)
- fix "category jumping" bug in acp
- u_action is defined by the module itself


git-svn-id: file:///svn/phpbb/trunk@5558 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-02-18 13:54:12 +00:00
parent f2f0dc7892
commit 26a6d215d0
29 changed files with 954 additions and 866 deletions

View File

@@ -13,6 +13,8 @@
*/
class acp_bbcodes
{
var $u_action;
function main($id, $mode)
{
global $db, $user, $auth, $template, $cache;
@@ -27,8 +29,6 @@ class acp_bbcodes
$this->tpl_name = 'acp_bbcodes';
$this->page_title = 'ACP_BBCODES';
$u_action = "{$phpbb_admin_path}index.$phpEx$SID&i=$id&mode=$mode";
// Set up mode-specific vars
switch ($action)
{
@@ -80,8 +80,8 @@ class acp_bbcodes
$template->assign_vars(array(
'S_EDIT_BBCODE' => true,
'U_BACK' => $u_action,
'U_ACTION' => $u_action . '&action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&bbcode=$bbcode_id" : ''),
'U_BACK' => $this->u_action,
'U_ACTION' => $this->u_action . '&action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&bbcode=$bbcode_id" : ''),
'BBCODE_MATCH' => $bbcode_match,
'BBCODE_TPL' => $bbcode_tpl,
@@ -165,7 +165,7 @@ class acp_bbcodes
add_log('admin', $log_action, $data['bbcode_tag']);
trigger_error($user->lang[$lang] . adm_back_link($u_action));
trigger_error($user->lang[$lang] . adm_back_link($this->u_action));
break;
@@ -186,7 +186,7 @@ class acp_bbcodes
}
$template->assign_vars(array(
'U_ACTION' => $u_action . '&mode=add')
'U_ACTION' => $this->u_action . '&mode=add')
);
$sql = 'SELECT *
@@ -198,8 +198,8 @@ class acp_bbcodes
{
$template->assign_block_vars('bbcodes', array(
'BBCODE_TAG' => $row['bbcode_tag'],
'U_EDIT' => $u_action . '&action=edit&bbcode=' . $row['bbcode_id'],
'U_DELETE' => $u_action . '&action=delete&bbcode=' . $row['bbcode_id'])
'U_EDIT' => $this->u_action . '&action=edit&bbcode=' . $row['bbcode_id'],
'U_DELETE' => $this->u_action . '&action=delete&bbcode=' . $row['bbcode_id'])
);
}
$db->sql_freeresult($result);