From 75560b0496d431ebbaf5b40951149728e1b78716 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 1 Jul 2015 16:23:25 -0700 Subject: turn attached audio/video into audio/video elements as well as providing an attachment link --- mod/item.php | 8 +++++++- mod/wall_attach.php | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mod/item.php b/mod/item.php index 1c0c6c53b..57a905395 100644 --- a/mod/item.php +++ b/mod/item.php @@ -649,6 +649,7 @@ function item_post(&$a) { if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) { $attachments = array(); foreach($match[2] as $mtch) { + $attach_link = ''; $hash = substr($mtch,0,strpos($mtch,',')); $rev = intval(substr($mtch,strpos($mtch,','))); $r = attach_by_hash_nodata($hash,$rev); @@ -661,7 +662,12 @@ function item_post(&$a) { 'revision' => $r['data']['revision'] ); } - $body = str_replace($match[1],'',$body); + $ext = substr($r['data']['filename'],strrpos($r['data']['filename'],'.')); + if(strpos($r['data']['filetype'],'audio/') !== false) + $attach_link = '[audio]' . z_root() . '/attach/' . $r['data']['hash'] . '/' . $r['data']['revision'] . (($ext) ? $ext : '') . '[/audio]'; + elseif(strpos($r['data']['filetype'],'video/') !== false) + $attach_link = '[video]' . z_root() . '/attach/' . $r['data']['hash'] . '/' . $r['data']['revision'] . (($ext) ? $ext : '') . '[/video]'; + $body = str_replace($match[1],$attach_link,$body); } } diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 4e30556b6..f08f931c2 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -53,8 +53,7 @@ function wall_attach_post(&$a) { if($using_api) return; } - else - echo "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; + echo "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; killme(); } -- cgit v1.2.3