Add urlshortenerplugin2.php to solve some @todo's and adding exceptions

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

diff --git a/lib/siteprofile.php b/lib/siteprofile.php
index ae32acdf768c5dc8344e1bfff181f62d3dc67c4e..569a4bbaf8d56f9eb987821784352822e137c8f2 100644 (file)
--- a/lib/siteprofile.php
+++ b/lib/siteprofile.php
@@ -110,10 +110,8 @@ class PublicSite extends SiteProfileSettings
             'plugins' => array(
                 'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
-                    'Directory'               => array(),
                     'ExtendedProfile'         => array(),
-                    'OStatus'                 => array(),
-                    'WebFinger'               => array(),
+                    'RegisterThrottle'        => array(),
                 ))
             ),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
@@ -146,11 +144,12 @@ 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,
              ),
             'profile'       => array('delete' => 'true'),
             'license'       => array('type'   => 'private'),
@@ -191,15 +190,13 @@ class CommunitySite extends SiteProfileSettings
             'site' => array_merge(
                 $config['site'], array(
                     'private'    => false,
+                    'inviteonly' => true,
                     'closed'     => false
                 )
             ),
             'plugins' => array(
                 'core'    => self::corePlugins(),
                 '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.)
@@ -233,11 +230,8 @@ class SingleuserSite extends SiteProfileSettings
                 'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
                     'MobileProfile'           => array(),
-                    'OStatus'                 => array(),
-                    'TwitterBridge'           => array(),
-                    'FacebookBridge'          => array(),
-                    'WebFinger'               => array(),
-                ))
+                )),
+                'disable-Directory' => 1,
             ),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
         );