move update_user function to openid.php

[quix0rs-gnu-social.git] / lib / openid.php

diff --git a/lib/openid.php b/lib/openid.php
index 74d7d64a9d2adfa922bb34ad9462022a23774952..111cc4a0cb4f235f16c0ff6acff392613b9b2eef 100644 (file)
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -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();
@@ -51,21 +74,37 @@ function oid_link_user($id, $canonical, $display) {
        $oid->display = $display;
        $oid->created = DB_DataObject_Cast::dateTime();
 
-    common_debug('oid = '.print_r($oid, TRUE), __FILE__);
-       
        if (!$oid->insert()) {
                $err = PEAR::getStaticProperty('DB_DataObject','lastError');
                common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
                return false;
        }
-
-    common_debug('oid = '.print_r($oid, TRUE), __FILE__);
        
        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) {
@@ -104,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;
@@ -115,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
@@ -141,3 +181,45 @@ function oid_authenticate($openid_url, $returnto) {
                }
        }
 }
+
+# update a user from sreg parameters
+
+function oid_update_user(&$user, &$sreg) {
+               
+       $profile = $user->getProfile();
+       
+       $orig_profile = clone($profile);
+       
+       if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
+               $profile->fullname = $sreg['fullname'];
+       }
+       
+       if ($sreg['country']) {
+               if ($sreg['postcode']) {
+                       # XXX: use postcode to get city and region
+                       # XXX: also, store postcode somewhere -- it's valuable!
+                       $profile->location = $sreg['postcode'] . ', ' . $sreg['country'];
+               } else {
+                       $profile->location = $sreg['country'];
+               }
+       }
+       
+       # XXX save language if it's passed
+       # XXX save timezone if it's passed
+       
+       if (!$profile->update($orig_profile)) {
+               common_server_error(_t('Error saving the profile.'));
+               return;
+       }
+       
+       $orig_user = clone($user);
+       
+       if ($sreg['email'] && Validate::email($sreg['email'], true)) {
+               $user->email = $sreg['email'];
+       }
+       
+       if (!$user->update($orig_user)) {
+               common_server_error(_t('Error saving the user.'));
+               return;
+       }
+}