Blanks replaced

[friendica.git] / src / Contact / Avatar.php

diff --git a/src/Contact/Avatar.php b/src/Contact/Avatar.php
index 6114788021f0a5f94d67d154178a25fd26193d45..38208a043efe94799dd2c0edda5adf49c98fcf30 100644 (file)
--- a/src/Contact/Avatar.php
+++ b/src/Contact/Avatar.php
@@ -39,6 +39,8 @@ use Friendica\Util\Strings;
  */
 class Avatar
 {
+       const BASE_PATH = '/avatar/';
+
        /**
         * Returns a field array with locally cached avatar pictures
         *
@@ -105,27 +107,55 @@ class Avatar
                        return '';
                }
 
-               $path = '/avatar/' . $filename . $size . '.' . $image->getExt();
+               $path = self::BASE_PATH . $filename . $size . '.' . $image->getExt();
 
                $filepath = DI::basePath() . $path;
 
-               $dirpath = dirname($filepath);
+               $dirpath = DI::basePath() . self::BASE_PATH;
 
                DI::profiler()->startRecording('file');
 
-               if (!file_exists($dirpath)) {
-                       mkdir($dirpath, 0775, true);
-               } else {
-                       chmod($dirpath, 0775);
+               // Fetch the permission and group ownership of the "avatar" path and apply to all files
+               $dir_perm  = fileperms($dirpath) & 0777;
+               $file_perm = fileperms($dirpath) & 0666;
+               $group     = filegroup($dirpath);
+
+               // 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 ((($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 ((($old_group = filegroup($dirpath)) != $group) && !chgrp($dirpath, $group)) {
+                               Logger::notice('Directory group could not be changed', ['directory' => $dirpath, 'old' => $old_group, 'new' => $group]);
+                       }
+               }
+
+               if (!file_put_contents($filepath, $image->asString())) {
+                       Logger::warning('File could not be created', ['file' => $filepath]);
                }
 
-               file_put_contents($filepath, $image->asString());
-               chmod($filepath, 0664);
+               $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 (($old_group != $group) && !chgrp($filepath, $group)) {
+                       Logger::notice('File group could not be changed', ['file' => $filepath, 'old' => $old_group, 'new' => $group]);
+               }
 
                DI::profiler()->stopRecording();
 
                if (!file_exists($filepath)) {
-                       Logger::notice('Avatar cache file could not be stored', ['file' => $filepath]);
+                       Logger::warning('Avatar cache file could not be stored', ['file' => $filepath]);
                        return '';
                }
 
@@ -155,13 +185,13 @@ class Avatar
                        return '';
                }
 
-               $path = Strings::normaliseLink(DI::baseUrl() . '/avatar');
+               $path = Strings::normaliseLink(DI::baseUrl() . self::BASE_PATH);
 
                if (Network::getUrlMatch($path, $avatar) != $path) {
                        return '';
                }
 
-               $filename = str_replace($path, DI::basePath(). '/avatar/', Strings::normaliseLink($avatar));
+               $filename = str_replace($path, DI::basePath(). self::BASE_PATH, Strings::normaliseLink($avatar));
 
                DI::profiler()->startRecording('file');
                $exists = file_exists($filename);