X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOpenID%2FOpenIDPlugin.php;h=c6d247caf310d73628645ce2d6a4e51e7cecc1f5;hb=1c5e364880fa5148dcedb07c331ea5b207fd46a4;hp=710a34410ac6e81551fb94068a26bae84e022463;hpb=871912a00a3e627569ac65111d55b47f5d8ccedf;p=quix0rs-gnu-social.git diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 710a34410a..c6d247caf3 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -329,29 +329,6 @@ class OpenIDPlugin extends Plugin return parent::onAutoload($cls); } - /** - * Sensitive actions - * - * These actions should use https when SSL support is 'sometimes' - * - * @param Action $action Action to form an URL for - * @param boolean &$ssl Whether to mark it for SSL - * - * @return boolean hook return - */ - function onSensitiveAction($action, &$ssl) - { - switch ($action) - { - case 'finishopenidlogin': - case 'finishaddopenid': - $ssl = true; - return false; - default: - return true; - } - } - /** * Login actions * @@ -390,11 +367,11 @@ class OpenIDPlugin extends Plugin $action->element('link', array('rel' => 'openid2.provider', 'href' => common_local_url('openidserver'))); $action->element('link', array('rel' => 'openid2.local_id', - 'href' => $action->profile->profileurl)); + 'href' => $action->getTarget()->getUrl())); $action->element('link', array('rel' => 'openid.server', 'href' => common_local_url('openidserver'))); $action->element('link', array('rel' => 'openid.delegate', - 'href' => $action->profile->profileurl)); + 'href' => $action->getTarget()->getUrl())); } if ($action instanceof SitestreamAction) { @@ -414,7 +391,7 @@ class OpenIDPlugin extends Plugin */ function onRedirectToLogin($action, $user) { - if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) { + if (common_config('site', 'openidonly') || (!empty($user) && User_openid::hasOpenID($user->id))) { common_redirect(common_local_url('openidlogin'), 303); } return true; @@ -620,7 +597,7 @@ class OpenIDPlugin extends Plugin $versions[] = array('name' => 'OpenID', 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou, Craig Andrews', - 'homepage' => 'http://status.net/wiki/Plugin:OpenID', + 'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OpenID', 'rawdescription' => // TRANS: Plugin description. _m('Use OpenID to login to the site.'));