X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fattachment.php;h=45d9b194c93542dafc3913385275d04608fc3ac1;hb=fb70dc02362155c8951a1a0ad66a668f1f857ca5;hp=6981354d10546262c85c8f7f00bf19376b87058e;hpb=df86aa721455fde537608d5faeaaf92075afb738;p=quix0rs-gnu-social.git

diff --git a/actions/attachment.php b/actions/attachment.php
index 6981354d10..45d9b194c9 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -27,11 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/attachmentlist.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Show notice attachments
@@ -42,8 +38,7 @@ require_once INSTALLDIR.'/lib/attachmentlist.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 AttachmentAction extends Action
+class AttachmentAction extends ManagedAction
 {
     /**
      * Attachment object to show
@@ -61,17 +56,17 @@ class AttachmentAction extends Action
      * @return success flag
      */
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
         if ($id = $this->trimmed('attachment')) {
-            $this->attachment = File::staticGet($id);
+            $this->attachment = File::getKV($id);
         }
 
-        if (empty($this->attachment)) {
+        if (!$this->attachment instanceof File) {
+            // TRANS: Client error displayed trying to get a non-existing attachment.
             $this->clientError(_('No such attachment.'), 404);
-            return false;
         }
         return true;
     }
@@ -81,8 +76,7 @@ class AttachmentAction extends Action
      *
      * @return boolean true
      */
-
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
@@ -98,61 +92,21 @@ class AttachmentAction extends Action
         return $a->title();
     }
 
-    function extraHead()
-    {
-        $this->element('link',array('rel'=>'alternate',
-            'type'=>'application/json+oembed',
-            'href'=>common_local_url(
-                'oembed',
-                array(),
-                array('format'=>'json', 'url'=>
-                    common_local_url('attachment',
-                        array('attachment' => $this->attachment->id)))),
-            'title'=>'oEmbed'),null);
-        $this->element('link',array('rel'=>'alternate',
-            'type'=>'text/xml+oembed',
-            'href'=>common_local_url(
-                'oembed',
-                array(),
-                array('format'=>'xml','url'=>
-                    common_local_url('attachment',
-                        array('attachment' => $this->attachment->id)))),
-            'title'=>'oEmbed'),null);
-    }
-
     /**
      * Handle input
      *
      * Only handles get, so just show the page.
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
-
         if (empty($this->attachment->filename)) {
-
             // if it's not a local file, gtfo
-
             common_redirect($this->attachment->url, 303);
-
-        } else {
-            $this->showPage();
         }
-    }
-
-    /**
-     * Don't show local navigation
-     *
-     * @return void
-     */
 
-    function showLocalNavBlock()
-    {
+        parent::handle();
     }
 
     /**
@@ -162,7 +116,6 @@ class AttachmentAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $ali = new Attachment($this->attachment, $this);
@@ -174,7 +127,6 @@ class AttachmentAction extends Action
      *
      * @return void
      */
-
     function showPageNoticeBlock()
     {
     }
@@ -187,8 +139,9 @@ class AttachmentAction extends Action
     function showSections() {
         $ns = new AttachmentNoticeSection($this);
         $ns->show();
-        $atcs = new AttachmentTagCloudSection($this);
-        $atcs->show();
+        if (!common_config('performance', 'high')) {
+            $atcs = new AttachmentTagCloudSection($this);
+            $atcs->show();
+        }
     }
 }
-