don't show delete buttons on community page

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index 4c7e85d86731bc004f3e18c0cf7aaed849970b37..d1eb9d131c7e27a6f090be7acf0698c8d9d2d8e5 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -24,10 +24,19 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                // process logout request
 
                nuke_session();
-               notice( t('Logged out.') . EOL);
+               info( t('Logged out.') . EOL);
                goaway($a->get_baseurl());
        }
 
+       if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
+               $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                       intval($_SESSION['visitor_id'])
+               );
+               if(count($r)) {
+                       $a->contact = $r[0];
+               }
+       }
+
        if(x($_SESSION,'uid')) {
 
                // already logged in user returning
@@ -54,6 +63,12 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                $_SESSION['theme'] = $a->user['theme'];
                $_SESSION['page_flags'] = $a->user['page-flags'];
 
+               $member_since = strtotime($a->user['register_date']);
+               if(time() < ($member_since + ( 60 * 60 * 24 * 14)))
+                       $_SESSION['new_member'] = true;
+               else
+                       $_SESSION['new_member'] = false;
+
                if(strlen($a->user['timezone'])) {
                        date_default_timezone_set($a->user['timezone']);
                        $a->timezone = $a->user['timezone'];
@@ -196,11 +211,18 @@ else {
                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);
+
+
+               $member_since = strtotime($a->user['register_date']);
+               if(time() < ($member_since + ( 60 * 60 * 24 * 14)))
+                       $_SESSION['new_member'] = true;
+               else
+                       $_SESSION['new_member'] = false;
 
                if(strlen($a->user['timezone'])) {
                        date_default_timezone_set($a->user['timezone']);
@@ -223,9 +245,11 @@ else {
                        $_SESSION['cid'] = $a->cid;
                }
 
+               $l = get_language();
 
-               q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
+               q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
                        dbesc(datetime_convert()),
+                       dbesc($l),
                        intval($_SESSION['uid'])
                );