From 56d981c8ef0680d5124214b4cd8849b9a42feeb7 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 20 Nov 2017 14:48:29 -0800 Subject: provide a generalised interface for thumbnail generators to support various content types --- Zotlabs/Daemon/Thumbnail.php | 60 ++++++++++++++++++-------------------------- Zotlabs/Thumbs/Text.php | 49 ++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 35 deletions(-) create mode 100644 Zotlabs/Thumbs/Text.php diff --git a/Zotlabs/Daemon/Thumbnail.php b/Zotlabs/Daemon/Thumbnail.php index aeea07410..caf5dd3ae 100644 --- a/Zotlabs/Daemon/Thumbnail.php +++ b/Zotlabs/Daemon/Thumbnail.php @@ -17,46 +17,36 @@ class Thumbnail { if(! $c) return; - $preview_style = intval(get_config('system','thumbnail_security',0)); + $preview_style = intval(get_config('system','thumbnail_security',0)); + $preview_width = intval(get_config('system','thumbnail_width',300)); + $preview_height = intval(get_config('system','thumbnail_height',300)); $attach = $c[0]; - $isize = 300; + $default_controller = null; - 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; + $files = glob('Zotlabs/Thumbs/*.php'); + if($files) { + foreach($files as $f) { + $clsname = '\\Zotlabs\\Thumbs\\' . ucfirst(basename($f,'.php')); + if(class_exists($clsname)) { + $x = new $clsname(); + if(method_exists($x,'Match')) { + $matched = $x->Match($attach['filetype']); + if($matched) { + $x->Thumb($attach,$preview_style,$preview_width,$preview_height); + } + } + if(method_exists($x,'MatchDefault')) { + $default_matched = $x->MatchDefault(substr($attach['filetype'],0,strpos($attach['filetype'],'/'))); + if($default_matched) { + $default_controller = $x; + } } } - imagejpeg($image,$attach['content'] . '.thumb'); } } + if(($default_controller) && (! file_exists(dbunescbin($attach['content']) . '.thumb'))) { + $default_controller->Thumb($attach,$preview_style,$preview_width,$preview_height); + } } -} \ No newline at end of file +} diff --git a/Zotlabs/Thumbs/Text.php b/Zotlabs/Thumbs/Text.php new file mode 100644 index 000000000..86d788992 --- /dev/null +++ b/Zotlabs/Thumbs/Text.php @@ -0,0 +1,49 @@ + $t) { + $l = $l + 1; + $x = 3; + $y = ($l * $lsize) + 3 - $fsize; + imagestring($image,1,$x,$y,$t,$colour); + if(($l * $lsize) >= $height) { + break; + } + } + imagejpeg($image,dbunescbin($attach['content']) . '.thumb'); + } + } +} \ No newline at end of file -- cgit v1.2.3 From d2e3e3003a4291416bc97ee6b23903a70c08bf5f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 20 Nov 2017 15:02:23 -0800 Subject: set display_path for photo_upload from the DAV File interface --- Zotlabs/Storage/File.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php index 37376c177..53d5d3476 100644 --- a/Zotlabs/Storage/File.php +++ b/Zotlabs/Storage/File.php @@ -129,12 +129,16 @@ class File extends DAV\Node implements DAV\IFile { $album = ''; $os_path = ''; - $r = q("SELECT flags, folder, os_storage, os_path, filename, is_photo FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1", + $r = q("SELECT flags, folder, os_storage, os_path, display_path, filename, is_photo FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1", dbesc($this->data['hash']), intval($c[0]['channel_id']) ); if ($r) { + $os_path = $r[0]['os_path']; + $display_path = $r[0]['display_path']; + $filename = $r[0]['filename']; + if (intval($r[0]['os_storage'])) { $d = q("select folder, content from attach where hash = '%s' and uid = %d limit 1", @@ -210,7 +214,7 @@ class File extends DAV\Node implements DAV\IFile { if($is_photo) { require_once('include/photos.php'); - $args = array( 'resource_id' => $this->data['hash'], 'album' => $album, 'os_syspath' => $f, 'os_path' => $os_path, 'filename' => $r[0]['filename'], 'getimagesize' => $gis, 'directory' => $direct ); + $args = array( 'resource_id' => $this->data['hash'], 'album' => $album, 'os_syspath' => $f, 'os_path' => $os_path, 'display_path' => $display_path, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct ); $p = photo_upload($c[0],\App::get_observer(),$args); } -- cgit v1.2.3 From 7f9ab491f29a71387bbbb066b9f6cea083d8813c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 20 Nov 2017 15:44:25 -0800 Subject: add mp3 audio thumbnail generator --- Zotlabs/Thumbs/Mp3audio.php | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Zotlabs/Thumbs/Mp3audio.php diff --git a/Zotlabs/Thumbs/Mp3audio.php b/Zotlabs/Thumbs/Mp3audio.php new file mode 100644 index 000000000..d2e660cf8 --- /dev/null +++ b/Zotlabs/Thumbs/Mp3audio.php @@ -0,0 +1,37 @@ +analyze(dbunescbin($attach['content'])); + + $photo = isset($id['id3v2']['APIC'][0]['data']) ? $id['id3v2']['APIC'][0]['data'] : null; + if(is_null($photo) && isset($id['id3v2']['PIC'][0]['data'])) { + $photo = $id['id3v2']['PIC'][0]['data']; + } + + if($photo) { + $image = imagecreatefromstring($photo); + $dest = imagecreatetruecolor( $width, $height ); + $srcwidth = imagesx($image); + $srcheight = imagesy($image); + + imagealphablending($dest, false); + imagesavealpha($dest, true); + imagecopyresampled($dest, $image, 0, 0, 0, 0, $width, $height, $srcwidth, $srcheight); + imagedestroy($image); + imagejpeg($dest,dbunescbin($attach['content']) . '.thumb'); + } + } +} + -- cgit v1.2.3 From 1810edae93565d5340e724b4411520ea18e2b7e0 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 20 Nov 2017 16:05:24 -0800 Subject: more work theming the tile view --- Zotlabs/Thumbs/Text.php | 2 +- view/theme/redbasic/css/style.css | 15 +++++++++++---- view/tpl/cloud_directory.tpl | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Zotlabs/Thumbs/Text.php b/Zotlabs/Thumbs/Text.php index 86d788992..3ee7819bd 100644 --- a/Zotlabs/Thumbs/Text.php +++ b/Zotlabs/Thumbs/Text.php @@ -23,7 +23,7 @@ class Text { $image = imagecreate($width,$height); imagecolorallocate($image,255,255,255); $colour = imagecolorallocate($image,0,0,0); - $border = imagecolorallocate($image,64,64,64); + $border = imagecolorallocate($image,208,208,208); $x1 = 0; $y1 = 0; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b3cd9c9f8..82687db17 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -105,9 +105,6 @@ a, color: $link_colour; } -.cloud-icon.tiles i { - color: #aaa; -} a:hover, a:focus, @@ -1735,13 +1732,23 @@ dl.bb-dl > dd > li { margin: 5px; } +.cloud-icon-container { + width: 48px; + height: 48px; + border: 1px solid #eee; + border-radius: $radius; +} + .cloud-icon i { - font-size: 48px; + font-size: 32px; + color: #aaa; + margin-top: 8px; } .cloud-icon img { width: 48px; height: 48px; + border-radius: $radius; } .cloud-title { diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index a9840a0b8..88b6bf563 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -4,7 +4,7 @@ {{if $parentpath}}
- +
.. @@ -18,7 +18,7 @@ {{if $item.photo_icon}} {{else}} - +
{{/if}}
-- cgit v1.2.3 From 53445ba6bdd1cde780f4a3d84cbb061cb6b72df9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 20 Nov 2017 18:14:44 -0800 Subject: fix album cover thumb generator --- Zotlabs/Thumbs/Mp3audio.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Thumbs/Mp3audio.php b/Zotlabs/Thumbs/Mp3audio.php index d2e660cf8..000d65b22 100644 --- a/Zotlabs/Thumbs/Mp3audio.php +++ b/Zotlabs/Thumbs/Mp3audio.php @@ -2,7 +2,7 @@ namespace Zotlabs\Thumbs; -use ID3Parser\ID3Parser; +use \ID3Parser\ID3Parser; class Mp3audio { @@ -11,7 +11,7 @@ class Mp3audio { } function Thumb($attach,$preview_style,$height = 300, $width = 300) { - $p = newID3Parser(); + $p = new ID3Parser(); $id = $p->analyze(dbunescbin($attach['content'])); -- cgit v1.2.3 From 159d6469fd45818dd24137894ce1792531753417 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 21 Nov 2017 10:19:50 +0100 Subject: make browser history buttons work with ajax calls in /display and /hq --- Zotlabs/Module/Hq.php | 16 +++++++-------- view/tpl/notifications_widget.tpl | 42 +++++++++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index 92dfc8587..71008b6d2 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -47,19 +47,24 @@ class Hq extends \Zotlabs\Web\Controller { $r = q("SELECT mid FROM item WHERE uid = %d AND mid = parent_mid - $item_normal ORDER BY created DESC limit 1", local_channel() ); - $item_hash = 'b64.' . base64url_encode($r[0]['mid']); - if(!$item_hash) { + if(!$r[0]['mid']) { \App::$error = 404; notice( t('Item not found.') . EOL); return; } + + $item_hash = 'b64.' . base64url_encode($r[0]['mid']); } + + if(strpos($item_hash,'b64.') === 0) + $decoded = @base64url_decode(substr($item_hash,4)); + if($decoded) + $item_hash = $decoded; $updateable = false; @@ -101,11 +106,6 @@ class Hq extends \Zotlabs\Web\Controller { $target_item = null; - if(strpos($item_hash,'b64.') === 0) - $decoded = @base64url_decode(substr($item_hash,4)); - if($decoded) - $item_hash = $decoded; - $r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid like '%s' limit 1", dbesc($item_hash . '%') ); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 8168866ad..8ab9a79a0 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -1,5 +1,6 @@ -- cgit v1.2.3 From d942818bd9d9e90db7a3083bfe33a54732f6184d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 21 Nov 2017 22:10:09 +0100 Subject: use item_thread_top = 1 instead of mid = parent_mid and make sure local_channel is intval --- Zotlabs/Module/Hq.php | 6 +++--- view/js/mod_hq.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index 71008b6d2..78087c0f9 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -45,11 +45,11 @@ class Hq extends \Zotlabs\Web\Controller { if(! $item_hash) { $r = q("SELECT mid FROM item - WHERE uid = %d - AND mid = parent_mid + WHERE uid = %d + AND item_thread_top = 1 ORDER BY created DESC limit 1", - local_channel() + intval(local_channel()) ); if(!$r[0]['mid']) { diff --git a/view/js/mod_hq.js b/view/js/mod_hq.js index cf7ec941c..8bbd5e3ad 100644 --- a/view/js/mod_hq.js +++ b/view/js/mod_hq.js @@ -1,4 +1,4 @@ -function hqLiveUpdate(notify_id, b64mid) { +function hqLiveUpdate(notify_id) { if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */ if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; } @@ -65,7 +65,7 @@ function hqLiveUpdate(notify_id, b64mid) { // else data was valid - reset the recursion counter liveRecurse = 0; - if(notify_id !== 'undefined') { + if(notify_id !== 'undefined') { $.post( "hq", { -- cgit v1.2.3