X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=c09f2afe145d510981a53ca434c96e37b8ccf5ca;hb=64078f2ce68e3679dfa315247d5e70a8a7f0f5d1;hp=933767356db3c7e6ae903f2ef0dee841a0f4db1c;hpb=2c1e550b6f652e2a649a82c1e67fd8a423f1c28e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 933767356d..c09f2afe14 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1461,27 +1461,27 @@ $wgDjvuOutputExtension = 'jpg'; $wgEmergencyContact = false; /** - * Password reminder email address. + * Sender email address for e-mail notifications. * - * The address we should use as sender when a user is requesting his password. + * The address we use as sender when a user requests a password reminder. * * Defaults to "apache@$wgServerName". */ $wgPasswordSender = false; /** - * Password reminder name + * Sender name for e-mail notifications. * * @deprecated since 1.23; use the system message 'emailsender' instead. */ $wgPasswordSenderName = 'MediaWiki Mail'; /** - * Dummy address which should be accepted during mail send action. - * It might be necessary to adapt the address or to set it equal - * to the $wgEmergencyContact address. + * Reply-To address for e-mail notifications. + * + * Defaults to $wgPasswordSender. */ -$wgNoReplyAddress = 'reply@not.possible.invalid'; +$wgNoReplyAddress = false; /** * Set to true to enable the e-mail basic features: @@ -1500,7 +1500,7 @@ $wgEnableUserEmail = true; * Set to true to put the sending user's email in a Reply-To header * instead of From. ($wgEmergencyContact will be used as From.) * - * Some mailers (eg sSMTP) set the SMTP envelope sender to the From value, + * Some mailers (eg SMTP) set the SMTP envelope sender to the From value, * which can cause problems with SPF validation and leak recipient addresses * when bounces are sent to the sender. */ @@ -2096,7 +2096,7 @@ $wgTransactionalTimeLimit = 120; /** * Directory for caching data in the local filesystem. Should not be accessible - * from the web. Set this to false to not use any local caches. + * from the web. * * Note: if multiple wikis share the same localisation cache directory, they * must all have the same set of extensions. You can set a directory just for @@ -3574,24 +3574,6 @@ $wgResourceLoaderMinifierMaxLineLength = 1000; */ $wgIncludeLegacyJavaScript = true; -/** - * Whether to ensure the mediawiki.util is loaded before other modules. - * - * Before MediaWiki 1.19, modules used to load less asynchronous which allowed - * modules to lack dependencies on 'popular' modules that were likely loaded already. - * - * This setting is to aid scripts during migration by providing mediawiki.util - * unconditionally (which was the most commonly missed dependency). It doesn't - * cover all missing dependencies obviously but should fix most of them. - * - * This should be removed at some point after site/user scripts have been fixed. - * Enable this if your wiki has a large amount of user/site scripts that are - * lacking dependencies. - * - * @deprecated since 1.26: Always declare dependencies. - */ -$wgPreloadJavaScriptMwUtil = false; - /** * Whether or not to assign configuration variables to the global window object. * @@ -4875,6 +4857,7 @@ $wgGroupPermissions['sysop']['undelete'] = true; $wgGroupPermissions['sysop']['editinterface'] = true; $wgGroupPermissions['sysop']['editusercss'] = true; $wgGroupPermissions['sysop']['edituserjs'] = true; +$wgGroupPermissions['sysop']['editcontentmodel'] = true; $wgGroupPermissions['sysop']['import'] = true; $wgGroupPermissions['sysop']['importupload'] = true; $wgGroupPermissions['sysop']['move'] = true; @@ -5190,7 +5173,7 @@ $wgHideUserContribLimit = 1000; /** * Number of accounts each IP address may create, 0 to disable. * - * @warning Requires memcached + * @warning Requires $wgMainCacheType to be enabled */ $wgAccountCreationThrottle = 0; @@ -5371,9 +5354,23 @@ $wgQueryPageDefaultLimit = 50; /** * Limit password attempts to X attempts per Y seconds per IP per account. * - * @warning Requires memcached. - */ -$wgPasswordAttemptThrottle = [ 'count' => 5, 'seconds' => 300 ]; + * Value is an array of arrays. Each sub-array must have a key for count + * (ie count of how many attempts before throttle) and a key for seconds. + * If the key 'allIPs' (case sensitive) is present, then the limit is + * just per account instead of per IP per account. + * + * @since 1.27 allIps support and multiple limits added in 1.27. Prior + * to 1.27 this only supported having a single throttle. + * @warning Requires $wgMainCacheType to be enabled + */ +$wgPasswordAttemptThrottle = [ + // Short term limit + [ 'count' => 5, 'seconds' => 300 ], + // Long term limit. We need to balance the risk + // of somebody using this as a DoS attack to lock someone + // out of their account, and someone doing a brute force attack. + [ 'count' => 150, 'seconds' => 60*60*48 ], +]; /** * @var Array Map of (grant => right => boolean) @@ -5958,7 +5955,7 @@ $wgCachePrefix = false; /** * Display the new debugging toolbar. This also enables profiling on database * queries and other useful output. - * Will disable file cache. + * Will be ignored if $wgUseFileCache or $wgUseSquid is enabled. * * @since 1.19 */ @@ -7188,6 +7185,7 @@ $wgLogActionsHandlers = [ 'block/reblock' => 'BlockLogFormatter', 'block/unblock' => 'BlockLogFormatter', 'contentmodel/change' => 'ContentModelLogFormatter', + 'contentmodel/new' => 'ContentModelLogFormatter', 'delete/delete' => 'DeleteLogFormatter', 'delete/event' => 'DeleteLogFormatter', 'delete/restore' => 'DeleteLogFormatter', @@ -7729,7 +7727,11 @@ $wgUpdateRowsPerQuery = 100; */ /** - * Name of the external diff engine to use + * Name of the external diff engine to use. Supported values: + * * false: default PHP implementation, DairikiDiff + * * 'wikidiff2': Wikimedia's fast difference engine implemented as a PHP/HHVM module + * * 'wikidiff3': newer PHP-based difference engine + * * any other string is treated as a path to external diff executable */ $wgExternalDiffEngine = false;