X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContact%2FAvatar.php;h=38208a043efe94799dd2c0edda5adf49c98fcf30;hb=65b86fe0d556829c09e8c8f5c707b868ad37dfe1;hp=9d06995ec5ab779689208ba02e8817bcdeedff5d;hpb=d195d934bee1ac3c4e00d0c7dc1eaece07a96048;p=friendica.git

diff --git a/src/Contact/Avatar.php b/src/Contact/Avatar.php
index 9d06995ec5..38208a043e 100644
--- a/src/Contact/Avatar.php
+++ b/src/Contact/Avatar.php
@@ -123,20 +123,17 @@ class Avatar
 		// Check directory permissions of all parts of the path
 		foreach (explode('/', dirname($filename)) as $part) {
 			$dirpath .= $part . '/';
+
 			if (!file_exists($dirpath)) {
 				if (!mkdir($dirpath, $dir_perm)) {
 					Logger::warning('Directory could not be created', ['directory' => $dirpath]);
 				}
-			} elseif (fileperms($dirpath) & 0777 != $dir_perm) {
-				if (!chmod($dirpath, $dir_perm)) {
-					Logger::info('Directory permissions could not be changed', ['directory' => $dirpath]);
-				}
+			} elseif ((($old_perm = fileperms($dirpath) & 0777) != $dir_perm) && !chmod($dirpath, $dir_perm)) {
+				Logger::notice('Directory permissions could not be changed', ['directory' => $dirpath, 'old' => $old_perm, 'new' => $dir_perm]);
 			}
 
-			if (filegroup($dirpath) != $group) {
-				if (!chgrp($dirpath, $group)) {
-					Logger::info('Directory group could not be changed', ['directory' => $dirpath]);
-				}
+			if ((($old_group = filegroup($dirpath)) != $group) && !chgrp($dirpath, $group)) {
+				Logger::notice('Directory group could not be changed', ['directory' => $dirpath, 'old' => $old_group, 'new' => $group]);
 			}
 		}
 
@@ -144,12 +141,15 @@ class Avatar
 			Logger::warning('File could not be created', ['file' => $filepath]);
 		}
 
-		if (!chmod($filepath, $file_perm)) {
-			Logger::warning('File permissions could not be changed', ['file' => $filepath]);
+		$old_perm  = fileperms($filepath) & 0666;
+		$old_group = filegroup($filepath);
+
+		if (($old_perm != $file_perm) && !chmod($filepath, $file_perm)) {
+			Logger::notice('File permissions could not be changed', ['file' => $filepath, 'old' => $old_perm, 'new' => $file_perm]);
 		}
 
-		if (!chgrp($filepath, $group)) {
-			Logger::warning('File group could not be changed', ['file' => $filepath]);
+		if (($old_group != $group) && !chgrp($filepath, $group)) {
+			Logger::notice('File group could not be changed', ['file' => $filepath, 'old' => $old_group, 'new' => $group]);
 		}
 
 		DI::profiler()->stopRecording();