X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=c9b0e36eacfd0aa0ec6c35451ae8fcccedff15e2;hb=84022083410088f9ed00433485a4b076fec79ab8;hp=5e6e511f18f32d8b420f2058613eb3d0f5905e28;hpb=0aafc0bfe768be99f3d487ddff1d9cb6c156cead;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 5e6e511f18..c9b0e36eac 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -2181,7 +2181,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 +2316,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 */ @@ -4660,6 +4659,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 } /************************************************************************//** @@ -5362,6 +5385,161 @@ $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['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['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 +6356,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 +6366,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 */