If there's no Happening, we can't use the RSVP.

[quix0rs-gnu-social.git] / lib / attachmentlistitem.php

diff --git a/lib/attachmentlistitem.php b/lib/attachmentlistitem.php
index 8ab6a82a12680aa367bb723812924f2a7b7a0167..3a95eb10c3f3c3d92e9b31a934e9ecb96a00bbe6 100644 (file)
--- a/lib/attachmentlistitem.php
+++ b/lib/attachmentlistitem.php
@@ -108,13 +108,19 @@ class AttachmentListItem extends Widget
         if (Event::handle('StartShowAttachmentRepresentation', array($this->out, $this->attachment))) {
             if (!empty($this->attachment->mimetype)) {
                 $mediatype = common_get_mime_media($this->attachment->mimetype);
+
+                // FIXME: Get proper mime recognition of Ogg files! If system has 'mediainfo', this should do it:
+                // $ mediainfo --inform='General;%InternetMediaType%'
+                if ($this->attachment->mimetype === 'application/ogg') {
+                    $mediatype = 'video';   // because this element can handle Ogg/Vorbis etc. on its own
+                }
                 switch ($mediatype) {
                 // Anything we understand as an image, if we need special treatment, do it in StartShowAttachmentRepresentation
                 case 'image':
                     try {
                         // Tell getThumbnail that we can show an animated image if it has one (4th arg, "force_still")
                         $thumb = $this->attachment->getThumbnail(null, null, false, false);
-                        $this->out->element('img', array('class'=>'u-photo', 'src' => $thumb->getUrl(), 'alt' => ''));
+                        $this->out->element('img', $thumb->getHtmlAttrs(['class'=>'u-photo', 'alt' => '']));
                     } catch (UseFileAsThumbnailException $e) {
                         $this->out->element('img', array('class'=>'u-photo', 'src' => $e->file->getUrl(), 'alt' => $e->file->title));
                     } catch (UnsupportedMediaException $e) {
@@ -144,18 +150,6 @@ class AttachmentListItem extends Widget
 
                 default:
                     switch ($this->attachment->mimetype) {
-                    // Ogg media that we're not really sure what it is...
-                    case 'application/ogg':
-                        $arr  = array('type' => $this->attachment->mimetype,
-                            'data' => $this->attachment->getUrl(),
-                            'width' => 320,
-                            'height' => 240
-                        );
-                        $this->out->elementStart('object', $arr);
-                        $this->out->element('param', array('name' => 'src', 'value' => $this->attachment->getUrl()));
-                        $this->out->element('param', array('name' => 'autoStart', 'value' => 1));
-                        $this->out->elementEnd('object');
-                        break;
                     case 'text/html':
                         if (!empty($this->attachment->filename)
                                 && (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) {