aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/ucp.php
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-09-10 15:48:29 -0700
committerDavid King <imkingdavid@gmail.com>2013-09-10 15:48:29 -0700
commitfc1dfd779da37128382322ffdc75bf751a0834a3 (patch)
tree5d43d1847832169510c55c3358c42ccd095b2128 /phpBB/ucp.php
parent71aeec40f6c4c5e6a69699486b618c2ba67dff2d (diff)
parent18f6a161017f5350d9487181f4b4ed66a53a0284 (diff)
downloadforums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar
forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.gz
forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.bz2
forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.xz
forums-fc1dfd779da37128382322ffdc75bf751a0834a3.zip
Merge remote-tracking branch 'Hardolaf/feature/oauth' into develop
Diffstat (limited to 'phpBB/ucp.php')
-rw-r--r--phpBB/ucp.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 7180c54de6..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);
}
@@ -80,6 +80,16 @@ 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');
+ $module->display($user->lang['UCP_LOGIN_LINK']);
+ break;
+
case 'logout':
if ($user->data['user_id'] != ANONYMOUS && $request->is_set('sid') && $request->variable('sid', '') === $user->session_id)
{