aboutsummaryrefslogtreecommitdiffstats
path: root/include/auth.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-30 15:12:20 -0700
committerfriendica <info@friendica.com>2012-03-30 15:12:20 -0700
commitaace55df0ad279d74c5e612078c3f29d114389dc (patch)
treeec1318b325ec3dc5ab2bc4ded5dae1c657b8fc7b /include/auth.php
parentcfdfcb37cbed8354e9f6c025a6e9ccadafc2d625 (diff)
parent007d67a998eb8f26228ddd22bb0323d54af9af8c (diff)
downloadvolse-hubzilla-aace55df0ad279d74c5e612078c3f29d114389dc.tar.gz
volse-hubzilla-aace55df0ad279d74c5e612078c3f29d114389dc.tar.bz2
volse-hubzilla-aace55df0ad279d74c5e612078c3f29d114389dc.zip
Merge branch 'pull'
Diffstat (limited to 'include/auth.php')
-rwxr-xr-xinclude/auth.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/auth.php b/include/auth.php
index 835616a82..1341f3bb8 100755
--- a/include/auth.php
+++ b/include/auth.php
@@ -94,13 +94,17 @@ else {
// Otherwise it's probably an openid.
+ try {
require_once('library/openid.php');
$openid = new LightOpenID;
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$a = get_app();
$openid->returnUrl = $a->get_baseurl(true) . '/openid';
- goaway($openid->authUrl());
+ goaway($openid->authUrl());
+ } catch (Exception $e) {
+ notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage());
+ }
// NOTREACHED
}
}