eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

OStatus enabled by default, only disabled for private siteprofile

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-05-09 10:31:55 +02:00
parent 220ec072c9
commit c15216f00b
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/default.php
View File

@ -305,10 +305,12 @@ $default =
'Oembed' => array(), 'Oembed' => array(),
'OpenID' => array(), 'OpenID' => array(),
'OpportunisticQM' => array(), 'OpportunisticQM' => array(),
'OStatus' => array(),
'Poll' => array(), 'Poll' => array(),
'QnA' => array(), 'QnA' => array(),
'SearchSub' => array(), 'SearchSub' => array(),
'TagSub' => array(), 'TagSub' => array(),
'WebFinger' => array(),
), ),
'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories 'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
'server' => null, 'server' => null,

16
lib/siteprofile.php
View File

@ -110,11 +110,8 @@ class PublicSite extends SiteProfileSettings
'plugins' => array( 'plugins' => array(
'core' => self::corePlugins(), 'core' => self::corePlugins(),
'default' => array_merge(self::defaultPlugins(), array( 'default' => array_merge(self::defaultPlugins(), array(
'Directory' => array(),
'ExtendedProfile' => array(), 'ExtendedProfile' => array(),
'OStatus' => array(),
'RegisterThrottle' => array(), 'RegisterThrottle' => array(),
'WebFinger' => array(),
)) ))
), ),
'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.) 'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
@ -147,11 +144,12 @@ class PrivateSite extends SiteProfileSettings
'plugins' => array( 'plugins' => array(
'core' => self::corePlugins(), 'core' => self::corePlugins(),
'default' => array_merge(self::defaultPlugins(), array( 'default' => array_merge(self::defaultPlugins(), array(
'Directory' => array(),
'ExtendedProfile' => array(), 'ExtendedProfile' => array(),
'EmailRegistration' => array(), 'EmailRegistration' => array(),
'MobileProfile' => array(), 'MobileProfile' => array(),
)) )),
'disable-OStatus' => 1,
'disable-WebFinger' => 1,
), ),
'profile' => array('delete' => 'true'), 'profile' => array('delete' => 'true'),
'license' => array('type' => 'private'), 'license' => array('type' => 'private'),
@ -199,9 +197,6 @@ class CommunitySite extends SiteProfileSettings
'plugins' => array( 'plugins' => array(
'core' => self::corePlugins(), 'core' => self::corePlugins(),
'default' => array_merge(self::defaultPlugins(), array( 'default' => array_merge(self::defaultPlugins(), array(
'Directory' => array(),
'OStatus' => array(),
'WebFinger' => array(),
)) ))
), ),
'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.) 'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
@ -235,11 +230,10 @@ class SingleuserSite extends SiteProfileSettings
'core' => self::corePlugins(), 'core' => self::corePlugins(),
'default' => array_merge(self::defaultPlugins(), array( 'default' => array_merge(self::defaultPlugins(), array(
'MobileProfile' => array(), 'MobileProfile' => array(),
'OStatus' => array(),
'TwitterBridge' => array(), 'TwitterBridge' => array(),
'FacebookBridge' => array(), 'FacebookBridge' => array(),
'WebFinger' => array(), )),
)) 'disable-Directory' => 1,
), ),
'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.) 'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
); );