Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index 6e8baeee7aa75324826817cb4d7284c7f86d4511..c85029dcf609e871a57b4c5d72bfcc929b4e4284 100644 (file)
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Show notice attachments
@@ -42,42 +42,26 @@ class Attachment_thumbnailAction extends AttachmentAction
 {
     protected $thumb_w = null;  // max width
     protected $thumb_h = null;  // max height
-    protected $thumb_a = null;  // "aspect ratio" (more like "square", 1 or 0)
+    protected $thumb_c = null;  // crop?
 
-    protected function prepare(array $args=array())
+    protected function doPreparation()
     {
-        parent::prepare($args);
+        parent::doPreparation();
 
-        foreach (array('w', 'h', 'a') as $attr) {
-            $this->{"thumb_$attr"} = $this->arg($attr);
-        }
-        return true;
+        $this->thumb_w = $this->int('w');
+        $this->thumb_h = $this->int('h');
+        $this->thumb_c = $this->boolean('c');
     }
 
-    /**
-     * Show page, a template method.
-     *
-     * @return nothing
-     */
-    function showPage()
+    public function showPage()
     {
-        if (Event::handle('StartShowBody', array($this))) {
-            $this->showCore();
-            Event::handle('EndShowBody', array($this));
+        // 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());
         }
-    }
 
-    /**
-     * Show core.
-     *
-     * Shows local navigation, content block and aside.
-     *
-     * @return nothing
-     */
-    function showCore()
-    {
-        // Returns a File_thumbnail object or throws exception if not available
-        $thumbnail = $this->attachment->getThumbnail($this->thumb_w, $this->thumb_h, $this->thumb_a);
-        $this->element('img', array('src' => $thumbnail->getUrl(), 'alt' => 'Thumbnail'));
+        common_redirect($thumbnail->getUrl());
     }
 }