X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=fd8ec0575ea4494cdcccfc57937d3446714660ea;hb=fdc2dc77a3996b490074a6fe3908ec9787be5b9a;hp=f71ddd13a73469ea93eb4201fa8fa6fa66d09717;hpb=fae70256447bcd2d1d2d899d5d61b57d68c5c93b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index f71ddd13a7..fd8ec0575e 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -26,7 +26,6 @@ if( !defined( 'MEDIAWIKI' ) ) { die( 1 ); } - # Create a site configuration object. Not used for much in a default install if ( !defined( 'MW_PHP4' ) ) { require_once( "$IP/includes/SiteConfiguration.php" ); @@ -35,7 +34,7 @@ if ( !defined( 'MW_PHP4' ) ) { /** @endcond */ /** MediaWiki version number */ -$wgVersion = '1.17alpha'; +$wgVersion = '1.18alpha'; /** Name of the site. It must be changed in LocalSettings.php */ $wgSitename = 'MediaWiki'; @@ -73,7 +72,7 @@ $wgServer = $wgProto.'://' . $serverName; # If the port is a non-standard one, add it to the URL if( isset( $_SERVER['SERVER_PORT'] ) && !strpos( $serverName, ':' ) - && ( ( $wgProto == 'http' && $_SERVER['SERVER_PORT'] != 80 ) + && ( ( $wgProto == 'http' && $_SERVER['SERVER_PORT'] != 80 ) || ( $wgProto == 'https' && $_SERVER['SERVER_PORT'] != 443 ) ) ) { $wgServer .= ":" . $_SERVER['SERVER_PORT']; @@ -140,7 +139,6 @@ $wgScript = false; * Defaults to "{$wgScriptPath}/redirect{$wgScriptExtension}". */ $wgRedirectScript = false; ///< defaults to -/**@}*/ /** * The URL path to load.php. @@ -149,6 +147,8 @@ $wgRedirectScript = false; ///< defaults to */ $wgLoadScript = false; +/**@}*/ + /************************************************************************//** * @name URLs and file paths * @@ -258,6 +258,14 @@ $wgTmpDirectory = false; */ $wgUploadBaseUrl = ""; +/** + * To enable remote on-demand scaling, set this to the thumbnail base URL. + * Full thumbnail URL will be like $wgUploadStashScalerBaseUrl/e/e6/Foo.jpg/123px-Foo.jpg + * where 'e6' are the first two characters of the MD5 hash of the file name. + * If $wgUploadStashScalerBaseUrl is set to false, thumbs are rendered locally as needed. + */ +$wgUploadStashScalerBaseUrl = false; + /** * To set 'pretty' URL paths for actions other than * plain page views, add to this array. For instance: @@ -496,9 +504,9 @@ $wgRepositoryBaseUrl = "http://commons.wikimedia.org/wiki/File:"; * This is the list of preferred extensions for uploading files. Uploading files * with extensions not in this list will trigger a warning. * - * WARNING: If you add any OpenOffice or Microsoft Office file formats here, - * such as odt or doc, and untrusted users are allowed to upload files, then - * your wiki will be vulnerable to cross-site request forgery (CSRF). + * WARNING: If you add any OpenOffice or Microsoft Office file formats here, + * such as odt or doc, and untrusted users are allowed to upload files, then + * your wiki will be vulnerable to cross-site request forgery (CSRF). */ $wgFileExtensions = array( 'png', 'gif', 'jpg', 'jpeg' ); @@ -536,7 +544,7 @@ $wgMimeTypeBlacklist = array( 'application/x-opc+zip', ); -/** +/** * This is a flag to determine whether or not to check file extensions on upload. * * WARNING: setting this to false is insecure for public wikis. @@ -547,7 +555,7 @@ $wgCheckFileExtensions = true; * If this is turned off, users may override the warning for files not covered * by $wgFileExtensions. * - * WARNING: setting this to false is insecure for public wikis. + * WARNING: setting this to false is insecure for public wikis. */ $wgStrictFileExtensions = true; @@ -886,7 +894,7 @@ $wgThumbLimits = array( * Default parameters for the tag */ $wgGalleryOptions = array ( - 'imagesPerRow' => 4, // Default number of images per-row in the gallery + 'imagesPerRow' => 0, // Default number of images per-row in the gallery. 0 -> Adapt to screensize 'imageWidth' => 120, // Width of the cells containing images in galleries (in "px") 'imageHeight' => 120, // Height of the cells containing images in galleries (in "px") 'captionLength' => 20, // Length of caption to truncate (in characters) @@ -968,16 +976,21 @@ $wgEmergencyContact = 'wikiadmin@' . $serverName; * * The address we should use as sender when a user is requesting his password. */ -$wgPasswordSender = 'MediaWiki Mail '; +$wgPasswordSender = 'apache@' . $serverName; -unset($serverName); # Don't leak local variables to global scope +unset( $serverName ); # Don't leak local variables to global scope + +/** + * Password reminder name + */ +$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. */ -$wgNoReplyAddress = 'reply@not.possible'; +$wgNoReplyAddress = 'reply@not.possible'; /** * Set to true to enable the e-mail basic features: @@ -1028,8 +1041,10 @@ $wgNewPasswordExpiry = 3600 * 24 * 7; */ $wgSMTP = false; -/** For email notification on page changes */ -$wgPasswordSender = $wgEmergencyContact; +/** + * Additional email parameters, will be passed as the last argument to mail() call. + */ +$wgAdditionalMailParams = null; /** * True: from page editor if s/he opted-in. False: Enotif mails appear to come @@ -1437,7 +1452,7 @@ $wgCacheDirectory = false; * - CACHE_ANYTHING: Use anything, as long as it works * - CACHE_NONE: Do not cache * - CACHE_DB: Store cache objects in the DB - * - CACHE_MEMCACHED: MemCached, must specify servers in $wgMemCacheServers + * - CACHE_MEMCACHED: MemCached, must specify servers in $wgMemCachedServers * - CACHE_ACCEL: eAccelerator, APC, XCache or WinCache * - CACHE_DBA: Use PHP's DBA extension to store in a DBM-style * database. This is slow, and is not recommended for @@ -1586,6 +1601,14 @@ $wgUseFileCache = false; */ $wgFileCacheDirectory = false; +/** + * Depth of the subdirectory hierarchy to be created under + * $wgFileCacheDirectory. The subdirectories will be named based on + * the MD5 hash of the title. A value of 0 means all cache files will + * be put directly into the main file cache directory. + */ +$wgFileCacheDepth = 2; + /** * Keep parsed pages in a cache (objectcache table or memcached) * to speed up output of the same page viewed by another user with the @@ -1629,7 +1652,10 @@ $wgSidebarCacheExpiry = 86400; */ $wgUseGzip = false; -/** Whether MediaWiki should send an ETag header */ +/** + * Whether MediaWiki should send an ETag header. Seems to cause + * broken behavior with Squid 2.6, see bug 7098. + */ $wgUseETag = false; /** Clock skew or the one-second resolution of time() can occasionally cause cache @@ -1640,39 +1666,15 @@ $wgUseETag = false; $wgClockSkewFudge = 5; /** - * Maximum time in seconds to cache resources served by the resource loader - */ -$wgResourceLoaderMaxage = array( - 'versioned' => array( - // Squid/Varnish but also any other public proxy cache between the client and MediaWiki - 'server' => 30 * 24 * 60 * 60, // 30 days - // On the client side (e.g. in the browser cache). - 'client' => 30 * 24 * 60 * 60, // 30 days - ), - 'unversioned' => array( - 'server' => 5 * 60, // 5 minutes - 'client' => 5 * 60, // 5 minutes - ), -); - -/** - * Whether to embed private modules inline with HTML output or to bypass caching and check the user parameter against - * $wgUser to prevent unauthorized access to private modules. - */ -$wgResourceLoaderInlinePrivateModules = true; - -/** - * The default debug mode (on/off) for of ResourceLoader requests. This will still - * be overridden when the debug URL parameter is used. - */ -$wgResourceLoaderDebug = false; - -/** - * Enable embedding of certain resources using Edge Side Includes. This will - * improve performance but only works if there is something in front of the - * web server (e..g a Squid or Varnish server) configured to process the ESI. + * Invalidate various caches when LocalSettings.php changes. This is equivalent + * to setting $wgCacheEpoch to the modification time of LocalSettings.php, as + * was previously done in the default LocalSettings.php file. + * + * On high-traffic wikis, this should be set to false, to avoid the need to + * check the file modification time, and to avoid the performance impact of + * unnecessary cache invalidations. */ -$wgResourceLoaderUseESI = false; +$wgInvalidateCacheOnLocalSettingsChange = true; /** @} */ # end of cache settings @@ -1966,6 +1968,9 @@ $wgDisableLangConversion = false; /** Whether to enable language variant conversion for links. */ $wgDisableTitleConversion = false; +/** Whether to enable cononical language links in meta data. */ +$wgCanonicalLanguageLinks = true; + /** Default variant code, if false, the default will be the language code */ $wgDefaultLanguageVariant = false; @@ -2276,6 +2281,45 @@ $wgDisableOutputCompression = false; */ $wgExperimentalHtmlIds = true; +/** + * Abstract list of footer icons for skins in place of old copyrightico and poweredbyico code + * You can add new icons to the built in copyright or poweredby, or you can create + * a new block. Though note that you may need to add some custom css to get good styling + * of new blocks in monobook. vector and modern should work without any special css. + * + * $wgFooterIcons itself is a key/value array. + * The key os the name of a block that the icons will be wrapped in. + * The final id varries by skin; Monobook and Vector will turn poweredby into f-poweredbyico + * while Modern turns it into mw_poweredby. + * The value is a key/value array of icons. The key may or may not be used by the + * skin but it can be used to find the icon and unset it or change the icon if needed. + * This is useful for disabling icons that are set by extensions. + * The value should be either a string or an array. + * If it is a string it will be output directly, however some skins may choose to ignore it. + * An array is the preferred format for the icon, the following keys are used: + * src: An absolute url to the image to use for the icon, this is recommended + * but not required, however some skins will ignore icons without an image + * url: The url to use in the arround the text or icon, if not set an will not be outputted + * alt: This is the text form of the icon, it will be displayed without an image in + * skins like Modern or if src is not set, and will otherwise be used as + * the alt="" for the image. This key is required. + * width and height: If the icon specified by src is not of the standard size + * you can specify the size of image to use with these keys. + * Otherwise they will default to the standard 88x31. + */ +$wgFooterIcons = array( + "copyright" => array( + "copyright" => array(), // placeholder for the built in copyright icon + ), + "poweredby" => array( + "mediawiki" => array( + "src" => null, // Defaults to "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" + "url" => "http://www.mediawiki.org/", + "alt" => "Powered by MediaWiki", + ) + ), +); + /** * Search form behavior for Vector skin only * true = use an icon search button @@ -2308,6 +2352,65 @@ $wgBetterDirectionality = false; /** @} */ # End of output format settings } +/*************************************************************************//** + * @name Resource loader settings + * @{ + */ + +/** + * Client-side resource modules. Extensions should add their module definitions + * here. + * + * Example: + * $wgResourceModules['ext.myExtension'] = array( + * 'scripts' => 'myExtension.js', + * 'styles' => 'myExtension.css', + * 'dependencies' => array( 'jquery.cookie', 'jquery.tabIndex' ), + * 'localBasePath' => dirname( __FILE__ ), + * 'remoteExtPath' => 'MyExtension', + * ); + */ +$wgResourceModules = array(); + +/** + * Maximum time in seconds to cache resources served by the resource loader + */ +$wgResourceLoaderMaxage = array( + 'versioned' => array( + // Squid/Varnish but also any other public proxy cache between the client and MediaWiki + 'server' => 30 * 24 * 60 * 60, // 30 days + // On the client side (e.g. in the browser cache). + 'client' => 30 * 24 * 60 * 60, // 30 days + ), + 'unversioned' => array( + 'server' => 5 * 60, // 5 minutes + 'client' => 5 * 60, // 5 minutes + ), +); + +/** + * Whether to embed private modules inline with HTML output or to bypass + * caching and check the user parameter against $wgUser to prevent + * unauthorized access to private modules. + */ +$wgResourceLoaderInlinePrivateModules = true; + +/** + * The default debug mode (on/off) for of ResourceLoader requests. This will still + * be overridden when the debug URL parameter is used. + */ +$wgResourceLoaderDebug = false; + +/** + * Enable embedding of certain resources using Edge Side Includes. This will + * improve performance but only works if there is something in front of the + * web server (e..g a Squid or Varnish server) configured to process the ESI. + */ +$wgResourceLoaderUseESI = false; + +/** @} */ # End of resource loader settings } + + /*************************************************************************//** * @name Page title and interwiki link settings * @{ @@ -2394,8 +2497,15 @@ $wgNamespaceAliases = array(); */ $wgLegalTitleChars = " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z\\\\^_`a-z~\\x80-\\xFF+"; -$wgLocalInterwiki = 'w'; -$wgInterwikiExpiry = 10800; # Expiry time for cache of interwiki table +/** + * The interwiki prefix of the current wiki, or false if it doesn't have one. + */ +$wgLocalInterwiki = false; + +/** + * Expiry time for cache of interwiki table + */ +$wgInterwikiExpiry = 10800; /** Interwiki caching settings. $wgInterwikiCache specifies path to constant database file @@ -2765,6 +2875,12 @@ $wgMinimalPasswordLength = 1; */ $wgLivePasswordStrengthChecks = false; +/** + * List of weak passwords which shouldn't be allowed. + * The items should be in lowercase. The check is case insensitive. + */ +$wgWeakPasswords = array( 'password', 'passpass', 'passpass1' ); + /** * Maximum number of Unicode characters in signature */ @@ -2826,6 +2942,7 @@ $wgDefaultUserOptions = array( 'imagesize' => 2, 'justify' => 0, 'math' => 1, + 'minordefault' => 0, 'newpageshidepatrolled' => 0, 'nocache' => 0, 'noconvertlink' => 0, @@ -2949,6 +3066,19 @@ $wgAutocreatePolicy = 'login'; */ $wgAllowPrefChange = array(); +/** + * This is to let user authenticate using https when they come from http. + * Based on an idea by George Herbert on wikitech-l: + * http://lists.wikimedia.org/pipermail/wikitech-l/2010-October/050065.html + * @since 1.17 + */ +$wgSecureLogin = false; +/** + * Default for 'use secure login' checkbox + * @since 1.17 + */ +$wgSecureLoginStickHTTPS = false; + /** @} */ # end user accounts } /************************************************************************//** @@ -3116,6 +3246,7 @@ $wgGroupPermissions['sysop']['browsearchive'] = true; $wgGroupPermissions['sysop']['noratelimit'] = true; $wgGroupPermissions['sysop']['movefile'] = true; $wgGroupPermissions['sysop']['unblockself'] = true; +$wgGroupPermissions['sysop']['suppressredirect'] = true; #$wgGroupPermissions['sysop']['mergehistory'] = true; // Permission to change users' group assignments @@ -3134,6 +3265,11 @@ $wgGroupPermissions['bureaucrat']['noratelimit'] = true; // For private suppression log access #$wgGroupPermissions['suppress']['suppressionlog'] = true; +// Permission to disable user accounts +// Note that disabling an account is not reversible without a system administrator +// who has direct access to the database +#$wgGroupPermissions['bureaucrat']['disableaccount'] = true; + /** * The developer group is deprecated, but can be activated if need be * to use the 'lockdb' and 'unlockdb' special pages. Those require @@ -3416,8 +3552,6 @@ $wgRateLimitsExcludedGroups = array(); /** * Array of IPs which should be excluded from rate limits. * This may be useful for whitelisting NAT gateways for conferences, etc. - * Wiki administrators can add additional IP addresses via - * [[MediaWiki:Ratelimit-excluded-ips]] */ $wgRateLimitsExcludedIPs = array(); @@ -3988,7 +4122,7 @@ $wgMaintenanceScripts = array(); */ $wgReadOnly = null; -/*** +/** * If this lock file exists (size > 0), the wiki will be forced into read-only mode. * Its contents will be shown to users as part of the read-only warning * message. @@ -3997,6 +4131,17 @@ $wgReadOnly = null; */ $wgReadOnlyFile = false; +/** + * When you run the web-based upgrade utility, it will tell you what to set + * this to in order to authorize the upgrade process. It will subsequently be + * used as a password, to authorize further upgrades. + * + * For security, do not set this to a guessable string. Use the value supplied + * by the install/upgrade process. To cause the upgrader to generate a new key, + * delete the old key from LocalSettings.php. + */ +$wgUpgradeKey = false; + /** @} */ # End of maintenance } /************************************************************************//** @@ -4558,6 +4703,7 @@ $wgLogActions = array( 'protect/unprotect' => 'unprotectedarticle', 'protect/move_prot' => 'movedarticleprotection', 'rights/rights' => 'rightslogentry', + 'rights/disable' => 'disableaccount-logentry', 'delete/delete' => 'deletedarticle', 'delete/restore' => 'undeletedarticle', 'delete/revision' => 'revdelete-logentry', @@ -5085,37 +5231,6 @@ $wgPoolCounterConf = null; */ $wgUploadMaintenance = false; -/** - * The location of the MediaWiki package repository to use. - * - * @since 1.17 - * @var string - */ -$wgRepositoryApiLocation = 'http://www.mediawiki.org/w/api.php'; - -/** - * The location of the remote web interface for the selected repository. - * - * @since 1.17 - * @var string - */ -$wgRepositoryLocation = 'http://www.mediawiki.org/wiki/Special:Repository'; - -/** - * List of package states to filter update detection and extension listing on. - * - * @since 1.17 - * @var array - */ -$wgRepositoryPackageStates = array( - //'dev', - //'alpha', - 'beta', - //'rc', - 'stable', - //'deprecated', -); - /** * Allows running of selenium tests via maintenance/tests/RunSeleniumTests.php */ @@ -5123,8 +5238,6 @@ $wgEnableSelenium = false; $wgSeleniumTestConfigs = array(); $wgSeleniumConfigFile = null; - - /** * For really cool vim folding this needs to be at the end: * vim: foldmarker=@{,@} foldmethod=marker