X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fattachmentlist.php;h=41d03f8e2124b2d3a9762aad2b3963d417d6cdd8;hb=0535b439445cdfbbefb4fe2b22d4791260e2adec;hp=559962accab60e4614f35773001a22182c5fb734;hpb=60ac9bc6fda74278d98890a2c26f3834acad8222;p=quix0rs-gnu-social.git

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 559962acca..41d03f8e21 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -46,7 +46,6 @@ if (!defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  * @see      Notice
- * @see      StreamAction
  * @see      NoticeListItem
  * @see      ProfileNoticeList
  */
@@ -80,13 +79,15 @@ class AttachmentList extends Widget
 
     function show()
     {
-        $this->out->elementStart('dl', array('id' =>'attachments'));
+        $atts = new File;
+        $att = $atts->getAttachments($this->notice->id);
+        if (empty($att)) return 0;
+        $this->out->elementStart('dl', array('id' =>'attachments',
+                                             'class' => 'entry-content'));
         $this->out->element('dt', null, _('Attachments'));
         $this->out->elementStart('dd');
         $this->out->elementStart('ol', array('class' => 'attachments'));
 
-        $atts = new File;
-        $att = $atts->getAttachments($this->notice->id);
         foreach ($att as $n=>$attachment) {
             $item = $this->newListItem($attachment);
             $item->show();
@@ -210,7 +211,7 @@ class AttachmentListItem extends Widget
     function showRepresentation() {
         $thumbnail = File_thumbnail::staticGet('file_id', $this->attachment->id);
         if (!empty($thumbnail)) {
-            $this->out->element('img', array('alt' => 'nothing to say', 'src' => $thumbnail->url, 'width' => $thumbnail->width, 'height' => $thumbnail->height));
+            $this->out->element('img', array('alt' => '', 'src' => $thumbnail->url, 'width' => $thumbnail->width, 'height' => $thumbnail->height));
         }
     }
 
@@ -243,6 +244,53 @@ class AttachmentListItem extends Widget
 
 class Attachment extends AttachmentListItem
 {
+    function showLink() {
+        $this->out->elementStart('div', array('id' => 'attachment_view',
+                                              'class' => 'hentry'));
+        $this->out->elementStart('div', 'entry-title');
+        $this->out->elementStart('a', $this->linkAttr());
+        $this->out->element('span', null, $this->linkTitle());
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('div');
+
+        $this->out->elementStart('div', 'entry-content');
+        $this->showRepresentation();
+        $this->out->elementEnd('div');
+
+        if (!empty($this->oembed->author_name) || !empty($this->oembed->provider)) {
+            $this->out->elementStart('div', array('id' => 'oembed_info', 
+                                                  'class' => 'entry-content'));
+            if (!empty($this->oembed->author_name)) {
+                $this->out->elementStart('dl', 'vcard author');
+                $this->out->element('dt', null, _('Author'));
+                $this->out->elementStart('dd', 'fn');
+                if (empty($this->oembed->author_url)) {
+                    $this->out->text($this->oembed->author_name);
+                } else {
+                    $this->out->element('a', array('href' => $this->oembed->author_url,
+                                                   'class' => 'url'), $this->oembed->author_name);
+                }
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
+            }
+            if (!empty($this->oembed->provider)) {
+                $this->out->elementStart('dl', 'vcard');
+                $this->out->element('dt', null, _('Provider'));
+                $this->out->elementStart('dd', 'fn');
+                if (empty($this->oembed->provider_url)) {
+                    $this->out->text($this->oembed->provider);
+                } else {
+                    $this->out->element('a', array('href' => $this->oembed->provider_url,
+                                                   'class' => 'url'), $this->oembed->provider);
+                }
+                $this->out->elementEnd('dd');
+                $this->out->elementEnd('dl');
+            }
+            $this->out->elementEnd('div');
+        }
+        $this->out->elementEnd('div');
+    }
+
     function show() {
         $this->showNoticeAttachment();
     }
@@ -267,6 +315,23 @@ class Attachment extends AttachmentListItem
                 case 'image/jpeg':
                     $this->out->element('img', array('src' => $this->attachment->url, 'alt' => 'alt'));
                     break;
+
+                case 'application/ogg':
+                case 'audio/x-speex':
+                case 'video/mpeg':
+                case 'audio/mpeg':
+                case 'video/mp4':
+                case 'video/quicktime':
+                    $arr  = array('type' => $this->attachment->mimetype,
+                        'data' => $this->attachment->url,
+                        'width' => 320,
+                        'height' => 240
+                    );
+                    $this->out->elementStart('object', $arr);
+                    $this->out->element('param', array('name' => 'src', 'value' => $this->attachment->url));
+                    $this->out->element('param', array('name' => 'autoStart', 'value' => 1));
+                    $this->out->elementEnd('object');
+                    break;
                 }
             }
         } else {
@@ -275,7 +340,12 @@ class Attachment extends AttachmentListItem
             case 'video':
             case 'link':
                 if (!empty($this->oembed->html)) {
-                    $this->out->raw($this->oembed->html);
+                    require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
+                    $config = array(
+                        'safe'=>1,
+                        'elements'=>'*+object+embed');
+                    $this->out->raw(htmLawed($this->oembed->html,$config));
+                    //$this->out->raw($this->oembed->html);
                 }
                 break;