diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
| commit | a1183bf09a93459282078038b94ef89c00297604 (patch) | |
| tree | 2e14bec170e37c6615fcd5ff2892233ddffce452 /Zotlabs/Module/Rmagic.php | |
| parent | 7fc2b13fe605ad461f6b6aeacd6a187c1ef794de (diff) | |
| parent | 1789c3242adcf11fe37f0ef0ec6180966853eeda (diff) | |
| download | volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.gz volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.bz2 volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.zip | |
Merge remote-tracking branch 'upstream/dev' into embedphotos
Diffstat (limited to 'Zotlabs/Module/Rmagic.php')
| -rw-r--r-- | Zotlabs/Module/Rmagic.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php index bcdbf6c90..26b0c46a6 100644 --- a/Zotlabs/Module/Rmagic.php +++ b/Zotlabs/Module/Rmagic.php @@ -24,7 +24,7 @@ class Rmagic extends \Zotlabs\Web\Controller { } } - function post() { + function post() { $address = trim($_REQUEST['address']); @@ -34,13 +34,13 @@ class Rmagic extends \Zotlabs\Web\Controller { try { require_once('library/openid/openid.php'); - $openid = new LightOpenID(z_root()); + $openid = new \LightOpenID(z_root()); $openid->identity = $address; $openid->returnUrl = z_root() . '/openid'; $openid->required = array('namePerson/friendly', 'namePerson'); $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default'); goaway($openid->authUrl()); - } catch (Exception $e) { + } 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()); } @@ -82,7 +82,7 @@ class Rmagic extends \Zotlabs\Web\Controller { } - function get() { + function get() { $o = replace_macros(get_markup_template('rmagic.tpl'),array( '$title' => t('Remote Authentication'), |