X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=3da6ec7dfdc993af55ed3b8d2d7573989f884c94;hb=c53ccc605f1128eefebda9378116fd18223b1ec2;hp=7ab734b33b9c8365b5b6e28e32ee3a3e60c6b921;hpb=9830c1577a864e6c975af22a39cc42f77fbe6f83;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 7ab734b33b..3da6ec7dfd 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'; @@ -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 * @@ -1043,6 +1043,7 @@ $wgSMTP = false; /** * Additional email parameters, will be passed as the last argument to mail() call. + * If using safe_mode this has no effect */ $wgAdditionalMailParams = null; @@ -1601,6 +1602,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 @@ -1657,6 +1666,17 @@ $wgUseETag = false; */ $wgClockSkewFudge = 5; +/** + * 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. + */ +$wgInvalidateCacheOnLocalSettingsChange = true; + /** @} */ # end of cache settings /************************************************************************//** @@ -2241,11 +2261,32 @@ $wgUseSiteCss = true; $wgEnableTooltipsAndAccesskeys = true; /** - * Break out of framesets. This can be used to prevent external sites from - * framing your site with ads. + * Break out of framesets. This can be used to prevent clickjacking attacks, + * or to prevent external sites from framing your site with ads. */ $wgBreakFrames = false; +/** + * The X-Frame-Options header to send on pages sensitive to clickjacking + * attacks, such as edit pages. This prevents those pages from being displayed + * in a frame or iframe. The options are: + * + * - 'DENY': Do not allow framing. This is recommended for most wikis. + * + * - 'SAMEORIGIN': Allow framing by pages on the same domain. This can be used + * to allow framing within a trusted domain. This is insecure if there + * is a page on the same domain which allows framing of arbitrary URLs. + * + * - false: Allow all framing. This opens up the wiki to XSS attacks and thus + * full compromise of local user accounts. Private wikis behind a + * corporate firewall are especially vulnerable. This is not + * recommended. + * + * For extra safety, set $wgBreakFrames = true, to prevent framing on all pages, + * not just edit pages. + */ +$wgEditPageFrameOptions = 'DENY'; + /** * Disable output compression (enabled by default if zlib is available) */ @@ -2262,6 +2303,51 @@ $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 is the name of a block that the icons will be wrapped in. The final id varies + * 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", + ) + ), +); + +/** + * Login / create account link behavior when it's possible for anonymous users to create an account + * true = use a combined login / create account link + * false = split login and create account into two separate links + */ +$wgUseCombinedLoginLink = true; + /** * Search form behavior for Vector skin only * true = use an icon search button @@ -2439,8 +2525,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 @@ -2810,12 +2903,6 @@ $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 */ @@ -3257,8 +3344,10 @@ $wgGroupsRemoveFromSelf = array(); * Set of available actions that can be restricted via action=protect * You probably shouldn't change this. * Translated through restriction-* messages. + * Title::getRestrictionTypes() will remove restrictions that are not + * applicable to a specific title (upload currently) */ -$wgRestrictionTypes = array( 'edit', 'move' ); +$wgRestrictionTypes = array( 'edit', 'move', 'upload' ); /** * Rights which can be required for each protection level (via action=protect) @@ -3805,8 +3894,8 @@ $wgUseTrackbacks = false; * Use full paths. */ $wgParserTestFiles = array( - "$IP/maintenance/tests/parser/parserTests.txt", - "$IP/maintenance/tests/parser/ExtraParserTests.txt" + "$IP/tests/parser/parserTests.txt", + "$IP/tests/parser/extraParserTests.txt" ); /** @@ -4067,8 +4156,13 @@ $wgReadOnly = null; $wgReadOnlyFile = false; /** - * If this is set to some string, this opens up config/index.php for upgrades - * when needed. You will need to provide this key to use it + * 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; @@ -4383,7 +4477,10 @@ $wgParserOutputHooks = array(); /** * List of valid skin names. - * The key should be the name in all lower case, the value should be a display name. + * The key should be the name in all lower case, the value should be a properly + * cased name for the skin. This value will be prefixed with "Skin" to create the + * class name of the skin to load, and if the skin's class cannot be found through + * the autoloader it will be used to load a .php file by that name in the skins directory. * The default skins will be added later, by Skin::getSkinNames(). Use * Skin::getSkinNames() as an accessor if you wish to have access to the full list. */ @@ -5161,37 +5258,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 */ @@ -5199,8 +5265,6 @@ $wgEnableSelenium = false; $wgSeleniumTestConfigs = array(); $wgSeleniumConfigFile = null; - - /** * For really cool vim folding this needs to be at the end: * vim: foldmarker=@{,@} foldmethod=marker