X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fattachmentlistitem.php;h=fe11dbe639141b631e8539f17d227b2a26fbdfdc;hb=3290227b50582ed29790f0bb10210362ca2f4093;hp=6ee3c7087b43d5d573489974693ed89c8bfcf9fb;hpb=5f5e53a8d55ee8ddffe92b5ba7a378063e44859d;p=quix0rs-gnu-social.git

diff --git a/lib/attachmentlistitem.php b/lib/attachmentlistitem.php
index 6ee3c7087b..fe11dbe639 100644
--- a/lib/attachmentlistitem.php
+++ b/lib/attachmentlistitem.php
@@ -63,7 +63,7 @@ class AttachmentListItem extends Widget
     }
 
     function title() {
-        return $this->attachment->getTitle();
+        return $this->attachment->getTitle() ?: _('Untitled attachment');
     }
 
     function linkTitle() {
@@ -86,28 +86,26 @@ class AttachmentListItem extends Widget
     }
 
     function linkAttr() {
-        return array('class' => 'attachment',
-                     'href' => $this->attachment->getUrl(false),
-                     'id' => 'attachment-' . $this->attachment->id,
+        return array(
+                     'class' => 'u-url',
+                     'href' => $this->attachment->getAttachmentUrl(),
                      'title' => $this->linkTitle());
     }
 
-    function showLink() {
-        $this->out->elementStart('a', $this->linkAttr());
-        $this->out->element('span', null, $this->linkTitle());
-        $this->showRepresentation();
-        $this->out->elementEnd('a');
-    }
-
     function showNoticeAttachment()
     {
-        $this->showLink();
+        $this->showRepresentation();
     }
 
     function showRepresentation() {
         $enclosure = $this->attachment->getEnclosure();
 
         if (Event::handle('StartShowAttachmentRepresentation', array($this->out, $this->attachment))) {
+
+            $this->out->elementStart('label');
+            $this->out->element('a', $this->linkAttr(), $this->title());
+            $this->out->elementEnd('label');
+
             if (!empty($enclosure->mimetype)) {
                 // First, prepare a thumbnail if it exists.
                 $thumb = null;
@@ -141,7 +139,13 @@ class AttachmentListItem extends Widget
                     if ($thumb instanceof File_thumbnail) {
                         $this->out->element('img', $thumb->getHtmlAttrs(['class'=>'u-photo', 'alt' => '']));
                     } else {
-                        $this->out->element('img', array('class'=>'u-photo', 'src' => $this->attachment->getUrl(), 'alt' => $this->attachment->getTitle()));
+                        try {
+                            // getUrl(true) because we don't want to hotlink, could be made configurable
+                            $this->out->element('img', ['class'=>'u-photo', 'src'=>$this->attachment->getUrl(true), 'alt' => $this->attachment->getTitle()]);
+                        } catch (FileNotStoredLocallyException $e) {
+                            $url = $e->file->getUrl(false);
+                            $this->out->element('a', ['href'=>$url, 'rel'=>'external'], $url);
+                        }
                     }
                     unset($thumb);  // there's no need carrying this along after this
                     break;
@@ -168,7 +172,7 @@ class AttachmentListItem extends Widget
 
                 default:
                     unset($thumb);  // there's no need carrying this along
-                    switch ($this->attachment->mimetype) {
+                    switch (common_bare_mime($this->attachment->mimetype)) {
                     case 'text/plain':
                         $this->element('div', ['class'=>'e-content plaintext'], file_get_contents($this->attachment->getPath()));
                         break;