Merge branch 'master' into 1.0.x

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

diff --git a/actions/attachment.php b/actions/attachment.php
index ee4cd9640d971d1b0b19bbe1cdbfa6b1ee5be67b..22018ab043d06e49291c549756468ceddc478e17 100644 (file)
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Show notice attachments
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Personal
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -37,12 +37,11 @@ require_once INSTALLDIR.'/lib/attachmentlist.php';
  * Show notice attachments
  *
  * @category Personal
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
-
 class AttachmentAction extends Action
 {
     /**
@@ -70,6 +69,7 @@ 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;
         }
@@ -81,7 +81,6 @@ class AttachmentAction extends Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -98,6 +97,28 @@ 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
      *
@@ -107,7 +128,6 @@ class AttachmentAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -123,16 +143,6 @@ class AttachmentAction extends Action
         }
     }
 
-    /**
-     * Don't show local navigation
-     *
-     * @return void
-     */
-
-    function showLocalNavBlock()
-    {
-    }
-
     /**
      * Fill the content area of the page
      *
@@ -140,7 +150,6 @@ class AttachmentAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $ali = new Attachment($this->attachment, $this);
@@ -152,7 +161,6 @@ class AttachmentAction extends Action
      *
      * @return void
      */
-
     function showPageNoticeBlock()
     {
     }
@@ -169,4 +177,3 @@ class AttachmentAction extends Action
         $atcs->show();
     }
 }
-