X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FImage.php;h=aafed8f95d16c6e0c7ff12b2f4cc24f8c2352c32;hb=cfa68c52b9117616fa95a4639ad74e7d220d193d;hp=9692b84715c1d0e47db33de116c2e72ddd248a02;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git diff --git a/src/Object/Image.php b/src/Object/Image.php index 9692b84715..aafed8f95d 100644 --- 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']; @@ -781,18 +784,22 @@ class Image $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) { @@ -875,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([]); }