Redirect from Attachment_thumbnailAction

[quix0rs-gnu-social.git] / actions / attachment_thumbnail.php

diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index 38648b8bef4005d25a4706e721abac7944372b9a..b5173efa771dfca0969e4d118be7dee24b836d04 100644 (file)
--- 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') && !defined('STATUSNET')) { exit(1); }
 
 /**
  * Show notice attachments
@@ -44,9 +40,19 @@ require_once INSTALLDIR.'/actions/attachment.php';
  */
 class Attachment_thumbnailAction extends AttachmentAction
 {
-    function handle($args)
+    protected $thumb_w = null;  // max width
+    protected $thumb_h = null;  // max height
+    protected $thumb_c = null;  // crop?
+
+    protected function prepare(array $args=array())
     {
-        $this->showPage();
+        parent::prepare($args);
+
+        $this->thumb_w = $this->int('w');
+        $this->thumb_h = $this->int('h');
+        $this->thumb_c = $this->boolean('c');
+
+        return true;
     }
 
     /**
@@ -56,25 +62,8 @@ class Attachment_thumbnailAction extends AttachmentAction
      */
     function showPage()
     {
-        if (Event::handle('StartShowBody', array($this))) {
-            $this->showCore();
-            Event::handle('EndShowBody', array($this));
-        }
-    }
-
-    /**
-     * Show core.
-     *
-     * Shows local navigation, content block and aside.
-     *
-     * @return nothing
-     */
-    function showCore()
-    {
-        $file_thumbnail = File_thumbnail::staticGet('file_id', $this->attachment->id);
-        if (empty($file_thumbnail->url)) {
-            return;
-        }
-        $this->element('img', array('src' => $file_thumbnail->url, 'alt' => 'Thumbnail'));
+        // Returns a File_thumbnail object or throws exception if not available
+        $thumbnail = $this->attachment->getThumbnail($this->thumb_w, $this->thumb_h, $this->thumb_c);
+        common_redirect($thumbnail->getUrl());
     }
 }