forgot to check this in earlier... splits up text and html into two different templat...

[friendica.git] / mod / openid.php

diff --git a/mod/openid.php b/mod/openid.php
index 6c1edd72e26b19bb1ebff9f2b50d8adc0125f875..2e1025692d3a8285eff137a2fc0a7d8589700904 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -6,11 +6,55 @@ require_once('library/openid.php');
 
 function openid_content(&$a) {
 
+       $noid = get_config('system','no_openid');
+       if($noid)
+               goaway($a->get_baseurl());
+
        if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
                $openid = new LightOpenID;
 
                if($openid->validate()) {
 
+                       if(x($_SESSION,'register')) {
+                               unset($_SESSION['register']);
+                               $args = '';
+                               $attr = $openid->getAttributes();
+                               if(is_array($attr) && count($attr)) {
+                                       foreach($attr as $k => $v) {
+                                               if($k === 'namePerson/friendly')
+                                                       $nick = notags(trim($v));
+                                               if($k === 'namePerson/first')
+                                                       $first = notags(trim($v));
+                                               if($k === 'namePerson')
+                                                       $args .= '&username=' . notags(trim($v));
+                                               if($k === 'contact/email')
+                                                       $args .= '&email=' . notags(trim($v));
+                                               if($k === 'media/image/aspect11')
+                                                       $photosq = bin2hex(trim($v));
+                                               if($k === 'media/image/default')
+                                                       $photo = bin2hex(trim($v));
+                                       }
+                               }
+                               if($nick)
+                                       $args .= '&nickname=' . $nick;
+                               elseif($first)
+                                       $args .= '&nickname=' . $first;
+
+                               if($photosq)
+                                       $args .= '&photo=' . $photosq;
+                               elseif($photo)
+                                       $args .= '&photo=' . $photo;
+
+                               $args .= '&openid_url=' . notags(trim($_SESSION['openid']));
+                               if($a->config['register_policy'] != REGISTER_CLOSED)
+                                       goaway($a->get_baseurl() . '/register' . $args);
+                               else
+                                       goaway($a->get_baseurl());
+
+                               // NOTREACHED
+                       } 
+
+
                        $r = q("SELECT * FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
                                dbesc($_SESSION['openid'])
                        );
@@ -28,8 +72,11 @@ function openid_content(&$a) {
 
                        notice( t("Welcome back ") . $r[0]['username'] . EOL);
                        $a->user = $r[0];
-                       if(strlen($a->user['timezone']))
+
+                       if(strlen($a->user['timezone'])) {
                                date_default_timezone_set($a->user['timezone']);
+                               $a->timezone = $a->user['timezone'];
+                       }
 
                        $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
                                intval($_SESSION['uid']));
@@ -39,6 +86,11 @@ function openid_content(&$a) {
                                $_SESSION['cid'] = $a->cid;
                        }
 
+                       q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
+                               dbesc(datetime_convert()),
+                               intval($_SESSION['uid'])
+                       );
+
                        header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
                        if(($a->module !== 'home') && isset($_SESSION['return_url']))
                                goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);