X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOpenID%2FOpenIDPlugin.php;h=5adb56662619694c625bd9449fb94cb81c2146d9;hb=fb70dc02362155c8951a1a0ad66a668f1f857ca5;hp=d5c5c303c232f4a66fc545e55402d6f5d5056662;hpb=206c09068884f701d9dc295c851a1216c5839ff3;p=quix0rs-gnu-social.git diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index d5c5c303c2..5adb566626 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -20,7 +20,7 @@ * @category Plugin * @package StatusNet * @author Evan Prodromou - * @author Craig Andrews + * @author Craig Andrews * @copyright 2009-2010 StatusNet, Inc. * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 @@ -37,6 +37,8 @@ if (!defined('STATUSNET')) { * This class enables consumer support for OpenID, the distributed authentication * and identity system. * + * Depends on: WebFinger plugin for HostMeta-lookup (user@host format) + * * @category Plugin * @package StatusNet * @author Evan Prodromou @@ -130,10 +132,8 @@ class OpenIDPlugin extends Plugin $action = trim($args['action']); if (in_array($action, array('login', 'register'))) { common_redirect(common_local_url('openidlogin')); - exit(0); } else if ($action == 'passwordsettings') { common_redirect(common_local_url('openidsettings')); - exit(0); } else if ($action == 'recoverpassword') { // TRANS: Client exception thrown when an action is not available. throw new ClientException(_m('Unavailable action.')); @@ -350,31 +350,14 @@ class OpenIDPlugin extends Plugin { switch ($cls) { - case 'OpenidloginAction': - case 'FinishopenidloginAction': - case 'FinishaddopenidAction': - case 'XrdsAction': - case 'PublicxrdsAction': - case 'OpenidsettingsAction': - case 'OpenidserverAction': - case 'OpenidtrustAction': - case 'OpenidadminpanelAction': - require_once dirname(__FILE__) . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; - return false; - case 'User_openid': - require_once dirname(__FILE__) . '/User_openid.php'; - return false; - case 'User_openid_trustroot': - require_once dirname(__FILE__) . '/User_openid_trustroot.php'; - return false; case 'Auth_OpenID_TeamsExtension': case 'Auth_OpenID_TeamsRequest': case 'Auth_OpenID_TeamsResponse': require_once dirname(__FILE__) . '/extlib/teams-extension.php'; return false; - default: - return true; } + + return parent::onAutoload($cls); } /** @@ -425,8 +408,8 @@ class OpenIDPlugin extends Plugin } /** - * We include a element linking to the userxrds page, for OpenID - * client-side authentication. + * We include a element linking to the webfinger resource page, + * for OpenID client-side authentication. * * @param Action $action Action being shown * @@ -459,7 +442,6 @@ class OpenIDPlugin extends Plugin { if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) { common_redirect(common_local_url('openidlogin'), 303); - return false; } return true; } @@ -555,24 +537,9 @@ class OpenIDPlugin extends Plugin function onCheckSchema() { $schema = Schema::get(); - $schema->ensureTable('user_openid', - array(new ColumnDef('canonical', 'varchar', - '255', false, 'PRI'), - new ColumnDef('display', 'varchar', - '255', false, 'UNI'), - new ColumnDef('user_id', 'integer', - null, false, 'MUL'), - new ColumnDef('created', 'datetime', - null, false), - new ColumnDef('modified', 'timestamp'))); - $schema->ensureTable('user_openid_trustroot', - array(new ColumnDef('trustroot', 'varchar', - '255', false, 'PRI'), - new ColumnDef('user_id', 'integer', - null, false, 'PRI'), - new ColumnDef('created', 'datetime', - null, false), - new ColumnDef('modified', 'timestamp'))); + $schema->ensureTable('user_openid', User_openid::schemaDef()); + $schema->ensureTable('user_openid_trustroot', User_openid_trustroot::schemaDef()); + $schema->ensureTable('user_openid_prefs', User_openid_prefs::schemaDef()); /* These are used by JanRain OpenID library */ @@ -677,7 +644,7 @@ class OpenIDPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'OpenID', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou, Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:OpenID', 'rawdescription' => @@ -768,7 +735,7 @@ class OpenIDPlugin extends Plugin oid_assert_allowed($openid_url); $returnto = common_local_url( - 'ApiOauthAuthorize', + 'ApiOAuthAuthorize', array(), array( 'oauth_token' => $action->arg('oauth_token'), @@ -797,20 +764,17 @@ class OpenIDPlugin extends Plugin * Webfinger identity to services that support it. See * http://webfinger.org/login for an example. * - * @param XRD &$xrd Currently-displaying XRD object - * @param User $user The user that it's for + * @param XML_XRD $xrd Currently-displaying resource descriptor + * @param Profile $target The profile that it's for * * @return boolean hook value (always true) */ - function onEndXrdActionLinks(&$xrd, $user) + function onEndWebFingerProfileLinks(XML_XRD $xrd, Profile $target) { - $profile = $user->getProfile(); - - if (!empty($profile)) { - $xrd->links[] = array('rel' => 'http://specs.openid.net/auth/2.0/provider', - 'href' => $profile->profileurl); - } + $xrd->links[] = new XML_XRD_Element_Link( + 'http://specs.openid.net/auth/2.0/provider', + $target->profileurl); return true; } @@ -826,15 +790,20 @@ class OpenIDPlugin extends Plugin function onOtherAccountProfiles($profile, &$links) { - $oid = new User_openid(); + $prefs = User_openid_prefs::getKV('user_id', $profile->id); - $oid->user_id = $profile->id; + if (empty($prefs) || !$prefs->hide_profile_link) { - if ($oid->find()) { - while ($oid->fetch()) { - $links[] = array('href' => $oid->display, - 'text' => _('OpenID'), - 'image' => $this->path("icons/openid-16x16.gif")); + $oid = new User_openid(); + + $oid->user_id = $profile->id; + + if ($oid->find()) { + while ($oid->fetch()) { + $links[] = array('href' => $oid->display, + 'text' => _('OpenID'), + 'image' => $this->path("icons/openid-16x16.gif")); + } } }