aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Storage
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-11-20 14:27:20 +0100
committerMario Vavti <mario@mariovavti.com>2017-11-20 14:27:20 +0100
commit0325efeb350f575f70f18e9f199ad273e5ba1d15 (patch)
tree742ffbc2b46a31547f114124546353d3b1102157 /Zotlabs/Storage
parent9ab33f1e134e6e7694a42b92fc9d73c2e6dcffd1 (diff)
parent250d947667b1500633d80b043ac3760be21446fc (diff)
downloadvolse-hubzilla-0325efeb350f575f70f18e9f199ad273e5ba1d15.tar.gz
volse-hubzilla-0325efeb350f575f70f18e9f199ad273e5ba1d15.tar.bz2
volse-hubzilla-0325efeb350f575f70f18e9f199ad273e5ba1d15.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Storage')
-rw-r--r--Zotlabs/Storage/Browser.php13
-rw-r--r--Zotlabs/Storage/Directory.php2
-rw-r--r--Zotlabs/Storage/File.php3
3 files changed, 16 insertions, 2 deletions
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index 17b07ad82..dd3067cf8 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -208,6 +208,16 @@ class Browser extends DAV\Browser\Plugin {
$photo_icon = '';
$preview_style = intval(get_config('system','thumbnail_security',0));
+ $r = q("select content from attach where hash = '%s' and uid = %d limit 1",
+ dbesc($attachHash),
+ intval($owner)
+ );
+
+ if($r && file_exists(dbunescbin($r[0]['content']) . '.thumb')) {
+ $photo_icon = 'data:image/jpeg;base64,' . base64_encode(file_get_contents(dbunescbin($r[0]['content']) . '.thumb'));
+// logger('found thumb: ' . $photo_icon);
+ }
+
if(strpos($type,'image/') === 0 && $attachHash) {
$r = q("select resource_id, imgscale from photo where resource_id = '%s' and imgscale in ( %d, %d ) order by imgscale asc limit 1",
dbesc($attachHash),
@@ -220,12 +230,11 @@ class Browser extends DAV\Browser\Plugin {
if($type === 'image/svg+xml' && $preview_style > 0) {
$photo_icon = $fullPath;
}
-
}
$g = [ 'resource_id' => $attachHash, 'thumbnail' => $photo_icon, 'security' => $preview_style ];
call_hooks('file_thumbnail', $g);
- $photo_icon = $g['photo_icon'];
+ $photo_icon = $g['thumbnail'];
$attachIcon = ""; // "<a href=\"attach/".$attachHash."\" title=\"".$displayName."\"><i class=\"fa fa-arrow-circle-o-down\"></i></a>";
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 27df3569f..45df9ddd5 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -362,6 +362,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
$args = array( 'resource_id' => $hash, 'album' => $album, 'os_syspath' => $f, 'os_path' => $xpath['os_path'], 'display_path' => $xpath['path'], 'filename' => $name, 'getimagesize' => $gis, 'directory' => $direct);
$p = photo_upload($c[0], \App::get_observer(), $args);
}
+
+ \Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $this->folder_hash ]);
$sync = attach_export_data($c[0], $hash);
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index 8bf9997ed..37376c177 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -244,6 +244,9 @@ class File extends DAV\Node implements DAV\IFile {
}
}
+ \Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $this->data['hash'] ]);
+
+
$sync = attach_export_data($c[0],$this->data['hash']);
if($sync)