account expiration structures

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index ec02cd85c05696b6ccce3a965466dee386a955d7..1f16b350479a9074da639249f35cb336eee229bc 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -24,11 +24,11 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                // process logout request
 
                nuke_session();
-               notice( t('Logged out.') . EOL);
-               goaway($a->get_baseurl());
+               info( t('Logged out.') . EOL);
+               goaway(z_root());
        }
 
-       if(x($_SESSION['visitor_id']) && (! x($_SESSION['uid']))) {
+       if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
                $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
                        intval($_SESSION['visitor_id'])
                );
@@ -45,16 +45,17 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                // extra paranoia - if the IP changed, log them out
                if($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
                        nuke_session();
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                }
 
-               $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+               $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
+               FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
                        intval($_SESSION['uid'])
                );
 
                if(! count($r)) {
                        nuke_session();
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                }
 
                // initialise user environment
@@ -63,6 +64,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'];
@@ -112,7 +119,7 @@ else {
                        if(($noid) || (strpos($temp_string,'@')) || (! validate_url($temp_string))) {
                                $a = get_app();
                                notice( t('Login failed.') . EOL);
-                               goaway($a->get_baseurl());
+                               goaway(z_root());
                                // NOTREACHED
                        }
 
@@ -137,7 +144,7 @@ else {
                                if($a->config['register_policy'] == REGISTER_CLOSED) {
                                        $a = get_app();
                                        notice( t('Login failed.') . EOL);
-                                       goaway($a->get_baseurl());
+                                       goaway(z_root());
                                        // NOTREACHED
                                }
                                // new account
@@ -177,8 +184,9 @@ else {
 
                        // process normal login request
 
-                       $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
-                               AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
+                       $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`  
+                               FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
+                               AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
                                dbesc(trim($_POST['openid_url'])),
                                dbesc(trim($_POST['openid_url'])),
                                dbesc($encrypted)
@@ -190,7 +198,7 @@ else {
                if((! $record) || (! count($record))) {
                        logger('authenticate: failed login attempt: ' . trim($_POST['openid_url'])); 
                        notice( t('Login failed.') . EOL );
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                }
 
                $_SESSION['uid'] = $record['uid'];
@@ -205,11 +213,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']);
@@ -232,9 +247,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'])
                );