X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUser.php;h=736612b0d158eb45e35059d5574ea372587c839b;hb=2e05dac7dae0a3d028b442a2d5afbd4176a32e99;hp=3178b888e7c03fa90378cc047f4900fe1e74d2ab;hpb=42e77e23acfe9d923b0d7da56e60b54403c53df6;p=friendica.git

diff --git a/src/Model/User.php b/src/Model/User.php
index 3178b888e7..736612b0d1 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -481,13 +481,12 @@ class User
 	/**
 	 * Returns the default group for a given user and network
 	 *
-	 * @param int    $uid     User id
-	 * @param string $network network name
+	 * @param int $uid User id
 	 *
 	 * @return int group id
 	 * @throws Exception
 	 */
-	public static function getDefaultGroup($uid, $network = '')
+	public static function getDefaultGroup($uid)
 	{
 		$user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]);
 		if (DBA::isResult($user)) {
@@ -499,26 +498,6 @@ class User
 		return $default_group;
 	}
 
-
-	/**
-	 * Authenticate a user with a clear text password
-	 *
-	 * @param mixed  $user_info
-	 * @param string $password
-	 * @param bool   $third_party
-	 * @return int|boolean
-	 * @deprecated since version 3.6
-	 * @see        User::getIdFromPasswordAuthentication()
-	 */
-	public static function authenticate($user_info, $password, $third_party = false)
-	{
-		try {
-			return self::getIdFromPasswordAuthentication($user_info, $password, $third_party);
-		} catch (Exception $ex) {
-			return false;
-		}
-	}
-
 	/**
 	 * Authenticate a user with a clear text password
 	 *
@@ -706,7 +685,7 @@ class User
 	{
 		$cache = new CacheItemPool();
 		$cache->changeConfig([
-			'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
+			'cacheDirectory' => System::getTempPath() . '/password-exposed-cache/',
 		]);
 
 		try {
@@ -844,7 +823,7 @@ class User
 	 * Get avatar link for given user
 	 *
 	 * @param array  $user
-	 * @param string $size One of the ProxyUtils::SIZE_* constants
+	 * @param string $size One of the Proxy::SIZE_* constants
 	 * @return string avatar link
 	 * @throws Exception
 	 */
@@ -911,18 +890,18 @@ class User
 
 		$using_invites = DI::config()->get('system', 'invitation_only');
 
-		$invite_id  = !empty($data['invite_id'])  ? Strings::escapeTags(trim($data['invite_id']))  : '';
-		$username   = !empty($data['username'])   ? Strings::escapeTags(trim($data['username']))   : '';
-		$nickname   = !empty($data['nickname'])   ? Strings::escapeTags(trim($data['nickname']))   : '';
-		$email      = !empty($data['email'])      ? Strings::escapeTags(trim($data['email']))      : '';
-		$openid_url = !empty($data['openid_url']) ? Strings::escapeTags(trim($data['openid_url'])) : '';
-		$photo      = !empty($data['photo'])      ? Strings::escapeTags(trim($data['photo']))      : '';
-		$password   = !empty($data['password'])   ? trim($data['password'])           : '';
-		$password1  = !empty($data['password1'])  ? trim($data['password1'])          : '';
-		$confirm    = !empty($data['confirm'])    ? trim($data['confirm'])            : '';
+		$invite_id  = !empty($data['invite_id'])  ? trim($data['invite_id'])  : '';
+		$username   = !empty($data['username'])   ? trim($data['username'])   : '';
+		$nickname   = !empty($data['nickname'])   ? trim($data['nickname'])   : '';
+		$email      = !empty($data['email'])      ? trim($data['email'])      : '';
+		$openid_url = !empty($data['openid_url']) ? trim($data['openid_url']) : '';
+		$photo      = !empty($data['photo'])      ? trim($data['photo'])      : '';
+		$password   = !empty($data['password'])   ? trim($data['password'])   : '';
+		$password1  = !empty($data['password1'])  ? trim($data['password1'])  : '';
+		$confirm    = !empty($data['confirm'])    ? trim($data['confirm'])    : '';
 		$blocked    = !empty($data['blocked']);
 		$verified   = !empty($data['verified']);
-		$language   = !empty($data['language'])   ? Strings::escapeTags(trim($data['language']))   : 'en';
+		$language   = !empty($data['language'])   ? trim($data['language'])   : 'en';
 
 		$netpublish = $publish = !empty($data['profile_publish_reg']);
 
@@ -979,7 +958,7 @@ class User
 		$username_max_length = max(1, min(64, intval(DI::config()->get('system', 'username_max_length', 48))));
 
 		if ($username_min_length > $username_max_length) {
-			Logger::log(DI::l10n()->t('system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values.', $username_min_length, $username_max_length), Logger::WARNING);
+			Logger::error(DI::l10n()->t('system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values.', $username_min_length, $username_max_length));
 			$tmp = $username_min_length;
 			$username_min_length = $username_max_length;
 			$username_max_length = $tmp;
@@ -1161,7 +1140,10 @@ class User
 
 				$resource_id = Photo::newResource();
 
-				$r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 4);
+				// Not using Photo::PROFILE_PHOTOS here, so that it is discovered as translateble string
+				$profile_album = DI::l10n()->t('Profile Photos');
+
+				$r = Photo::store($Image, $uid, 0, $resource_id, $filename, $profile_album, 4);
 
 				if ($r === false) {
 					$photo_failure = true;
@@ -1169,7 +1151,7 @@ class User
 
 				$Image->scaleDown(80);
 
-				$r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 5);
+				$r = Photo::store($Image, $uid, 0, $resource_id, $filename, $profile_album, 5);
 
 				if ($r === false) {
 					$photo_failure = true;
@@ -1177,14 +1159,14 @@ class User
 
 				$Image->scaleDown(48);
 
-				$r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 6);
+				$r = Photo::store($Image, $uid, 0, $resource_id, $filename, $profile_album, 6);
 
 				if ($r === false) {
 					$photo_failure = true;
 				}
 
 				if (!$photo_failure) {
-					Photo::update(['profile' => 1], ['resource-id' => $resource_id]);
+					Photo::update(['profile' => true, 'photo-type' => Photo::USER_AVATAR], ['resource-id' => $resource_id]);
 				}
 			}
 
@@ -1514,7 +1496,7 @@ class User
 			return false;
 		}
 
-		Logger::log('Removing user: ' . $uid);
+		Logger::notice('Removing user', ['user' => $uid]);
 
 		$user = DBA::selectFirst('user', [], ['uid' => $uid]);