Merge pull request #5878 from nupplaphil/curl_response_refactoring

[friendica.git] / src / Object / Image.php

diff --git a/src/Object/Image.php b/src/Object/Image.php
index aafed8f95d16c6e0c7ff12b2f4cc24f8c2352c32..a76599223d0bbad165f72ee3611f5452869002c1 100644 (file)
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -11,6 +11,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Util\Network;
 use Exception;
@@ -654,7 +655,7 @@ class Image
 
                $stamp1 = microtime(true);
                file_put_contents($path, $string);
-               $a->save_timestamp($stamp1, "file");
+               $a->saveTimestamp($stamp1, "file");
        }
 
        /**
@@ -719,17 +720,18 @@ class Image
         *
         * @param string  $filename Image filename
         * @param boolean $fromcurl Check Content-Type header from curl request
+        * @param string $header passed headers to take into account
         *
         * @return object
         */
-       public static function guessType($filename, $fromcurl = false)
+       public static function guessType($filename, $fromcurl = false, $header = '')
        {
                logger('Image: guessType: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
                $type = null;
                if ($fromcurl) {
                        $a = get_app();
                        $headers=[];
-                       $h = explode("\n", $a->get_curl_headers());
+                       $h = explode("\n", $header);
                        foreach ($h as $l) {
                                $data = array_map("trim", explode(":", trim($l), 2));
                                if (count($data) > 1) {
@@ -782,18 +784,23 @@ class Image
 
                if (is_null($data) || !$data || !is_array($data)) {
                        $img_str = Network::fetchUrl($url, true, $redirects, 4);
+
+                       if (!$img_str) {
+                               return false;
+                       }
+
                        $filesize = strlen($img_str);
 
                        try {
                                if (function_exists("getimagesizefromstring")) {
-                                       $data = getimagesizefromstring($img_str);
+                                       $data = @getimagesizefromstring($img_str);
                                } else {
                                        $tempfile = tempnam(get_temppath(), "cache");
 
                                        $a = get_app();
                                        $stamp1 = microtime(true);
                                        file_put_contents($tempfile, $img_str);
-                                       $a->save_timestamp($stamp1, "file");
+                                       $a->saveTimestamp($stamp1, "file");
 
                                        $data = getimagesize($tempfile);
                                        unlink($tempfile);
@@ -891,7 +898,7 @@ class Image
 
                /// @TODO
                /// $default_cid      = $r[0]['id'];
-               /// $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+               /// $community_page   = (($r[0]['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
 
                if ((strlen($imagedata) == 0) && ($url == "")) {
                        logger("No image data and no url provided", LOGGER_DEBUG);
@@ -901,7 +908,7 @@ class Image
 
                        $stamp1 = microtime(true);
                        $imagedata = @file_get_contents($url);
-                       $a->save_timestamp($stamp1, "file");
+                       $a->saveTimestamp($stamp1, "file");
                }
 
                $maximagesize = Config::get('system', 'maximagesize');
@@ -915,7 +922,7 @@ class Image
 
                $stamp1 = microtime(true);
                file_put_contents($tempfile, $imagedata);
-               $a->save_timestamp($stamp1, "file");
+               $a->saveTimestamp($stamp1, "file");
 
                $data = getimagesize($tempfile);