X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fsecurity.php;h=05371f71ca55d1a44559480ffc2c350197cc3add;hb=9521f39ebea7603098e4f96f5edb6c85a40fc646;hp=1c7813e74bb08078e24c86ae965e1203c3205510;hpb=9c2c4839968169a191084d6d2b0d629d82430e67;p=friendica.git

diff --git a/include/security.php b/include/security.php
index 1c7813e74b..05371f71ca 100644
--- a/include/security.php
+++ b/include/security.php
@@ -54,34 +54,30 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 
 	$a->user = $user_record;
 
-	if ($interactive) {
-		/// @TODO Comparison of strings this way may lead to bugs/incompatiblities
+	if($interactive) {
 		if ($a->user['login_date'] <= NULL_DATE) {
 			$_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);
 		}
+		else
+			info( t("Welcome back ") . $a->user['username'] . EOL);
 	}
 
 	$member_since = strtotime($a->user['register_date']);
-
-	if (time() < ($member_since + ( 60 * 60 * 24 * 14))) {
+	if(time() < ($member_since + ( 60 * 60 * 24 * 14)))
 		$_SESSION['new_member'] = true;
-	} else {
+	else
 		$_SESSION['new_member'] = false;
-	}
-
-	if (strlen($a->user['timezone'])) {
+	if(strlen($a->user['timezone'])) {
 		date_default_timezone_set($a->user['timezone']);
 		$a->timezone = $a->user['timezone'];
 	}
 
 	$master_record = $a->user;
 
-	if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
+	if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
 		$r = q("select * from user where uid = %d limit 1",
 			intval($_SESSION['submanage'])
 		);
@@ -106,9 +102,9 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	if (dbm::is_result($r))
 		$a->identities = array_merge($a->identities,$r);
 
-	if ($login_initial)
+	if($login_initial)
 		logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
-	if ($login_refresh)
+	if($login_refresh)
 		logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG);
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
@@ -121,7 +117,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 
 	header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 
-	if ($login_initial || $login_refresh) {
+	if($login_initial || $login_refresh) {
 
 		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d",
 			dbesc(datetime_convert()),
@@ -251,7 +247,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 	 * Profile owner - everything is visible
 	 */
 
-	if (($local_user) && ($local_user == $owner_id)) {
+	if(($local_user) && ($local_user == $owner_id)) {
 		$sql = '';
 	}
 
@@ -263,9 +259,9 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 	 * done this and passed the groups into this function.
 	 */
 
-	elseif ($remote_user) {
+	elseif($remote_user) {
 
-		if (! $remote_verified) {
+		if(! $remote_verified) {
 			$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
 				intval($remote_user),
 				intval($owner_id)
@@ -275,12 +271,12 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 				$groups = init_groups_visitor($remote_user);
 			}
 		}
-		if ($remote_verified) {
+		if($remote_verified) {
 
 			$gs = '<<>>'; // should be impossible to match
 
-			if (is_array($groups) && count($groups)) {
-				foreach ($groups as $g)
+			if(is_array($groups) && count($groups)) {
+				foreach($groups as $g)
 					$gs .= '|<' . intval($g) . '>';
 			}
 
@@ -333,7 +329,7 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
 	 * Profile owner - everything is visible
 	 */
 
-	if ($local_user && ($local_user == $owner_id)) {
+	if($local_user && ($local_user == $owner_id)) {
 		$sql = '';
 	}
 
@@ -345,9 +341,9 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
 	 * done this and passed the groups into this function.
 	 */
 
-	elseif ($remote_user) {
+	elseif($remote_user) {
 
-		if (! $remote_verified) {
+		if(! $remote_verified) {
 			$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
 				intval($remote_user),
 				intval($owner_id)
@@ -357,14 +353,13 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
 				$groups = init_groups_visitor($remote_user);
 			}
 		}
-		if ($remote_verified) {
+		if($remote_verified) {
 
 			$gs = '<<>>'; // should be impossible to match
 
-			if (is_array($groups) && count($groups)) {
-				foreach ($groups as $g) {
+			if(is_array($groups) && count($groups)) {
+				foreach($groups as $g)
 					$gs .= '|<' . intval($g) . '>';
-				}
 			}
 
 			$sql = sprintf(
@@ -457,7 +452,7 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
 // DFRN contact. They are *not* neccessarily unique across the entire site.
 
 
-if (! function_exists('init_groups_visitor')) {
+if(! function_exists('init_groups_visitor')) {
 function init_groups_visitor($contact_id) {
 	$groups = array();
 	$r = q("SELECT `gid` FROM `group_member`
@@ -465,7 +460,7 @@ function init_groups_visitor($contact_id) {
 		intval($contact_id)
 	);
 	if (dbm::is_result($r)) {
-		foreach ($r as $rr)
+		foreach($r as $rr)
 			$groups[] = $rr['gid'];
 	}
 	return $groups;