No more needed (for this fix) but maybe later. So I always only comment them out.

[quix0rs-gnu-social.git] / lib / siteprofile.php

diff --git a/lib/siteprofile.php b/lib/siteprofile.php
index d3ab4c9705df529e445252b84eceb390b2bd9101..4bbffea7542ccd149ded02acad15b64f4762c4bb 100644 (file)
--- a/lib/siteprofile.php
+++ b/lib/siteprofile.php
@@ -110,11 +110,8 @@ class PublicSite extends SiteProfileSettings
             'plugins' => array(
                 'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
-                    'Directory'               => array(),
                     'ExtendedProfile'         => array(),
-                    'OStatus'                 => array(),
                     'RegisterThrottle'        => array(),
-                    'WebFinger'               => array(),
                 ))
             ),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
@@ -147,12 +144,14 @@ class PrivateSite extends SiteProfileSettings
             'plugins' => array(
                 'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
-                    'Directory'               => array(),
                     'ExtendedProfile'         => array(),
                     'EmailRegistration'       => array(),
                     'MobileProfile'           => array(),
-                ))
+                )),
+                'disable-OStatus' => 1,
+                'disable-WebFinger' => 1,
              ),
+            'public'        => array('localonly' => true),
             'profile'       => array('delete' => 'true'),
             'license'       => array('type'   => 'private'),
             'attachments'   => array(
@@ -199,11 +198,9 @@ class CommunitySite extends SiteProfileSettings
             'plugins' => array(
                 'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
-                    'Directory'               => array(),
-                    'OStatus'                 => array(),
-                    'WebFinger'               => array(),
                 ))
             ),
+            'public'    => array('localonly' => true),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
         );
     }
@@ -229,18 +226,17 @@ class SingleuserSite extends SiteProfileSettings
                 $config['site'], array(
                     'private'    => false,
                     'closed'     => true,
+                    'localonly'  => true,
                 )
             ),
             'plugins' => array(
                 'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
                     'MobileProfile'           => array(),
-                    'OStatus'                 => array(),
-                    'TwitterBridge'           => array(),
-                    'FacebookBridge'          => array(),
-                    'WebFinger'               => array(),
-                ))
+                )),
+                'disable-Directory' => 1,
             ),
+            'public'    => array('localonly' => true),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
         );
     }