Merge pull request #12397 from HankG/fix-photo-get-without-scale-arg

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

diff --git a/src/Contact/Avatar.php b/src/Contact/Avatar.php
index d63ebe5b6d6cb80f2eac8f039551886244c2eb58..0cfc8df3458275478b84340d9245440c595af10c 100644 (file)
--- a/src/Contact/Avatar.php
+++ b/src/Contact/Avatar.php
@@ -32,7 +32,6 @@ use Friendica\Util\HTTPSignature;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy;
-use Friendica\Util\Strings;
 
 /**
  * functions for handling contact avatar caching
@@ -124,7 +123,7 @@ class Avatar
                return $fields;
        }
 
-       private static function getFilename(string $url)
+       private static function getFilename(string $url): string
        {
                $guid = Item::guidFromUri($url, parse_url($url, PHP_URL_HOST));
 
@@ -139,20 +138,18 @@ class Avatar
                        return '';
                }
 
-               $path = self::BASE_PATH . $filename . $size . '.' . $image->getExt();
+               $path = $filename . $size . '.' . $image->getExt();
 
-               $filepath = DI::basePath() . $path;
+               $basepath = self::basePath();
+               if (empty($basepath)) {
+                       return '';
+               }
 
-               $dirpath = DI::basePath() . self::BASE_PATH;
+               $filepath = $basepath . $path;
 
-               DI::profiler()->startRecording('file');
+               $dirpath = $basepath;
 
-               if (!file_exists($dirpath)) {
-                       if (!mkdir($dirpath, 0775)) {
-                               Logger::warning('Base directory could not be created', ['directory' => $dirpath]);
-                               return '';
-                       }
-               }
+               DI::profiler()->startRecording('file');
 
                // Fetch the permission and group ownership of the "avatar" path and apply to all files
                $dir_perm  = fileperms($dirpath) & 0777;
@@ -164,15 +161,15 @@ class Avatar
                        $dirpath .= $part . '/';
 
                        if (!file_exists($dirpath)) {
-                               if (!mkdir($dirpath, $dir_perm)) {
+                               if (!@mkdir($dirpath, $dir_perm) && !file_exists($dirpath)) {
                                        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]);
+                               Logger::warning('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]);
+                               Logger::warning('Directory group could not be changed', ['directory' => $dirpath, 'old' => $old_group, 'new' => $group]);
                        }
                }
 
@@ -184,11 +181,11 @@ class Avatar
                $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]);
+                       Logger::warning('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]);
+                       Logger::warning('File group could not be changed', ['file' => $filepath, 'old' => $old_group, 'new' => $group]);
                }
 
                DI::profiler()->stopRecording();
@@ -198,7 +195,7 @@ class Avatar
                        return '';
                }
 
-               return DI::baseUrl() . $path . '?ts=' . $timestamp;
+               return self::baseUrl() . $path . '?ts=' . $timestamp;
        }
 
        /**
@@ -221,16 +218,17 @@ class Avatar
        private static function getCacheFile(string $avatar): string
        {
                $parts = parse_url($avatar);
-               if (empty($parts['host']) || ($parts['host'] != DI::baseUrl()->getHostname())) {
+               if (empty($parts['host']) || ($parts['host'] != parse_url(self::baseUrl(), PHP_URL_HOST))) {
                        return '';
                }
 
-               $pos = strpos($parts['path'], DI::baseUrl()->getUrlPath() . self::BASE_PATH);
+               $avatarpath = parse_url(self::baseUrl(), PHP_URL_PATH);
+               $pos = strpos($parts['path'], $avatarpath);
                if ($pos !== 0) {
                        return '';
                }
 
-               $filename = DI::basePath() . $parts['path'];
+               $filename = self::basePath() . substr($parts['path'], strlen($avatarpath));
 
                DI::profiler()->startRecording('file');
                $exists = file_exists($filename);
@@ -265,8 +263,51 @@ class Avatar
        {
                $localFile = self::getCacheFile($avatar);
                if (!empty($localFile)) {
-                       unlink($localFile);
+                       @unlink($localFile);
                        Logger::debug('Unlink avatar', ['avatar' => $avatar]);
                }
        }
+
+       /**
+        * Fetch the avatar base path
+        *
+        * @return string
+        */
+       private static function basePath(): string
+       {
+               $basepath = DI::config()->get('system', 'avatar_cache_path');
+               if (empty($basepath)) {
+                       $basepath = DI::basePath() . self::BASE_PATH;
+               }
+               $basepath = rtrim($basepath, '/') . '/';
+
+               if (!file_exists($basepath)) {
+                       // We only automatically create the folder when it is in the web root
+                       if (strpos($basepath, DI::basePath()) !== 0) {
+                               Logger::warning('Base directory does not exist', ['directory' => $basepath]);
+                               return '';
+                       }
+                       if (!mkdir($basepath, 0775)) {
+                               Logger::warning('Base directory could not be created', ['directory' => $basepath]);
+                               return '';
+                       }
+               }
+
+               return $basepath;
+       }
+
+       /**
+        * Fetch the avatar base url
+        *
+        * @return string
+        */
+       private static function baseUrl(): string
+       {
+               $baseurl = DI::config()->get('system', 'avatar_cache_url');
+               if (!empty($baseurl)) {
+                       return rtrim($baseurl, '/') . '/';
+               }
+
+               return DI::baseUrl() . self::BASE_PATH;
+       }
 }