diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-05-29 12:25:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-05-29 12:25:56 +0000 |
| commit | 2f4a618900e2c3b6ea14c68cbeb5897cd2ac1a04 (patch) | |
| tree | 3b7ea329bf35eab5ddab9b0b5eb790e45e283a5c /phpBB/ucp.php | |
| parent | 91b4fe1868ca2c4d81111943f781e3cfd0262ef2 (diff) | |
| download | forums-2f4a618900e2c3b6ea14c68cbeb5897cd2ac1a04.tar forums-2f4a618900e2c3b6ea14c68cbeb5897cd2ac1a04.tar.gz forums-2f4a618900e2c3b6ea14c68cbeb5897cd2ac1a04.tar.bz2 forums-2f4a618900e2c3b6ea14c68cbeb5897cd2ac1a04.tar.xz forums-2f4a618900e2c3b6ea14c68cbeb5897cd2ac1a04.zip | |
ok... i hope i haven't messed too much with the code and everything is still working.
Changes:
- Ascraeus now uses constants for the phpbb root path and the php extension. This ensures more security for external applications and modifications (no more overwriting of root path and extension possible through insecure mods and register globals enabled) as well as no more globalizing needed.
- A second change implemented here is an additional short-hand-notation for append_sid(). It is allowed to omit the root path and extension now (for example calling append_sid('memberlist')) - in this case the root path and extension get added automatically. The hook is called after these are added.
git-svn-id: file:///svn/phpbb/trunk@8572 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/ucp.php')
| -rwxr-xr-x | phpBB/ucp.php | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 1d182a713a..88feeeac2f 100755 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -12,11 +12,11 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; -$phpEx = substr(strrchr(__FILE__, '.'), 1); -require($phpbb_root_path . 'common.' . $phpEx); -require($phpbb_root_path . 'includes/functions_user.' . $phpEx); -require($phpbb_root_path . 'includes/functions_module.' . $phpEx); +if (!defined('PHPBB_ROOT_PATH')) define('PHPBB_ROOT_PATH', './'); +if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1)); +include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT); +require(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT); +require(PHPBB_ROOT_PATH . 'includes/functions_module.' . PHP_EXT); // Basic parameter data $id = request_var('i', ''); @@ -44,7 +44,7 @@ switch ($mode) $module->load('ucp', 'activate'); $module->display($user->lang['UCP_ACTIVATE']); - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect(append_sid('index')); break; case 'resend_act': @@ -60,7 +60,7 @@ switch ($mode) case 'register': if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect(append_sid('index')); } $module->load('ucp', 'register'); @@ -75,10 +75,10 @@ switch ($mode) case 'login': if ($user->data['is_registered']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect(append_sid('index')); } - login_box(request_var('redirect', "index.$phpEx")); + login_box(request_var('redirect', 'index' . PHP_EXT)); break; case 'logout': @@ -92,9 +92,9 @@ switch ($mode) { $message = ($user->data['user_id'] == ANONYMOUS) ? $user->lang['LOGOUT_REDIRECT'] : $user->lang['LOGOUT_FAILED']; } - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, append_sid('index')); - $message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a> '); + $message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a> '); trigger_error($message); break; @@ -109,7 +109,7 @@ switch ($mode) { if ($user->data['is_registered']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect(append_sid('index')); } login_box(); @@ -126,7 +126,7 @@ switch ($mode) 'S_AGREEMENT' => true, 'AGREEMENT_TITLE' => $user->lang[$title], 'AGREEMENT_TEXT' => sprintf($user->lang[$message], $config['sitename'], generate_board_url()), - 'U_BACK' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), + 'U_BACK' => append_sid('ucp', 'mode=login'), 'L_BACK' => $user->lang['BACK_TO_LOGIN']) ); @@ -161,9 +161,9 @@ switch ($mode) $user->session_kill(); $user->session_begin(); - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, append_sid('index')); - $message = $user->lang['COOKIES_DELETED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>'); + $message = $user->lang['COOKIES_DELETED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>'); trigger_error($message); } else @@ -171,7 +171,7 @@ switch ($mode) confirm_box(false, 'DELETE_COOKIES', ''); } - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect(append_sid('index')); break; @@ -188,20 +188,20 @@ switch ($mode) if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == $user->data['user_id']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect(append_sid('index')); } - include($phpbb_root_path . 'includes/acp/auth.' . $phpEx); + include(PHPBB_ROOT_PATH . 'includes/acp/auth.' . PHP_EXT); $auth_admin = new auth_admin(); if (!$auth_admin->ghost_permissions($user_id, $user->data['user_id'])) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect(append_sid('index')); } add_log('admin', 'LOG_ACL_TRANSFER_PERMISSIONS', $user_row['username']); - $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>'); + $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>'); trigger_error($message); break; @@ -210,7 +210,7 @@ switch ($mode) if (!$user->data['user_perm_from'] || !$auth->acl_get('a_switchperm')) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect(append_sid('index')); } $auth->acl_cache($user->data); @@ -229,7 +229,7 @@ switch ($mode) add_log('admin', 'LOG_ACL_RESTORE_PERMISSIONS', $username); - $message = $user->lang['PERMISSIONS_RESTORED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>'); + $message = $user->lang['PERMISSIONS_RESTORED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>'); trigger_error($message); break; @@ -240,7 +240,7 @@ if (!$user->data['is_registered']) { if ($user->data['is_bot']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect(append_sid('index')); } login_box('', $user->lang['LOGIN_EXPLAIN_UCP']); @@ -310,7 +310,7 @@ $module->set_active($id, $mode); $module->load_active(); // Assign data to the template engine for the list of modules -$module->assign_tpl_vars(append_sid("{$phpbb_root_path}ucp.$phpEx")); +$module->assign_tpl_vars(append_sid('ucp')); // Generate the page, do not display/query online list $module->display($module->get_page_title(), false); |