aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-01 16:23:25 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-01 16:23:25 -0700
commit75560b0496d431ebbaf5b40951149728e1b78716 (patch)
tree33046ef46c131f062d075f1373f2b902ad776321
parentd5c085a3c6e04ff53b81e47d74cc4381c5ef5875 (diff)
downloadvolse-hubzilla-75560b0496d431ebbaf5b40951149728e1b78716.tar.gz
volse-hubzilla-75560b0496d431ebbaf5b40951149728e1b78716.tar.bz2
volse-hubzilla-75560b0496d431ebbaf5b40951149728e1b78716.zip
turn attached audio/video into audio/video elements as well as providing an attachment link
-rw-r--r--mod/item.php8
-rw-r--r--mod/wall_attach.php3
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();
}