X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=004cc5e10559fefd91dead0cc2736f1bcd9b352b;hb=ffd7b6829ec2a9e692fec0ebd7b1bdee626280f8;hp=1c9f69da6ee9912413762695db12544c3a3957d8;hpb=776b54b8eb3c36465ae45559a302d913e3d0c7d3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1c9f69da6e..004cc5e105 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -31,8 +31,11 @@ if( isset( $_SERVER['SERVER_NAME'] ) ) {
 	$wgServerName = $_SERVER['SERVER_NAME'];
 } elseif( isset( $_SERVER['HOSTNAME'] ) ) {
 	$wgServerName = $_SERVER['HOSTNAME'];
+} elseif( isset( $_SERVER['HTTP_HOST'] ) ) {
+	$wgServerName = $_SERVER['HTTP_HOST'];
+} elseif( isset( $_SERVER['SERVER_ADDR'] ) ) {
+	$wgServerName = $_SERVER['SERVER_ADDR'];
 } else {
-	# FIXME: Fall back on... something else?
 	$wgServerName = 'localhost';
 }
 
@@ -102,6 +105,11 @@ $wgTmpDirectory     = "{$wgUploadDirectory}/tmp";
 $wgUploadBaseUrl    = "";
 /**#@-*/
 
+/**
+ * Produce hashed HTML article paths. Used internally, do not set.
+ */ 
+$wgMakeDumpLinks = false;
+
 /**
  * To set 'pretty' URL paths for actions other than
  * plain page views, add to this array. For instance:
@@ -342,12 +350,9 @@ $wgLanguageFile     = false;
 /** Treat language links as magic connectors, not inline links */
 $wgInterwikiMagic	= true;
 
-/** LanguageUtf8.php normally overrides this */
-$wgInputEncoding	= 'ISO-8859-1';
-/** unless you set the next option to true: */
-$wgOutputEncoding	= 'ISO-8859-1'; 
-/** Enable ISO-8859-1 compatibility mode */
-$wgUseLatin1 		= false;
+/** We speak UTF-8 all the time now, unless some oddities happen */
+$wgInputEncoding	= 'UTF-8';
+$wgOutputEncoding	= 'UTF-8'; 
 $wgEditEncoding		= '';
 
 # Set this to eg 'ISO-8859-1' to perform character set
@@ -367,7 +372,9 @@ $wgDTD				= 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd';
 /** Enable to allow rewriting dates in page text.
  * DOES NOT FORMAT CORRECTLY FOR MOST LANGUAGES */
 $wgUseDynamicDates  = false; 
-/** Enable for English module to print dates as eg 'May 12' instead of '12 May' */
+/** Enable dates like 'May 12' instead of '12 May', this only takes effect if
+ * the interface is set to English
+ */
 $wgAmericanDates    = false; 
 /**
  * For Hindi and Arabic use local numerals instead of Western style (0-9)
@@ -431,7 +438,7 @@ $wgReadOnlyFile         = "{$wgUploadDirectory}/lock_yBgMBwiR";
 /**
  * The debug log file should be not be publicly accessible if it is used, as it
  * may contain private data. */
-$wgDebugLogFile         = 'deb.txt';
+$wgDebugLogFile         = '';
 
 /**#@+
  * @global bool
@@ -477,6 +484,18 @@ $wgUseOldExistenceCheck = false;  # use old prefill link method, for debugging o
  */
 $wgEnableParserCache = true;
 
+/**
+ * Under which condition should a page in the main namespace be counted
+ * as a valid article? If $wgUseCommaCount is set to true, it will be
+ * counted if it contains at least one comma. If it is set to false
+ * (default), it will only be counted if it contains at least one [[wiki
+ * link]]. See http://meta.wikimedia.org/wiki/Help:Article_count
+ *
+ * Retroactively changing this variable will not affect
+ * the existing count (cf. maintenance/recount.sql).
+*/
+$wgUseCommaCount = false;
+
 /**#@-*/
 
 /**
@@ -499,8 +518,8 @@ $wgWhitelistAccount = array ( 'user' => 1, 'sysop' => 1, 'developer' => 1 );
 
 $wgAllowAnonymousMinor = false; # Allow anonymous users to mark changes as 'minor'
 
-$wgSysopUserBans        = false; # Allow sysops to ban logged-in users
-$wgSysopRangeBans		= false; # Allow sysops to ban IP ranges
+$wgSysopUserBans        = true; # Allow sysops to ban logged-in users
+$wgSysopRangeBans		= true; # Allow sysops to ban IP ranges
 
 /** Comma-separated list of options to show on the IP block form. 
   * Use strtotime() format, or "infinite" for an infinite block 
@@ -645,6 +664,10 @@ $wgSquidServersNoPurge = array();
 /** Maximum number of titles to purge in any one client operation */
 $wgMaxSquidPurgeTitles = 400;
 
