statusnet improvements

[friendica.git] / mod / openid.php

diff --git a/mod/openid.php b/mod/openid.php
index 91efbbbc421313e405e6eb2f3acdecf665f2e111..537d84ce3891d9b283ecc6e1f21cd2af152acdab 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -70,24 +70,48 @@ function openid_content(&$a) {
                        $_SESSION['page_flags'] = $r[0]['page-flags'];
                        $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
 
-                       notice( t("Welcome back ") . $r[0]['username'] . EOL);
                        $a->user = $r[0];
-                       if(strlen($a->user['timezone']))
+
+                       if($a->user['login_date'] === '0000-00-00 00:00:00') {
+                               $_SESSION['return_url'] = 'profile_photo/new';
+                               $a->module = 'profile_photo';
+                               info( t("Welcome ") . $a->user['username'] . EOL);
+                               info( t('Please upload a profile photo.') . EOL);
+                       }
+                       else
+                               info( t("Welcome back ") . $a->user['username'] . EOL);
+
+
+                       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']));
+                       $r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
+                               dbesc($a->user['password']),
+                               dbesc($a->user['email'])
+                       );
+                       if(count($r))
+                               $a->identities = $r;
+
+                       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+                               intval($_SESSION['uid'])
+                       );
                        if(count($r)) {
                                $a->contact = $r[0];
                                $a->cid = $r[0]['id'];
                                $_SESSION['cid'] = $a->cid;
                        }
 
-                       q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
+                       $l = get_language();
+
+                       q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
                                dbesc(datetime_convert()),
+                               dbesc($l),
                                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']);
@@ -98,4 +122,4 @@ function openid_content(&$a) {
        notice( t('Login failed.') . EOL);
        goaway($a->get_baseurl());
        // NOTREACHED
-}
\ No newline at end of file
+}