Merge pull request #169 from michal-s/master

[friendica.git] / mod / openid.php

diff --git a/mod/openid.php b/mod/openid.php
index c3c6c11e9e8f9a02a34ca84b240d5e4bb5a05ba1..3c32931471025ee3ca2ecf4d257151ffcdebbdde 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -8,7 +8,7 @@ function openid_content(&$a) {
 
        $noid = get_config('system','no_openid');
        if($noid)
-               goaway($a->get_baseurl());
+               goaway(z_root());
 
        if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
                $openid = new LightOpenID;
@@ -49,18 +49,19 @@ function openid_content(&$a) {
                                if($a->config['register_policy'] != REGISTER_CLOSED)
                                        goaway($a->get_baseurl() . '/register' . $args);
                                else
-                                       goaway($a->get_baseurl());
+                                       goaway(z_root());
 
                                // NOTREACHED
                        } 
 
 
-                       $r = q("SELECT * FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
+                       $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
+                               FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
                                dbesc($_SESSION['openid'])
                        );
                        if(! count($r)) {
                                notice( t('Login failed.') . EOL );
-                               goaway($a->get_baseurl());
+                               goaway(z_root());
                        }
                        unset($_SESSION['openid']);
 
@@ -75,11 +76,11 @@ function openid_content(&$a) {
                        if($a->user['login_date'] === '0000-00-00 00:00:00') {
                                $_SESSION['return_url'] = 'profile_photo/new';
                                $a->module = 'profile_photo';
-                               notice( t("Welcome ") . $a->user['username'] . EOL);
-                               notice( t('Please upload a profile photo.') . EOL);
+                               info( t("Welcome ") . $a->user['username'] . EOL);
+                               info( t('Please upload a profile photo.') . EOL);
                        }
                        else
-                               notice( t("Welcome back ") . $a->user['username'] . EOL);
+                               info( t("Welcome back ") . $a->user['username'] . EOL);
 
 
                        if(strlen($a->user['timezone'])) {
@@ -103,19 +104,23 @@ function openid_content(&$a) {
                                $_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']);
                        else
-                               goaway($a->get_baseurl());
+                               goaway(z_root());
                }
        }
        notice( t('Login failed.') . EOL);
-       goaway($a->get_baseurl());
+       goaway(z_root());
        // NOTREACHED
-}
\ No newline at end of file
+}