X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUser.php;h=57d5560a47cec7d4ad7e68c64f01b829c3309da7;hb=23b10cf2ae5fe10ba21a4b43e1aae17818647661;hp=fbee73c786b527e5b10c7bd4419e8a864e855957;hpb=13827edd2cb6632a13ca983fe8c47cf679eaf4dc;p=friendica.git

diff --git a/src/Model/User.php b/src/Model/User.php
index fbee73c786..57d5560a47 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -706,7 +706,7 @@ class User
 	{
 		$cache = new CacheItemPool();
 		$cache->changeConfig([
-			'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
+			'cacheDirectory' => System::getTempPath() . '/password-exposed-cache/',
 		]);
 
 		try {
@@ -911,18 +911,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 +979,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 +1161,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 +1172,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,7 +1180,7 @@ 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;
@@ -1514,7 +1517,7 @@ class User
 			return false;
 		}
 
-		Logger::log('Removing user: ' . $uid);
+		Logger::notice('Removing user', ['user' => $uid]);
 
 		$user = DBA::selectFirst('user', [], ['uid' => $uid]);