X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsiteprofile.php;h=a2c09efb2f6be08f5dc0919573ff1a0b601d5d71;hb=d2e6519bad041e50b4ae7df441e43fd2cfed46fc;hp=420b4f3e93f890cb8ff0847eb34ee7e3c62e4c27;hpb=2a5ba1f74bb428fc74f181f806aa786b04b48d0a;p=quix0rs-gnu-social.git

diff --git a/lib/siteprofile.php b/lib/siteprofile.php
index 420b4f3e93..a2c09efb2f 100644
--- a/lib/siteprofile.php
+++ b/lib/siteprofile.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('GNUSOCIAL')) {
     exit(1);
 }
 
@@ -78,9 +78,11 @@ abstract class SiteProfileSettings
         throw new MethodNotImplementedException(__METHOD__);
     }
 
+    static function corePlugins() {
+        return common_config('plugins', 'core');
+    }
     static function defaultPlugins() {
-        return array_merge(common_config('plugins', 'core'),
-                           common_config('plugins', 'default'));
+        return common_config('plugins', 'default');
     }
 }
 
@@ -106,12 +108,9 @@ class PublicSite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
-                    'Directory'               => null,
-                    'ExtendedProfile'         => null,
-                    'Geonames'                => null,
-                    'OStatus'                 => null,
-                    'WebFinger'               => null,
+                    'RegisterThrottle'        => array(),
                 ))
             ),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
@@ -142,15 +141,16 @@ class PrivateSite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
-                    'Directory'               => null,
-                    'ExtendedProfile'         => null,
-                    'EmailRegistration'       => null,
-                    'Geonames'                => null,
-                    'NewMenu'                 => null,
-                    'MobileProfile'           => null,
-                ))
+                    '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(
@@ -190,17 +190,16 @@ 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'               => null,
-                    'Geonames'                => null,
-                    'OStatus'                 => null,
-                    'WebFinger'               => null,
                 ))
             ),
+            'public'    => array('localonly' => true),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
         );
     }
@@ -226,19 +225,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(
-                    'Geonames'                => null,
-                    'NewMenu'                 => null,
-                    'MobileProfile'           => null,
-                    'OStatus'                 => null,
-                    'TwitterBridge'           => null,
-                    'FacebookBridge'          => null,
-                    'WebFinger'               => null,
-                ))
+                    'MobileProfile'           => array(),
+                )),
+                'disable-Directory' => 1,
             ),
+            'public'    => array('localonly' => true),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
         );
     }