aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
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
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')
-rw-r--r--Zotlabs/Daemon/Thumbnail.php62
-rw-r--r--Zotlabs/Module/Ping.php3
-rw-r--r--Zotlabs/Storage/Browser.php13
-rw-r--r--Zotlabs/Storage/Directory.php2
-rw-r--r--Zotlabs/Storage/File.php3
5 files changed, 80 insertions, 3 deletions
diff --git a/Zotlabs/Daemon/Thumbnail.php b/Zotlabs/Daemon/Thumbnail.php
new file mode 100644
index 000000000..aeea07410
--- /dev/null
+++ b/Zotlabs/Daemon/Thumbnail.php
@@ -0,0 +1,62 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+
+class Thumbnail {
+
+ static public function run($argc,$argv) {
+
+ if(! $argc == 2)
+ return;
+
+ $c = q("select * from attach where hash = '%s' ",
+ dbesc($argv[1])
+ );
+
+ if(! $c)
+ return;
+
+ $preview_style = intval(get_config('system','thumbnail_security',0));
+
+ $attach = $c[0];
+ $isize = 300;
+
+ if(strpos($attach['filetype'],'text/') !== false) {
+ $stream = @fopen($attach['content'],'rb');
+ if($stream) {
+ $content = trim(stream_get_contents($stream,4096));
+ $content = str_replace("\r",'',$content);
+ $content_a = explode("\n",$content);
+ }
+ if($content_a) {
+ $fsize = 4;
+ $lsize = 8;
+ $image = imagecreate($isize,$isize);
+ imagecolorallocate($image,255,255,255);
+ $colour = imagecolorallocate($image,0,0,0);
+ $border = imagecolorallocate($image,64,64,64);
+
+ $x1 = 0;
+ $y1 = 0;
+ $x2 = ImageSX($image) - 1;
+ $y2 = ImageSY($image) - 1;
+
+ for($i = 0; $i < 2; $i++) {
+ ImageRectangle($image, $x1++, $y1++, $x2--, $y2--, $border);
+ }
+
+ foreach($content_a as $l => $t) {
+ $l = $l + 1;
+ $x = 3;
+ $y = ($l * $lsize) + 3 - $fsize;
+ imagestring($image,1,$x,$y,$t,$colour);
+ if(($l * $lsize) >= $isize) {
+ break;
+ }
+ }
+ imagejpeg($image,$attach['content'] . '.thumb');
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 8644b8326..406e554d1 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -492,10 +492,11 @@ class Ping extends \Zotlabs\Web\Controller {
$t3 = dba_timer();
if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) {
+
$r = q("SELECT id, item_wall FROM item
WHERE item_unseen = 1 and uid = %d
$item_normal
- AND author_xchan != '%s'",
+ AND author_xchan != '%s' $sql_extra ",
intval(local_channel()),
dbesc($ob_hash)
);
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)