X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fattachment_thumbnail.php;h=e8f89ffc360d45c505aefd5198e4927e9b04a8ec;hb=e868ac41cd8221c45dfed56a43d155fb2307a7e4;hp=38648b8bef4005d25a4706e721abac7944372b9a;hpb=2617c40e048aee071b72b4b5f664fab36e6c632d;p=quix0rs-gnu-social.git

diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index 38648b8bef..e8f89ffc36 100644
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -27,11 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/actions/attachment.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Show notice attachments
@@ -44,37 +40,28 @@ require_once INSTALLDIR.'/actions/attachment.php';
  */
 class Attachment_thumbnailAction extends AttachmentAction
 {
-    function handle($args)
-    {
-        $this->showPage();
-    }
+    protected $thumb_w = null;  // max width
+    protected $thumb_h = null;  // max height
+    protected $thumb_c = null;  // crop?
 
-    /**
-     * Show page, a template method.
-     *
-     * @return nothing
-     */
-    function showPage()
+    protected function doPreparation()
     {
-        if (Event::handle('StartShowBody', array($this))) {
-            $this->showCore();
-            Event::handle('EndShowBody', array($this));
-        }
+        parent::doPreparation();
+
+        $this->thumb_w = $this->int('w');
+        $this->thumb_h = $this->int('h');
+        $this->thumb_c = $this->boolean('c');
     }
 
-    /**
-     * Show core.
-     *
-     * Shows local navigation, content block and aside.
-     *
-     * @return nothing
-     */
-    function showCore()
+    public function showPage()
     {
-        $file_thumbnail = File_thumbnail::staticGet('file_id', $this->attachment->id);
-        if (empty($file_thumbnail->url)) {
-            return;
+        // Returns a File_thumbnail object or throws exception if not available
+        try {
+            $thumbnail = $this->attachment->getThumbnail($this->thumb_w, $this->thumb_h, $this->thumb_c);
+        } catch (UseFileAsThumbnailException $e) {
+            common_redirect($e->file->getUrl());
         }
-        $this->element('img', array('src' => $file_thumbnail->url, 'alt' => 'Thumbnail'));
+
+        common_redirect(File_thumbnail::url($thumbnail->filename));
     }
 }