X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=d1eb9d131c7e27a6f090be7acf0698c8d9d2d8e5;hb=5e1335ac892ce07bf7b1a3a043f71b8abbed8dba;hp=bc77e5dbc0980c53ef6d15c8b1357634cb7d3e77;hpb=c217e9da345d6c6c0d42da3a0de39294a4454f6f;p=friendica.git

diff --git a/include/auth.php b/include/auth.php
index bc77e5dbc0..d1eb9d131c 100644
--- 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
@@ -53,11 +62,27 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		$a->user = $r[0];
 		$_SESSION['theme'] = $a->user['theme'];
 		$_SESSION['page_flags'] = $a->user['page-flags'];
-		if(strlen($a->user['timezone']))
+
+		$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'];
+		}
 
 		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
+		$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)) {
@@ -132,16 +157,18 @@ else {
 	}
 	if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
 
+		$record = null;
 
 		$addon_auth = array(
-			'name' => trim($_POST['openid_url']), 
+			'username' => trim($_POST['openid_url']), 
 			'password' => trim($_POST['password']),
-			'authenticated' => 0
+			'authenticated' => 0,
+			'user_record' => null
 		);
 
 		/**
 		 *
-		 * A plugin indicates successful login by setting 'authenticated' to non-zero value
+		 * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record
 		 * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained
 		 * and later plugins should not interfere with an earlier one that succeeded.
 		 *
@@ -149,8 +176,12 @@ else {
 
 		call_hooks('authenticate', $addon_auth);
 
-		if(! $addon_auth['authenticated']) {
-			// process login request
+		if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) {
+			$record = $addon_auth['user_record'];
+		}
+		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",
@@ -158,33 +189,67 @@ else {
 				dbesc(trim($_POST['openid_url'])),
 				dbesc($encrypted)
 			);
-			if(($r === false) || (! count($r))) {
-				notice( t('Login failed.') . EOL );
-				goaway($a->get_baseurl());
-  			}
+			if(count($r))
+				$record = $r[0];
 		}
 
-		$_SESSION['uid'] = $r[0]['uid'];
-		$_SESSION['theme'] = $r[0]['theme'];
+		if((! $record) || (! count($record))) {
+			logger('authenticate: failed login attempt: ' . trim($_POST['openid_url'])); 
+			notice( t('Login failed.') . EOL );
+			goaway($a->get_baseurl());
+  		}
+
+		$_SESSION['uid'] = $record['uid'];
+		$_SESSION['theme'] = $record['theme'];
 		$_SESSION['authenticated'] = 1;
-		$_SESSION['page_flags'] = $r[0]['page-flags'];
-		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
+		$_SESSION['page_flags'] = $record['page-flags'];
+		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
 		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
-		notice( t("Welcome back ") . $r[0]['username'] . EOL);
-		$a->user = $r[0];
-		if(strlen($a->user['timezone']))
+		$a->user = $record;
+
+		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);
+
+
+		$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'];
+		}
+
+		$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` = %s AND `self` = 1 LIMIT 1",
+		$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'])
 		);