[CORE] Move core plugins to a new modules directory

For reference (raised by rozzin in IRC):

* http://foldoc.org/module
* http://foldoc.org/library
* http://foldoc.org/plugin

As noted by XRevan86, modules are not necessarily non-essential.
As we will keep the modules directory in GS root [therefore, near to
plugins/], it is evidenced the difference between both.

This is a simple yet fundamental structural change. It doesn't change
functionality but makes clearer the way we understand GNU social's
internals.
This commit is contained in:
Diogo Cordeiro 2019-07-23 09:30:05 +01:00 committed by tenma
parent 350cde08d8
commit 8c0601816f
446 changed files with 605 additions and 2357 deletions

View File

@ -27,196 +27,196 @@
$default = $default =
array('site' => array('site' =>
array('name' => 'Just another GNU social node', array('name' => 'Just another GNU social node',
'nickname' => 'gnusocial', 'nickname' => 'gnusocial',
'wildcard' => null, 'wildcard' => null,
'server' => $_server, 'server' => $_server,
'theme' => 'neo-gnu', 'theme' => 'neo-gnu',
'path' => $_path, 'path' => $_path,
'logfile' => null, 'logfile' => null,
'logdebug' => false, 'logdebug' => false,
'logo' => null, 'logo' => null,
'ssllogo' => null, 'ssllogo' => null,
'logperf' => false, // Enable to dump performance counters to syslog 'logperf' => false, // Enable to dump performance counters to syslog
'logperf_detail' => false, // Enable to dump every counter hit 'logperf_detail' => false, // Enable to dump every counter hit
'fancy' => false, 'fancy' => false,
'locale_path' => INSTALLDIR.'/locale', 'locale_path' => INSTALLDIR . '/locale',
'language' => 'en', 'language' => 'en',
'langdetect' => true, 'langdetect' => true,
'languages' => get_all_languages(), 'languages' => get_all_languages(),
'email' => 'email' =>
array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null, array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null,
'fakeaddressrecovery' => true, 'fakeaddressrecovery' => true,
'broughtby' => null, 'broughtby' => null,
'timezone' => 'UTC', 'timezone' => 'UTC',
'broughtbyurl' => null, 'broughtbyurl' => null,
'closed' => false, 'closed' => false,
'inviteonly' => true, 'inviteonly' => true,
'private' => false, 'private' => false,
'ssl' => 'never', 'ssl' => 'never',
'sslproxy' => false, // set to true to force GNU social to think it is HTTPS (i.e. using reverse proxy to enable it) 'sslproxy' => false, // set to true to force GNU social to think it is HTTPS (i.e. using reverse proxy to enable it)
'sslserver' => null, 'sslserver' => null,
'dupelimit' => 60, // default for same person saying the same thing 'dupelimit' => 60, // default for same person saying the same thing
'textlimit' => 1000, // in chars; 0 == no limit 'textlimit' => 1000, // in chars; 0 == no limit
'indent' => true, 'indent' => true,
'use_x_sendfile' => false, 'use_x_sendfile' => false,
'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
),
'security' =>
array('hash_algos' => ['sha1', 'sha256', 'sha512'], // set to null for anything that hash_hmac() can handle (and is in hash_algos())
), ),
'security' =>
array('hash_algos' => ['sha1', 'sha256', 'sha512'], // set to null for anything that hash_hmac() can handle (and is in hash_algos())
),
'db' => 'db' =>
array('database' => null, // must be set array('database' => null, // must be set
'schema_location' => INSTALLDIR . '/classes', 'schema_location' => INSTALLDIR . '/classes',
'class_location' => INSTALLDIR . '/classes', 'class_location' => INSTALLDIR . '/classes',
'require_prefix' => 'classes/', 'require_prefix' => 'classes/',
'class_prefix' => '', 'class_prefix' => '',
'mirror' => null, 'mirror' => null,
'utf8' => true, 'utf8' => true,
'db_driver' => 'DB', # XXX: JanRain libs only work with DB 'db_driver' => 'DB', # XXX: JanRain libs only work with DB
'quote_identifiers' => false, 'quote_identifiers' => false,
'type' => 'mysql', 'type' => 'mysql',
'schemacheck' => 'runtime', // 'runtime' or 'script' 'schemacheck' => 'runtime', // 'runtime' or 'script'
'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */ 'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */
'log_queries' => false, // true to log all DB queries 'log_queries' => false, // true to log all DB queries
'log_slow_queries' => 0, // if set, log queries taking over N seconds 'log_slow_queries' => 0, // if set, log queries taking over N seconds
'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL 'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL
'fix' => 'fix' =>
array('fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs array('fancyurls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
'legacy_http' => false, // set this to true if you have upgraded your site from http=>https 'legacy_http' => false, // set this to true if you have upgraded your site from http=>https
), ),
'log' => [ 'log' => [
'debugtrace' => false, // index.php handleError function, whether to include exception backtrace in log 'debugtrace' => false, // index.php handleError function, whether to include exception backtrace in log
], ],
'syslog' => 'syslog' =>
array('appname' => 'statusnet', # for syslog array('appname' => 'statusnet', # for syslog
'priority' => 'debug', # XXX: currently ignored 'priority' => 'debug', # XXX: currently ignored
'facility' => LOG_USER), 'facility' => LOG_USER),
'queue' => 'queue' =>
array('enabled' => true, array('enabled' => true,
'daemon' => false, # Use queuedaemon. Default to false 'daemon' => false, # Use queuedaemon. Default to false
'threads' => null, # an empty value here uses processor count to determine 'threads' => null, # an empty value here uses processor count to determine
'subsystem' => 'db', # default to database, or 'stomp' 'subsystem' => 'db', # default to database, or 'stomp'
'stomp_server' => null, 'stomp_server' => null,
'queue_basename' => '/queue/statusnet/', 'queue_basename' => '/queue/statusnet/',
'control_channel' => '/topic/statusnet/control', // broadcasts to all queue daemons 'control_channel' => '/topic/statusnet/control', // broadcasts to all queue daemons
'stomp_username' => null, 'stomp_username' => null,
'stomp_password' => null, 'stomp_password' => null,
'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled 'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled
'stomp_transactions' => true, // use STOMP transactions to aid in detecting failures (supported by ActiveMQ, but not by all) 'stomp_transactions' => true, // use STOMP transactions to aid in detecting failures (supported by ActiveMQ, but not by all)
'stomp_acks' => true, // send acknowledgements after successful processing (supported by ActiveMQ, but not by all) 'stomp_acks' => true, // send acknowledgements after successful processing (supported by ActiveMQ, but not by all)
'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all) 'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all)
'monitor' => null, // URL to monitor ping endpoint (work in progress) 'monitor' => null, // URL to monitor ping endpoint (work in progress)
'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully 'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully
'spawndelay' => 1, // Wait at least N seconds between (re)spawns of child processes to avoid slamming the queue server with subscription startup 'spawndelay' => 1, // Wait at least N seconds between (re)spawns of child processes to avoid slamming the queue server with subscription startup
'debug_memory' => false, // true to spit memory usage to log 'debug_memory' => false, // true to spit memory usage to log
'breakout' => array(), // List queue specifiers to break out when using Stomp queue. 'breakout' => [], // List queue specifiers to break out when using Stomp queue.
// Default will share all queues for all sites within each group. // Default will share all queues for all sites within each group.
// Specify as <group>/<queue> or <group>/<queue>/<site>, // Specify as <group>/<queue> or <group>/<queue>/<site>,
// using nickname identifier as site. // using nickname identifier as site.
// //
// 'main/distrib' separate "distrib" queue covering all sites // 'main/distrib' separate "distrib" queue covering all sites
// 'xmpp/xmppout/mysite' separate "xmppout" queue covering just 'mysite' // 'xmpp/xmppout/mysite' separate "xmppout" queue covering just 'mysite'
'max_retries' => 10, // drop messages after N failed attempts to process (Stomp) 'max_retries' => 10, // drop messages after N failed attempts to process (Stomp)
'dead_letter_dir' => false, // set to directory to save dropped messages into (Stomp) 'dead_letter_dir' => false, // set to directory to save dropped messages into (Stomp)
), ),
'license' => 'license' =>
array('type' => 'cc', # can be 'cc', 'allrightsreserved', 'private' array('type' => 'cc', # can be 'cc', 'allrightsreserved', 'private'
'owner' => null, # can be name of content owner e.g. for enterprise 'owner' => null, # can be name of content owner e.g. for enterprise
'url' => 'https://creativecommons.org/licenses/by/3.0/', 'url' => 'https://creativecommons.org/licenses/by/3.0/',
'title' => 'Creative Commons Attribution 3.0', 'title' => 'Creative Commons Attribution 3.0',
'image' => $_path . '/theme/licenses/cc_by_3.0_80x15.png'), 'image' => $_path . '/theme/licenses/cc_by_3.0_80x15.png'),
'mail' => 'mail' =>
array('backend' => 'mail', array('backend' => 'mail',
'params' => null, 'params' => null,
'domain_check' => true), 'domain_check' => true),
'nickname' => 'nickname' =>
array('blacklist' => array(), array('blacklist' => [],
'featured' => array()), 'featured' => []),
'profile' => 'profile' =>
array('banned' => array(), array('banned' => [],
'biolimit' => null, 'biolimit' => null,
'changenick' => false, 'changenick' => false,
'allowprivate' => false, // whether to allow setting stream to private ("only followers can read") 'allowprivate' => false, // whether to allow setting stream to private ("only followers can read")
'backup' => false, // can cause DoS, so should be done via CLI 'backup' => false, // can cause DoS, so should be done via CLI
'restore' => false, 'restore' => false,
'delete' => false, 'delete' => false,
'move' => true), 'move' => true),
'image' => 'image' =>
array('jpegquality' => 85), array('jpegquality' => 85),
'avatar' => 'avatar' =>
array('server' => null, array('server' => null,
'dir' => PUBLICDIR . '/avatar/', 'dir' => PUBLICDIR . '/avatar/',
'path' => $_path . '/avatar/', 'path' => $_path . '/avatar/',
'ssl' => null, 'ssl' => null,
'maxsize' => 300), 'maxsize' => 300),
'foaf' => 'foaf' =>
array( array(
'mbox_sha1sum' => false, 'mbox_sha1sum' => false,
), ),
'public' => 'public' =>
array('localonly' => false, array('localonly' => false,
'blacklist' => array(), 'blacklist' => [],
'autosource' => array()), 'autosource' => []),
'theme' => 'theme' =>
array('server' => null, array('server' => null,
'dir' => null, 'dir' => null,
'path'=> null, 'path' => null,
'ssl' => null), 'ssl' => null),
'usertheme' => 'usertheme' =>
array('linkcolor' => 'black', array('linkcolor' => 'black',
'backgroundcolor' => 'black'), 'backgroundcolor' => 'black'),
'theme_upload' => 'theme_upload' =>
array('enabled' => extension_loaded('zip')), array('enabled' => extension_loaded('zip')),
'javascript' => 'javascript' =>
array('server' => null, array('server' => null,
'path'=> null, 'path' => null,
'ssl' => null, 'ssl' => null,
'bustframes' => true), 'bustframes' => true),
'local' => // To override path/server for themes in 'local' dir (not currently applied to local plugins) 'local' => // To override path/server for themes in 'local' dir (not currently applied to local plugins)
array('server' => null, array('server' => null,
'dir' => null, 'dir' => null,
'path' => null, 'path' => null,
'ssl' => null), 'ssl' => null),
'throttle' => 'throttle' =>
array('enabled' => false, // whether to throttle edits; false by default array('enabled' => false, // whether to throttle edits; false by default
'count' => 20, // number of allowed messages in timespan 'count' => 20, // number of allowed messages in timespan
'timespan' => 600), // timespan for throttling 'timespan' => 600), // timespan for throttling
'invite' => 'invite' =>
array('enabled' => true), array('enabled' => true),
'tag' => 'tag' =>
array('dropoff' => 864000.0, # controls weighting based on age array('dropoff' => 864000.0, # controls weighting based on age
'cutoff' => 86400 * 90), # only look at notices posted in last 90 days 'cutoff' => 86400 * 90), # only look at notices posted in last 90 days
'popular' => 'popular' =>
array('dropoff' => 864000.0, # controls weighting based on age array('dropoff' => 864000.0, # controls weighting based on age
'cutoff' => 86400 * 90), # only look at notices favorited in last 90 days 'cutoff' => 86400 * 90), # only look at notices favorited in last 90 days
'daemon' => 'daemon' =>
array('piddir' => sys_get_temp_dir(), array('piddir' => sys_get_temp_dir(),
'user' => false, 'user' => false,
'group' => false), 'group' => false),
'emailpost' => 'emailpost' =>
array('enabled' => false), array('enabled' => false),
'sms' => 'sms' =>
array('enabled' => false), array('enabled' => false),
'twitterimport' => 'twitterimport' =>
array('enabled' => false), array('enabled' => false),
'integration' => 'integration' =>
array('source' => 'StatusNet', # source attribute for Twitter array('source' => 'StatusNet', # source attribute for Twitter
'taguri' => null), # base for tag URIs 'taguri' => null), # base for tag URIs
'twitter' => 'twitter' =>
array('signin' => true, array('signin' => true,
'consumer_key' => null, 'consumer_key' => null,
'consumer_secret' => null), 'consumer_secret' => null),
'cache' => 'cache' =>
array('base' => null), array('base' => null),
'ping' => 'ping' =>
array('notify' => array(), array('notify' => [],
'timeout' => 2), 'timeout' => 2),
'inboxes' => 'inboxes' =>
array('enabled' => true), # ignored after 0.9.x array('enabled' => true), # ignored after 0.9.x
'newuser' => 'newuser' =>
array('default' => null, array('default' => null,
'welcome' => null), 'welcome' => null),
'linkify' => array( 'linkify' => array(
// "bare" below means "without schema", like domain.com vs. https://domain.com // "bare" below means "without schema", like domain.com vs. https://domain.com
'bare_domains' => false, // convert domain.com to <a href="http://domain.com/" ...>domain.com</a> ? 'bare_domains' => false, // convert domain.com to <a href="http://domain.com/" ...>domain.com</a> ?
@ -224,183 +224,183 @@ $default =
'bare_ipv6' => false, // convert IPv6 addresses to hyperlinks? 'bare_ipv6' => false, // convert IPv6 addresses to hyperlinks?
), ),
'attachments' => 'attachments' =>
array('server' => null, array('server' => null,
'dir' => INSTALLDIR . '/file/', 'dir' => INSTALLDIR . '/file/',
'path' => $_path . '/file/', 'path' => $_path . '/file/',
'sslserver' => null, 'sslserver' => null,
'sslpath' => null, 'sslpath' => null,
'ssl' => null, 'ssl' => null,
'supported' => array( 'supported' => array(
'application/vnd.oasis.opendocument.chart' => 'odc', 'application/vnd.oasis.opendocument.chart' => 'odc',
'application/vnd.oasis.opendocument.formula' => 'odf', 'application/vnd.oasis.opendocument.formula' => 'odf',
'application/vnd.oasis.opendocument.graphics' => 'odg', 'application/vnd.oasis.opendocument.graphics' => 'odg',
'application/vnd.oasis.opendocument.graphics-template' => 'otg', 'application/vnd.oasis.opendocument.graphics-template' => 'otg',
'application/vnd.oasis.opendocument.image' => 'odi', 'application/vnd.oasis.opendocument.image' => 'odi',
'application/vnd.oasis.opendocument.presentation' => 'odp', 'application/vnd.oasis.opendocument.presentation' => 'odp',
'application/vnd.oasis.opendocument.presentation-template' => 'otp', 'application/vnd.oasis.opendocument.presentation-template' => 'otp',
'application/vnd.oasis.opendocument.spreadsheet' => 'ods', 'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots', 'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots',
'application/vnd.oasis.opendocument.text' => 'odt', 'application/vnd.oasis.opendocument.text' => 'odt',
'application/vnd.oasis.opendocument.text-master' => 'odm', 'application/vnd.oasis.opendocument.text-master' => 'odm',
'application/vnd.oasis.opendocument.text-template' => 'ott', 'application/vnd.oasis.opendocument.text-template' => 'ott',
'application/vnd.oasis.opendocument.text-web' => 'oth', 'application/vnd.oasis.opendocument.text-web' => 'oth',
'application/pdf' => 'pdf', 'application/pdf' => 'pdf',
'application/zip' => 'zip', 'application/zip' => 'zip',
'application/x-bzip2' => 'bz2', 'application/x-bzip2' => 'bz2',
'application/x-go-sgf' => 'sgf', 'application/x-go-sgf' => 'sgf',
'application/xml' => 'xml', 'application/xml' => 'xml',
'application/gpx+xml' => 'gpx', 'application/gpx+xml' => 'gpx',
image_type_to_mime_type(IMAGETYPE_PNG) => image_type_to_extension(IMAGETYPE_PNG), image_type_to_mime_type(IMAGETYPE_PNG) => image_type_to_extension(IMAGETYPE_PNG),
image_type_to_mime_type(IMAGETYPE_JPEG) => image_type_to_extension(IMAGETYPE_JPEG), image_type_to_mime_type(IMAGETYPE_JPEG) => image_type_to_extension(IMAGETYPE_JPEG),
image_type_to_mime_type(IMAGETYPE_GIF) => image_type_to_extension(IMAGETYPE_GIF), image_type_to_mime_type(IMAGETYPE_GIF) => image_type_to_extension(IMAGETYPE_GIF),
'image/svg+xml' => 'svg', // No built-in constant 'image/svg+xml' => 'svg', // No built-in constant
image_type_to_mime_type(IMAGETYPE_ICO) => image_type_to_extension(IMAGETYPE_ICO), image_type_to_mime_type(IMAGETYPE_ICO) => image_type_to_extension(IMAGETYPE_ICO),
'audio/ogg' => 'ogg', 'audio/ogg' => 'ogg',
'audio/mpeg' => 'mpg', 'audio/mpeg' => 'mpg',
'audio/x-speex' => 'spx', 'audio/x-speex' => 'spx',
'application/ogg' => 'ogx', 'application/ogg' => 'ogx',
'text/plain' => 'txt', 'text/plain' => 'txt',
'video/mpeg' => 'mpeg', 'video/mpeg' => 'mpeg',
'video/mp4' => 'mp4', 'video/mp4' => 'mp4',
'video/ogg' => 'ogv', 'video/ogg' => 'ogv',
'video/quicktime' => 'mov', 'video/quicktime' => 'mov',
'video/webm' => 'webm', 'video/webm' => 'webm',
), ),
'file_quota' => common_get_preferred_php_upload_limit(), 'file_quota' => common_get_preferred_php_upload_limit(),
'user_quota' => 50000000, 'user_quota' => 50000000,
'monthly_quota' => 15000000, 'monthly_quota' => 15000000,
'uploads' => true, 'uploads' => true,
'show_html' => false, // show (filtered) text/html attachments (and oEmbed HTML etc.). Doesn't affect AJAX calls. 'show_html' => false, // show (filtered) text/html attachments (and oEmbed HTML etc.). Doesn't affect AJAX calls.
'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info 'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info
'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages. 'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages.
'extblacklist' => [], 'extblacklist' => [],
'memory_limit' => '1024M' // PHP's memory limit to use temporarily when handling images 'memory_limit' => '1024M' // PHP's memory limit to use temporarily when handling images
), ),
'thumbnail' => [ 'thumbnail' => [
'dir' => null, // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/') 'dir' => null, // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/')
'path' => null, // falls back to generating a URL with File::url('thumb/$filename') (equivalent to ['attachments']['path'] . '/thumb/') 'path' => null, // falls back to generating a URL with File::url('thumb/$filename') (equivalent to ['attachments']['path'] . '/thumb/')
'server' => null, // Only used if ['thumbnail']['path'] is NOT empty, and then it falls back to ['site']['server'], schema is decided from GNUsocial::useHTTPS() 'server' => null, // Only used if ['thumbnail']['path'] is NOT empty, and then it falls back to ['site']['server'], schema is decided from GNUsocial::useHTTPS()
'crop' => false, // overridden to true if thumb height === null 'crop' => false, // overridden to true if thumb height === null
'maxsize' => 1000, // thumbs with an edge larger than this will not be generated 'maxsize' => 1000, // thumbs with an edge larger than this will not be generated
'width' => 450, 'width' => 450,
'height' => 600, 'height' => 600,
'upscale' => false, 'upscale' => false,
'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin 'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin
], ],
'application' => 'application' =>
array('desclimit' => null), array('desclimit' => null),
'group' => 'group' =>
array('maxaliases' => 3, array('maxaliases' => 3,
'desclimit' => null, 'desclimit' => null,
'addtag' => true), 'addtag' => true),
'peopletag' => 'peopletag' =>
array('maxtags' => 100, // maximum number of tags a user can create. array('maxtags' => 100, // maximum number of tags a user can create.
'maxpeople' => 500, // maximum no. of people with the same tag by the same user 'maxpeople' => 500, // maximum no. of people with the same tag by the same user
'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true) 'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true)
'desclimit' => null), 'desclimit' => null),
'search' => 'search' =>
array('type' => 'like'), array('type' => 'like'),
'sessions' => 'sessions' =>
array('handle' => false, // whether to handle sessions ourselves array('handle' => false, // whether to handle sessions ourselves
'debug' => false, // debugging output for sessions 'debug' => false, // debugging output for sessions
'gc_limit' => 1000), // max sessions to expire at a time 'gc_limit' => 1000), // max sessions to expire at a time
'htmlfilter' => [ // remove tags from user/remotely generated HTML if they are === true 'htmlfilter' => [ // remove tags from user/remotely generated HTML if they are === true
'img' => true, 'img' => true,
'video' => true, 'video' => true,
'audio' => true, 'audio' => true,
], ],
'htmlpurifier' => [ // configurable options for HTMLPurifier 'htmlpurifier' => [ // configurable options for HTMLPurifier
'Cache.DefinitionImpl' => 'Serializer', 'Cache.DefinitionImpl' => 'Serializer',
'Cache.SerializerPath' => implode(DIRECTORY_SEPARATOR, [sys_get_temp_dir(), 'gnusocial']), 'Cache.SerializerPath' => implode(DIRECTORY_SEPARATOR, [sys_get_temp_dir(), 'gnusocial']),
], ],
'notice' => 'notice' =>
array('contentlimit' => null, array('contentlimit' => null,
'allowprivate' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers. 'allowprivate' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers.
'defaultscope' => null, // null means 1 if site/private, 0 otherwise 'defaultscope' => null, // null means 1 if site/private, 0 otherwise
'hidespam' => true), // Whether to hide silenced users from timelines 'hidespam' => true), // Whether to hide silenced users from timelines
'message' => 'message' =>
array('contentlimit' => null), array('contentlimit' => null),
'location' => 'location' =>
array('share' => 'user', // whether to share location; 'always', 'user', 'never' array('share' => 'user', // whether to share location; 'always', 'user', 'never'
'sharedefault' => false), 'sharedefault' => false),
'logincommand' => 'logincommand' =>
array('disabled' => true), array('disabled' => true),
'plugins' => 'plugins' =>[
array('core' => array( 'core' => [
'ActivityVerb' => array(), 'Activity' => [],
'ActivityVerbPost' => array(), 'ActivityModeration' => [],
'ActivityModeration' => array(), 'ActivityVerb' => [],
'AuthCrypt' => array(), 'ActivityVerbPost' => [],
'Cronish' => array(), 'AuthCrypt' => [],
'Favorite' => array(), 'Favorite' => [],
'HTMLPurifierSchemes' => array(), 'HTMLPurifierSchemes' => [],
'Share' => array(), 'Share' => [],
'LRDD' => array(), ],
), 'default' => [
'default' => array( 'AntiBrute' => [],
'Activity' => array(), 'Blacklist' => [],
'AntiBrute' => array(), 'Bookmark' => [],
'Blacklist' => array(), 'ClientSideShorten' => [],
'Bookmark' => array(), 'Cronish' => [],
'ClientSideShorten' => array(), 'DefaultLayout' => [],
'DefaultLayout' => array(), 'DirectMessage' => [],
'Directory' => array(), 'Directory' => [],
'DirectMessage' => array(), 'EmailAuthentication' => [],
'EmailAuthentication' => array(), 'Embed' => [],
'Event' => array(), 'Event' => [],
'Embed' => array(), 'LRDD' => [],
'OpenID' => array(), 'Nodeinfo' => [],
'OpportunisticQM' => array(), 'OpenID' => [],
'ActivityPub' => array(), 'OpportunisticQM' => [],
'OStatus' => array(), 'ActivityPub' => [], // The order is important here (IT HAS TO COME BEFORE OSTATUS)
'Poll' => array(), 'OStatus' => [],
'SimpleCaptcha' => array(), 'Poll' => [],
'TagSub' => array(), 'SimpleCaptcha' => [],
'WebFinger' => array(), 'TagSub' => [],
'Nodeinfo' => array(), 'WebFinger' => [],
), ],
'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,
'sslserver' => null, 'sslserver' => null,
'path' => null, 'path' => null,
'sslpath' => null, 'sslpath' => null,
), ],
'admin' => 'admin' =>
array('panels' => array('site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')), array('panels' => array('site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')),
'singleuser' => 'singleuser' =>
array('enabled' => false, array('enabled' => false,
'nickname' => null), 'nickname' => null),
'robotstxt' => 'robotstxt' =>
array('crawldelay' => 0, array('crawldelay' => 0,
'disallow' => array('main', 'settings', 'admin', 'search', 'message') 'disallow' => array('main', 'settings', 'admin', 'search', 'message')
), ),
'api' => 'api' =>
array('realm' => null), array('realm' => null),
'nofollow' => 'nofollow' =>
array('subscribers' => true, array('subscribers' => true,
'members' => true, 'members' => true,
'peopletag' => true, 'peopletag' => true,
'external' => 'sometimes'), // Options: 'sometimes', 'never', default = 'sometimes' 'external' => 'sometimes'), // Options: 'sometimes', 'never', default = 'sometimes'
'url' => 'url' =>
array('shortener' => 'internal', array('shortener' => 'internal',
'maxurllength' => 100, 'maxurllength' => 100,
'maxnoticelength' => -1), 'maxnoticelength' => -1),
'http' => // HTTP client settings when contacting other sites 'http' => // HTTP client settings when contacting other sites
array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt') (this activates "ssl_verify_peer") array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt') (this activates "ssl_verify_peer")
'ssl_verify_host' => true, // HTTPRequest2 makes sure this is set to CURLOPT_SSL_VERIFYHOST==2 if using curl 'ssl_verify_host' => true, // HTTPRequest2 makes sure this is set to CURLOPT_SSL_VERIFYHOST==2 if using curl
'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.) 'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)
'connect_timeout' => 5, 'connect_timeout' => 5,
'timeout' => intval(ini_get('default_socket_timeout')), // effectively should be this by default already, but this makes it more explicitly configurable for you users .) 'timeout' => intval(ini_get('default_socket_timeout')), // effectively should be this by default already, but this makes it more explicitly configurable for you users .)
'proxy_host' => null, 'proxy_host' => null,
'proxy_port' => null, 'proxy_port' => null,
'proxy_user' => null, 'proxy_user' => null,
'proxy_password' => null, 'proxy_password' => null,
'proxy_auth_scheme' => null, 'proxy_auth_scheme' => null,
), ),
'router' => 'router' =>
array('cache' => true), // whether to cache the router object. Defaults to true, turn off for devel array('cache' => true), // whether to cache the router object. Defaults to true, turn off for devel
'discovery' => 'discovery' =>
array('cors' => false), // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.) array('cors' => false), // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
'performance' => array('high' => false) // disable some features for higher performance; default false 'performance' => array('high' => false) // disable some features for higher performance; default false
); );

