*/
namespace Friendica\Object;
+use Exception;
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;
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;
use Imagick;
use ImagickPixel;
*/
class Image
{
+ /** @var Imagick|resource */
private $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)
{
}
/**
- * @param object $data data
+ * @param string $data data
* @return boolean
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private function loadData($data)
{
$width = $this->getWidth();
$height = $this->getHeight();
- $dest_width = $dest_height = 0;
-
if ((! $width)|| (! $height)) {
return false;
}
return;
}
- $ort = $exif['IFD0']['Orientation'];
+ $ort = isset($exif['IFD0']['Orientation']) ? $exif['IFD0']['Orientation'] : 1;
switch ($ort) {
case 1: // nothing
break;
}
- // logger('exif: ' . print_r($exif,true));
+ // Logger::log('exif: ' . print_r($exif,true));
return $exif;
}
$width = $this->getWidth();
$height = $this->getHeight();
- $dest_width = $dest_height = 0;
-
if ((!$width)|| (!$height)) {
return false;
}
/**
* @param string $path file path
* @return mixed
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function saveToFilePath($path)
{
$string = $this->asString();
- $a = get_app();
+ $a = \get_app();
$stamp1 = microtime(true);
file_put_contents($path, $string);
- $a->save_timestamp($stamp1, "file");
+ $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
}
/**
* $data = (string) $Image;
*
* @return string
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function __toString() {
return $this->asString();
/**
* @return mixed
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function asString()
{
return $string;
}
- $quality = false;
-
ob_start();
// Enable interlacing
*
* @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
+ * @throws \ImagickException
*/
- 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);
+ Logger::log('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) {
}
}
}
- logger('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)
{
try {
if (function_exists("getimagesizefromstring")) {
- $data = getimagesizefromstring($img_str);
+ $data = @getimagesizefromstring($img_str);
} else {
$tempfile = tempnam(get_temppath(), "cache");
- $a = get_app();
+ $a = \get_app();
$stamp1 = microtime(true);
file_put_contents($tempfile, $img_str);
- $a->save_timestamp($stamp1, "file");
+ $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
$data = getimagesize($tempfile);
unlink($tempfile);
*/
public static function getScalingDimensions($width, $height, $max)
{
- $dest_width = $dest_height = 0;
-
if ((!$width) || (!$height)) {
return false;
}
/**
* @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 = "")
{
);
if (!DBA::isResult($r)) {
- logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
+ Logger::log("Can't detect user data for uid ".$uid, Logger::DEBUG);
return([]);
}
/// @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("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("Uploading picture from ".$url, LOGGER_DEBUG);
+ Logger::log("Uploading picture from ".$url, Logger::DEBUG);
$stamp1 = microtime(true);
$imagedata = @file_get_contents($url);
- $a->save_timestamp($stamp1, "file");
+ $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
}
$maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
- logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
+ Logger::log("Image exceeds size limit of ".$maximagesize, Logger::DEBUG);
return([]);
}
$stamp1 = microtime(true);
file_put_contents($tempfile, $imagedata);
- $a->save_timestamp($stamp1, "file");
+ $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
$data = getimagesize($tempfile);
if (!isset($data["mime"])) {
unlink($tempfile);
- logger("File is no picture", LOGGER_DEBUG);
+ Logger::log("File is no picture", Logger::DEBUG);
return([]);
}
if (!$Image->isValid()) {
unlink($tempfile);
- logger("Picture is no valid picture", LOGGER_DEBUG);
+ Logger::log("Picture is no valid picture", Logger::DEBUG);
return([]);
}
$hash = Photo::newResource();
- $smallest = 0;
-
// Pictures are always public by now
//$defperm = '<'.$default_cid.'>';
$defperm = "";
$r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 0, 0, $defperm);
if (!$r) {
- logger("Picture couldn't be stored", LOGGER_DEBUG);
+ Logger::log("Picture couldn't be stored", Logger::DEBUG);
return([]);
}
projects / friendica.git / blobdiff