From b03fc197aa502c7170f1d6f00a6c83bdd9cc03f0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 11 Jun 2019 16:32:33 -0700
Subject: [PATCH] file sync issues related to thumbnail os_storage

---
 Zotlabs/Module/Getfile.php |  8 ++++++--
 include/import.php         | 31 +++++++++++++++++--------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php
index c222177dc..208683acd 100644
--- a/Zotlabs/Module/Getfile.php
+++ b/Zotlabs/Module/Getfile.php
@@ -1,6 +1,9 @@
 <?php
 namespace Zotlabs\Module;
 
+use Zotlabs\Web\Controller;
+use Zotlabs\Web\HTTPSig;
+
 /**
  * module: getfile
  * 
@@ -24,7 +27,8 @@ namespace Zotlabs\Module;
 require_once('include/attach.php');
 
 
-class Getfile extends \Zotlabs\Web\Controller {
+
+class Getfile extends Controller {
 
 	function post() {
 
@@ -53,7 +57,7 @@ class Getfile extends \Zotlabs\Web\Controller {
 					continue;
 				}
 
-				$verified = \Zotlabs\Web\HTTPSig::verify('');	
+				$verified = HTTPSig::verify('');	
 				if($verified && $verified['header_signed'] && $verified['header_valid']) {
 					$r = q("select hubloc_hash from hubloc where hubloc_id_url = '%s' or hubloc_addr = '%s' limit 1",
 						dbesc($verified['signer']),
diff --git a/include/import.php b/include/import.php
index f254cf3ee..9e91eefc5 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1424,12 +1424,13 @@ function sync_files($channel, $files) {
 
 						$time = datetime_convert();
 
-						$parr = array('hash' => $channel['channel_hash'],
-							'time' => $time,
-							'resource' => $att['hash'],
-							'revision' => 0,
+						$parr = [
+							'hash'      => $channel['channel_hash'],
+							'time'      => $time,
+							'resource'  => $att['hash'],
+							'revision'  => 0,
 							'signature' => Libzot::sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey'])
-						);
+						];
 
 						$store_path = $newfname;
 
@@ -1504,23 +1505,25 @@ function sync_files($channel, $files) {
 						);
 					}
 
-					if (intval($p['imgscale']) === 0 && $p['os_storage']) {
-						$p['content'] = $store_path;
+					if (intval($p['os_storage'])) {
+						$p['content'] = $store_path . ((intval($p['imgscale'])) ? '-' . $p['imgscale'] : EMPTY_STR);
 					}
 					else {
-						$p['content'] = (($p['content'])? base64_decode($p['content']) : '');
+						$p['content'] = (($p['content']) ? base64_decode($p['content']) : '');
 					}
+
 					if (intval($p['imgscale']) && (! $p['content'])) {
 
 						$time = datetime_convert();
 
-						$parr = array('hash' => $channel['channel_hash'],
-							'time' => $time,
-							'resource' => $att['hash'],
-							'revision' => 0,
-							'signature' => zot_sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey']),
+						$parr = [
+							'hash'       => $channel['channel_hash'],
+							'time'       => $time,
+							'resource'   => $att['hash'],
+							'revision'   => 0,
+							'signature'  => Libzot::sign($channel['channel_hash'] . '.' . $time, $channel['channel_prvkey']),
 							'resolution' => $p['imgscale']
-						);
+						];
 
 						$stored_image = $newfname . '-' . intval($p['imgscale']);