clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6784 from nupplaphil/task/image_to_model 

Delete deprecated method Image::storePhoto()
This commit is contained in:
Hypolite Petovan 2019-04-09 09:01:39 -04:00 committed by GitHub
parent 6ea531d2f8 ac57f55868
commit 4b80b7caea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
src/Object/Image.php
View File

@ -6,14 +6,10 @@
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\Photo;
use Friendica\Util\Network;
use Imagick;
use ImagickPixel;
@ -872,168 +868,4 @@ class Image
}
return ["width" => $dest_width, "height" => $dest_height];
}
/**
* @brief This function is used by the fromgplus addon
* @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 = "")
{
$r = q(
"SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1",
intval($uid)
);
if (!DBA::isResult($r)) {
Logger::log("Can't detect user data for uid ".$uid, Logger::DEBUG);
return([]);
}
$page_owner_nick = $r[0]['nickname'];
/// @TODO
/// $default_cid = $r[0]['id'];
/// $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);
return([]);
} elseif (strlen($imagedata) == 0) {
Logger::log("Uploading picture from ".$url, Logger::DEBUG);
$stamp1 = microtime(true);
$imagedata = @file_get_contents($url);
$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
}
$maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
Logger::log("Image exceeds size limit of ".$maximagesize, Logger::DEBUG);
return([]);
}
$tempfile = tempnam(get_temppath(), "cache");
$stamp1 = microtime(true);
file_put_contents($tempfile, $imagedata);
$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
$data = getimagesize($tempfile);
if (!isset($data["mime"])) {
unlink($tempfile);
Logger::log("File is no picture", Logger::DEBUG);
return([]);
}
$Image = new Image($imagedata, $data["mime"]);
if (!$Image->isValid()) {
unlink($tempfile);
Logger::log("Picture is no valid picture", Logger::DEBUG);
return([]);
}
$Image->orient($tempfile);
unlink($tempfile);
$max_length = Config::get('system', 'max_image_length');
if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH;
}
if ($max_length > 0) {
$Image->scaleDown($max_length);
}
$width = $Image->getWidth();
$height = $Image->getHeight();
$hash = Photo::newResource();
// Pictures are always public by now
//$defperm = '<'.$default_cid.'>';
$defperm = "";
$visitor = 0;
$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);
return([]);
}
$image = ["page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
"full" => System::baseUrl()."/photo/{$hash}-0.".$Image->getExt()];
if ($width > 800 || $height > 800) {
$image["large"] = System::baseUrl()."/photo/{$hash}-0.".$Image->getExt();
}
if ($width > 640 || $height > 640) {
$Image->scaleDown(640);
$r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 1, 0, $defperm);
if ($r) {
$image["medium"] = System::baseUrl()."/photo/{$hash}-1.".$Image->getExt();
}
}
if ($width > 320 || $height > 320) {
$Image->scaleDown(320);
$r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 2, 0, $defperm);
if ($r) {
$image["small"] = System::baseUrl()."/photo/{$hash}-2.".$Image->getExt();
}
}
if ($width > 160 && $height > 160) {
$x = 0;
$y = 0;
$min = $Image->getWidth();
if ($min > 160) {
$x = ($min - 160) / 2;
}
if ($Image->getHeight() < $min) {
$min = $Image->getHeight();
if ($min > 160) {
$y = ($min - 160) / 2;
}
}
$min = 160;
$Image->crop(160, $x, $y, $min, $min);
$r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 3, 0, $defperm);
if ($r) {
$image["thumb"] = System::baseUrl()."/photo/{$hash}-3.".$Image->getExt();
}
}
// Set the full image as preview image. This will be overwritten, if the picture is larger than 640.
$image["preview"] = $image["full"];
// Deactivated, since that would result in a cropped preview, if the picture wasn't larger than 320
//if (isset($image["thumb"]))
// $image["preview"] = $image["thumb"];
// Unsure, if this should be activated or deactivated
//if (isset($image["small"]))
// $image["preview"] = $image["small"];
if (isset($image["medium"])) {
$image["preview"] = $image["medium"];
}
return($image);
}
}