diff options
author | Evan Prodromou <evan@status.net> | 2009-11-01 13:04:23 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-01 13:04:23 -0500 |
commit | 5f5413624d166a9b2116d266c7698dd6dcd2d8c4 (patch) | |
tree | 3f7f85bbfb747d68bf518df026eea6ac686ad0c0 /plugins/OpenID/openid.php | |
parent | 658683e240ef6e44c6450a16448fe7cb82f792f2 (diff) | |
parent | 44ce8e2fcd1eba0d0f2723c246c1a021614e2763 (diff) |
Merge branch '0.9.x' into userflag
Diffstat (limited to 'plugins/OpenID/openid.php')
-rw-r--r-- | plugins/OpenID/openid.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 0944117c0..ff7a93899 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -23,6 +23,7 @@ require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php'); require_once('Auth/OpenID.php'); require_once('Auth/OpenID/Consumer.php'); +require_once('Auth/OpenID/Server.php'); require_once('Auth/OpenID/SReg.php'); require_once('Auth/OpenID/MySQLStore.php'); @@ -50,6 +51,13 @@ function oid_consumer() return $consumer; } +function oid_server() +{ + $store = oid_store(); + $server = new Auth_OpenID_Server($store, common_local_url('openidserver')); + return $server; +} + function oid_clear_last() { oid_set_last(''); @@ -241,7 +249,7 @@ function oid_update_user(&$user, &$sreg) $orig_user = clone($user); - if ($sreg['email'] && Validate::email($sreg['email'], true)) { + if ($sreg['email'] && Validate::email($sreg['email'], common_config('email', 'check_domain'))) { $user->email = $sreg['email']; } |