X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fattachment_thumbnail.php;h=cc1b0f09c6ba336f7d64da15f37e527b7bce00d6;hb=2a8ab1c6cae572d324339b211625c4d219db0c89;hp=7d0ac97a6906f53bff785009940a938160b7d543;hpb=df86aa721455fde537608d5faeaaf92075afb738;p=quix0rs-gnu-social.git

diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index 7d0ac97a69..cc1b0f09c6 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
@@ -42,43 +38,30 @@ require_once INSTALLDIR.'/actions/attachment.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class Attachment_thumbnailAction extends AttachmentAction
 {
+    protected $thumb_w = null;  // max width
+    protected $thumb_h = null;  // max height
+    protected $thumb_c = null;  // crop?
 
-    function handle($args)
+    protected function doPreparation()
     {
-        $this->showPage();
-    }
+        parent::doPreparation();
 
-    /**
-     * Show page, a template method.
-     *
-     * @return nothing
-     */
-    function showPage()
-    {
-        if (Event::handle('StartShowBody', array($this))) {
-            $this->showCore();
-            Event::handle('EndShowBody', array($this));
-        }
+        $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(), 302);
         }
-        $this->element('img', array('src' => $file_thumbnail->url, 'alt' => 'Thumbnail'));
-    }
 
+        common_redirect(File_thumbnail::url($thumbnail->getFilename()), 302);
+    }
 }
-