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