eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

immediate mode for openid

Browse Source 
darcs-hash:20080619134710-84dde-6086a4ac7bbd72a251fe5ce6fe3156e3270ebd74.gz
This commit is contained in:
Evan Prodromou
2008-06-19 09:47:10 -04:00
parent 7258969cd4
commit 171b4f72ee
7 changed files with 146 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/openid.php
View File

@@ -26,6 +26,11 @@ require_once('Auth/OpenID/Consumer.php');
require_once('Auth/OpenID/SReg.php');
require_once('Auth/OpenID/MySQLStore.php');
# About one year cookie expiry
define('OPENID_COOKIE_EXPIRY', round(365.25 * 24 * 60 * 60));
define('OPENID_COOKIE_KEY', 'lastusedopenid');
function oid_store() {
static $store = NULL;
if (!$store) {
@@ -43,6 +48,24 @@ function oid_consumer() {
return $consumer;
}
function oid_clear_last() {
if (oid_get_last()) {
oid_set_last('');
}
}
function oid_set_last($openid_url) {
global $config;
setcookie(OPENID_COOKIE_KEY, $openid_url,
time() + OPENID_COOKIE_EXPIRY,
'/' . $config['site']['path'] . '/',
$config['site']['server']);
}
function oid_get_last() {
return $_COOKIE[OPENID_COOKIE_KEY];
}
function oid_link_user($id, $canonical, $display) {
$oid = new User_openid();
@@ -60,8 +83,28 @@ function oid_link_user($id, $canonical, $display) {
return true;
}
function oid_authenticate($openid_url, $returnto) {
function oid_get_user($openid_url) {
$user = NULL;
$oid = User_openid::staticGet('canonical', $openid_url);
if ($oid) {
$user = User::staticGet('id', $oid->user_id);
}
return $user;
}
function oid_check_immediate($openid_url, $backto=NULL) {
if (!$backto) {
$backto = $_SERVER['PHP_SELF'];
}
common_ensure_session();
$_SESSION['openid_immediate_backto'] = $backto;
oid_authenticate($openid_url,
'finishimmediate',
true);
}
function oid_authenticate($openid_url, $returnto, $immediate=false) {
$consumer = oid_consumer();
if (!$consumer) {
@@ -100,7 +143,8 @@ function oid_authenticate($openid_url, $returnto) {
if ($auth_request->shouldSendRedirect()) {
$redirect_url = $auth_request->redirectURL($trust_root,
$process_url);
$process_url,
$immediate);
if (!$redirect_url) {
} else if (Auth_OpenID::isFailure($redirect_url)) {
return _t('Could not redirect to server: ') . $redirect_url->message;
@@ -111,7 +155,7 @@ function oid_authenticate($openid_url, $returnto) {
// Generate form markup and render it.
$form_id = 'openid_message';
$form_html = $auth_request->formMarkup($trust_root, $process_url,
false, array('id' => $form_id));
$immediate, array('id' => $form_id));
# XXX: This is cheap, but things choke if we don't escape ampersands
# in the HTML attributes