Fallback to getPathname() for uploaded files - closes #41054105

freescout-help-desk · Jul 5, 2024 · 9b5286e · 9b5286e
1 parent 78e1067
commit 9b5286e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php
@@ -77,7 +77,7 @@ function mb_ucfirst($string)
         // Photo
         $validator->after(function ($validator) use ($customer, $request) {
             if ($request->hasFile('photo_url')) {
-                $path_url = $customer->savePhoto($request->file('photo_url')->getRealPath(), $request->file('photo_url')->getMimeType());
+                $path_url = $customer->savePhoto($request->file('photo_url')->getRealPath() ?: $request->file('photo_url')->getPathname(), $request->file('photo_url')->getMimeType());
 
                 if ($path_url) {
                     $customer->photo_url = $path_url;

diff --git a/app/Misc/Helper.php b/app/Misc/Helper.php
@@ -1732,7 +1732,7 @@ public static function sanitizeUploadedFileName($file_name, $uploaded_file = nul
         } elseif ($ext == 'pdf') {
             // Rename PDF to avoid running embedded JavaScript.
             if ($uploaded_file && !$contents) {
-                $contents = file_get_contents($uploaded_file->getRealPath());
+                $contents = file_get_contents($uploaded_file->getRealPath() ?: $uploaded_file->getPathname());
             }
             if ($contents && strstr($contents, '/JavaScript')) {
                 $file_name = $file_name.'_';

diff --git a/app/User.php b/app/User.php
@@ -869,6 +869,10 @@ public function savePhoto($uploaded_file, $mime_type = '')
         if (!is_string($uploaded_file)) {
             $real_path = $uploaded_file->getRealPath();
             $mime_type = $uploaded_file->getMimeType();
+
+            if (!$real_path) {
+                $real_path = $uploaded_file->getPathname();
+            }
         }
 
         $photo_size = config('app.user_photo_size');