Some files got updated coding style

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

diff --git a/actions/attachment.php b/actions/attachment.php
index f805aa1fc30bb47a397c7171d7a3c34b862c372d..b532b81d88438ddbf5a91b3a5e854129137531fb 100644 (file)
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -60,7 +60,7 @@ class AttachmentAction extends Action
      * @return success flag
      */
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -71,7 +71,6 @@ class AttachmentAction extends Action
         if (empty($this->attachment)) {
             // TRANS: Client error displayed trying to get a non-existing attachment.
             $this->clientError(_('No such attachment.'), 404);
-            return false;
         }
         return true;
     }
@@ -117,45 +116,6 @@ class AttachmentAction extends Action
                     common_local_url('attachment',
                         array('attachment' => $this->attachment->id)))),
             'title'=>'oEmbed'),null);
-        /* Twitter card support. See https://dev.twitter.com/docs/cards */
-        /* @fixme: should we display twitter cards only for attachments posted
-         *         by local users ? Seems mandatory to display twitter:creator
-         */
-        switch ($this->attachment->mimetype) {
-            case 'image/pjpeg':
-            case 'image/jpeg':
-            case 'image/jpg':
-            case 'image/png':
-            case 'image/gif':
-                $this->element('meta', array('name'    => 'twitter:card',
-                                             'content' => 'photo'),
-                                       null);
-                $this->element('meta', array('name'    => 'twitter:url',
-                                             'content' => common_local_url('attachment',
-                                                              array('attachment' => $this->attachment->id))),
-                                       null );
-                $this->element('meta', array('name'    => 'twitter:image',
-                                             'content' => $this->attachment->url));
-
-                $ns = new AttachmentNoticeSection($this);
-                $notices = $ns->getNotices();
-                $noticeArray = $notices->fetchAll();
-
-                // Should not have more than 1 notice for this attachment.
-                if( count($noticeArray) != 1 ) { break; }
-                $post = $noticeArray[0];
-
-                $flink = Foreign_link::getByUserID($post->profile_id, TWITTER_SERVICE);
-                if( $flink ) { // Our local user has registered Twitter Gateway
-                    $fuser = Foreign_user::getForeignUser($flink->foreign_id, TWITTER_SERVICE);
-                    if( $fuser ) { // Got nickname for local user's Twitter account
-                        $this->element('meta', array('name'    => 'twitter:creator',
-                                                     'content' => '@'.$fuser->nickname));
-                    }
-                }
-                break;
-            default: break;
-        }
     }
 
     /**
@@ -163,13 +123,11 @@ class AttachmentAction extends Action
      *
      * 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);
+        parent::handle();
 
         if (empty($this->attachment->filename)) {