From 2f4a618900e2c3b6ea14c68cbeb5897cd2ac1a04 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 29 May 2008 12:25:56 +0000 Subject: 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 --- phpBB/ucp.php | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'phpBB/ucp.php') 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 . '

' . sprintf($user->lang['RETURN_INDEX'], '', ' '); + $message = $message . '

' . sprintf($user->lang['RETURN_INDEX'], '', ' '); 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'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = $user->lang['COOKIES_DELETED'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); 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']) . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); 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'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = $user->lang['PERMISSIONS_RESTORED'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); 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); -- cgit v1.2.1 From 150c6c4c245ac2728bca78aee998da9fe8ca7bb8 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 4 Jun 2008 15:38:14 +0000 Subject: removed executable props [Bug #6464] git-svn-id: file:///svn/phpbb/trunk@8599 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 phpBB/ucp.php (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php old mode 100755 new mode 100644 -- cgit v1.2.1 From eeba8f456003cdcbdd4a6573b6a3b25250bbccef Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 13 Jun 2008 19:44:40 +0000 Subject: Fix some instances where we left db connections open (registration -> captcha for example) git-svn-id: file:///svn/phpbb/trunk@8656 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 88feeeac2f..32de59da38 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -69,7 +69,7 @@ switch ($mode) case 'confirm': $module->load('ucp', 'confirm'); - exit_handler(); + exit; break; case 'login': @@ -93,7 +93,7 @@ switch ($mode) $message = ($user->data['user_id'] == ANONYMOUS) ? $user->lang['LOGOUT_REDIRECT'] : $user->lang['LOGOUT_FAILED']; } meta_refresh(3, append_sid('index')); - + $message = $message . '

' . sprintf($user->lang['RETURN_INDEX'], '', ' '); trigger_error($message); @@ -135,7 +135,7 @@ switch ($mode) break; case 'delete_cookies': - + // Delete Cookies with dynamic names (do NOT delete poll cookies) if (confirm_box(true)) { -- cgit v1.2.1 From e6e9618be678180083bece4c6342c103a5057b4a Mon Sep 17 00:00:00 2001 From: "Marek A. R" Date: Sun, 27 Jul 2008 22:39:22 +0000 Subject: Fix ucp.php?mode=login login box redirect git-svn-id: file:///svn/phpbb/trunk@8686 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 32de59da38..603391c046 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -78,7 +78,7 @@ switch ($mode) redirect(append_sid('index')); } - login_box(request_var('redirect', 'index' . PHP_EXT)); + login_box(request_var('redirect', 'index')); break; case 'logout': -- cgit v1.2.1 From bb97d3531aae6d11f468e72a9db0c2bb4282ebec Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 23 Sep 2008 13:31:04 +0000 Subject: remove exit statement and make sure no "additional" code gets executed git-svn-id: file:///svn/phpbb/trunk@8916 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 82 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 35 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 603391c046..d4eb566301 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -37,7 +37,7 @@ $template->assign_var('S_IN_UCP', true); $module = new p_master(); -// Basic "global" modes +// Go through basic "global" modes switch ($mode) { case 'activate': @@ -69,7 +69,6 @@ switch ($mode) case 'confirm': $module->load('ucp', 'confirm'); - exit; break; case 'login': @@ -233,26 +232,57 @@ switch ($mode) trigger_error($message); break; -} -// Only registered users can go beyond this point -if (!$user->data['is_registered']) -{ - if ($user->data['is_bot']) - { - redirect(append_sid('index')); - } + default: - login_box('', $user->lang['LOGIN_EXPLAIN_UCP']); -} + // Only registered users can go beyond this point + if (!$user->data['is_registered']) + { + if ($user->data['is_bot']) + { + redirect(append_sid('index')); + } + + login_box('', $user->lang['LOGIN_EXPLAIN_UCP']); + } -// Instantiate module system and generate list of available modules -$module->list_modules('ucp'); + // Instantiate module system and generate list of available modules + $module->list_modules('ucp'); + + // Check if the zebra module is set + if ($module->is_active('zebra', 'friends')) + { + _display_friends(); + } + + // Do not display subscribed topics/forums if not allowed + if (!$config['allow_topic_notify'] && !$config['allow_forum_notify']) + { + $module->set_display('main', 'subscribed', false); + } -// Check if the zebra module is set -if ($module->is_active('zebra', 'friends')) + // Select the active module + $module->set_active($id, $mode); + + // Load and execute the relevant module + $module->load_active(); + + // Assign data to the template engine for the list of modules + $module->assign_tpl_vars(append_sid('ucp')); + + // Generate the page, do not display/query online list + $module->display($module->get_page_title(), false); + + break; +} + +/** +* Output listing of friends online +*/ +function _display_friends() { - // Output listing of friends online + global $config, $db, $template, $user, $auth; + $update_time = $config['load_online_time'] * 60; $sql = $db->sql_build_query('SELECT_DISTINCT', array( @@ -297,24 +327,6 @@ if ($module->is_active('zebra', 'friends')) $db->sql_freeresult($result); } -// Do not display subscribed topics/forums if not allowed -if (!$config['allow_topic_notify'] && !$config['allow_forum_notify']) -{ - $module->set_display('main', 'subscribed', false); -} - -// Select the active module -$module->set_active($id, $mode); - -// Load and execute the relevant module -$module->load_active(); - -// Assign data to the template engine for the list of modules -$module->assign_tpl_vars(append_sid('ucp')); - -// Generate the page, do not display/query online list -$module->display($module->get_page_title(), false); - /** * Function for assigning a template var if the zebra module got included */ -- cgit v1.2.1 From 07e9b83a3de0264916a058b9cf180b91b297604f Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 24 Nov 2008 00:20:33 +0000 Subject: - updated all code to use the request class instead of any direct access to super globals - disabled super globals in common.php. See commit r9101 for more information - cleaned up/simplified a few lines along the way. git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index d4eb566301..8fd3243341 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -58,7 +58,7 @@ switch ($mode) break; case 'register': - if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])) + if ($user->data['is_registered'] || request::is_set('not_agreed')) { redirect(append_sid('index')); } @@ -81,7 +81,7 @@ switch ($mode) break; case 'logout': - if ($user->data['user_id'] != ANONYMOUS && isset($_GET['sid']) && !is_array($_GET['sid']) && $_GET['sid'] === $user->session_id) + if ($user->data['user_id'] != ANONYMOUS && request::variable('sid', '', false, request::GET) === $user->session_id) { $user->session_kill(); $user->session_begin(); @@ -140,7 +140,8 @@ switch ($mode) { $set_time = time() - 31536000; - foreach ($_COOKIE as $cookie_name => $cookie_data) + $cookies = request::variable_names(request::COOKIE); + foreach ($cookies as $cookie_name) { $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); -- cgit v1.2.1 From 5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 25 Dec 2008 14:47:57 +0000 Subject: add nils' request and super globals class rename request:: to phpbb_request:: git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 8fd3243341..eabe067479 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -58,7 +58,7 @@ switch ($mode) break; case 'register': - if ($user->data['is_registered'] || request::is_set('not_agreed')) + if ($user->data['is_registered'] || phpbb_request::is_set('not_agreed')) { redirect(append_sid('index')); } @@ -81,7 +81,7 @@ switch ($mode) break; case 'logout': - if ($user->data['user_id'] != ANONYMOUS && request::variable('sid', '', false, request::GET) === $user->session_id) + if ($user->data['user_id'] != ANONYMOUS && phpbb_request::variable('sid', '', false, phpbb_request::GET) === $user->session_id) { $user->session_kill(); $user->session_begin(); @@ -140,7 +140,7 @@ switch ($mode) { $set_time = time() - 31536000; - $cookies = request::variable_names(request::COOKIE); + $cookies = phpbb_request::variable_names(phpbb_request::COOKIE); foreach ($cookies as $cookie_name) { $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); -- cgit v1.2.1 From 19aed179e53f9660a7202e2e50816e1cef0f7be9 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 28 Dec 2008 23:30:09 +0000 Subject: $config to phpbb::$config git-svn-id: file:///svn/phpbb/trunk@9242 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index eabe067479..dfa640b388 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -124,7 +124,7 @@ switch ($mode) $template->assign_vars(array( 'S_AGREEMENT' => true, 'AGREEMENT_TITLE' => $user->lang[$title], - 'AGREEMENT_TEXT' => sprintf($user->lang[$message], $config['sitename'], generate_board_url()), + 'AGREEMENT_TEXT' => sprintf($user->lang[$message], phpbb::$config['sitename'], generate_board_url()), 'U_BACK' => append_sid('ucp', 'mode=login'), 'L_BACK' => $user->lang['BACK_TO_LOGIN']) ); @@ -143,7 +143,7 @@ switch ($mode) $cookies = phpbb_request::variable_names(phpbb_request::COOKIE); foreach ($cookies as $cookie_name) { - $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); + $cookie_name = str_replace(phpbb::$config['cookie_name'] . '_', '', $cookie_name); // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ if (strpos($cookie_name, 'poll_') !== 0) @@ -257,7 +257,7 @@ switch ($mode) } // Do not display subscribed topics/forums if not allowed - if (!$config['allow_topic_notify'] && !$config['allow_forum_notify']) + if (!phpbb::$config['allow_topic_notify'] && !phpbb::$config['allow_forum_notify']) { $module->set_display('main', 'subscribed', false); } @@ -282,9 +282,9 @@ switch ($mode) */ function _display_friends() { - global $config, $db, $template, $user, $auth; + global $db, $template, $user, $auth; - $update_time = $config['load_online_time'] * 60; + $update_time = phpbb::$config['load_online_time'] * 60; $sql = $db->sql_build_query('SELECT_DISTINCT', array( 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', -- cgit v1.2.1 From 57aea7e62f7df2424ffbd1adc90941bff482d7ea Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 16 Jan 2009 17:41:04 +0000 Subject: modified some files to get the admin index page working, as well as index page in logged in state and not logged in state additionally prepare for a working installation git-svn-id: file:///svn/phpbb/trunk@9272 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index dfa640b388..726de2071f 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -14,9 +14,9 @@ define('IN_PHPBB', true); 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); +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', ''); @@ -28,12 +28,12 @@ if ($mode == 'login' || $mode == 'logout' || $mode == 'confirm') } // Start session management -$user->session_begin(); -$auth->acl($user->data); -$user->setup('ucp'); +phpbb::$user->session_begin(); +phpbb::$acl->init(phpbb::$user->data); +phpbb::$user->setup('ucp'); // Setting a variable to let the style designer know where he is... -$template->assign_var('S_IN_UCP', true); +phpbb::$template->assign_var('S_IN_UCP', true); $module = new p_master(); @@ -72,28 +72,28 @@ switch ($mode) break; case 'login': - if ($user->data['is_registered']) + if (phpbb::$user->is_registered) { - redirect(append_sid('index')); + phpbb::$url->redirect(phpbb::$url->append_sid('index')); } login_box(request_var('redirect', 'index')); break; case 'logout': - if ($user->data['user_id'] != ANONYMOUS && phpbb_request::variable('sid', '', false, phpbb_request::GET) === $user->session_id) + if (phpbb::$user->data['user_id'] != ANONYMOUS && phpbb_request::variable('sid', '', false, phpbb_request::GET) === phpbb::$user->session_id) { - $user->session_kill(); - $user->session_begin(); - $message = $user->lang['LOGOUT_REDIRECT']; + phpbb::$user->session_kill(); + phpbb::$user->session_begin(); + $message = phpbb::$user->lang['LOGOUT_REDIRECT']; } else { - $message = ($user->data['user_id'] == ANONYMOUS) ? $user->lang['LOGOUT_REDIRECT'] : $user->lang['LOGOUT_FAILED']; + $message = (phpbb::$user->data['user_id'] == ANONYMOUS) ? phpbb::$user->lang['LOGOUT_REDIRECT'] : phpbb::$user->lang['LOGOUT_FAILED']; } - meta_refresh(3, append_sid('index')); + phpbb::$url->meta_refresh(3, phpbb::$url->append_sid('index')); - $message = $message . '

' . sprintf($user->lang['RETURN_INDEX'], '', ' '); + $message = $message . '

' . phpbb::$user->lang('RETURN_INDEX', '', ' '); trigger_error($message); break; -- cgit v1.2.1 From 794c5749696c9fa2595ed3a1d7c836a0d984e11c Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 22 Feb 2009 15:29:18 +0000 Subject: remove global and change $user-> to phpbb::$user-> git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 66 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 35 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 726de2071f..58700b73a0 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -42,29 +42,29 @@ switch ($mode) { case 'activate': $module->load('ucp', 'activate'); - $module->display($user->lang['UCP_ACTIVATE']); + $module->display(phpbb::$user->lang['UCP_ACTIVATE']); redirect(append_sid('index')); break; case 'resend_act': $module->load('ucp', 'resend'); - $module->display($user->lang['UCP_RESEND']); + $module->display(phpbb::$user->lang['UCP_RESEND']); break; case 'sendpassword': $module->load('ucp', 'remind'); - $module->display($user->lang['UCP_REMIND']); + $module->display(phpbb::$user->lang['UCP_REMIND']); break; case 'register': - if ($user->data['is_registered'] || phpbb_request::is_set('not_agreed')) + if (phpbb::$user->is_registered || phpbb_request::is_set('not_agreed')) { redirect(append_sid('index')); } $module->load('ucp', 'register'); - $module->display($user->lang['REGISTER']); + $module->display(phpbb::$user->lang['REGISTER']); break; case 'confirm': @@ -104,9 +104,9 @@ switch ($mode) $message = ($mode == 'terms') ? 'TERMS_OF_USE_CONTENT' : 'PRIVACY_POLICY'; $title = ($mode == 'terms') ? 'TERMS_USE' : 'PRIVACY'; - if (empty($user->lang[$message])) + if (empty(phpbb::$user->lang[$message])) { - if ($user->data['is_registered']) + if (phpbb::$user->is_registered) { redirect(append_sid('index')); } @@ -119,14 +119,14 @@ switch ($mode) ); // Disable online list - page_header($user->lang[$title], false); + page_header(phpbb::$user->lang[$title], false); $template->assign_vars(array( 'S_AGREEMENT' => true, - 'AGREEMENT_TITLE' => $user->lang[$title], - 'AGREEMENT_TEXT' => sprintf($user->lang[$message], phpbb::$config['sitename'], generate_board_url()), + 'AGREEMENT_TITLE' => phpbb::$user->lang[$title], + 'AGREEMENT_TEXT' => sprintf(phpbb::$user->lang[$message], phpbb::$config['sitename'], generate_board_url()), 'U_BACK' => append_sid('ucp', 'mode=login'), - 'L_BACK' => $user->lang['BACK_TO_LOGIN']) + 'L_BACK' => phpbb::$user->lang['BACK_TO_LOGIN']) ); page_footer(); @@ -148,22 +148,22 @@ switch ($mode) // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ if (strpos($cookie_name, 'poll_') !== 0) { - $user->set_cookie($cookie_name, '', $set_time); + phpbb::$user->set_cookie($cookie_name, '', $set_time); } } - $user->set_cookie('track', '', $set_time); - $user->set_cookie('u', '', $set_time); - $user->set_cookie('k', '', $set_time); - $user->set_cookie('sid', '', $set_time); + phpbb::$user->set_cookie('track', '', $set_time); + phpbb::$user->set_cookie('u', '', $set_time); + phpbb::$user->set_cookie('k', '', $set_time); + phpbb::$user->set_cookie('sid', '', $set_time); // We destroy the session here, the user will be logged out nevertheless - $user->session_kill(); - $user->session_begin(); + phpbb::$user->session_kill(); + phpbb::$user->session_begin(); meta_refresh(3, append_sid('index')); - $message = $user->lang['COOKIES_DELETED'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = phpbb::$user->lang['COOKIES_DELETED'] . '

' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '', ''); trigger_error($message); } else @@ -186,7 +186,7 @@ switch ($mode) $user_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == $user->data['user_id']) + if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == phpbb::$user->data['user_id']) { redirect(append_sid('index')); } @@ -194,42 +194,42 @@ switch ($mode) 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'])) + if (!$auth_admin->ghost_permissions($user_id, phpbb::$user->data['user_id'])) { redirect(append_sid('index')); } add_log('admin', 'LOG_ACL_TRANSFER_PERMISSIONS', $user_row['username']); - $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = sprintf(phpbb::$user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '', ''); trigger_error($message); break; case 'restore_perm': - if (!$user->data['user_perm_from'] || !$auth->acl_get('a_switchperm')) + if (!phpbb::$user->data['user_perm_from'] || !$auth->acl_get('a_switchperm')) { redirect(append_sid('index')); } - $auth->acl_cache($user->data); + $auth->acl_cache(phpbb::$user->data); $sql = 'UPDATE ' . USERS_TABLE . " SET user_perm_from = 0 - WHERE user_id = " . $user->data['user_id']; + WHERE user_id = " . phpbb::$user->data['user_id']; $db->sql_query($sql); $sql = 'SELECT username FROM ' . USERS_TABLE . ' - WHERE user_id = ' . $user->data['user_perm_from']; + WHERE user_id = ' . phpbb::$user->data['user_perm_from']; $result = $db->sql_query($sql); $username = $db->sql_fetchfield('username'); $db->sql_freeresult($result); add_log('admin', 'LOG_ACL_RESTORE_PERMISSIONS', $username); - $message = $user->lang['PERMISSIONS_RESTORED'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = phpbb::$user->lang['PERMISSIONS_RESTORED'] . '

' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '', ''); trigger_error($message); break; @@ -237,14 +237,14 @@ switch ($mode) default: // Only registered users can go beyond this point - if (!$user->data['is_registered']) + if (!phpbb::$user->is_registered) { - if ($user->data['is_bot']) + if (phpbb::$user->is_bot) { redirect(append_sid('index')); } - login_box('', $user->lang['LOGIN_EXPLAIN_UCP']); + login_box('', phpbb::$user->lang['LOGIN_EXPLAIN_UCP']); } // Instantiate module system and generate list of available modules @@ -282,8 +282,6 @@ switch ($mode) */ function _display_friends() { - global $db, $template, $user, $auth; - $update_time = phpbb::$config['load_online_time'] * 60; $sql = $db->sql_build_query('SELECT_DISTINCT', array( @@ -301,7 +299,7 @@ function _display_friends() ) ), - 'WHERE' => 'z.user_id = ' . $user->data['user_id'] . ' + 'WHERE' => 'z.user_id = ' . phpbb::$user->data['user_id'] . ' AND z.friend = 1 AND u.user_id = z.zebra_id', @@ -333,8 +331,6 @@ function _display_friends() */ function _module_zebra($mode, &$module_row) { - global $template; - $template->assign_var('S_ZEBRA_ENABLED', true); if ($mode == 'friends') -- cgit v1.2.1 From 95b69cfa7f66e721cea3f8a5d62ad1cb2b822cfc Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 22 Feb 2009 15:48:29 +0000 Subject: $auth-> to phpbb::$acl-> git-svn-id: file:///svn/phpbb/trunk@9335 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 58700b73a0..a7e792c3ad 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -186,7 +186,7 @@ switch ($mode) $user_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == phpbb::$user->data['user_id']) + if (!phpbb::$acl->acl_get('a_switchperm') || !$user_row || $user_id == phpbb::$user->data['user_id']) { redirect(append_sid('index')); } @@ -208,12 +208,12 @@ switch ($mode) case 'restore_perm': - if (!phpbb::$user->data['user_perm_from'] || !$auth->acl_get('a_switchperm')) + if (!phpbb::$user->data['user_perm_from'] || !phpbb::$acl->acl_get('a_switchperm')) { redirect(append_sid('index')); } - $auth->acl_cache(phpbb::$user->data); + phpbb::$acl->acl_cache(phpbb::$user->data); $sql = 'UPDATE ' . USERS_TABLE . " SET user_perm_from = 0 @@ -312,7 +312,7 @@ function _display_friends() while ($row = $db->sql_fetchrow($result)) { - $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || $auth->acl_get('u_viewonline'))) ? 'online' : 'offline'; + $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || phpbb::$acl->acl_get('u_viewonline'))) ? 'online' : 'offline'; $template->assign_block_vars("friends_{$which}", array( 'USER_ID' => $row['user_id'], -- cgit v1.2.1 From 84f795e9fbd172924280593d575bf4587c9b40e5 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 22 Feb 2009 18:06:05 +0000 Subject: $db-> to phpbb::$db-> git-svn-id: file:///svn/phpbb/trunk@9336 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index a7e792c3ad..7b71966dbd 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -182,9 +182,9 @@ switch ($mode) $sql = 'SELECT * FROM ' . USERS_TABLE . ' WHERE user_id = ' . (int) $user_id; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); + $result = phpbb::$db->sql_query($sql); + $user_row = phpbb::$db->sql_fetchrow($result); + phpbb::$db->sql_freeresult($result); if (!phpbb::$acl->acl_get('a_switchperm') || !$user_row || $user_id == phpbb::$user->data['user_id']) { @@ -218,14 +218,14 @@ switch ($mode) $sql = 'UPDATE ' . USERS_TABLE . " SET user_perm_from = 0 WHERE user_id = " . phpbb::$user->data['user_id']; - $db->sql_query($sql); + phpbb::$db->sql_query($sql); $sql = 'SELECT username FROM ' . USERS_TABLE . ' WHERE user_id = ' . phpbb::$user->data['user_perm_from']; - $result = $db->sql_query($sql); - $username = $db->sql_fetchfield('username'); - $db->sql_freeresult($result); + $result = phpbb::$db->sql_query($sql); + $username = phpbb::$db->sql_fetchfield('username'); + phpbb::$db->sql_freeresult($result); add_log('admin', 'LOG_ACL_RESTORE_PERMISSIONS', $username); @@ -284,7 +284,7 @@ function _display_friends() { $update_time = phpbb::$config['load_online_time'] * 60; - $sql = $db->sql_build_query('SELECT_DISTINCT', array( + $sql = phpbb::$db->sql_build_query('SELECT_DISTINCT', array( 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', 'FROM' => array( @@ -308,9 +308,9 @@ function _display_friends() 'ORDER_BY' => 'u.username_clean ASC', )); - $result = $db->sql_query($sql); + $result = phpbb::$db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) + while ($row = phpbb::$db->sql_fetchrow($result)) { $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || phpbb::$acl->acl_get('u_viewonline'))) ? 'online' : 'offline'; @@ -323,7 +323,7 @@ function _display_friends() 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'])) ); } - $db->sql_freeresult($result); + phpbb::$db->sql_freeresult($result); } /** -- cgit v1.2.1 From b27add94f8eb36d5e740afadf5306c48873736f9 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 22 Feb 2009 18:56:09 +0000 Subject: $template to phpbb::$template git-svn-id: file:///svn/phpbb/trunk@9337 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 7b71966dbd..cc74545eb0 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -114,20 +114,20 @@ switch ($mode) login_box(); } - $template->set_filenames(array( - 'body' => 'ucp_agreement.html') - ); + phpbb::$template->set_filenames(array( + 'body' => 'ucp_agreement.html', + )); // Disable online list page_header(phpbb::$user->lang[$title], false); - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'S_AGREEMENT' => true, 'AGREEMENT_TITLE' => phpbb::$user->lang[$title], 'AGREEMENT_TEXT' => sprintf(phpbb::$user->lang[$message], phpbb::$config['sitename'], generate_board_url()), 'U_BACK' => append_sid('ucp', 'mode=login'), - 'L_BACK' => phpbb::$user->lang['BACK_TO_LOGIN']) - ); + 'L_BACK' => phpbb::$user->lang['BACK_TO_LOGIN'], + )); page_footer(); @@ -314,14 +314,14 @@ function _display_friends() { $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || phpbb::$acl->acl_get('u_viewonline'))) ? 'online' : 'offline'; - $template->assign_block_vars("friends_{$which}", array( + phpbb::$template->assign_block_vars("friends_{$which}", array( 'USER_ID' => $row['user_id'], 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), 'USER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'])) - ); + 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), + )); } phpbb::$db->sql_freeresult($result); } @@ -331,16 +331,16 @@ function _display_friends() */ function _module_zebra($mode, &$module_row) { - $template->assign_var('S_ZEBRA_ENABLED', true); + phpbb::$template->assign_var('S_ZEBRA_ENABLED', true); if ($mode == 'friends') { - $template->assign_var('S_ZEBRA_FRIENDS_ENABLED', true); + phpbb::$template->assign_var('S_ZEBRA_FRIENDS_ENABLED', true); } if ($mode == 'foes') { - $template->assign_var('S_ZEBRA_FOES_ENABLED', true); + phpbb::$template->assign_var('S_ZEBRA_FOES_ENABLED', true); } } -- cgit v1.2.1 From d181f0ef36f4cfbc8726da21e4de864df3a6f3d2 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 22 Feb 2009 19:17:10 +0000 Subject: append_sid wrapper + is_guest git-svn-id: file:///svn/phpbb/trunk@9338 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index cc74545eb0..3b519dcfa6 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -81,7 +81,7 @@ switch ($mode) break; case 'logout': - if (phpbb::$user->data['user_id'] != ANONYMOUS && phpbb_request::variable('sid', '', false, phpbb_request::GET) === phpbb::$user->session_id) + if (!phpbb::$user->is_guest && phpbb_request::variable('sid', '', false, phpbb_request::GET) === phpbb::$user->session_id) { phpbb::$user->session_kill(); phpbb::$user->session_begin(); @@ -89,7 +89,7 @@ switch ($mode) } else { - $message = (phpbb::$user->data['user_id'] == ANONYMOUS) ? phpbb::$user->lang['LOGOUT_REDIRECT'] : phpbb::$user->lang['LOGOUT_FAILED']; + $message = (phpbb::$user->is_guest) ? phpbb::$user->lang['LOGOUT_REDIRECT'] : phpbb::$user->lang['LOGOUT_FAILED']; } phpbb::$url->meta_refresh(3, phpbb::$url->append_sid('index')); -- cgit v1.2.1 From bf8ac19eaa8d74f9dfd6d597190f5664e7339382 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 4 Oct 2009 18:13:59 +0000 Subject: Move trunk/phpBB to old_trunk/phpBB git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 347 ---------------------------------------------------------- 1 file changed, 347 deletions(-) delete mode 100644 phpBB/ucp.php (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php deleted file mode 100644 index 3b519dcfa6..0000000000 --- a/phpBB/ucp.php +++ /dev/null @@ -1,347 +0,0 @@ -session_begin(); -phpbb::$acl->init(phpbb::$user->data); -phpbb::$user->setup('ucp'); - -// Setting a variable to let the style designer know where he is... -phpbb::$template->assign_var('S_IN_UCP', true); - -$module = new p_master(); - -// Go through basic "global" modes -switch ($mode) -{ - case 'activate': - $module->load('ucp', 'activate'); - $module->display(phpbb::$user->lang['UCP_ACTIVATE']); - - redirect(append_sid('index')); - break; - - case 'resend_act': - $module->load('ucp', 'resend'); - $module->display(phpbb::$user->lang['UCP_RESEND']); - break; - - case 'sendpassword': - $module->load('ucp', 'remind'); - $module->display(phpbb::$user->lang['UCP_REMIND']); - break; - - case 'register': - if (phpbb::$user->is_registered || phpbb_request::is_set('not_agreed')) - { - redirect(append_sid('index')); - } - - $module->load('ucp', 'register'); - $module->display(phpbb::$user->lang['REGISTER']); - break; - - case 'confirm': - $module->load('ucp', 'confirm'); - break; - - case 'login': - if (phpbb::$user->is_registered) - { - phpbb::$url->redirect(phpbb::$url->append_sid('index')); - } - - login_box(request_var('redirect', 'index')); - break; - - case 'logout': - if (!phpbb::$user->is_guest && phpbb_request::variable('sid', '', false, phpbb_request::GET) === phpbb::$user->session_id) - { - phpbb::$user->session_kill(); - phpbb::$user->session_begin(); - $message = phpbb::$user->lang['LOGOUT_REDIRECT']; - } - else - { - $message = (phpbb::$user->is_guest) ? phpbb::$user->lang['LOGOUT_REDIRECT'] : phpbb::$user->lang['LOGOUT_FAILED']; - } - phpbb::$url->meta_refresh(3, phpbb::$url->append_sid('index')); - - $message = $message . '

' . phpbb::$user->lang('RETURN_INDEX', '', ' '); - trigger_error($message); - - break; - - case 'terms': - case 'privacy': - - $message = ($mode == 'terms') ? 'TERMS_OF_USE_CONTENT' : 'PRIVACY_POLICY'; - $title = ($mode == 'terms') ? 'TERMS_USE' : 'PRIVACY'; - - if (empty(phpbb::$user->lang[$message])) - { - if (phpbb::$user->is_registered) - { - redirect(append_sid('index')); - } - - login_box(); - } - - phpbb::$template->set_filenames(array( - 'body' => 'ucp_agreement.html', - )); - - // Disable online list - page_header(phpbb::$user->lang[$title], false); - - phpbb::$template->assign_vars(array( - 'S_AGREEMENT' => true, - 'AGREEMENT_TITLE' => phpbb::$user->lang[$title], - 'AGREEMENT_TEXT' => sprintf(phpbb::$user->lang[$message], phpbb::$config['sitename'], generate_board_url()), - 'U_BACK' => append_sid('ucp', 'mode=login'), - 'L_BACK' => phpbb::$user->lang['BACK_TO_LOGIN'], - )); - - page_footer(); - - break; - - case 'delete_cookies': - - // Delete Cookies with dynamic names (do NOT delete poll cookies) - if (confirm_box(true)) - { - $set_time = time() - 31536000; - - $cookies = phpbb_request::variable_names(phpbb_request::COOKIE); - foreach ($cookies as $cookie_name) - { - $cookie_name = str_replace(phpbb::$config['cookie_name'] . '_', '', $cookie_name); - - // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ - if (strpos($cookie_name, 'poll_') !== 0) - { - phpbb::$user->set_cookie($cookie_name, '', $set_time); - } - } - - phpbb::$user->set_cookie('track', '', $set_time); - phpbb::$user->set_cookie('u', '', $set_time); - phpbb::$user->set_cookie('k', '', $set_time); - phpbb::$user->set_cookie('sid', '', $set_time); - - // We destroy the session here, the user will be logged out nevertheless - phpbb::$user->session_kill(); - phpbb::$user->session_begin(); - - meta_refresh(3, append_sid('index')); - - $message = phpbb::$user->lang['COOKIES_DELETED'] . '

' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - } - else - { - confirm_box(false, 'DELETE_COOKIES', ''); - } - - redirect(append_sid('index')); - - break; - - case 'switch_perm': - - $user_id = request_var('u', 0); - - $sql = 'SELECT * - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . (int) $user_id; - $result = phpbb::$db->sql_query($sql); - $user_row = phpbb::$db->sql_fetchrow($result); - phpbb::$db->sql_freeresult($result); - - if (!phpbb::$acl->acl_get('a_switchperm') || !$user_row || $user_id == phpbb::$user->data['user_id']) - { - redirect(append_sid('index')); - } - - include(PHPBB_ROOT_PATH . 'includes/acp/auth.' . PHP_EXT); - - $auth_admin = new auth_admin(); - if (!$auth_admin->ghost_permissions($user_id, phpbb::$user->data['user_id'])) - { - redirect(append_sid('index')); - } - - add_log('admin', 'LOG_ACL_TRANSFER_PERMISSIONS', $user_row['username']); - - $message = sprintf(phpbb::$user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - - break; - - case 'restore_perm': - - if (!phpbb::$user->data['user_perm_from'] || !phpbb::$acl->acl_get('a_switchperm')) - { - redirect(append_sid('index')); - } - - phpbb::$acl->acl_cache(phpbb::$user->data); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_perm_from = 0 - WHERE user_id = " . phpbb::$user->data['user_id']; - phpbb::$db->sql_query($sql); - - $sql = 'SELECT username - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . phpbb::$user->data['user_perm_from']; - $result = phpbb::$db->sql_query($sql); - $username = phpbb::$db->sql_fetchfield('username'); - phpbb::$db->sql_freeresult($result); - - add_log('admin', 'LOG_ACL_RESTORE_PERMISSIONS', $username); - - $message = phpbb::$user->lang['PERMISSIONS_RESTORED'] . '

' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - - break; - - default: - - // Only registered users can go beyond this point - if (!phpbb::$user->is_registered) - { - if (phpbb::$user->is_bot) - { - redirect(append_sid('index')); - } - - login_box('', phpbb::$user->lang['LOGIN_EXPLAIN_UCP']); - } - - // Instantiate module system and generate list of available modules - $module->list_modules('ucp'); - - // Check if the zebra module is set - if ($module->is_active('zebra', 'friends')) - { - _display_friends(); - } - - // Do not display subscribed topics/forums if not allowed - if (!phpbb::$config['allow_topic_notify'] && !phpbb::$config['allow_forum_notify']) - { - $module->set_display('main', 'subscribed', false); - } - - // Select the active module - $module->set_active($id, $mode); - - // Load and execute the relevant module - $module->load_active(); - - // Assign data to the template engine for the list of modules - $module->assign_tpl_vars(append_sid('ucp')); - - // Generate the page, do not display/query online list - $module->display($module->get_page_title(), false); - - break; -} - -/** -* Output listing of friends online -*/ -function _display_friends() -{ - $update_time = phpbb::$config['load_online_time'] * 60; - - $sql = phpbb::$db->sql_build_query('SELECT_DISTINCT', array( - 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', - - 'FROM' => array( - USERS_TABLE => 'u', - ZEBRA_TABLE => 'z' - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(SESSIONS_TABLE => 's'), - 'ON' => 's.session_user_id = z.zebra_id' - ) - ), - - 'WHERE' => 'z.user_id = ' . phpbb::$user->data['user_id'] . ' - AND z.friend = 1 - AND u.user_id = z.zebra_id', - - 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_colour, u.username', - - 'ORDER_BY' => 'u.username_clean ASC', - )); - - $result = phpbb::$db->sql_query($sql); - - while ($row = phpbb::$db->sql_fetchrow($result)) - { - $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || phpbb::$acl->acl_get('u_viewonline'))) ? 'online' : 'offline'; - - phpbb::$template->assign_block_vars("friends_{$which}", array( - 'USER_ID' => $row['user_id'], - - 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), - 'USER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), - )); - } - phpbb::$db->sql_freeresult($result); -} - -/** -* Function for assigning a template var if the zebra module got included -*/ -function _module_zebra($mode, &$module_row) -{ - phpbb::$template->assign_var('S_ZEBRA_ENABLED', true); - - if ($mode == 'friends') - { - phpbb::$template->assign_var('S_ZEBRA_FRIENDS_ENABLED', true); - } - - if ($mode == 'foes') - { - phpbb::$template->assign_var('S_ZEBRA_FOES_ENABLED', true); - } -} - -?> \ No newline at end of file -- cgit v1.2.1 From 2e17e448deed073f8614bb555a8ef20c57291c2a Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 4 Oct 2009 18:14:59 +0000 Subject: Copy 3.0.x branch to trunk git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/ucp.php | 349 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) create mode 100644 phpBB/ucp.php (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php new file mode 100644 index 0000000000..994fe064a1 --- /dev/null +++ b/phpBB/ucp.php @@ -0,0 +1,349 @@ +session_begin(); +$auth->acl($user->data); +$user->setup('ucp'); + +// Setting a variable to let the style designer know where he is... +$template->assign_var('S_IN_UCP', true); + +$module = new p_master(); +$default = false; + +// Basic "global" modes +switch ($mode) +{ + case 'activate': + $module->load('ucp', 'activate'); + $module->display($user->lang['UCP_ACTIVATE']); + + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + break; + + case 'resend_act': + $module->load('ucp', 'resend'); + $module->display($user->lang['UCP_RESEND']); + break; + + case 'sendpassword': + $module->load('ucp', 'remind'); + $module->display($user->lang['UCP_REMIND']); + break; + + case 'register': + if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])) + { + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + } + + $module->load('ucp', 'register'); + $module->display($user->lang['REGISTER']); + break; + + case 'confirm': + $module->load('ucp', 'confirm'); + break; + + case 'login': + if ($user->data['is_registered']) + { + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + } + + login_box(request_var('redirect', "index.$phpEx")); + break; + + case 'logout': + if ($user->data['user_id'] != ANONYMOUS && isset($_GET['sid']) && !is_array($_GET['sid']) && $_GET['sid'] === $user->session_id) + { + $user->session_kill(); + $user->session_begin(); + $message = $user->lang['LOGOUT_REDIRECT']; + } + else + { + $message = ($user->data['user_id'] == ANONYMOUS) ? $user->lang['LOGOUT_REDIRECT'] : $user->lang['LOGOUT_FAILED']; + } + meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + + $message = $message . '

' . sprintf($user->lang['RETURN_INDEX'], '', ' '); + trigger_error($message); + + break; + + case 'terms': + case 'privacy': + + $message = ($mode == 'terms') ? 'TERMS_OF_USE_CONTENT' : 'PRIVACY_POLICY'; + $title = ($mode == 'terms') ? 'TERMS_USE' : 'PRIVACY'; + + if (empty($user->lang[$message])) + { + if ($user->data['is_registered']) + { + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + } + + login_box(); + } + + $template->set_filenames(array( + 'body' => 'ucp_agreement.html') + ); + + // Disable online list + page_header($user->lang[$title], false); + + $template->assign_vars(array( + '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'), + 'L_BACK' => $user->lang['BACK_TO_LOGIN'], + )); + + page_footer(); + + break; + + case 'delete_cookies': + + // Delete Cookies with dynamic names (do NOT delete poll cookies) + if (confirm_box(true)) + { + $set_time = time() - 31536000; + + foreach ($_COOKIE as $cookie_name => $cookie_data) + { + // Only delete board cookies, no other ones... + if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0) + { + continue; + } + + $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); + + // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ + if (strpos($cookie_name, 'poll_') !== 0) + { + $user->set_cookie($cookie_name, '', $set_time); + } + } + + $user->set_cookie('track', '', $set_time); + $user->set_cookie('u', '', $set_time); + $user->set_cookie('k', '', $set_time); + $user->set_cookie('sid', '', $set_time); + + // We destroy the session here, the user will be logged out nevertheless + $user->session_kill(); + $user->session_begin(); + + meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + + $message = $user->lang['COOKIES_DELETED'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + trigger_error($message); + } + else + { + confirm_box(false, 'DELETE_COOKIES', ''); + } + + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + + break; + + case 'switch_perm': + + $user_id = request_var('u', 0); + + $sql = 'SELECT * + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . (int) $user_id; + $result = $db->sql_query($sql); + $user_row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == $user->data['user_id'] || !check_link_hash(request_var('hash', ''), 'switchperm')) + { + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + } + + include($phpbb_root_path . 'includes/acp/auth.' . $phpEx); + + $auth_admin = new auth_admin(); + if (!$auth_admin->ghost_permissions($user_id, $user->data['user_id'])) + { + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + } + + add_log('admin', 'LOG_ACL_TRANSFER_PERMISSIONS', $user_row['username']); + + $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + trigger_error($message); + + break; + + case 'restore_perm': + + if (!$user->data['user_perm_from'] || !$auth->acl_get('a_switchperm')) + { + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + } + + $auth->acl_cache($user->data); + + $sql = 'SELECT username + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . $user->data['user_perm_from']; + $result = $db->sql_query($sql); + $username = $db->sql_fetchfield('username'); + $db->sql_freeresult($result); + + add_log('admin', 'LOG_ACL_RESTORE_PERMISSIONS', $username); + + $message = $user->lang['PERMISSIONS_RESTORED'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + trigger_error($message); + + break; + + default: + $default = true; + break; +} + +// We use this approach because it does not impose large code changes +if (!$default) +{ + return true; +} + +// Only registered users can go beyond this point +if (!$user->data['is_registered']) +{ + if ($user->data['is_bot']) + { + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + } + + login_box('', $user->lang['LOGIN_EXPLAIN_UCP']); +} + +// Instantiate module system and generate list of available modules +$module->list_modules('ucp'); + +// Check if the zebra module is set +if ($module->is_active('zebra', 'friends')) +{ + // Output listing of friends online + $update_time = $config['load_online_time'] * 60; + + $sql = $db->sql_build_query('SELECT_DISTINCT', array( + 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', + + 'FROM' => array( + USERS_TABLE => 'u', + ZEBRA_TABLE => 'z' + ), + + 'LEFT_JOIN' => array( + array( + 'FROM' => array(SESSIONS_TABLE => 's'), + 'ON' => 's.session_user_id = z.zebra_id' + ) + ), + + 'WHERE' => 'z.user_id = ' . $user->data['user_id'] . ' + AND z.friend = 1 + AND u.user_id = z.zebra_id', + + 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_colour, u.username', + + 'ORDER_BY' => 'u.username_clean ASC', + )); + + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || $auth->acl_get('u_viewonline'))) ? 'online' : 'offline'; + + $template->assign_block_vars("friends_{$which}", array( + 'USER_ID' => $row['user_id'], + + 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), + 'USER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), + 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), + 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'])) + ); + } + $db->sql_freeresult($result); +} + +// Do not display subscribed topics/forums if not allowed +if (!$config['allow_topic_notify'] && !$config['allow_forum_notify']) +{ + $module->set_display('main', 'subscribed', false); +} + +// Select the active module +$module->set_active($id, $mode); + +// Load and execute the relevant module +$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")); + +// Generate the page, do not display/query online list +$module->display($module->get_page_title(), false); + +/** +* Function for assigning a template var if the zebra module got included +*/ +function _module_zebra($mode, &$module_row) +{ + global $template; + + $template->assign_var('S_ZEBRA_ENABLED', true); + + if ($mode == 'friends') + { + $template->assign_var('S_ZEBRA_FRIENDS_ENABLED', true); + } + + if ($mode == 'foes') + { + $template->assign_var('S_ZEBRA_FOES_ENABLED', true); + } +} + +?> \ No newline at end of file -- cgit v1.2.1 From 204ee4714b2a0be1513e6a30b255477f39dac5cb Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 31 Aug 2010 21:29:11 +0200 Subject: [feature/request-class] Removal of direct access to some superglobals PHPBB3-9716 --- phpBB/ucp.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index f5a2ec9648..f26f7b048e 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -136,13 +136,17 @@ switch ($mode) case 'delete_cookies': + global $request; + // Delete Cookies with dynamic names (do NOT delete poll cookies) if (confirm_box(true)) { $set_time = time() - 31536000; - foreach ($_COOKIE as $cookie_name => $cookie_data) + foreach ($request->variable_names(phpbb_request_interface::COOKIE) as $cookie_name) { + $cookie_data = $request->variable($cookie_name, '', true, phpbb_request_interface::COOKIE); + // Only delete board cookies, no other ones... if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0) { -- cgit v1.2.1 From 15883dfac22c8a5660c0400c565ba980eaf6f618 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Mon, 20 Sep 2010 18:52:08 +0200 Subject: [feature/request-class] Add $request to style.php, minor change Add $request instantiation to style.php to allow request_var to work properly. Also remove unneeded globalization of $request in ucp.php. PHPBB3-9716 --- phpBB/ucp.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index f26f7b048e..2d190cb1a9 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -136,8 +136,6 @@ switch ($mode) case 'delete_cookies': - global $request; - // Delete Cookies with dynamic names (do NOT delete poll cookies) if (confirm_box(true)) { -- cgit v1.2.1 From fccd7f0ab5ab559dc89be6af9e582a986af8bb13 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Wed, 22 Sep 2010 21:58:20 +0200 Subject: [feature/request-class] Convert any direct access to $_* to use $request PHPBB3-9716 --- phpBB/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 2d190cb1a9..bd8c47a7df 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -82,7 +82,7 @@ switch ($mode) break; case 'logout': - if ($user->data['user_id'] != ANONYMOUS && isset($_GET['sid']) && !is_array($_GET['sid']) && $_GET['sid'] === $user->session_id) + if ($user->data['user_id'] != ANONYMOUS && $request->is_set('sid') && $request->variable('sid', '') === $user->session_id) { $user->session_kill(); $user->session_begin(); -- cgit v1.2.1 From af5b9a96409d788733fcb1ff367e0c7fb0583702 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 9 Nov 2010 08:59:25 +0100 Subject: [ticket/9556] Drop php closing tags, add trailing newline Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556 --- phpBB/ucp.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index bd8c47a7df..69e48ac85b 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -347,5 +347,3 @@ function _module_zebra($mode, &$module_row) $template->assign_var('S_ZEBRA_FOES_ENABLED', true); } } - -?> \ No newline at end of file -- cgit v1.2.1 From 4c77903129749008cd08c346006d2a57cf6ff544 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 21 Nov 2011 16:22:07 +0100 Subject: [ticket/10484] Use variables for sql_build_query() calls It's easier for mods/extensions to extend the arrays. PHPBB3-10484 --- phpBB/ucp.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 505dbb998b..c8a0795bcb 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -274,19 +274,19 @@ if ($module->is_active('zebra', 'friends')) // Output listing of friends online $update_time = $config['load_online_time'] * 60; - $sql = $db->sql_build_query('SELECT_DISTINCT', array( + $sql_ary = array( 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', 'FROM' => array( USERS_TABLE => 'u', - ZEBRA_TABLE => 'z' + ZEBRA_TABLE => 'z', ), 'LEFT_JOIN' => array( array( 'FROM' => array(SESSIONS_TABLE => 's'), - 'ON' => 's.session_user_id = z.zebra_id' - ) + 'ON' => 's.session_user_id = z.zebra_id', + ), ), 'WHERE' => 'z.user_id = ' . $user->data['user_id'] . ' @@ -296,8 +296,9 @@ if ($module->is_active('zebra', 'friends')) 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_colour, u.username', 'ORDER_BY' => 'u.username_clean ASC', - )); + ); + $sql = $db->sql_build_query('SELECT_DISTINCT', $sql_ary); $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) -- cgit v1.2.1 From 7a04c9048c110f0bd21ea3e9e869e17b408d640e Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 31 Dec 2011 13:32:52 +0000 Subject: [ticket/9916] Updating header license and removing Version $Id$ PHPBB3-9916 --- phpBB/ucp.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index c8a0795bcb..64afa0be67 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -2,9 +2,8 @@ /** * * @package ucp -* @version $Id$ * @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ -- cgit v1.2.1 From 34a85639422214af23c6e56d175e5634c24db798 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 16 Mar 2012 00:43:52 +0100 Subject: [feature/events] Adding ledge ucp_modules Used by phpBB Gallery PHPBB3-9550 --- phpBB/ucp.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 64afa0be67..2b129f3ec7 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -328,6 +328,11 @@ if (!$auth->acl_get('u_sig')) $module->set_display('profile', 'signature', false); } +$vars = array('module'); +$event = new phpbb_event_data(compact($vars)); +$phpbb_dispatcher->dispatch('core.ucp_modules', $event); +extract($event->get_data_filtered($vars)); + // Select the active module $module->set_active($id, $mode); -- cgit v1.2.1 From 8af7d225ef481cd26e6fd7862847183d25727117 Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Tue, 20 Mar 2012 11:23:03 +0000 Subject: [feature/events] Change to use the new method of adding events PHPBB3-9550 --- phpBB/ucp.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 2b129f3ec7..02434cc3c8 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -329,9 +329,7 @@ if (!$auth->acl_get('u_sig')) } $vars = array('module'); -$event = new phpbb_event_data(compact($vars)); -$phpbb_dispatcher->dispatch('core.ucp_modules', $event); -extract($event->get_data_filtered($vars)); +extract($phpbb_dispatcher->trigger_event('core.ucp_modules', compact($vars), $vars)); // Select the active module $module->set_active($id, $mode); -- cgit v1.2.1 From 3f1b4e83aef7f7344cd551463b59de71bb4bd6fe Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Sat, 31 Mar 2012 13:39:41 +0100 Subject: [feature/events] Removing the third trigger_event parameter PHPBB3-9550 --- phpBB/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 02434cc3c8..53cd9d2b74 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -329,7 +329,7 @@ if (!$auth->acl_get('u_sig')) } $vars = array('module'); -extract($phpbb_dispatcher->trigger_event('core.ucp_modules', compact($vars), $vars)); +extract($phpbb_dispatcher->trigger_event('core.ucp_modules', compact($vars))); // Select the active module $module->set_active($id, $mode); -- cgit v1.2.1 From b153637cb8bd58d571748f9539e81822be11d8bb Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 3 Aug 2012 23:41:00 +0200 Subject: [feature/php-events] Fix naming and doc of core.ucp_display_module_before PHPBB3-9550 --- phpBB/ucp.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 53cd9d2b74..9730591698 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -328,8 +328,17 @@ if (!$auth->acl_get('u_sig')) $module->set_display('profile', 'signature', false); } -$vars = array('module'); -extract($phpbb_dispatcher->trigger_event('core.ucp_modules', compact($vars))); +/** +* Use this event to enable and disable additional UCP modules +* +* @event core.ucp_display_module_before +* @var p_master module Object holding all modules and their status +* @var mixed id Active module category (can be the int or string) +* @var string mode Active module +* @since 3.1-A1 +*/ +$vars = array('module', 'id', 'mode'); +extract($phpbb_dispatcher->trigger_event('core.ucp_display_module_before', compact($vars))); // Select the active module $module->set_active($id, $mode); -- cgit v1.2.1 From 8f95ef55a65cbf58e74840957cf9acfaf9e16d31 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 13 Jul 2013 12:27:00 -0400 Subject: [ticket/11685] Remove logout confirmation page PHPBB3-11685 --- phpBB/ucp.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index a7e75f76c4..7180c54de6 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -85,17 +85,16 @@ switch ($mode) { $user->session_kill(); $user->session_begin(); - $message = $user->lang['LOGOUT_REDIRECT']; } - else + else if ($user->data['user_id'] != ANONYMOUS) { - $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("{$phpbb_root_path}index.$phpEx")); - $message = $message . '

