X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FImage.php;h=9143c23c16b3d2d15f095a097832df604365d6d1;hb=d40b2792b638e68f3040f4a55d30d1b3ef3cbe44;hp=6449bf09a593edb3396c4a8f8373f2b13eb9bad9;hpb=14fde5dc9b1915392601fb94efc6224c01f2b216;p=friendica.git diff --git a/src/Object/Image.php b/src/Object/Image.php index 6449bf09a5..9143c23c16 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -12,7 +12,6 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Database\DBA; -use Friendica\Model\Contact; use Friendica\Model\Photo; use Friendica\Util\Network; use Exception; @@ -24,6 +23,7 @@ use ImagickPixel; */ class Image { + /** @var Imagick|resource */ private $image; /* @@ -63,9 +63,10 @@ class Image /** * @brief Constructor - * @param object $data data + * @param string $data * @param boolean $type optional, default null - * @return object + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public function __construct($data, $type = null) { @@ -126,8 +127,10 @@ class Image } /** - * @param object $data data + * @param string $data data * @return boolean + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private function loadData($data) { @@ -296,8 +299,6 @@ class Image $width = $this->getWidth(); $height = $this->getHeight(); - $dest_width = $dest_height = 0; - if ((! $width)|| (! $height)) { return false; } @@ -500,8 +501,6 @@ class Image $width = $this->getWidth(); $height = $this->getHeight(); - $dest_width = $dest_height = 0; - if ((!$width)|| (!$height)) { return false; } @@ -643,6 +642,7 @@ class Image /** * @param string $path file path * @return mixed + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function saveToFilePath($path) { @@ -652,7 +652,7 @@ class Image $string = $this->asString(); - $a = get_app(); + $a = \get_app(); $stamp1 = microtime(true); file_put_contents($path, $string); @@ -667,6 +667,7 @@ class Image * $data = (string) $Image; * * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function __toString() { return $this->asString(); @@ -674,6 +675,7 @@ class Image /** * @return mixed + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function asString() { @@ -688,8 +690,6 @@ class Image return $string; } - $quality = false; - ob_start(); // Enable interlacing @@ -721,16 +721,16 @@ 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 + * @param string $header passed headers to take into account * * @return object + * @throws \ImagickException */ public static function guessType($filename, $fromcurl = false, $header = '') { - Logger::log('Image: guessType: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG); + Logger::log('Image: guessType: '.$filename . ($fromcurl?' from curl headers':''), Logger::DEBUG); $type = null; if ($fromcurl) { - $a = get_app(); $headers=[]; $h = explode("\n", $header); foreach ($h as $l) { @@ -765,13 +765,14 @@ class Image } } } - Logger::log('Image: guessType: type='.$type, LOGGER_DEBUG); + Logger::log('Image: guessType: type='.$type, Logger::DEBUG); return $type; } /** * @param string $url url * @return object + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function getInfoFromURL($url) { @@ -798,7 +799,7 @@ class Image } else { $tempfile = tempnam(get_temppath(), "cache"); - $a = get_app(); + $a = \get_app(); $stamp1 = microtime(true); file_put_contents($tempfile, $img_str); $a->saveTimestamp($stamp1, "file"); @@ -828,8 +829,6 @@ class Image */ public static function getScalingDimensions($width, $height, $max) { - $dest_width = $dest_height = 0; - if ((!$width) || (!$height)) { return false; } @@ -876,11 +875,13 @@ class Image /** * @brief This function is used by the fromgplus addon - * @param object $a App + * @param App $a App * @param integer $uid user id * @param string $imagedata optional, default empty * @param string $url optional, default empty * @return array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function storePhoto(App $a, $uid, $imagedata = "", $url = "") { @@ -891,7 +892,7 @@ class Image ); if (!DBA::isResult($r)) { - Logger::log("Can't detect user data for uid ".$uid, LOGGER_DEBUG); + Logger::log("Can't detect user data for uid ".$uid, Logger::DEBUG); return([]); } @@ -899,13 +900,13 @@ class Image /// @TODO /// $default_cid = $r[0]['id']; - /// $community_page = (($r[0]['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false); + /// $community_page = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false); if ((strlen($imagedata) == 0) && ($url == "")) { - Logger::log("No image data and no url provided", LOGGER_DEBUG); + Logger::log("No image data and no url provided", Logger::DEBUG); return([]); } elseif (strlen($imagedata) == 0) { - Logger::log("Uploading picture from ".$url, LOGGER_DEBUG); + Logger::log("Uploading picture from ".$url, Logger::DEBUG); $stamp1 = microtime(true); $imagedata = @file_get_contents($url); @@ -915,7 +916,7 @@ class Image $maximagesize = Config::get('system', 'maximagesize'); if (($maximagesize) && (strlen($imagedata) > $maximagesize)) { - Logger::log("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG); + Logger::log("Image exceeds size limit of ".$maximagesize, Logger::DEBUG); return([]); } @@ -929,7 +930,7 @@ class Image if (!isset($data["mime"])) { unlink($tempfile); - Logger::log("File is no picture", LOGGER_DEBUG); + Logger::log("File is no picture", Logger::DEBUG); return([]); } @@ -937,7 +938,7 @@ class Image if (!$Image->isValid()) { unlink($tempfile); - Logger::log("Picture is no valid picture", LOGGER_DEBUG); + Logger::log("Picture is no valid picture", Logger::DEBUG); return([]); } @@ -958,8 +959,6 @@ class Image $hash = Photo::newResource(); - $smallest = 0; - // Pictures are always public by now //$defperm = '<'.$default_cid.'>'; $defperm = ""; @@ -968,7 +967,7 @@ class Image $r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 0, 0, $defperm); if (!$r) { - Logger::log("Picture couldn't be stored", LOGGER_DEBUG); + Logger::log("Picture couldn't be stored", Logger::DEBUG); return([]); }