GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline into merge-requests/157

Browse Source
This commit is contained in:
Zach Copley 2011-07-07 15:58:28 -07:00
commit cb183359e2
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/hostmeta.php
View File

@ -59,6 +59,10 @@ class HostMetaAction extends Action
Event::handle('EndHostMetaLinks', array(&$xrd->links)); Event::handle('EndHostMetaLinks', array(&$xrd->links));
} }
global $config;
if($config['site']['cors'] === true){
header('Access-Control-Allow-Origin: *');
}
header('Content-type: application/xrd+xml'); header('Content-type: application/xrd+xml');
print $xrd->toXML(); print $xrd->toXML();
} }

4
actions/userxrd.php
View File

@ -30,6 +30,10 @@ class UserxrdAction extends XrdAction
function prepare($args) function prepare($args)
{ {
parent::prepare($args); parent::prepare($args);
global $config;
if($config['site']['cors'] === true){
header('Access-Control-Allow-Origin: *');
}
$this->uri = $this->trimmed('uri'); $this->uri = $this->trimmed('uri');
$this->uri = self::normalize($this->uri); $this->uri = self::normalize($this->uri);

2
config.php.sample
View File

@ -40,6 +40,8 @@ $config['site']['path'] = 'statusnet';
// $config['site']['inviteonly'] = true; // $config['site']['inviteonly'] = true;
// Make the site invisible to non-logged-in users // Make the site invisible to non-logged-in users
// $config['site']['private'] = true; // $config['site']['private'] = true;
// Allow Cross-Origin Resource Sharing
// $config['site']['cors'] = true;
// If your web server supports X-Sendfile (Apache with mod_xsendfile, // If your web server supports X-Sendfile (Apache with mod_xsendfile,
// lighttpd, nginx), you can enable X-Sendfile support for better // lighttpd, nginx), you can enable X-Sendfile support for better

1
lib/default.php
View File

@ -61,6 +61,7 @@ $default =
'textlimit' => 140, 'textlimit' => 140,
'indent' => true, 'indent' => true,
'use_x_sendfile' => false, 'use_x_sendfile' => false,
'cors' => true,
'notice' => null, // site wide notice text 'notice' => null, // site wide notice text
'build' => 1, // build number, for code-dependent cache 'build' => 1, // build number, for code-dependent cache
'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development 'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development