Merge https://github.com/friendika/friendika into pull

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index e8cee3918c5d368938c2fd94d2014e1f63dec4b4..4c7e85d86731bc004f3e18c0cf7aaed849970b37 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -191,9 +191,17 @@ else {
                $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
                $_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
-               notice( t("Welcome back ") . $record['username'] . EOL);
                $a->user = $record;
 
+               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);
+               }
+               else
+                       notice( t("Welcome back ") . $a->user['username'] . EOL);
+
                if(strlen($a->user['timezone'])) {
                        date_default_timezone_set($a->user['timezone']);
                        $a->timezone = $a->user['timezone'];
@@ -214,6 +222,8 @@ else {
                        $a->cid = $r[0]['id'];
                        $_SESSION['cid'] = $a->cid;
                }
+
+
                q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
                        dbesc(datetime_convert()),
                        intval($_SESSION['uid'])