+/** HTCP multicast purging */
+$wgHTCPPort = 4827;
+$wgHTCPMulticastTTL = 1;
+# $wgHTCPMulticastAddress = "224.0.0.85";
 
 # Cookie settings:
 #
@@ -710,7 +733,7 @@ $wgDisableTextSearch = false;
  */
 $wgDisableSearchUpdate = false;
 /** Uploads have to be specially set up to be secure */
-$wgDisableUploads = true;
+$wgEnableUploads = false;
 /**
  * Set to true to enable the upload _link_ while local uploads are disabled.
  * Assumes that the special page link will be bounced to another server where
@@ -760,7 +783,7 @@ $wgCheckFileExtensions = true;
 $wgStrictFileExtensions = true;
 
 /** Warn if uploaded files are larger than this */
-$wgUploadSizeWarning = 150000;
+$wgUploadSizeWarning = 150 * 1024;
 
 /** For compatibility with old installations set to false */
 $wgPasswordSalt = true; 
@@ -768,10 +791,27 @@ $wgPasswordSalt = true;
 /** Which namespaces should support subpages?
  * See Language.php for a list of namespaces.
  */
-$wgNamespacesWithSubpages = array( -1 => 0, 0 => 0, 1 => 1,
-  2 => 1, 3 => 1, 4 => 0, 5 => 1, 6 => 0, 7 => 1, 8 => 0, 9 => 1, 10 => 0, 11 => 1);
-
-$wgNamespacesToBeSearchedDefault = array( -1 => 0, 0 => 1, 1 => 0,
+$wgNamespacesWithSubpages = array(
+	NS_SPECIAL => 0,
+	NS_MAIN => 0,
+	NS_TALK => 1,
+ 	NS_USER => 1,
+ 	NS_USER_TALK => 1,
+ 	NS_PROJECT => 0,
+ 	NS_PROJECT_TALK => 1,
+ 	NS_IMAGE => 0,
+ 	NS_IMAGE_TALK => 1,
+ 	NS_MEDIAWIKI => 0,
+ 	NS_MEDIAWIKI_TALK => 1,
+ 	NS_TEMPLATE => 0,
+ 	NS_TEMPLATE_TALK => 1,
+ 	NS_HELP => 0,
+ 	NS_HELP_TALK => 1,
+ 	NS_CATEGORY => 0,
+ 	NS_CATEGORY_TALK => 1
+ );
+
+$wgNamespacesToBeSearchedDefault = array( NS_SPECIAL => 0, 0 => 1, 1 => 0,
   2 => 0, 3 => 0, 4 => 0, 5 => 0, 6 => 0, 7 => 0, 8 => 0, 9 => 1, 10 => 0, 11 => 1 );
 
 /** If set, a bold ugly notice will show up at the top of every page. */
@@ -1171,6 +1211,26 @@ $wgNoFollowLinks = true;
  */
 $wgMinimalPasswordLength = 0;
 
+/**
+ * Activate external editor interface for files and pages
+ * See http://meta.wikimedia.org/wiki/Help:External_editors
+ */
+$wgUseExternalEditor = true;
+
+/** Whether or not to sort special pages in Special:Specialpages */
+
+$wgSortSpecialPages = true;
+
+/**
+ * Array of disabled article actions, e.g. view, edit, dublincore, delete, etc.
+ */
+$wgDisabledActions = array();
+
+/**
+ * Use http.dnsbl.sorbs.net to check for open proxies
+ */
+$wgEnableSorbs = true;
+
 } else {
 	die();
 }