' . sprintf($user->lang['RETURN_INDEX'], '', ' '); - trigger_error($message); + $message = $user->lang['LOGOUT_FAILED'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ' '); + trigger_error($message); + } + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); break; case 'terms': -- cgit v1.2.1 From da2752e4004b296ae5acdd08b7c0a758d8f61e9d Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 13:30:52 -0400 Subject: [ticket/11700] Modify all code to use the new interface names PHPBB3-11700 --- phpBB/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 7180c54de6..b1e576fee8 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -139,9 +139,9 @@ switch ($mode) { $set_time = time() - 31536000; - foreach ($request->variable_names(phpbb_request_interface::COOKIE) as $cookie_name) + foreach ($request->variable_names(phpbb_request_request_interface::COOKIE) as $cookie_name) { - $cookie_data = $request->variable($cookie_name, '', true, phpbb_request_interface::COOKIE); + $cookie_data = $request->variable($cookie_name, '', true, phpbb_request_request_interface::COOKIE); // Only delete board cookies, no other ones... if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0) -- cgit v1.2.1 From fcac58e065ed888662f5e8c99bd6cbf1943778b7 Mon Sep 17 00:00:00 2001 From: Joseph Warner Date: Thu, 25 Jul 2013 11:41:04 -0400 Subject: [feature/oauth] Have login_link loaded in ucp.php PHPBB3-11673 --- phpBB/ucp.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 7180c54de6..b07e0139d4 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -80,6 +80,15 @@ switch ($mode) login_box(request_var('redirect', "index.$phpEx")); break; + case 'login_link': + if ($user->data['is_registered']) + { + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + } + + $module->load('ucp', 'login_link'); + break; + case 'logout': if ($user->data['user_id'] != ANONYMOUS && $request->is_set('sid') && $request->variable('sid', '') === $user->session_id) { -- cgit v1.2.1 From 317a71a8384f137cedca3c9afbb02605876920c3 Mon Sep 17 00:00:00 2001 From: Joseph Warner Date: Thu, 25 Jul 2013 12:49:30 -0400 Subject: [feature/oauth] Template for ucp_login_link started PHPBB3-11673 --- phpBB/ucp.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index b07e0139d4..d69d938038 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -87,6 +87,7 @@ switch ($mode) } $module->load('ucp', 'login_link'); + $module->display($user->lang['UCP_LOGIN_LINK']); break; case 'logout': -- cgit v1.2.1 From 4683c37682541f73deca1f1476daf8c24f6962d6 Mon Sep 17 00:00:00 2001 From: Joseph Warner Date: Mon, 5 Aug 2013 15:38:58 -0400 Subject: [feature/oauth] Forgot to have login_link be "in login" in ucp PHPBB3-11673 --- phpBB/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index d69d938038..f1f8f2a829 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -21,7 +21,7 @@ require($phpbb_root_path . 'includes/functions_module.' . $phpEx); $id = request_var('i', ''); $mode = request_var('mode', ''); -if (in_array($mode, array('login', 'logout', 'confirm', 'sendpassword', 'activate'))) +if (in_array($mode, array('login', 'login_link', 'logout', 'confirm', 'sendpassword', 'activate'))) { define('IN_LOGIN', true); } -- cgit v1.2.1 From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 14:01:09 +0200 Subject: [ticket/11700] Move all recent code to namespaces PHPBB3-11700 --- phpBB/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index b1e576fee8..ee0584c081 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -139,9 +139,9 @@ switch ($mode) { $set_time = time() - 31536000; - foreach ($request->variable_names(phpbb_request_request_interface::COOKIE) as $cookie_name) + foreach ($request->variable_names(\phpbb\request\request_interface::COOKIE) as $cookie_name) { - $cookie_data = $request->variable($cookie_name, '', true, phpbb_request_request_interface::COOKIE); + $cookie_data = $request->variable($cookie_name, '', true, \phpbb\request\request_interface::COOKIE); // Only delete board cookies, no other ones... if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0) -- cgit v1.2.1 From 18bed2ea476849fce3774783d728a763ab3e7138 Mon Sep 17 00:00:00 2001 From: geetakshi Date: Wed, 19 Mar 2014 19:55:55 +0530 Subject: [ticket/11360] Change second parameter in page_header function PHPBB3-11360 --- phpBB/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 0c587cbf28..ba906bd410 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -128,7 +128,7 @@ switch ($mode) ); // Disable online list - page_header($user->lang[$title], false); + page_header($user->lang[$title]); $template->assign_vars(array( 'S_AGREEMENT' => true, -- cgit v1.2.1 From 76f7ef5c837345c80f0dcefb6787f23a9c0159e7 Mon Sep 17 00:00:00 2001 From: geetakshi Date: Mon, 24 Mar 2014 00:12:40 +0530 Subject: [ticket/11360] Updating default value of $display_online_list PHPBB3-11360 --- phpBB/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index ba906bd410..8c773886a6 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -353,7 +353,7 @@ $module->load_active(); $module->assign_tpl_vars(append_sid("{$phpbb_root_path}ucp.$phpEx")); // Generate the page, do not display/query online list -$module->display($module->get_page_title(), false); +$module->display($module->get_page_title()); /** * Function for assigning a template var if the zebra module got included -- cgit v1.2.1 From 1a56400a45e36bd68df8f9e72bc33c44079bd228 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Sun, 6 Apr 2014 23:12:20 +0200 Subject: [ticket/12360] Fix duplicated creation of session when logging out the user In 7d8b578 this line was introduced to fix a bug with style.php. Later since 1d42d1b a new session is always created after killing the old one. This causes a duplicated creation of the session everytime the user logs itself out. PHPBB3-12360 --- phpBB/ucp.php | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 8c773886a6..eaa40a07a2 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -94,7 +94,6 @@ switch ($mode) if ($user->data['user_id'] != ANONYMOUS && $request->is_set('sid') && $request->variable('sid', '') === $user->session_id) { $user->session_kill(); - $user->session_begin(); } else if ($user->data['user_id'] != ANONYMOUS) { -- cgit v1.2.1 From b32895308d13d5d9b0cd954fd8ce871a1fa073da Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 25 Apr 2014 12:15:44 +0200 Subject: [ticket/12273] Update since version to 3.1.0-a* style PHPBB3-12273 --- phpBB/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index eaa40a07a2..73eaeaa127 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -337,7 +337,7 @@ if (!$config['allow_topic_notify'] && !$config['allow_forum_notify']) * @var p_master module Object holding all modules and their status * @var mixed id Active module category (can be the int or string) * @var string mode Active module -* @since 3.1-A1 +* @since 3.1.0-a1 */ $vars = array('module', 'id', 'mode'); extract($phpbb_dispatcher->trigger_event('core.ucp_display_module_before', compact($vars))); -- cgit v1.2.1 From a759704b39fc1c1353f865a633759b1369589b67 Mon Sep 17 00:00:00 2001 From: Yuriy Rusko Date: Tue, 27 May 2014 20:18:06 +0200 Subject: [ticket/12594] Remove @package tags and update file headers PHPBB3-12594 --- phpBB/ucp.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 73eaeaa127..4c7723b0ac 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ -- cgit v1.2.1 From de103f60e32b0756d17299eba11ff8f3c1ed48f1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 18 Jun 2014 15:21:22 +0200 Subject: [ticket/12612] Move function from ucp.php to functions_user.php PHPBB3-12612 --- phpBB/ucp.php | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 4c7723b0ac..182bc2e285 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -357,23 +357,3 @@ $module->assign_tpl_vars(append_sid("{$phpbb_root_path}ucp.$phpEx")); // Generate the page, do not display/query online list $module->display($module->get_page_title()); - -/** -* Function for assigning a template var if the zebra module got included -*/ -function _module_zebra($mode, &$module_row) -{ - global $template; - - $template->assign_var('S_ZEBRA_ENABLED', true); - - if ($mode == 'friends') - { - $template->assign_var('S_ZEBRA_FRIENDS_ENABLED', true); - } - - if ($mode == 'foes') - { - $template->assign_var('S_ZEBRA_FOES_ENABLED', true); - } -} -- cgit v1.2.1 From 4700b44125131d1121a346d6135e451cbf438be7 Mon Sep 17 00:00:00 2001 From: MasterShredder Date: Sun, 7 Dec 2014 05:52:24 +0400 Subject: [ticket/13422] Add new event core.ucp_save_custom_cookies PHPBB3-13422 --- phpBB/ucp.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 182bc2e285..d8b8e92119 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -164,6 +164,22 @@ switch ($mode) $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); + /** + * Event to save custom cookies from deletion + * + * @event core.ucp_save_custom_cookies + * @var string cookie_name Cookie name to checking + * @var bool continue Do we save our cookie or not + * @since 3.1.3-RC1 + */ + $continue = false; + $vars = array('cookie_name', 'continue'); + extract($phpbb_dispatcher->trigger_event('core.ucp_save_custom_cookies', compact($vars))); + if ($continue) + { + continue; + } + // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ if (strpos($cookie_name, 'poll_') !== 0) { -- cgit v1.2.1 From 50ed202aacb79703892eb822a6ac7e05079c0e85 Mon Sep 17 00:00:00 2001 From: MasterShredder Date: Sat, 27 Dec 2014 17:43:30 +0400 Subject: [ticket/13422] Renamed "continue" variable to "retain_cookie" for the event core.ucp_save_custom_cookies PHPBB3-13422 --- phpBB/ucp.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index d8b8e92119..e20bc15f49 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -169,13 +169,13 @@ switch ($mode) * * @event core.ucp_save_custom_cookies * @var string cookie_name Cookie name to checking - * @var bool continue Do we save our cookie or not + * @var bool retain_cookie Do we retain our cookie or not, true if retain * @since 3.1.3-RC1 */ - $continue = false; - $vars = array('cookie_name', 'continue'); + $retain_cookie = false; + $vars = array('cookie_name', 'retain_cookie'); extract($phpbb_dispatcher->trigger_event('core.ucp_save_custom_cookies', compact($vars))); - if ($continue) + if ($retain_cookie) { continue; } -- cgit v1.2.1 From 0a1f8388d006d83ce0eba648200f62861cebfd1d Mon Sep 17 00:00:00 2001 From: MasterShredder Date: Sun, 28 Dec 2014 03:44:07 +0400 Subject: [ticket/13422] Changed some spaces to tabs PHPBB3-13422 --- phpBB/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index e20bc15f49..654fd59345 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -168,8 +168,8 @@ switch ($mode) * Event to save custom cookies from deletion * * @event core.ucp_save_custom_cookies - * @var string cookie_name Cookie name to checking - * @var bool retain_cookie Do we retain our cookie or not, true if retain + * @var string cookie_name Cookie name to checking + * @var bool retain_cookie Do we retain our cookie or not, true if retain * @since 3.1.3-RC1 */ $retain_cookie = false; -- cgit v1.2.1 From 655d95002c3ea0289eb27a89ef33ddccefa247c3 Mon Sep 17 00:00:00 2001 From: MasterShredder Date: Sun, 28 Dec 2014 13:20:04 +0400 Subject: [ticket/13422] Renamed event PHPBB3-13422 --- phpBB/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 654fd59345..8c74ca1f3c 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -167,14 +167,14 @@ switch ($mode) /** * Event to save custom cookies from deletion * - * @event core.ucp_save_custom_cookies + * @event core.ucp_delete_cookies * @var string cookie_name Cookie name to checking * @var bool retain_cookie Do we retain our cookie or not, true if retain * @since 3.1.3-RC1 */ $retain_cookie = false; $vars = array('cookie_name', 'retain_cookie'); - extract($phpbb_dispatcher->trigger_event('core.ucp_save_custom_cookies', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.ucp_delete_cookies', compact($vars))); if ($retain_cookie) { continue; -- cgit v1.2.1 From 927c211d41127adb5b20f352989c2d86d577949a Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Mon, 23 Jan 2017 14:04:02 +0100 Subject: [ticket/13609] Add core.ucp_switch_permissions event PHPBB3-13609 --- phpBB/ucp.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 8c74ca1f3c..1c724e2126 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -237,6 +237,19 @@ switch ($mode) add_log('admin', 'LOG_ACL_TRANSFER_PERMISSIONS', $user_row['username']); $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + + /** + * Event to run code after permissions are switched + * + * @event core.ucp_switch_permissions + * @var int user_id User ID to switch permission to + * @var array user_row User data + * @var string message Success message + * @since 3.1.11-RC1 + */ + $vars = array('user_id', 'user_row', 'message'); + extract($phpbb_dispatcher->trigger_event('core.ucp_switch_permissions', compact($vars))); + trigger_error($message); break; -- cgit v1.2.1 From 15f6d66a61cdbaf195327c9f2c3077ffb833e94f Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Mon, 23 Jan 2017 14:07:44 +0100 Subject: [ticket/13608] Add core.ucp_restore_permissions event PHPBB3-13608 --- phpBB/ucp.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 8c74ca1f3c..11b33d3a26 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -260,6 +260,18 @@ switch ($mode) add_log('admin', 'LOG_ACL_RESTORE_PERMISSIONS', $username); $message = $user->lang['PERMISSIONS_RESTORED'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); + + /** + * Event to run code after permissions are restored + * + * @event core.ucp_restore_permissions + * @var string username User name + * @var string message Success message + * @since 3.1.11-RC1 + */ + $vars = array('username', 'message'); + extract($phpbb_dispatcher->trigger_event('core.ucp_restore_permissions', compact($vars))); + trigger_error($message); break; -- cgit v1.2.1