View File

@ -82,7 +82,7 @@ class Event {
* on results of handlers. * on results of handlers.
*/ */
public static function handle($name, array $args=array()) { public static function handle($name, array $args = []) {
$result = null; $result = null;
if (array_key_exists($name, Event::$_handlers)) { if (array_key_exists($name, Event::$_handlers)) {
foreach (Event::$_handlers[$name] as $handler) { foreach (Event::$_handlers[$name] as $handler) {

View File

@ -30,7 +30,7 @@ class GNUsocial
protected static $plugins = array(); protected static $plugins = array();
/** /**
* Configure and instantiate a plugin into the current configuration. * Configure and instantiate a plugin (or a core module) into the current configuration.
* Class definitions will be loaded from standard paths if necessary. * Class definitions will be loaded from standard paths if necessary.
* Note that initialization events won't be fired until later. * Note that initialization events won't be fired until later.
* *
@ -39,7 +39,7 @@ class GNUsocial
* *
* @throws ServerException if plugin can't be found * @throws ServerException if plugin can't be found
*/ */
public static function addPlugin($name, array $attrs=array()) public static function addPlugin($name, array $attrs = [])
{ {
$name = ucfirst($name); $name = ucfirst($name);
@ -54,12 +54,16 @@ class GNUsocial
if (!class_exists($pluginclass)) { if (!class_exists($pluginclass)) {
$files = array("local/plugins/{$pluginclass}.php", $files = [
"local/plugins/{$name}/{$pluginclass}.php", "local/plugins/{$pluginclass}.php",
"local/{$pluginclass}.php", "local/plugins/{$name}/{$pluginclass}.php",
"local/{$name}/{$pluginclass}.php", "local/{$pluginclass}.php",
"plugins/{$pluginclass}.php", "local/{$name}/{$pluginclass}.php",
"plugins/{$name}/{$pluginclass}.php"); "modules/{$pluginclass}.php",
"modules/{$name}/{$pluginclass}.php",
"plugins/{$pluginclass}.php",
"plugins/{$name}/{$pluginclass}.php"
];
foreach ($files as $file) { foreach ($files as $file) {
$fullpath = INSTALLDIR.'/'.$file; $fullpath = INSTALLDIR.'/'.$file;

View File

@ -64,9 +64,9 @@ class Plugin
} }
/** /**
* Load related modules when needed * Load related components when needed
* *
* Most non-trivial plugins will require extra modules to do their work. Typically * Most non-trivial plugins will require extra components to do their work. Typically
* these include data classes, action classes, widget classes, or external libraries. * these include data classes, action classes, widget classes, or external libraries.
* *
* This method receives a class name and loads the PHP file related to that class. By * This method receives a class name and loads the PHP file related to that class. By
@ -79,11 +79,14 @@ class Plugin
* *
* @param string $cls Name of the class to be loaded * @param string $cls Name of the class to be loaded
* *
* @return boolean hook value; true means continue processing, false means stop. * @return bool hook value; true means continue processing, false means stop.
*/ */
public function onAutoload($cls) { public function onAutoload($cls) {
$cls = basename($cls); $cls = basename($cls);
$basedir = INSTALLDIR . '/local/plugins/' . mb_substr(get_called_class(), 0, -6); $basedir = INSTALLDIR . '/local/plugins/' . mb_substr(get_called_class(), 0, -6);
if (!file_exists($basedir)) {
$basedir = INSTALLDIR . '/modules/' . mb_substr(get_called_class(), 0, -6);
}
if (!file_exists($basedir)) { if (!file_exists($basedir)) {
$basedir = INSTALLDIR . '/plugins/' . mb_substr(get_called_class(), 0, -6); $basedir = INSTALLDIR . '/plugins/' . mb_substr(get_called_class(), 0, -6);
} }
@ -92,17 +95,17 @@ class Plugin
if (preg_match('/^(\w+)(Action|Form)$/', $cls, $type)) { if (preg_match('/^(\w+)(Action|Form)$/', $cls, $type)) {
$type = array_map('strtolower', $type); $type = array_map('strtolower', $type);
$file = "$basedir/{$type[2]}s/{$type[1]}.php"; $file = "{$basedir}/{$type[2]}s/{$type[1]}.php";
} }
if (!file_exists($file)) { if (!file_exists($file)) {
$file = "$basedir/classes/{$cls}.php"; $file = "{$basedir}/classes/{$cls}.php";
// library files can be put into subdirs ('_'->'/' conversion) // library files can be put into subdirs ('_'->'/' conversion)
// such as LRDDMethod_WebFinger -> lib/lrddmethod/webfinger.php // such as LRDDMethod_WebFinger -> lib/lrddmethod/webfinger.php
if (!file_exists($file)) { if (!file_exists($file)) {
$type = strtolower($cls); $type = strtolower($cls);
$type = str_replace('_', '/', $type); $type = str_replace('_', '/', $type);
$file = "$basedir/lib/{$type}.php"; $file = "{$basedir}/lib/{$type}.php";
} }
} }
@ -127,9 +130,12 @@ class Plugin
if (!$path) { if (!$path) {
// @fixme this will fail for things installed in local/plugins // @fixme this will fail for things installed in local/plugins
// ... but then so will web links so far. // ... but then so will web links so far.
$path = INSTALLDIR . "/plugins/$name/locale"; $path = INSTALLDIR . "/plugins/{$name}/locale";
if (!file_exists($path)) { if (!file_exists($path)) {
$path = INSTALLDIR . "/local/plugins/$name/locale"; $path = INSTALLDIR . "/modules/{$name}/locale";
}
if (!file_exists($path)) {
$path = INSTALLDIR . "/local/plugins/{$name}/locale";
} }
} }
if (file_exists($path) && is_dir($path)) { if (file_exists($path) && is_dir($path)) {
@ -206,8 +212,10 @@ class Plugin
if (empty($path)) { if (empty($path)) {
// XXX: extra stat(). // XXX: extra stat().
if (@file_exists(PUBLICDIR.'/local/plugins/'.$plugin.'/'.$relative)) { if (@file_exists(PUBLICDIR . '/local/plugins/' . $plugin . '/' . $relative)) {
$path = common_config('site', 'path') . '/local/plugins/'; $path = common_config('site', 'path') . '/local/plugins/';
} elseif (@file_exists(PUBLICDIR . '/modules/' . $plugin . '/' . $relative)) {
$path = common_config('site', 'path') . '/modules/';
} else { } else {
$path = common_config('site', 'path') . '/plugins/'; $path = common_config('site', 'path') . '/plugins/';
} }

Some files were not shown because too many files have changed in this diff Show More