Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

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

diff --git a/actions/hostmeta.php b/actions/hostmeta.php
index 2587bb6b91977711d6bea22c09eaff45ffcae043..5caf1960cbb1ae2970071ba62ff5df916230dc88 100644 (file)
--- a/actions/hostmeta.php
+++ b/actions/hostmeta.php
@@ -28,9 +28,9 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+// @todo XXX: Add documentation.
 class HostMetaAction extends Action
 {
-
     /**
      * Is read only?
      *
@@ -51,15 +51,21 @@ class HostMetaAction extends Action
         $xrd->host = $domain;
 
         if(Event::handle('StartHostMetaLinks', array(&$xrd->links))) {
-           $url = common_local_url('userxrd');
-           $url.= '?uri={uri}';
-           $xrd->links[] = array('rel' => Discovery::LRDD_REL,
-                                 'template' => $url,
-                                 'title' => array('Resource Descriptor'));
+            $url = common_local_url('userxrd');
+            $url.= '?uri={uri}';
+            $xrd->links[] = array('rel' => Discovery::LRDD_REL,
+                      'template' => $url,
+                      'title' => array('Resource Descriptor'));
             Event::handle('EndHostMetaLinks', array(&$xrd->links));
         }
 
+        // Output Cross-Origin Resource Sharing (CORS) header
+        if (common_config('discovery', 'cors')) {
+            header('Access-Control-Allow-Origin: *');
+        }
+
         header('Content-type: application/xrd+xml');
+
         print $xrd->toXML();
     }
 }