Some more API functions moved

[friendica.git] / src / Module / Photo.php

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 58a2eeac56bdf436761c2652eada3f5c8a9f3cbb..399313e3f5c428816d89404b1dbc47837376343c 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -29,8 +29,8 @@ use Friendica\Model\Contact;
 use Friendica\Model\Photo as MPhoto;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
-use Friendica\Model\Storage\ExternalResource;
-use Friendica\Model\Storage\SystemResource;
+use Friendica\Core\Storage\Type\ExternalResource;
+use Friendica\Core\Storage\Type\SystemResource;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\NotModifiedException;
@@ -289,13 +289,17 @@ class Photo extends BaseModule
                                $mimetext = '';
                                if (!empty($url)) {
                                        $mime = ParseUrl::getContentType($url);
-                                       if (empty($mime) || ($mime[0] != 'image')) {
-                                               $url = '';
-                                       } else {
+                                       if (!empty($mime)) {
                                                $mimetext = $mime[0] . '/' . $mime[1];
+                                       } else {
+                                               Logger::info('Invalid file', ['url' => $url]);
+                                       }
+                                       if (!empty($mimetext) && ($mime[0] != 'image') && ($mimetext != 'application/octet-stream')) {
+                                               Logger::info('Unexpected Content-Type', ['mime' => $mimetext, 'url' => $url]);
+                                               $mimetext = '';
                                        }
                                }
-                               if (empty($url)) {
+                               if (empty($mimetext)) {
                                        if ($customsize <= Proxy::PIXEL_MICRO) {
                                                $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
                                        } elseif ($customsize <= Proxy::PIXEL_THUMB) {