X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fattachment.php;h=6981354d10546262c85c8f7f00bf19376b87058e;hb=271d7dd8509537aee7e10fd6c8f493e62e6c75b2;hp=e4dc0e054e27be9a238ad842eb823a8575e8d989;hpb=280f8faab4f692ff7f4389f82397adfa6db56325;p=quix0rs-gnu-social.git

diff --git a/actions/attachment.php b/actions/attachment.php
index e4dc0e054e..6981354d10 100644
--- 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,10 +37,10 @@ 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
@@ -98,6 +98,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
      *
@@ -111,7 +133,16 @@ class AttachmentAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        $this->showPage();
+
+        if (empty($this->attachment->filename)) {
+
+            // if it's not a local file, gtfo
+
+            common_redirect($this->attachment->url, 303);
+
+        } else {
+            $this->showPage();
+        }
     }
 
     /**