From 5d70d889e908a32c846b9da3eb26703064d20ec6 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Wed, 10 Apr 2019 13:25:03 +0200
Subject: Revert "Update htconfig.sample.php"

This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12
---
 Zotlabs/Module/Getfile.php    |  8 ++++++--
 Zotlabs/Photo/PhotoDriver.php | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php
index abc9f50d9..5aa17b199 100644
--- a/Zotlabs/Module/Getfile.php
+++ b/Zotlabs/Module/Getfile.php
@@ -35,7 +35,6 @@ class Getfile extends \Zotlabs\Web\Controller {
 		$sig      = $_POST['signature'];
 		$resource = $_POST['resource'];
 		$revision = intval($_POST['revision']);
-		$resolution = (-1);
 
 		if(! $hash)
 			killme();
@@ -81,9 +80,14 @@ class Getfile extends \Zotlabs\Web\Controller {
 			killme();
 		}
 	
-		if(substr($resource,-2,1) == '-') {
+		if(isset($_POST['resolution']))
+			$resolution = intval($_POST['resolution']);
+		elseif(substr($resource,-2,1) == '-') {
 			$resolution = intval(substr($resource,-1,1));
 			$resource = substr($resource,0,-2);
+		}
+		else {
+			$resolution = (-1);
 		}			
 
 		$slop = intval(get_pconfig($channel['channel_id'],'system','getfile_time_slop'));
diff --git a/Zotlabs/Photo/PhotoDriver.php b/Zotlabs/Photo/PhotoDriver.php
index c47a7c3b2..4c7da92cf 100644
--- a/Zotlabs/Photo/PhotoDriver.php
+++ b/Zotlabs/Photo/PhotoDriver.php
@@ -494,5 +494,32 @@ abstract class PhotoDriver {
 
 		return $r;
 	}
+	
+	/**
+	 * @brief Stores thumbnail to database or filesystem.
+	 *
+	 * @param array $arr
+	 * @param scale int
+	 * @return boolean|array
+	 */
+	public function storeThumbnail($arr, $scale = 0) {
+	
+		if(boolval(get_config('system','filesystem_storage_thumbnails', 0)) && $scale > 0) {
+			$channel = \App::get_channel();
+			$arr['os_storage'] = 1;
+			$arr['imgscale'] = $scale;
+			$arr['os_syspath'] = 'store/' . $channel['channel_address'] . '/' . $arr['os_path'] . '-' . $scale;
+			if(! $this->saveImage($arr['os_syspath']))
+				return false;
+		}
+		
+		if(! $this->save($arr)) {
+			if(array_key_exists('os_syspath', $arr))
+				@unlink($arr['os_syspath']);
+			return false;
+		}
+		
+		return true;
+	}
 
 }
-- 
cgit v1.2.3