diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-02-18 13:54:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-02-18 13:54:12 +0000 |
| commit | 26a6d215d0897afa82eea9b0cc0fca79d4544da5 (patch) | |
| tree | 50645d56ce20cb6fa5e18a2eb1036deba65a1068 /phpBB/includes/acp/acp_modules.php | |
| parent | f2f0dc78929228619f8644d6553a02a8d1572242 (diff) | |
| download | forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar.gz forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar.bz2 forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar.xz forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.zip | |
- 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
Diffstat (limited to 'phpBB/includes/acp/acp_modules.php')
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index ba366c6982..39239d8901 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -24,6 +24,7 @@ class acp_modules { var $module_class = ''; + var $u_action; function main($id, $mode) { @@ -51,7 +52,6 @@ class acp_modules $this->page_title = strtoupper($this->module_class); - $u_action = "{$phpbb_admin_path}index.$phpEx$SID&i=$id&mode=$mode"; $parent_id = request_var('parent_id', 0); $module_id = request_var('m', 0); $action = request_var('action', ''); @@ -62,7 +62,7 @@ class acp_modules case 'delete': if (!$module_id) { - trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($u_action . '&parent_id=' . $parent_id)); + trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $parent_id)); } if (confirm_box(true)) @@ -72,7 +72,7 @@ class acp_modules if (!sizeof($errors)) { $this->remove_cache_file(); - trigger_error($user->lang['MODULE_DELETED'] . adm_back_link($u_action . '&parent_id=' . $parent_id)); + trigger_error($user->lang['MODULE_DELETED'] . adm_back_link($this->u_action . '&parent_id=' . $parent_id)); } } else @@ -92,7 +92,7 @@ class acp_modules case 'disable': if (!$module_id) { - trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($u_action . '&parent_id=' . $parent_id)); + trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $parent_id)); } $sql = 'UPDATE ' . MODULES_TABLE . ' @@ -109,7 +109,7 @@ class acp_modules case 'move_down': if (!$module_id) { - trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($u_action . '&parent_id=' . $parent_id)); + trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $parent_id)); } $sql = 'SELECT parent_id, left_id, right_id, module_langname @@ -120,7 +120,7 @@ class acp_modules if (!($row = $db->sql_fetchrow($result))) { - trigger_error($user->lang['NO_MODULE'] . adm_back_link($u_action . '&parent_id=' . $parent_id)); + trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&parent_id=' . $parent_id)); } $db->sql_freeresult($result); @@ -251,7 +251,7 @@ class acp_modules recalc_btree('module_id', MODULES_TABLE, $this->module_class); $this->remove_cache_file(); - trigger_error($user->lang['MODULE_ADDED'] . adm_back_link($u_action . '&parent_id=' . $parent_id)); + trigger_error($user->lang['MODULE_ADDED'] . adm_back_link($this->u_action . '&parent_id=' . $parent_id)); } } } @@ -272,7 +272,7 @@ class acp_modules if (!$module_id) { - trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($u_action . '&parent_id=' . $parent_id)); + trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $parent_id)); } $module_row = $this->get_module_row($module_id); @@ -310,7 +310,7 @@ class acp_modules { if (!$module_data['module_langname']) { - trigger_error($user->lang['NO_MODULE_LANGNAME'] . adm_back_link($u_action . '&parent_id=' . $parent_id)); + trigger_error($user->lang['NO_MODULE_LANGNAME'] . adm_back_link($this->u_action . '&parent_id=' . $parent_id)); } $module_type = request_var('module_type', 'category'); @@ -341,7 +341,7 @@ class acp_modules recalc_btree('module_id', MODULES_TABLE, $this->module_class); $this->remove_cache_file(); - trigger_error((($action == 'add') ? $user->lang['MODULE_ADDED'] : $user->lang['MODULE_EDITED']) . adm_back_link($u_action . '&parent_id=' . $parent_id)); + trigger_error((($action == 'add') ? $user->lang['MODULE_ADDED'] : $user->lang['MODULE_EDITED']) . adm_back_link($this->u_action . '&parent_id=' . $parent_id)); } } @@ -388,8 +388,8 @@ class acp_modules 'S_CAT_OPTIONS' => $s_cat_option . $this->make_module_select($module_data['parent_id'], ($action == 'edit') ? $module_row['module_id'] : false, false, false, false, true), 'S_MODULE_NAMES' => $s_name_options, 'S_MODULE_MODES' => $s_mode_options, - 'U_BACK' => $u_action . '&parent_id=' . $parent_id, - 'U_EDIT_ACTION' => $u_action . '&parent_id=' . $parent_id, + 'U_BACK' => $this->u_action . '&parent_id=' . $parent_id, + 'U_EDIT_ACTION' => $this->u_action . '&parent_id=' . $parent_id, 'L_TITLE' => $user->lang[strtoupper($action) . '_MODULE'], @@ -429,7 +429,7 @@ class acp_modules } else { - $navigation = '<a href="' . $u_action . '">' . strtoupper($this->module_class) . '</a>'; + $navigation = '<a href="' . $this->u_action . '">' . strtoupper($this->module_class) . '</a>'; $modules_nav = $this->get_module_branch($parent_id, 'parents', 'descending'); foreach ($modules_nav as $row) @@ -442,7 +442,7 @@ class acp_modules } else { - $navigation .= ' -> <a href="' . $u_action . '&parent_id=' . $row['module_id'] . '">' . $langname . '</a>'; + $navigation .= ' -> <a href="' . $this->u_action . '&parent_id=' . $row['module_id'] . '">' . $langname . '</a>'; } } } @@ -472,7 +472,7 @@ class acp_modules $module_image = (!$row['module_name'] || $row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" width="46" height="25" alt="' . $user->lang['CATEGORY'] . '" />' : '<img src="images/icon_folder.gif" width="46" height="25" alt="' . $user->lang['MODULE'] . '" />'; } - $url = $u_action . '&parent_id=' . $parent_id . '&m=' . $row['module_id']; + $url = $this->u_action . '&parent_id=' . $parent_id . '&m=' . $row['module_id']; $template->assign_block_vars('modules', array( 'MODULE_IMAGE' => $module_image, @@ -480,7 +480,7 @@ class acp_modules 'MODULE_ENABLED' => ($row['module_enabled']) ? true : false, 'MODULE_DISPLAYED' => ($row['module_display']) ? true : false, - 'U_MODULE' => $u_action . '&parent_id=' . $row['module_id'], + 'U_MODULE' => $this->u_action . '&parent_id=' . $row['module_id'], 'U_MOVE_UP' => $url . '&action=move_up', 'U_MOVE_DOWN' => $url . '&action=move_down', 'U_EDIT' => $url . '&action=edit', @@ -495,7 +495,7 @@ class acp_modules { $row = $this->get_module_row($parent_id); - $url = $u_action . '&parent_id=' . $parent_id . '&m=' . $row['module_id']; + $url = $this->u_action . '&parent_id=' . $parent_id . '&m=' . $row['module_id']; $template->assign_vars(array( 'S_NO_MODULES' => true, @@ -528,8 +528,8 @@ class acp_modules } $template->assign_vars(array( - 'U_SEL_ACTION' => $u_action, - 'U_ACTION' => $u_action . '&parent_id=' . $parent_id, + 'U_SEL_ACTION' => $this->u_action, + 'U_ACTION' => $this->u_action . '&parent_id=' . $parent_id, 'NAVIGATION' => $navigation, 'MODULE_BOX' => $module_box, 'PARENT_ID' => $parent_id, |