X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fattachmentlist.php;h=a93a6842bbe32648c009f735a0fab7d325bbf5f6;hb=8b32ac85d8cbfe1be03836af461d80fddd54fc6c;hp=8e6ad038a3a8679e94b614970ac518e926614da3;hpb=a2994e3aa232106f39a6c36c9176608467b8822e;p=quix0rs-gnu-social.git

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 8e6ad038a3..a93a6842bb 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -76,28 +76,30 @@ class AttachmentList extends Widget
      */
     function show()
     {
-        $atts = new File;
-        $att = $atts->getAttachments($this->notice->id);
+    	$att = $this->notice->attachments();
         if (empty($att)) return 0;
-        $this->out->elementStart('dl', array('id' =>'attachments',
-                                             'class' => 'entry-content'));
-        // TRANS: DT element label in attachment list.
-        $this->out->element('dt', null, _('Attachments'));
-        $this->out->elementStart('dd');
-        $this->out->elementStart('ol', array('class' => 'attachments'));
+        $this->showListStart();
 
         foreach ($att as $n=>$attachment) {
             $item = $this->newListItem($attachment);
             $item->show();
         }
 
-        $this->out->elementEnd('dd');
-        $this->out->elementEnd('ol');
-        $this->out->elementEnd('dl');
+        $this->showListEnd();
 
         return count($att);
     }
 
+    function showListStart()
+    {
+        $this->out->elementStart('ol', array('class' => 'attachments entry-content'));
+    }
+
+    function showListEnd()
+    {
+        $this->out->elementEnd('ol');
+    }
+
     /**
      * returns a new list item for the current notice
      *
@@ -181,15 +183,16 @@ class AttachmentListItem extends Widget
      */
     function show()
     {
-        if ($this->attachment->isEnclosure()) {
-            $this->showStart();
-            $this->showNoticeAttachment();
-            $this->showEnd();
-        }
+        $this->showStart();
+        $this->showNoticeAttachment();
+        $this->showEnd();
     }
 
     function linkAttr() {
-        return array('class' => 'attachment', 'href' => $this->attachment->url, 'id' => 'attachment-' . $this->attachment->id);
+        return array('class' => 'attachment',
+                     'href' => $this->attachment->url,
+                     'id' => 'attachment-' . $this->attachment->id,
+                     'title' => $this->title());
     }
 
     function showLink() {
@@ -207,54 +210,30 @@ class AttachmentListItem extends Widget
     function showRepresentation() {
         $thumb = $this->getThumbInfo();
         if ($thumb) {
-            $thumb = $this->sizeThumb($thumb);
             $this->out->element('img', array('alt' => '', 'src' => $thumb->url, 'width' => $thumb->width, 'height' => $thumb->height));
         }
     }
 
     /**
-     * Pull a thumbnail image reference for the given file.
-     * In order we check:
-     *  1) file_thumbnail table (thumbnails found via oEmbed)
-     *  2) image URL from direct dereference or oEmbed 'photo' type URL
-     *  3) ???
+     * Pull a thumbnail image reference for the given file, and if necessary
+     * resize it to match currently thumbnail size settings.
      *
-     * @return mixed object with (url, width, height) properties, or false
+     * @return File_Thumbnail or false/null
      */
     function getThumbInfo()
     {
         $thumbnail = File_thumbnail::staticGet('file_id', $this->attachment->id);
         if ($thumbnail) {
-            return $thumbnail;
-        }
-        $enc = $this->attachment->getEnclosure();
-        if ($enc) {
-            switch ($enc->mimetype) {
-                case 'image/gif':
-                case 'image/png':
-                case 'image/jpg':
-                case 'image/jpeg':
-                    $thumb = (object)array();
-                    $thumb->url = $enc->url;
-                    $thumb->width = 100;
-                    $thumb->height = 75; // @fixme
-                    return $thumb;
+            $maxWidth = common_config('attachments', 'thumb_width');
+            $maxHeight = common_config('attachments', 'thumb_height');
+            if ($thumbnail->width > $maxWidth) {
+                $thumb = clone($thumbnail);
+                $thumb->width = $maxWidth;
+                $thumb->height = intval($thumbnail->height * $maxWidth / $thumbnail->width);
+                return $thumb;
             }
         }
-        return false;
-    }
-
-    function sizeThumb($thumbnail) {
-        $maxWidth = 100;
-        $maxHeight = 75;
-        if ($thumbnail->width > $maxWidth) {
-            $thumb = clone($thumbnail);
-            $thumb->width = $maxWidth;
-            $thumb->height = intval($thumbnail->height * $maxWidth / $thumbnail->width);
-            return $thumb;
-        } else {
-            return $thumbnail;
-        }
+        return $thumbnail;
     }
 
     /**
@@ -302,32 +281,22 @@ class Attachment extends AttachmentListItem
             $this->out->elementStart('div', array('id' => 'oembed_info',
                                                   'class' => 'entry-content'));
             if (!empty($this->oembed->author_name)) {
-                $this->out->elementStart('dl', 'vcard author');
-                // TRANS: DT element label in attachment list item.
-                $this->out->element('dt', null, _('Author'));
-                $this->out->elementStart('dd', 'fn');
+                $this->out->elementStart('div', 'fn vcard author');
                 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');
-                // TRANS: DT element label in attachment list item.
-                $this->out->element('dt', null, _('Provider'));
-                $this->out->elementStart('dd', 'fn');
+                $this->out->elementStart('div', 'fn vcard');
                 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');
         }
@@ -465,4 +434,9 @@ class Attachment extends AttachmentListItem
 
         return $scrubbed;
     }
+
+    function showFallback()
+    {
+        // still needed: should show a link?
+    }
 }