From 09c44f96fd1df2b4f4facef4a184c1090f90d7fc Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 1 Mar 2019 13:06:23 +0100
Subject: [PATCH 1/8] Moving Model call outside Object Namespace

---
 src/Model/Photo.php  | 167 ++++++++++++++++++++++++++++++++++++++++++
 src/Object/Image.php | 168 -------------------------------------------
 2 files changed, 167 insertions(+), 168 deletions(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 8ad7f3145..0c8cd0c47 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -351,6 +351,173 @@ class Photo extends BaseObject
 		return DBA::delete("photo", $conditions, $options);
 	}
 
+	/**
+	 * @brief This function is used by the fromgplus addon
+	 * @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($uid, $imagedata = "", $url = "")
+	{
+		$a = self::getApp();
+		$logger = $a->getLogger();
+		$profiler = $a->getProfiler();
+
+		$r = DBA::p(
+			"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->info("Can't detect user data.", ['uid' => $uid]);
+			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->info("No image data and no url provided");
+			return([]);
+		} elseif (strlen($imagedata) == 0) {
+			$logger->info("Uploading picture,", ['url' => $url]);
+
+			$stamp1 = microtime(true);
+			$imagedata = @file_get_contents($url);
+			$profiler->saveTimestamp($stamp1, "file", System::callstack());
+		}
+
+		$maximagesize = Config::get('system', 'maximagesize');
+
+		if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
+			$logger->info("Image exceeds size limit.", ['max' => $maximagesize, 'current' => strlen($imagedata)]);
+			return([]);
+		}
+
+		$tempfile = tempnam(get_temppath(), "cache");
+
+		$stamp1 = microtime(true);
+		file_put_contents($tempfile, $imagedata);
+		$profiler->saveTimestamp($stamp1, "file", System::callstack());
+
+		$data = getimagesize($tempfile);
+
+		if (!isset($data["mime"])) {
+			unlink($tempfile);
+			$logger->info("File is no picture");
+			return([]);
+		}
+
+		$Image = new Image($imagedata, $data["mime"]);
+
+		if (!$Image->isValid()) {
+			unlink($tempfile);
+			$logger->info("Picture is no valid picture");
+			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->info("Picture couldn't be stored");
+			return([]);
+		}
+
+		$image = ["page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
+			"full" => $a->getBaseURL()."/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"] = $a->getBaseURL() . "/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);
+	}
+
 	/**
 	 * @brief Update a photo
 	 *
diff --git a/src/Object/Image.php b/src/Object/Image.php
index 66be78ad4..67413e3c0 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -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);
-	}
 }

From 0098f97c4ada561f64f9f7e38863b54c07ff8564 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 1 Mar 2019 13:09:40 +0100
Subject: [PATCH 2/8] Moving Model call outside Object Namespace

---
 src/Model/Photo.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 0c8cd0c47..61501bdac 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -353,6 +353,9 @@ class Photo extends BaseObject
 
 	/**
 	 * @brief This function is used by the fromgplus addon
+	 *
+	 * Stores a photo based on image data or an URL
+	 *
 	 * @param integer $uid       user id
 	 * @param string  $imagedata optional, default empty
 	 * @param string  $url       optional, default empty
@@ -360,7 +363,7 @@ class Photo extends BaseObject
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function storePhoto($uid, $imagedata = "", $url = "")
+	public static function storeByData($uid, $imagedata = "", $url = "")
 	{
 		$a = self::getApp();
 		$logger = $a->getLogger();

From 2aeea55f3f63f5794b89ab69fb46ca4858fa0eb3 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 1 Mar 2019 13:14:38 +0100
Subject: [PATCH 3/8] bugfix

---
 src/Model/Photo.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 61501bdac..bfc84e525 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -378,6 +378,8 @@ class Photo extends BaseObject
 		if (!DBA::isResult($r)) {
 			$logger->info("Can't detect user data.", ['uid' => $uid]);
 			return([]);
+		} else {
+			$r = DBA::toArray($r);
 		}
 
 		$page_owner_nick  = $r[0]['nickname'];

From 2daadb8c36dcbe32d3dce46c6152b7254b449a61 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 1 Mar 2019 17:24:53 +0100
Subject: [PATCH 4/8] code standards

---
 src/Model/Photo.php | 96 ++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index bfc84e525..d736890c7 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -369,28 +369,28 @@ class Photo extends BaseObject
 		$logger = $a->getLogger();
 		$profiler = $a->getProfiler();
 
-		$r = DBA::p(
+		$isStored = DBA::p(
 			"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)) {
+		if (!DBA::isResult($isStored)) {
 			$logger->info("Can't detect user data.", ['uid' => $uid]);
-			return([]);
+			return [];
 		} else {
-			$r = DBA::toArray($r);
+			$isStored = DBA::toArray($isStored);
 		}
 
-		$page_owner_nick  = $r[0]['nickname'];
+		$page_owner_nick  = $isStored[0]['nickname'];
 
 		/// @TODO
-		/// $default_cid      = $r[0]['id'];
-		/// $community_page   = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
+		/// $default_cid      = $isStored[0]['id'];
+		/// $community_page   = (($isStored[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
 
 		if ((strlen($imagedata) == 0) && ($url == "")) {
 			$logger->info("No image data and no url provided");
-			return([]);
+			return [];
 		} elseif (strlen($imagedata) == 0) {
 			$logger->info("Uploading picture,", ['url' => $url]);
 
@@ -399,37 +399,37 @@ class Photo extends BaseObject
 			$profiler->saveTimestamp($stamp1, "file", System::callstack());
 		}
 
-		$maximagesize = Config::get('system', 'maximagesize');
+		$maxImageSize = Config::get('system', 'maximagesize');
 
-		if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
-			$logger->info("Image exceeds size limit.", ['max' => $maximagesize, 'current' => strlen($imagedata)]);
-			return([]);
+		if (($maxImageSize) && (strlen($imagedata) > $maxImageSize)) {
+			$logger->info("image exceeds size limit.", ['max' => $maxImageSize, 'current' => strlen($imagedata)]);
+			return [];
 		}
 
-		$tempfile = tempnam(get_temppath(), "cache");
+		$tempFile = tempnam(get_temppath(), "cache");
 
 		$stamp1 = microtime(true);
-		file_put_contents($tempfile, $imagedata);
+		file_put_contents($tempFile, $imagedata);
 		$profiler->saveTimestamp($stamp1, "file", System::callstack());
 
-		$data = getimagesize($tempfile);
+		$data = getimagesize($tempFile);
 
 		if (!isset($data["mime"])) {
-			unlink($tempfile);
+			unlink($tempFile);
 			$logger->info("File is no picture");
-			return([]);
+			return [];
 		}
 
-		$Image = new Image($imagedata, $data["mime"]);
+		$image = new Image($imagedata, $data["mime"]);
 
-		if (!$Image->isValid()) {
-			unlink($tempfile);
+		if (!$image->isValid()) {
+			unlink($tempFile);
 			$logger->info("Picture is no valid picture");
-			return([]);
+			return [];
 		}
 
-		$Image->orient($tempfile);
-		unlink($tempfile);
+		$image->orient($tempFile);
+		unlink($tempFile);
 
 		$max_length = Config::get('system', 'max_image_length');
 		if (! $max_length) {
@@ -437,46 +437,46 @@ class Photo extends BaseObject
 		}
 
 		if ($max_length > 0) {
-			$Image->scaleDown($max_length);
+			$image->scaleDown($max_length);
 		}
 
-		$width = $Image->getWidth();
-		$height = $Image->getHeight();
+		$width = $image->getWidth();
+		$height = $image->getHeight();
 
-		$hash = Photo::newResource();
+		$hash = self::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);
+		$isStored = Photo::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 0, 0, $defperm);
 
-		if (!$r) {
+		if (!$isStored) {
 			$logger->info("Picture couldn't be stored");
-			return([]);
+			return [];
 		}
 
 		$image = ["page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
-			"full" => $a->getBaseURL()."/photo/{$hash}-0.".$Image->getExt()];
+			"full" => $a->getBaseURL()."/photo/{$hash}-0.".$image->getExt()];
 
 		if ($width > 800 || $height > 800) {
-			$image["large"] = System::baseUrl()."/photo/{$hash}-0.".$Image->getExt();
+			$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();
+			$image->scaleDown(640);
+			$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 1, 0, $defperm);
+			if ($isStored) {
+				$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();
+			$image->scaleDown(320);
+			$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 2, 0, $defperm);
+			if ($isStored) {
+				$image["small"] = System::baseUrl()."/photo/{$hash}-2.".$image->getExt();
 			}
 		}
 
@@ -484,24 +484,24 @@ class Photo extends BaseObject
 			$x = 0;
 			$y = 0;
 
-			$min = $Image->getWidth();
+			$min = $image->getWidth();
 			if ($min > 160) {
 				$x = ($min - 160) / 2;
 			}
 
-			if ($Image->getHeight() < $min) {
-				$min = $Image->getHeight();
+			if ($image->getHeight() < $min) {
+				$min = $image->getHeight();
 				if ($min > 160) {
 					$y = ($min - 160) / 2;
 				}
 			}
 
 			$min = 160;
-			$Image->crop(160, $x, $y, $min, $min);
+			$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"] = $a->getBaseURL() . "/photo/{$hash}-3." . $Image->getExt();
+			$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 3, 0, $defperm);
+			if ($isStored) {
+				$image["thumb"] = $a->getBaseURL() . "/photo/{$hash}-3." . $image->getExt();
 			}
 		}
 
@@ -520,7 +520,7 @@ class Photo extends BaseObject
 			$image["preview"] = $image["medium"];
 		}
 
-		return($image);
+		return $image;
 	}
 
 	/**

From b4a59f32c708b5a9ae6f2f9b87a0667b75edb9d7 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 1 Mar 2019 17:27:46 +0100
Subject: [PATCH 5/8] code standards

---
 src/Model/Photo.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index d736890c7..099f6e0b6 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -369,20 +369,20 @@ class Photo extends BaseObject
 		$logger = $a->getLogger();
 		$profiler = $a->getProfiler();
 
-		$isStored = DBA::p(
+		$stmtUser = DBA::p(
 			"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($isStored)) {
+		if (!DBA::isResult($stmtUser)) {
 			$logger->info("Can't detect user data.", ['uid' => $uid]);
 			return [];
 		} else {
-			$isStored = DBA::toArray($isStored);
+			$user = DBA::toArray($stmtUser);
 		}
 
-		$page_owner_nick  = $isStored[0]['nickname'];
+		$page_owner_nick  = $user[0]['nickname'];
 
 		/// @TODO
 		/// $default_cid      = $isStored[0]['id'];
@@ -457,18 +457,18 @@ class Photo extends BaseObject
 			return [];
 		}
 
-		$image = ["page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
-			"full" => $a->getBaseURL()."/photo/{$hash}-0.".$image->getExt()];
+		$image = ["page" => $a->getBaseURL() . '/photos/' . $page_owner_nick . '/image/' . $hash,
+			"full" => $a->getBaseURL() . "/photo/{$hash}-0." . $image->getExt()];
 
 		if ($width > 800 || $height > 800) {
-			$image["large"] = System::baseUrl()."/photo/{$hash}-0.".$image->getExt();
+			$image["large"] = $a->getBaseURL() . "/photo/{$hash}-0." . $image->getExt();
 		}
 
 		if ($width > 640 || $height > 640) {
 			$image->scaleDown(640);
 			$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 1, 0, $defperm);
 			if ($isStored) {
-				$image["medium"] = System::baseUrl()."/photo/{$hash}-1.".$image->getExt();
+				$image["medium"] = $a->getBaseURL() . "/photo/{$hash}-1." . $image->getExt();
 			}
 		}
 
@@ -476,7 +476,7 @@ class Photo extends BaseObject
 			$image->scaleDown(320);
 			$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 2, 0, $defperm);
 			if ($isStored) {
-				$image["small"] = System::baseUrl()."/photo/{$hash}-2.".$image->getExt();
+				$image["small"] = $a->getBaseURL() . "/photo/{$hash}-2." . $image->getExt();
 			}
 		}
 

From 76fd2a4aa01e17f61bee388429f90e213807cbf7 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 5 Apr 2019 08:00:34 +0200
Subject: [PATCH 6/8] some renamings

---
 src/Model/Photo.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 099f6e0b6..66b30baef 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -369,17 +369,17 @@ class Photo extends BaseObject
 		$logger = $a->getLogger();
 		$profiler = $a->getProfiler();
 
-		$stmtUser = DBA::p(
+		$userStmt = DBA::p(
 			"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($stmtUser)) {
+		if (!DBA::isResult($userStmt)) {
 			$logger->info("Can't detect user data.", ['uid' => $uid]);
 			return [];
 		} else {
-			$user = DBA::toArray($stmtUser);
+			$user = DBA::toArray($userStmt);
 		}
 
 		$page_owner_nick  = $user[0]['nickname'];
@@ -402,7 +402,7 @@ class Photo extends BaseObject
 		$maxImageSize = Config::get('system', 'maximagesize');
 
 		if (($maxImageSize) && (strlen($imagedata) > $maxImageSize)) {
-			$logger->info("image exceeds size limit.", ['max' => $maxImageSize, 'current' => strlen($imagedata)]);
+			$logger->info("Image exceeds size limit.", ['max' => $maxImageSize, 'current' => strlen($imagedata)]);
 			return [];
 		}
 

From 7e061e0cae880fa22bfc6c782d5e2cb7519e0297 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Sun, 7 Apr 2019 21:18:04 +0200
Subject: [PATCH 7/8] replacing direct query with User model call

---
 src/Model/Photo.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 66b30baef..52fc8bff1 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -369,17 +369,11 @@ class Photo extends BaseObject
 		$logger = $a->getLogger();
 		$profiler = $a->getProfiler();
 
-		$userStmt = DBA::p(
-			"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)
-		);
+		$user = User::getOwnerDataById($uid);
 
-		if (!DBA::isResult($userStmt)) {
+		if (!DBA::isResult($user) || !empty($user['blocked'])) {
 			$logger->info("Can't detect user data.", ['uid' => $uid]);
 			return [];
-		} else {
-			$user = DBA::toArray($userStmt);
 		}
 
 		$page_owner_nick  = $user[0]['nickname'];

From ac57f558687583294f7ab1a6383a4ad862616e67 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Tue, 9 Apr 2019 08:52:21 +0200
Subject: [PATCH 8/8] Delete deprecated method for photo

---
 src/Model/Photo.php | 166 --------------------------------------------
 1 file changed, 166 deletions(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 52fc8bff1..8ad7f3145 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -351,172 +351,6 @@ class Photo extends BaseObject
 		return DBA::delete("photo", $conditions, $options);
 	}
 
-	/**
-	 * @brief This function is used by the fromgplus addon
-	 *
-	 * Stores a photo based on image data or an URL
-	 *
-	 * @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 storeByData($uid, $imagedata = "", $url = "")
-	{
-		$a = self::getApp();
-		$logger = $a->getLogger();
-		$profiler = $a->getProfiler();
-
-		$user = User::getOwnerDataById($uid);
-
-		if (!DBA::isResult($user) || !empty($user['blocked'])) {
-			$logger->info("Can't detect user data.", ['uid' => $uid]);
-			return [];
-		}
-
-		$page_owner_nick  = $user[0]['nickname'];
-
-		/// @TODO
-		/// $default_cid      = $isStored[0]['id'];
-		/// $community_page   = (($isStored[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
-
-		if ((strlen($imagedata) == 0) && ($url == "")) {
-			$logger->info("No image data and no url provided");
-			return [];
-		} elseif (strlen($imagedata) == 0) {
-			$logger->info("Uploading picture,", ['url' => $url]);
-
-			$stamp1 = microtime(true);
-			$imagedata = @file_get_contents($url);
-			$profiler->saveTimestamp($stamp1, "file", System::callstack());
-		}
-
-		$maxImageSize = Config::get('system', 'maximagesize');
-
-		if (($maxImageSize) && (strlen($imagedata) > $maxImageSize)) {
-			$logger->info("Image exceeds size limit.", ['max' => $maxImageSize, 'current' => strlen($imagedata)]);
-			return [];
-		}
-
-		$tempFile = tempnam(get_temppath(), "cache");
-
-		$stamp1 = microtime(true);
-		file_put_contents($tempFile, $imagedata);
-		$profiler->saveTimestamp($stamp1, "file", System::callstack());
-
-		$data = getimagesize($tempFile);
-
-		if (!isset($data["mime"])) {
-			unlink($tempFile);
-			$logger->info("File is no picture");
-			return [];
-		}
-
-		$image = new Image($imagedata, $data["mime"]);
-
-		if (!$image->isValid()) {
-			unlink($tempFile);
-			$logger->info("Picture is no valid picture");
-			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 = self::newResource();
-
-		// Pictures are always public by now
-		//$defperm = '<'.$default_cid.'>';
-		$defperm = "";
-		$visitor = 0;
-
-		$isStored = Photo::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 0, 0, $defperm);
-
-		if (!$isStored) {
-			$logger->info("Picture couldn't be stored");
-			return [];
-		}
-
-		$image = ["page" => $a->getBaseURL() . '/photos/' . $page_owner_nick . '/image/' . $hash,
-			"full" => $a->getBaseURL() . "/photo/{$hash}-0." . $image->getExt()];
-
-		if ($width > 800 || $height > 800) {
-			$image["large"] = $a->getBaseURL() . "/photo/{$hash}-0." . $image->getExt();
-		}
-
-		if ($width > 640 || $height > 640) {
-			$image->scaleDown(640);
-			$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 1, 0, $defperm);
-			if ($isStored) {
-				$image["medium"] = $a->getBaseURL() . "/photo/{$hash}-1." . $image->getExt();
-			}
-		}
-
-		if ($width > 320 || $height > 320) {
-			$image->scaleDown(320);
-			$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 2, 0, $defperm);
-			if ($isStored) {
-				$image["small"] = $a->getBaseURL() . "/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);
-
-			$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 3, 0, $defperm);
-			if ($isStored) {
-				$image["thumb"] = $a->getBaseURL() . "/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;
-	}
-
 	/**
 	 * @brief Update a photo
 	 *