Merge https://github.com/friendica/friendica into pull

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
old mode 100755 (executable)
new mode 100644 (file)
index 835616a..b87662f
--- a/include/auth.php
+++ b/include/auth.php
@@ -11,6 +11,13 @@ function nuke_session() {
        unset($_SESSION['cid']);
        unset($_SESSION['theme']);
        unset($_SESSION['page_flags']);
+       unset($_SESSION['submanage']);
+       unset($_SESSION['my_url']);
+       unset($_SESSION['my_address']);
+       unset($_SESSION['addr']);
+       unset($_SESSION['return_url']);
+       unset($_SESSION['theme']);
+       unset($_SESSION['page_flags']);
 }
 
 
@@ -94,13 +101,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
                }
        }