X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=c892629defc9e9be2c0bf2fc0f975825de6e8ac2;hb=e2a7988178698b4369c7963d20610ee622db3ee7;hp=5e6e511f18f32d8b420f2058613eb3d0f5905e28;hpb=174f34a86de3162bc673fd3bc6bed815cccf0edc;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 5e6e511f18..c892629def 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -661,12 +661,6 @@ $wgCacheSharedUploads = true; */ $wgAllowCopyUploads = false; -/** - * Allow asynchronous copy uploads. - * This feature is experimental and broken as of r81612. - */ -$wgAllowAsyncCopyUploads = false; - /** * A list of domains copy uploads can come from * @@ -697,17 +691,6 @@ $wgCopyUploadProxy = false; */ $wgCopyUploadTimeout = false; -/** - * Different timeout for upload by url when run as a background job - * This could be useful since when fetching large files via job queue, - * you may want a different timeout, especially because there is no - * http request being kept alive. - * - * false means fallback to $wgCopyUploadTimeout. - * @since 1.22 - */ -$wgCopyUploadAsyncTimeout = false; - /** * Max size for uploads, in bytes. If not set to an array, applies to all * uploads. If set to an array, per upload type maximums can be set, using the @@ -960,6 +943,12 @@ $wgUseImageMagick = false; */ $wgImageMagickConvertCommand = '/usr/bin/convert'; +/** + * Array of max pixel areas for interlacing per MIME type + * @since 1.27 + */ +$wgMaxInterlacingAreas = array(); + /** * Sharpening parameter to ImageMagick */ @@ -1639,12 +1628,6 @@ $wgEnotifImpersonal = false; */ $wgEnotifMaxRecips = 500; -/** - * Send mails via the job queue. This can be useful to reduce the time it - * takes to save a page that a lot of people are watching. - */ -$wgEnotifUseJobQ = false; - /** * Use real name instead of username in e-mail "from" field. */ @@ -1882,24 +1865,6 @@ $wgDBservers = false; */ $wgLBFactoryConf = array( 'class' => 'LBFactorySimple' ); -/** - * The ID of the current data center - * @since 1.27 - */ -$wgDataCenterId = 'default'; - -/** - * Map of data center IDs to their role ("master" or "slave") - * - * Multiple data centers can be setup to handle MediaWiki, with HTTP - * POSTs routed to the master data center and GET/HEAD/OPTION routed to - * any data center (usually the closest to the end user). In such setups, - * this setting should be set to the appropriate value in the site - * config for each data center. - * @since 1.27 - */ -$wgDataCenterRoles = array( 'default' => 'master' ); - /** * After a state-changing request is done by a client, this determines * how many seconds that client should keep using the master datacenter. @@ -2181,7 +2146,7 @@ $wgMessageCacheType = CACHE_ANYTHING; $wgParserCacheType = CACHE_ANYTHING; /** - * The cache type for storing session data. Used if $wgSessionsInObjectCache is true. + * The cache type for storing session data. * * For available types see $wgMainCacheType. */ @@ -2316,30 +2281,29 @@ $wgParserCacheExpireTime = 86400; * * @deprecated since 1.20; Use $wgSessionsInObjectCache */ -$wgSessionsInMemcached = false; +$wgSessionsInMemcached = true; /** - * Store sessions in an object cache, configured by $wgSessionCacheType. This - * can be useful to improve performance, or to avoid the locking behavior of - * PHP's default session handler, which tends to prevent multiple requests for - * the same user from acting concurrently. + * @deprecated since 1.27, session data is always stored in object cache. */ -$wgSessionsInObjectCache = false; +$wgSessionsInObjectCache = true; /** - * The expiry time to use for session storage when $wgSessionsInObjectCache is - * enabled, in seconds. + * The expiry time to use for session storage, in seconds. */ $wgObjectCacheSessionExpiry = 3600; /** - * This is used for setting php's session.save_handler. In practice, you will - * almost never need to change this ever. Other options might be 'user' or - * 'session_mysql.' Setting to null skips setting this entirely (which might be - * useful if you're doing cross-application sessions, see bug 11381) + * @deprecated since 1.27, MediaWiki\\Session\\SessionManager doesn't use PHP session storage. */ $wgSessionHandler = null; +/** + * Whether to use PHP session handling ($_SESSION and session_*() functions) + * @var string 'enable', 'warn', or 'disable' + */ +$wgPHPSessionHandling = 'enable'; + /** * If enabled, will send MemCached debugging information to $wgDebugLogFile */ @@ -3706,7 +3670,15 @@ $wgResourceLoaderValidateStaticJS = false; * @endcode * @since 1.22 */ -$wgResourceLoaderLESSVars = array(); +$wgResourceLoaderLESSVars = array( + /** + * Minimum available screen width at which a device can be considered a tablet/desktop + * The number is currently based on the device width of a Samsung Galaxy S5 mini and is low + * enough to cover iPad (768px). Number is prone to change with new information. + * @since 1.27 + */ + 'deviceWidthTablet' => '720px', +); /** * Default import paths for LESS modules. LESS files referenced in @import @@ -4660,6 +4632,30 @@ $wgUserrightsInterwikiDelimiter = '@'; */ $wgSecureLogin = false; +/** + * MediaWiki\Session\SessionProvider configuration. + * + * Value is an array of ObjectFactory specifications for the SessionProviders + * to be used. Keys in the array are ignored. Order is not significant. + * + * @since 1.27 + */ +$wgSessionProviders = array( + 'MediaWiki\\Session\\CookieSessionProvider' => array( + 'class' => 'MediaWiki\\Session\\CookieSessionProvider', + 'args' => array( array( + 'priority' => 30, + 'callUserSetCookiesHook' => true, + ) ), + ), + 'MediaWiki\\Session\\BotPasswordSessionProvider' => array( + 'class' => 'MediaWiki\\Session\\BotPasswordSessionProvider', + 'args' => array( array( + 'priority' => 40, + ) ), + ), +); + /** @} */ # end user accounts } /************************************************************************//** @@ -4871,7 +4867,6 @@ $wgGroupPermissions['sysop']['patrol'] = true; $wgGroupPermissions['sysop']['autopatrol'] = true; $wgGroupPermissions['sysop']['protect'] = true; $wgGroupPermissions['sysop']['editprotected'] = true; -$wgGroupPermissions['sysop']['proxyunbannable'] = true; $wgGroupPermissions['sysop']['rollback'] = true; $wgGroupPermissions['sysop']['upload'] = true; $wgGroupPermissions['sysop']['reupload'] = true; @@ -5362,6 +5357,164 @@ $wgQueryPageDefaultLimit = 50; */ $wgPasswordAttemptThrottle = array( 'count' => 5, 'seconds' => 300 ); +/** + * @var Array Map of (grant => right => boolean) + * Users authorize consumers (like Apps) to act on their behalf but only with + * a subset of the user's normal account rights (signed off on by the user). + * The possible rights to grant to a consumer are bundled into groups called + * "grants". Each grant defines some rights it lets consumers inherit from the + * account they may act on behalf of. Note that a user granting a right does + * nothing if that user does not actually have that right to begin with. + * @since 1.27 + */ +$wgGrantPermissions = array(); + +// @TODO: clean up grants +// @TODO: auto-include read/editsemiprotected rights? + +$wgGrantPermissions['basic']['autoconfirmed'] = true; +$wgGrantPermissions['basic']['autopatrol'] = true; +$wgGrantPermissions['basic']['autoreview'] = true; +$wgGrantPermissions['basic']['editsemiprotected'] = true; +$wgGrantPermissions['basic']['ipblock-exempt'] = true; +$wgGrantPermissions['basic']['nominornewtalk'] = true; +$wgGrantPermissions['basic']['patrolmarks'] = true; +$wgGrantPermissions['basic']['purge'] = true; +$wgGrantPermissions['basic']['read'] = true; +$wgGrantPermissions['basic']['skipcaptcha'] = true; +$wgGrantPermissions['basic']['torunblocked'] = true; +$wgGrantPermissions['basic']['writeapi'] = true; + +$wgGrantPermissions['highvolume']['bot'] = true; +$wgGrantPermissions['highvolume']['apihighlimits'] = true; +$wgGrantPermissions['highvolume']['noratelimit'] = true; +$wgGrantPermissions['highvolume']['markbotedits'] = true; + +$wgGrantPermissions['editpage']['edit'] = true; +$wgGrantPermissions['editpage']['minoredit'] = true; +$wgGrantPermissions['editpage']['applychangetags'] = true; +$wgGrantPermissions['editpage']['changetags'] = true; + +$wgGrantPermissions['editprotected'] = $wgGrantPermissions['editpage']; +$wgGrantPermissions['editprotected']['editprotected'] = true; + +$wgGrantPermissions['editmycssjs'] = $wgGrantPermissions['editpage']; +$wgGrantPermissions['editmycssjs']['editmyusercss'] = true; +$wgGrantPermissions['editmycssjs']['editmyuserjs'] = true; + +$wgGrantPermissions['editmyoptions']['editmyoptions'] = true; + +$wgGrantPermissions['editinterface'] = $wgGrantPermissions['editpage']; +$wgGrantPermissions['editinterface']['editinterface'] = true; +$wgGrantPermissions['editinterface']['editusercss'] = true; +$wgGrantPermissions['editinterface']['edituserjs'] = true; + +$wgGrantPermissions['createeditmovepage'] = $wgGrantPermissions['editpage']; +$wgGrantPermissions['createeditmovepage']['createpage'] = true; +$wgGrantPermissions['createeditmovepage']['createtalk'] = true; +$wgGrantPermissions['createeditmovepage']['move'] = true; +$wgGrantPermissions['createeditmovepage']['move-rootuserpages'] = true; +$wgGrantPermissions['createeditmovepage']['move-subpages'] = true; +$wgGrantPermissions['createeditmovepage']['move-categorypages'] = true; + +$wgGrantPermissions['uploadfile']['upload'] = true; +$wgGrantPermissions['uploadfile']['reupload-own'] = true; + +$wgGrantPermissions['uploadeditmovefile'] = $wgGrantPermissions['uploadfile']; +$wgGrantPermissions['uploadeditmovefile']['reupload'] = true; +$wgGrantPermissions['uploadeditmovefile']['reupload-shared'] = true; +$wgGrantPermissions['uploadeditmovefile']['upload_by_url'] = true; +$wgGrantPermissions['uploadeditmovefile']['movefile'] = true; +$wgGrantPermissions['uploadeditmovefile']['suppressredirect'] = true; + +$wgGrantPermissions['patrol']['patrol'] = true; + +$wgGrantPermissions['rollback']['rollback'] = true; + +$wgGrantPermissions['blockusers']['block'] = true; +$wgGrantPermissions['blockusers']['blockemail'] = true; + +$wgGrantPermissions['viewdeleted']['browsearchive'] = true; +$wgGrantPermissions['viewdeleted']['deletedhistory'] = true; +$wgGrantPermissions['viewdeleted']['deletedtext'] = true; + +$wgGrantPermissions['delete'] = $wgGrantPermissions['editpage'] + + $wgGrantPermissions['viewdeleted']; +$wgGrantPermissions['delete']['delete'] = true; +$wgGrantPermissions['delete']['bigdelete'] = true; +$wgGrantPermissions['delete']['deletelogentry'] = true; +$wgGrantPermissions['delete']['deleterevision'] = true; +$wgGrantPermissions['delete']['undelete'] = true; + +$wgGrantPermissions['protect'] = $wgGrantPermissions['editprotected']; +$wgGrantPermissions['protect']['protect'] = true; + +$wgGrantPermissions['viewmywatchlist']['viewmywatchlist'] = true; + +$wgGrantPermissions['editmywatchlist']['editmywatchlist'] = true; + +$wgGrantPermissions['sendemail']['sendemail'] = true; + +$wgGrantPermissions['createaccount']['createaccount'] = true; + +/** + * @var Array Map of grants to their UI grouping + * @since 1.27 + */ +$wgGrantPermissionGroups = array( + // Hidden grants are implicitly present + 'basic' => 'hidden', + + 'editpage' => 'page-interaction', + 'createeditmovepage' => 'page-interaction', + 'editprotected' => 'page-interaction', + 'patrol' => 'page-interaction', + + 'uploadfile' => 'file-interaction', + 'uploadeditmovefile' => 'file-interaction', + + 'sendemail' => 'email', + + 'viewmywatchlist' => 'watchlist-interaction', + 'editviewmywatchlist' => 'watchlist-interaction', + + 'editmycssjs' => 'customization', + 'editmyoptions' => 'customization', + + 'editinterface' => 'administration', + 'rollback' => 'administration', + 'blockusers' => 'administration', + 'delete' => 'administration', + 'viewdeleted' => 'administration', + 'protect' => 'administration', + 'createaccount' => 'administration', + + 'highvolume' => 'high-volume', +); + +/** + * @var bool Whether to enable bot passwords + * @since 1.27 + */ +$wgEnableBotPasswords = true; + +/** + * Cluster for the bot_passwords table + * @var string|bool If false, the normal cluster will be used + * @since 1.27 + */ +$wgBotPasswordsCluster = false; + +/** + * Database name for the bot_passwords table + * + * To use a database with a table prefix, set this variable to + * "{$database}-{$prefix}". + * @var string|bool If false, the normal database will be used + * @since 1.27 + */ +$wgBotPasswordsDatabase = false; + /** @} */ # end of user rights settings /************************************************************************//** @@ -6178,7 +6331,8 @@ $wgRCEngines = array( $wgRCWatchCategoryMembership = false; /** - * Use RC Patrolling to check for vandalism + * Use RC Patrolling to check for vandalism (from recent changes and watchlists) + * New pages and new files are included. */ $wgUseRCPatrol = true; @@ -6187,6 +6341,13 @@ $wgUseRCPatrol = true; */ $wgUseNPPatrol = true; +/** + * Use file patrolling to check new files on Special:Newfiles + * + * @since 1.27 + */ +$wgUseFilePatrol = true; + /** * Log autopatrol actions to the log table */ @@ -6720,7 +6881,6 @@ $wgJobClasses = array( 'sendMail' => 'EmaillingJob', 'enotifNotify' => 'EnotifNotifyJob', 'fixDoubleRedirect' => 'DoubleRedirectJob', - 'uploadFromUrl' => 'UploadFromUrlJob', 'AssembleUploadChunks' => 'AssembleUploadChunksJob', 'PublishStashedFile' => 'PublishStashedFileJob', 'ThumbnailRender' => 'ThumbnailRenderJob', @@ -7506,7 +7666,6 @@ $wgHTTPConnectTimeout = 5e0; /************************************************************************//** * @name Job queue - * See also $wgEnotifUseJobQ. * @{ */