Merge pull request #5438 from MrPetovan/task/5410-remove-dbm-class

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

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 2f4d55dc0ac15c3a03d407f36c59bc67abbd1a1b..aafed8f95d16c6e0c7ff12b2f4cc24f8c2352c32 100644 (file)
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -10,7 +10,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Util\Network;
 use Exception;
@@ -731,8 +731,11 @@ class Image
                        $headers=[];
                        $h = explode("\n", $a->get_curl_headers());
                        foreach ($h as $l) {
-                               list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-                               $headers[$k] = $v;
+                               $data = array_map("trim", explode(":", trim($l), 2));
+                               if (count($data) > 1) {
+                                       list($k,$v) = $data;
+                                       $headers[$k] = $v;
+                               }
                        }
                        if (array_key_exists('Content-Type', $headers))
                                $type = $headers['Content-Type'];
@@ -771,24 +774,32 @@ class Image
        {
                $data = [];
 
+               if (empty($url)) {
+                       return $data;
+               }
+
                $data = Cache::get($url);
 
                if (is_null($data) || !$data || !is_array($data)) {
                        $img_str = Network::fetchUrl($url, true, $redirects, 4);
                        $filesize = strlen($img_str);
 
-                       if (function_exists("getimagesizefromstring")) {
-                               $data = getimagesizefromstring($img_str);
-                       } else {
-                               $tempfile = tempnam(get_temppath(), "cache");
+                       try {
+                               if (function_exists("getimagesizefromstring")) {
+                                       $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 = get_app();
+                                       $stamp1 = microtime(true);
+                                       file_put_contents($tempfile, $img_str);
+                                       $a->save_timestamp($stamp1, "file");
 
-                               $data = getimagesize($tempfile);
-                               unlink($tempfile);
+                                       $data = getimagesize($tempfile);
+                                       unlink($tempfile);
+                               }
+                       } catch (Exception $e) {
+                               return false;
                        }
 
                        if ($data) {
@@ -871,7 +882,7 @@ class Image
                        intval($uid)
                );
 
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
                        return([]);
                }