[Wikis-SVN] SF.net SVN: wikis:[295]
Brought to you by:
hydria
|
From: <hy...@us...> - 2011-05-23 14:11:39
|
Revision: 295
http://wikis.svn.sourceforge.net/wikis/?rev=295&view=rev
Author: hydria
Date: 2011-05-23 14:11:32 +0000 (Mon, 23 May 2011)
Log Message:
-----------
Updating files
Modified Paths:
--------------
CommonLogos.php
CommonRights.php
CommonSettings.php
InitialiseSettings.php
LocalDatabases.php
UploadDir.php
Modified: CommonLogos.php
===================================================================
--- CommonLogos.php 2011-05-16 12:43:28 UTC (rev 294)
+++ CommonLogos.php 2011-05-23 14:11:32 UTC (rev 295)
@@ -15,13 +15,13 @@
Begin configuration file:
*/
-
+/* WARNING: THIS FILE IS OBSOLETE! IT HAS BEEN REPLACED WITH INITIALISESETTINGS.PHP
// An important configuration:
$wgPath = "http://upload.wikisorg.tk"; //To ease creation of settings to logos.
// Wikis Organisation
if ($wgDBname == "wikiorg_wiki") {
- $wgLogo == "http://upload.wikisorg.tk/wikisorg/main/b/bc/Wiki.png";
+ $wgLogo == "$wgPath/wikisorg/main/b/bc/Wiki.png";
}
// Wikis Organisation Private Wiki
if ($wgDBname == "wikiorg_private") {
@@ -41,7 +41,7 @@
}
// Wikis Labs
#if ($wgDBname == "wikiorg_labs") {
-# $wgLogo = "$wgPath/wikisorg/labs/b/bc/Wiki.png";
+# $wgLogo = "$wgPath/b/bc/Wiki.png";
#}
// Test Wikis
if ($wgDBname == "wikiorg_test") {
@@ -49,7 +49,7 @@
}
// Wikis Usability Initiative
#if ($wgDBname == "wikiorg_usa") {
-# $wgLogo = "$wgPath/wikisorg/usability/b/bc/Wiki.png";
+# $wgLogo = "$wgPath/b/bc/Wiki.png";
#}
// Wikis Translate
if ($wgDBname == "wikiorg_trans") {
@@ -79,8 +79,8 @@
Simple English uses "simple" as the subdomain. But the database is using "sim" for the {{LANGCODE}} due to techinical restrictions.
Please check the databases accordingly. Thanks!
-*/
+
// www
if ($wgDBnane == "wikiorg_compo") {
$wgLogo = "$wgPath/wikicompo/main/b/bc/Wiki.png";
@@ -118,8 +118,8 @@
Wikifood logo configuration starts HERE.
Configuration same as Wikicompo. Please refer above. Thanks.
-*/
+
// www
if ($wgDBname == "wikiorg_food") {
$wgLogo = "$wgPath/wikifood/main/b/bc/Wiki.png";
@@ -136,3 +136,4 @@
if ($wgDBname == "wikiorg_foodde") {
$wgLogo = "$wgPath/wikifood/de/b/bc/Wiki.png";
}
+*/
Modified: CommonRights.php
===================================================================
--- CommonRights.php 2011-05-16 12:43:28 UTC (rev 294)
+++ CommonRights.php 2011-05-23 14:11:32 UTC (rev 295)
@@ -33,6 +33,7 @@
$wgGroupPermissions['user']['minoredit'] = true;
$wgGroupPermissions['user']['purge'] = true; // can use ?action=purge without clicking "ok"
$wgGroupPermissions['user']['sendemail'] = true;
+$wgGroupPermissions['user']['upload'] = false;
// Implicit group for accounts that pass $wgAutoConfirmAge
$wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true;
@@ -59,40 +60,39 @@
#$wgGroupPermissions['bot']['editprotected'] = true; // can edit all protected pages without cascade protection enabled
// Most extra permission abilities go to this group
-$wgGroupPermissions['sysop']['block'] = true;
-$wgGroupPermissions['sysop']['createaccount'] = true;
-$wgGroupPermissions['sysop']['delete'] = true;
-$wgGroupPermissions['sysop']['deletedhistory'] = true; // can view deleted history entries, but not see or restore the text
-$wgGroupPermissions['sysop']['deletedtext'] = true; // can view deleted revision text
-$wgGroupPermissions['sysop']['deleterevision'] = true;
-$wgGroupPermissions['sysop']['undelete'] = true;
-$wgGroupPermissions['sysop']['editinterface'] = true;
-$wgGroupPermissions['sysop']['editusercss'] = true;
-$wgGroupPermissions['sysop']['edituserjs'] = true;
-$wgGroupPermissions['sysop']['import'] = true;
-$wgGroupPermissions['sysop']['move'] = true;
-$wgGroupPermissions['sysop']['move-subpages'] = true;
+$wgGroupPermissions['sysop']['block'] = true;
+$wgGroupPermissions['sysop']['createaccount'] = true;
+$wgGroupPermissions['sysop']['delete'] = true;
+$wgGroupPermissions['sysop']['deletedhistory'] = true; // can view deleted history entries, but not see or restore the text
+$wgGroupPermissions['sysop']['deletedtext'] = true; // can view deleted revision text
+$wgGroupPermissions['sysop']['deleterevision'] = true;
+$wgGroupPermissions['sysop']['undelete'] = true;
+$wgGroupPermissions['sysop']['editinterface'] = true;
+$wgGroupPermissions['sysop']['editusercss'] = true;
+$wgGroupPermissions['sysop']['edituserjs'] = true;
+$wgGroupPermissions['sysop']['import'] = true;
+$wgGroupPermissions['sysop']['move'] = true;
+$wgGroupPermissions['sysop']['move-subpages'] = true;
$wgGroupPermissions['sysop']['move-rootuserpages'] = true;
-$wgGroupPermissions['sysop']['patrol'] = true;
-$wgGroupPermissions['sysop']['autopatrol'] = true;
-$wgGroupPermissions['sysop']['protect'] = true;
-$wgGroupPermissions['sysop']['proxyunbannable'] = true;
-$wgGroupPermissions['sysop']['rollback'] = true;
-$wgGroupPermissions['sysop']['trackback'] = true;
-$wgGroupPermissions['sysop']['upload'] = true;
-$wgGroupPermissions['sysop']['reupload'] = true;
-$wgGroupPermissions['sysop']['reupload-shared'] = true;
-$wgGroupPermissions['sysop']['unwatchedpages'] = true;
-$wgGroupPermissions['sysop']['autoconfirmed'] = true;
-$wgGroupPermissions['sysop']['upload_by_url'] = true;
-$wgGroupPermissions['sysop']['ipblock-exempt'] = true;
-$wgGroupPermissions['sysop']['blockemail'] = true;
-$wgGroupPermissions['sysop']['markbotedits'] = true;
-$wgGroupPermissions['sysop']['apihighlimits'] = true;
-$wgGroupPermissions['sysop']['browsearchive'] = true;
-$wgGroupPermissions['sysop']['noratelimit'] = true;
-$wgGroupPermissions['sysop']['versiondetail'] = true;
-$wgGroupPermissions['sysop']['movefile'] = true;
+$wgGroupPermissions['sysop']['patrol'] = true;
+$wgGroupPermissions['sysop']['autopatrol'] = true;
+$wgGroupPermissions['sysop']['protect'] = true;
+$wgGroupPermissions['sysop']['proxyunbannable'] = true;
+$wgGroupPermissions['sysop']['rollback'] = true;
+$wgGroupPermissions['sysop']['trackback'] = true;
+$wgGroupPermissions['sysop']['upload'] = true;
+$wgGroupPermissions['sysop']['reupload'] = true;
+$wgGroupPermissions['sysop']['reupload-shared'] = true;
+$wgGroupPermissions['sysop']['unwatchedpages'] = true;
+$wgGroupPermissions['sysop']['autoconfirmed'] = true;
+$wgGroupPermissions['sysop']['upload_by_url'] = true;
+$wgGroupPermissions['sysop']['ipblock-exempt'] = true;
+$wgGroupPermissions['sysop']['blockemail'] = true;
+$wgGroupPermissions['sysop']['markbotedits'] = true;
+$wgGroupPermissions['sysop']['apihighlimits'] = true;
+$wgGroupPermissions['sysop']['browsearchive'] = true;
+$wgGroupPermissions['sysop']['noratelimit'] = true;
+$wgGroupPermissions['sysop']['movefile'] = true;
$wgGroupPermissions['sysop']['abusefilter-log-detail'] = true;
$wgGroupPermissions['sysop']['abusefilter-revert'] = true;
$wgGroupPermissions['sysop']['abusefilter-view-private'] = true;
@@ -105,30 +105,27 @@
#$wgGroupPermissions['sysop']['mergehistory'] = true;
// Permission to change users' group assignments
-$wgGroupPermissions['bureaucrat']['userrights'] = true;
+$wgGroupPermissions['bureaucrat']['userrights'] = false;
$wgGroupPermissions['bureaucrat']['noratelimit'] = true;
$wgGroupPermissions['bureaucrat']['override-antispoof'] = true;
-$wgGroupPermissions['bureaucrat']['renameuser'] = false;
+$wgGroupPermissions['bureaucrat']['renameuser'] = false; // Renames are done on Meta by stewards, see below why
$wgAddGroups['bureaucrat'] = array('sysop', 'bot', 'bureaucrat', 'accountcreator', 'transwiki');
$wgRemoveGroups['bureaucrat'] = array('bot', 'accountcreator', 'transwiki', 'sysop');
// Steward's rights(Change global users rights of being a steward at Meta Wiki)
-$wgGroupPermissions['steward']['renameuser'] = true; // Our global user table is very different from Wikimedia, renames will affect all wikis
-$wgGroupPermissions['steward']['userrights-global'] = true;
-$wgGroupPermissions['steward']['userrights'] = true;
-$wgGroupPermissions['steward']['noratelimit'] = true;
-$wgGroupPermissions['steward']['upload'] = true;
-$wgGroupPermissions['steward']['userrights-interwiki'] = true;
-$wgGroupPermissions['steward']['closewikis'] = true; // Used for Extension:CloseWikis to close wikis
-$wgGroupPermissions['steward']['editclosedwikis'] = true; // Right to allow stewards to edit closed wikis
+$wgGroupPermissions['steward']['renameuser'] = false; // Our global user table is very different from Wikimedia, renames will affect all wikis, still being done on Meta
+$wgGroupPermissions['steward']['userrights-global'] = false; // Avoid letting stewards see bad errors
+$wgGroupPermissions['steward']['userrights'] = false; // Want stewards to log right changes only on Meta
+$wgGroupPermissions['steward']['noratelimit'] = true;
+$wgGroupPermissions['steward']['upload'] = true;
// Check users
-$wgGroupPermissions['checkuser']['checkuser'] = true;
-$wgGroupPermissiosn['checkuser']['checkuser-log'] = true;
+$wgGroupPermissions['checkuser']['checkuser'] = true;
+$wgGroupPermissiosn['checkuser']['checkuser-log'] = true;
-// Oversighters(Hide revisions)
-$wgGroupPermissions['oversight']['hiderevision'] = true;
-$wgGroupPermissions['oversight']['oversight'] = true;
+// Oversighters (Hide revisions)
+$wgGroupPermissions['oversight']['hiderevision'] = true;
+$wgGroupPermissions['oversight']['oversight'] = true;
// Rollbackers
$wgGroupPermissions['rollbacker']['rollback'] = true;
@@ -137,19 +134,19 @@
$wgGroupPermissions['abusefilter']['abusefilter-modify'] = true;
// Account creators
-$wgGroupPermissions['accountcreator']['noratelimit'] = true;
+$wgGroupPermissions['accountcreator']['noratelimit'] = true;
$wgGroupPermissions['accountcreator']['override-antispoof'] = true;
-$wgGroupPermissions['accountcreator']['tboverride'] = true;
+$wgGroupPermissions['accountcreator']['tboverride'] = true;
// Importers (should not be given to anyone)
-$wgGroupPermissions['import']['import'] = true;
+$wgGroupPermissions['import']['import'] = true;
$wgGroupPermissions['import']['importupload'] = true;
// Volunteers
-$wgGroupPermissions['volunteer']['delete'] = true;
-$wgGroupPermissions['volunteer']['deletedhistory'] = true;
-$wgGroupPermissions['volunteer']['deleterevision'] = true;
-$wgGroupPermissions['volunteer']['protect'] = true;
+$wgGroupPermissions['volunteer']['delete'] = true;
+$wgGroupPermissions['volunteer']['deletedhistory'] = true;
+$wgGroupPermissions['volunteer']['deleterevision'] = true;
+$wgGroupPermissions['volunteer']['protect'] = true;
$wgGroupPermissions['volunteer']['deletedtext'] = true;
$wgGroupPermissions['volunteer']['undelete'] = true;
$wgGroupPermissions['volunteer']['ipblock-exempt'] = true;
@@ -157,10 +154,48 @@
$wgGroupPermissions['volunteer']['upload'] = true;
$wgGroupPermissions['volunteer']['reupload'] = true;
$wgGroupPermissions['volunteer']['reupload-shared'] = true;
-$wgGroupPermissions['volunteer']['nuke'] = true;
-$wgGroupPermissions['volunteer']['skipcaptcha'] = true;
+$wgGroupPermissions['volunteer']['nuke'] = true;
+$wgGroupPermissions['volunteer']['skipcaptcha'] = true;
+// Global sysops (change global user rights on Global Wiki)
+$wgGroupPermissions['globalsysop']['blockemail'] = true;
+$wgGroupPermissions['globalsysop']['block'] = true;
+$wgGroupPermissions['globalsysop']['ipblock-exempt'] = true;
+$wgGroupPermissions['globalsysop']['proxyunbannable'] = true;
+$wgGroupPermissions['globalsysop']['delete'] = true;
+$wgGroupPermissions['globalsysop']['nuke'] = true;
+$wgGroupPermissions['globalsysop']['suppressredirect'] = true;
+$wgGroupPermissions['globalsysop']['browsearchive'] = true;
+$wgGroupPermissions['globalsysop']['undelete'] = true;
+$wgGroupPermissions['globalsysop']['deletedhistory'] = true;
+$wgGroupPermissions['globalsysop']['protect'] = true;
+$wgGroupPermissions['globalsysop']['editusercssjs'] = true;
+$wgGroupPermissions['globalsysop']['autoconfirmed'] = true;
+$wgGroupPermissions['globalsysop']['editinterface'] = true;
+$wgGroupPermissions['globalsysop']['abusefilter-modify'] = true;
+$wgGroupPermissions['globalsysop']['abusefilter-log-detail'] = true;
+$wgGroupPermissions['globalsysop']['autopatrol'] = true;
+$wgGroupPermissions['globalsysop']['noratelimit'] = true;
+$wgGroupPermissions['globalsysop']['import'] = true;
+$wgGroupPermissions['globalsysop']['patrol'] = true;
+$wgGroupPermissions['globalsysop']['markbotedits'] = true;
+$wgGroupPermissions['globalsysop']['movefile'] = true;
+$wgGroupPermissions['globalsysop']['move'] = true;
+$wgGroupPermissions['globalsysop']['move-subpages'] = true;
+$wgGroupPermissions['globalsysop']['move-rootuserpages'] = true;
+$wgGroupPermissions['globalsysop']['reupload-shared'] = true;
+$wgGroupPermissions['globalsysop']['override-antispoof'] = true;
+$wgGroupPermissions['globalsysop']['tboverride'] = true;
+$wgGroupPermissions['globalsysop']['reupload'] = true;
+$wgGroupPermissions['globalsysop']['skipcaptcha'] = true;
+$wgGroupPermissions['globalsysop']['rollback'] = true;
+$wgGroupPermissions['globalsysop']['upload'] = true;
+$wgGroupPermissions['globalsysop']['apihighlimits'] = true;
+$wgGroupPermissions['globalsysop']['unwatchedpages'] = true;
+// Staffers, disabled until there is a need for it
+#$wgGroupPermissions['staff']['userrights'] = true;
+
// Transwiki importers (HAHA! They are limited to wikis that I choose! No vandalism!!!)
$wgGroupPermissions['transwiki']['import'] = true;
@@ -175,7 +210,8 @@
'wikipedia',
'wikiquote',
'wikisource',
- 'wikibooks'
+ 'wikibooks',
+ 'mw'
);
// Permission to change users' groups assignments across wikis
Modified: CommonSettings.php
===================================================================
--- CommonSettings.php 2011-05-16 12:43:28 UTC (rev 294)
+++ CommonSettings.php 2011-05-23 14:11:32 UTC (rev 295)
@@ -22,7 +22,9 @@
Please note that default extensions should be required immediately without the "if" value!
*/
#$wgSiteNotice = "All [[m:Complete list of projects|Wikis Organisation wikis]] would be upgraded to MediaWiki's 1.17wmf1 from February 6 to February 12. If you don't see this message anymore, that means that we have finished upgrading, sorry for the inconvenience caused!";
-$wogExtensions = "/home/wikiorg/public_html/allextensions"; // If on a different server, please change accordingly
+#$wgSiteNotice = "The software that runs {{SITENAME}} would undergo a minor upgrade today. We apologise for any inconvenience caused.";
+// SITENOTICE CONFIGURATION MOVED TO INITIALISESETTINGS.PHP, MIGHT BE MOVING TO CENTRALNOTICE ON META
+$wogExtensions = "/home/wikiorg/public_html/allextensions";
// Default configuration
# Default address gets rejected by some mail hosts
$wgPasswordSender = 'ad...@wi...';
@@ -34,56 +36,54 @@
$wgUsePathInfo = true;
# Allowed file extensions
$wgFileExtensions[] = 'pdf';
-require_once ("/home/wikiorg/public_html/UploadDir.php");
+// OBSOLETE: Replaced in InitialiseSettings.php
+// require_once ("/home/wikiorg/public_html/UploadDir.php");
require_once("/home/wikiorg/public_html/CommonRights.php");
if ($wgDBname == "wikiorg_comsim") {
$wgGroupPermissions['*']['edit'] = false;
$wgGroupPermissions['user']['edit'] = false;
$wgGroupPermissions['sysop']['edit'] = true;
}
-if ($wgDBname == "wikiorg_tech") {
- $wgGroupPermissions['*']['edit'] = false;
- $wgGroupPermissions['user']['edit'] = false;
- $wgGroupPermissions['sysop']['edit'] = true;
- $wgGroupPermissions['*']['createaccount'] = false;
-}
-# Allow cross-wiki editing of user rights (currently in beta and only usable on meta.wikisorg.tk)
-$wgLocalDatabases = array( 'wikiorg_meta', 'wikiorg_test', 'wikiorg_labs' );
-require_once("/home/wikiorg/public_html/SiteNotice.php");
# Wikis Organisation specific messages(Heavily edited WikimediaMessages extension
require_once("/home/wikiorg/public_html/ext/WikimediaMessages/WikimediaMessages.php");
-# Configuration file for logos on ALL wikis
-require_once("/home/wikiorg/public_html/CommonLogos.php");
-$wgForeignFileRepos[] = array(
- 'class' => 'ForeignDBRepo',
- 'name' => 'Wikis Commons',
- 'url' => 'http://upload.wikisorg.tk/wikisorg/commons',
- 'directory' => '/home/wikiorg/public_html/upload/wikisorg/commons',
- 'hashLevels' => 2, // This must be the same for the other family member
- 'dbType' => $wgDBtype,
- 'dbServer' => $wgDBserver,
- 'dbUser' => 'wikiorg_commons',
- 'dbPassword' => 'password',
- 'dbFlags' => DBO_DEFAULT,
- 'dbName' => 'wikiorg_commons',
- 'tablePrefix' => '',
- 'hasSharedCache' => false,
- 'descBaseUrl' => 'http://commons.wikisorg.tk/wiki/File:',
- 'fetchDescription' => true, // Optional
-);
-if ($wgDBname == "wikiorg_commons") {
+# Configuration file for logos on ALL wikis OBSOLETE with InitialiseSettings.php
+#require_once("/home/wikiorg/public_html/CommonLogos.php");
+if ($wgDBname == "wikiorg_commonswiki") {
$wgForeignFileRepos = false;
-}
+} else {
+ $wgForeignFileRepos[] = array(
+ 'class' => 'ForeignDBRepo',
+ 'name' => 'Wikis Commons',
+ 'url' => 'http://upload.wikisorg.tk/wikisorg/commons',
+ 'directory' => '/home/wikiorg/public_html/upload/wikisorg/commons',
+ 'hashLevels' => 2, // This must be the same for the other family member
+ 'dbType' => $wgDBtype,
+ 'dbServer' => $wgDBserver,
+ 'dbUser' => 'wikiorg',
+ 'dbPassword' => 'password',
+ 'dbFlags' => DBO_DEFAULT,
+ 'dbName' => 'wikiorg_commonswiki',
+ 'tablePrefix' => '',
+ 'hasSharedCache' => false,
+ 'descBaseUrl' => 'http://commons.wikisorg.tk/wiki/File:',
+ 'fetchDescription' => true, // Optional
+ );
+};
+require_once( "$wogExtensions/GlobalUsage/GlobalUsage.php" );
+$wgGlobalUsageDatabase = 'wikiorg_commonswiki';
+require_once( "$IP/extensions/UploadWizard/UploadWizard.php" );
$wgEnableCreativeCommonsRdf = true;
$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
$wgRightsUrl = "http://creativecommons.org/licenses/by-sa/3.0/";
$wgRightsText = "Attribution-ShareAlike 3.0 Unported";
-$wgRightsIcon = "http://i.creativecommons.org/l/by-sa/3.0/88x31.png";
+$wgRightsIcon = "http://upload.wikisorg.tk/common/cc-by-sa.png"; // To avoid using too much of CC's resources
$wgUseTeX = true;
$wgMaxAnimatedGifArea = 5.0e7;
-$wgShowIPinHeader = false;
require_once('/home/wikiorg/public_html/ext/CloseWikis/CloseWikis.php');
$wgCloseWikisDatabase = "wikiorg_ext";
+$wgGroupPermissions['steward']['editclosedwikis'] = true;
+$wgAllowUserCss = true;
+$wgAllowUserJs = true;
// Default extensions
// Extensions that affect the whole farm
@@ -97,7 +97,46 @@
require_once("$wogExtensions/GlobalBlocking/GlobalBlocking.php");
$wgGlobalBlockingDatabase = 'wikiorg_globlk';
require_once("/home/wikiorg/public_html/InterWiki/InterWiki.php");
+// Preparing for the deployment of CentralNotice
+require_once("$wogExtensions/CentralNotice/CentralNotice.php");
+$wgNoticeInfrastructure = false;
+$wgCentralDBname = "wikiorg_metawiki";
+$wgCentralPagePath = "/w";
+$wgCentralNoticeLoader = true;
+$wgNoticeProject = "wikis";
+/*
+ include "$IP/extensions/CentralAuth/CentralAuth.php";
+ $wgCentralAuthDatabase = 'wikiorg_authdb';
+ $wgCentralAuthDryRun = false;
+ #unset( $wgGroupPermissions['*']['centralauth-merge'] );
+ #$wgGroupPermissions['sysop']['centralauth-merge'] = true;
+ $wgCentralAuthCookies = true;
+ $wgCentralAuthAutoLoginWikis = array(
+ '.wikicompo.tk' => 'wikiorg_compo',
+ 'meta.wikisorg.tk' => 'wikiorg_meta',
+ '.wikifood.tk' => 'wikiorg_food',
+ 'commons.wikisorg.tk' => 'wikiorg_commons',
+ 'incubator.wikisorg.tk' => 'wikiorg_incubat',
+ 'test.wikisorg.tk' => 'wikiorg_test',
+ );
+ # Don't set 2nd-level cookies for *.wikimedia.org, insecure
+ $wgCentralAuthCookieDomain = 'wikisorg.tk';
+ $wgCentralAuthCookieDomain = 'wikicompo.tk';
+ $wgCentralAuthCookieDomain = 'wikifood.tk';
+ $wgCentralAuthAutoNew = true;
+
+ // Let's give it another try
+ $wgCentralAuthCreateOnView = true;
+$wgGroupPermissions['steward']['globalgrouppermissions'] = true;
+$wgGroupPermissions['steward']['globalgroupmembership'] = true;
+$wgSharedDB = 'wikiorg_authdb'; // or whatever database you use for central data
+$wgSharedTables = array( 'objectcache' ); // remember to copy the table structure's to the central database first
+$wgMainCacheType = CACHE_DB; // Tell mediawiki to use objectcache database instead of nothing
+*/
+$wgUpgradeKey = "password";
+#require_once("/home/wikiorg/public_html/ext/MaintenanceShell/MaintenanceShell.php");
+
// Extensions that are affecting only one wiki
# Make books from wiki pages
require_once("$wogExtensions/Collection/Collection.php");
@@ -105,10 +144,11 @@
require_once("$wogExtensions/CategoryTree/CategoryTree.php");
# Checks users' IP address
include_once("$wogExtensions/CheckUser/CheckUser.php");
+$wgCheckUserForceSummary = true; // Forces CheckUsers to provide a summary of why checking is needed, false by default
# Cite pages
require_once("$wogExtensions/Cite/SpecialCite.php");
# Lists links across namespaces that should not exist on that wiki
-require_once "$wogExtensions/CrossNamespaceLinks/SpecialCrossNamespaceLinks.php";
+#require_once "$wogExtensions/CrossNamespaceLinks/SpecialCrossNamespaceLinks.php";
# Expand templates
require_once("$wogExtensions/ExpandTemplates/ExpandTemplates.php");
# Hide revisions for legal reasons
@@ -165,7 +205,7 @@
'expandablesearch' => array( 'global' => true, 'user' => false ),
);
# A newer look of the editor from the default
-require_once("$wogExtensions/WikiEditor/WikiEditor.php");
+require_once("$IP/extensions/WikiEditor/WikiEditor.php");
$wgWikiEditorModules['toc']['global'] = true; // Enable the TOC for everyone
$wgWikiEditorModules['toc']['user'] = false; // Don't allow users to turn the TOC on/off individually
$wgWikiEditorModules = array(
@@ -177,14 +217,14 @@
'templateEditor' => array( 'global' => false, 'user' => true ),
);
$wgDefaultUserOptions['useeditwarning'] = 1;
-$wgDefaultUserOptions['wikieditor-highlight'] = 1;
-$wgDefaultUserOptions['wikieditor-preview'] = 1;
-$wgDefaultUserOptions['wikieditor-publish'] = 1;
-$wgDefaultUserOptions['usenavigabletoc'] = 1;
-$wgDefaultUserOptions['wikieditor-template-editor'] = 1;
+$wgDefaultUserOptions['wikieditor-highlight'] = 0;
+$wgDefaultUserOptions['wikieditor-preview'] = 0;
+$wgDefaultUserOptions['wikieditor-publish'] = 0;
+$wgDefaultUserOptions['usenavigabletoc'] = 0;
+$wgDefaultUserOptions['wikieditor-template-editor'] = 0;
$wgDefaultUserOptions['usebetatoolbar'] = 1;
$wgDefaultUserOptions['usebetatoolbar-cgd'] = 1;
-;
+
# Check for spambots
require_once( "$wogExtensions/AntiBot/AntiBot.php" );
# Allows a user to remove the site notice
@@ -235,7 +275,7 @@
#);
// Specific site extensions
-if ($wogReaderFeedback) {
+if ($wgWogUseReaderFeedback) {
require_once("$wogExtensions/ReaderFeedback/ReaderFeedback.php");
$wgGroupPermissions['*']['feedback'] = true;
$wgGroupPermissions['user']['feedback'] = true;
@@ -247,11 +287,11 @@
'closeness' => 1
);
}
-if ($wogLiquidThreads) {
+if ($wgWogUseLiquidThreads) {
require_once("$wogExtensions/LiquidThreads/LiquidThreads.php");
}
-if ($wogUsabilityInitiative) {
+if ($wgWogUseUsabilityInitiative) {
require_once( "$wogExtensions/PrefSwitch/PrefSwitch.php" );
require_once("$wogExtensions/PrefStats/PrefStats.php");
$wgPrefStatsTrackPrefs = array( 'skin' => 'vector', 'usebetatoolbar' => 1 );
@@ -262,64 +302,61 @@
$wgClickTrackThrottle = 10;
require_once( "$wogExtensions/UserDailyContribs/UserDailyContribs.php" );
}
-if ($wogCodeReview) {
+if ($wgWogUseCodeReview) {
require_once("$wogExtensions/CodeReview/CodeReview.php");
}
-if ($wogAskSQL) {
+if ($wgWogUseAskSQL) {
require_once("$wogExtensions/AskSQL/Asksql.php");
$wgDBsqluser = "wikiorg_test";
$wgDBsqlpassword = "password";
$wgGroupPermissions['steward']['asksql'] = true;
}
-if ($wogWikimediaIncubator) {
+if ($wgWogUseWikimediaIncubator) {
require_once("$wogExtensions/WikimediaIncubator/WikimediaIncubator.php");
}
-if ($wogGroupPermissionsManager) {
+if ($wgWogUseGroupPermissionsManager) {
require_once("$wogExtensions/GroupPermissionsManager/GroupPermissionsManager.php");
}
// As renaming a user will affect global, can only allow Meta to rename, so...
-if ($wogRenameUser) {
+if ($wgWogUseRenameUser) {
require_once("$wogExtensions/Renameuser/SpecialRenameuser.php");
}
// Unclassified configurations
-if ($wgSitename == "WikiCompo") {
- define("NS_SCHOOL", 400);
- define("NS_SCHOOL_TALK", 401);
-
- $wgExtraNamespaces[NS_SCHOOL] = "School";
- $wgExtraNamespaces[NS_SCHOOL_TALK] = "School_talk";
-}
-if ($wgSitename == "WikiFood") {
- define("NS_RECIPE", 400);
- define("NS_RECIPE_TALK", 401);
- define("NS_REVIEW", 402);
- define("NS_REVIEW_TALK", 403);
-
- $wgExtraNamespaces[NS_RECIPE] = "Recipe";
- $wgExtraNamespaces[NS_RECIPE_TALK] = "Recipe_talk";
- $wgExtraNamespaces[NS_REVIEW] = "Review";
- $wgExtraNamespaces[NS_REVIEW_TALK] = "Review_talk";
-}
-if ($wgDBname == "wikiorg_trans") {
- define("NS_TRANSLATE", 400);
- define("NS_TRANSLATE_TALK", 401);
- $wgExtraNamespaces[NS_TRANSLATE] = "Translate";
- $wgExtraNamespaces[NS_TRANSLATE_TALK] = "Translate_talk";
-}
if ($wgDBname == "wikiorg_two") {
$wgGroupPermissions ['*']['edit'] = false;
$wgGroupPermissions ['*']['createaccount'] = false;
}
-/*
-
- LEAVE THE FOLLOWING LINES ALONE, THANKS
-
-*/
-// MaintenanceShell to run command line scripts from the web interface.
-// PLEASE ADD THE ORIGINAL COPY OF THE EXTENSION TO THE SHARED FOLDER!
-# Sysops will have access to the MaintenanceShell
-$wgGroupPermissions['sysop']['maintenanceshell'] = true;
+require_once("/home/wikiorg/public_html/LocalDatabases.php");
-#Place this on the VERY LAST line of your Localsettings.php file:
-require_once("$wogExtensions/MaintenanceShell/MaintenanceShell.php");
+$wgConf->wikis = $wgLocalDatabases;
+$wgConf->suffixes = array( 'wiki' );
+$wgConf->localVHosts = array( 'localhost' );
+
+require_once "/home/wikiorg/public_html/InitialiseSettings.php";
+
+function efGetSiteParams( $conf, $wiki ) {
+ $site = null;
+ $lang = null;
+ foreach( $conf->suffixes as $suffix ) {
+ if ( substr( $wiki, -strlen( $suffix ) ) == $suffix ) {
+ $site = $suffix;
+ $lang = substr( $wiki, 0, -strlen( $suffix ) );
+ break;
+ }
+ }
+ return array(
+ 'suffix' => $site,
+ 'lang' => $lang,
+ 'params' => array(
+ 'lang' => $lang,
+ 'site' => $site,
+ 'wiki' => $wiki,
+ ),
+ 'tags' => array(),
+ );
+}
+
+$wgConf->suffixes = $wgLocalDatabases;
+$wgConf->siteParamsCallback = 'efGetSiteParams';
+$wgConf->extractAllGlobals( $wgDBname );
Modified: InitialiseSettings.php
===================================================================
--- InitialiseSettings.php 2011-05-16 12:43:28 UTC (rev 294)
+++ InitialiseSettings.php 2011-05-23 14:11:32 UTC (rev 295)
@@ -26,12 +26,24 @@
'wikiorg_wikiswiki' => 'http://wikis.tk',
'wikiorg_usa' => 'http://usability.wikisorg.tk',
'wikiorg_testwiki' => 'http://test.wikisorg.tk',
- 'wikiorg_trans' => 'http://translate.wikisorg.tk',
'wikiorg_historywiki' => 'http://wikihistory.tk',
- 'wikiorg_centralauth-labswiki' => 'http://centralauth.labs.wikisorg.tk',
- 'wikiorg_en-centralauth-labswiki' => 'http://en.centralauth.labs.wikisorg.tk',
- 'wikiorg_simple-centralauth-labswiki' => 'http://simple.centralauth.labs.wikisorg.tk',
- 'wikiorg_ang-centralauth-labswiki' => 'http://ang.centralauth.labs.wikisorg.tk',
+ 'wikiorg_centralauth_labswiki' => 'http://centralauth.labs.wikisorg.tk',
+ 'wikiorg_en_centralauth_labswiki' => 'http://en.centralauth.labs.wikisorg.tk',
+ 'wikiorg_simple_centralauth_labswiki' => 'http://simple.centralauth.labs.wikisorg.tk',
+ 'wikiorg_ang_centralauth_labswiki' => 'http://ang.centralauth.labs.wikisorg.tk',
+ 'wikiorg_zhaawiki' => 'http://zhaa.wikisorg.tk',
+ 'wikiorg_annualreportwiki' => 'http://annualreport.wikisorg.tk',
+ 'wikiorg_internalwiki' => 'http://internal.wikisorg.tk',
+ 'wikiorg_helpwiki' => 'http://help.wikisorg.tk',
+ 'wikiorg_semanticmediawiki_labswiki' => 'http://semanticmediawiki.labs.wikisorg.tk',
+ 'wikiorg_uploadwizard_labswiki' => 'http://uploadwizard.labs.wikisorg.tk',
+ 'wikiorg_litaawiki' => 'http://litaa.wikisorg.tk',
+ 'wikiorg_flaggedrevs_labswiki' => 'http://flaggedrevs.labs.wikisorg.tk',
+ 'wikiorg_liquidthreads_labswiki' => 'http://liquidthreads.labs.wikisorg.tk',
+ 'wikiorg_readerfeedback_labswiki' => 'http://readerfeedback.labs.wikisorg.tk',
+ 'wikiorg_securepoll_labswiki' => 'http://securepoll.labs.wikisorg.tk',
+ 'wikiorg_translatewiki' => 'http://translate.wikisorg.tk',
+ 'wikiorg_histaawiki' => 'http://histaa.wikisorg.tk',
),
'wgScriptPath' => array(
@@ -41,6 +53,10 @@
'wgArticlePath' => array(
'default' => '/wiki/$1',
),
+
+'wgUsePathInfo' => array(
+ 'default' => true,
+),
'wgSitename' => array(
'default' => 'Wikis Organisation',
@@ -65,15 +81,26 @@
'wikiorg_wikiswiki' => 'Wikis',
'wikiorg_usa' => 'Wikis Usability Initiative',
'wikiorg_testwiki' => 'Test Wikis',
- 'wikiorg_trans' => 'Wikis Translate',
'wikiorg_historywiki' => 'Wikihistory',
'wikiorg_secretwiki' => 'Secret',
'wikiorg_enwikihistory' => 'Wikihistory',
'wikiorg_notfoundwiki' => 'Site not found',
- 'wikiorg_centralauth-labswiki' => 'CentralAuth Labs',
- 'wikiorg_en-centralauth-labswiki' => 'CentralAuth Labs',
- 'wikiorg_simple-centralauth-labswiki' => 'CentralAuth Labs',
- 'wikiorg_ang-centralauth-labswiki' => 'CentralAuth Labs',
+ 'wikiorg_centralauth_labswiki' => 'CentralAuth Labs',
+ 'wikiorg_en_centralauth_labswiki' => 'CentralAuth Labs',
+ 'wikiorg_simple_centralauth_labswiki' => 'CentralAuth Labs',
+ 'wikiorg_ang_centralauth_labswiki' => 'CentralAuth Labs',
+ 'wikiorg_zhaawiki' => 'Chinese Alternative Assessment',
+ 'wikiorg_annualreportwiki' => 'Annual Reports Planning',
+ 'wikiorg_helpwiki' => 'Wikihelp',
+ 'wikiorg_semanticmediawiki_labswiki' => 'Semantic MediaWiki Labs',
+ 'wikiorg_uploadwizard_labswiki' => 'UploadWizard Labs',
+ 'wikiorg_litaawiki' => 'Literature Alternative Assessment',
+ 'wikiorg_flaggedrevs_labswiki' => 'FlaggedRevs Labs',
+ 'wikiorg_liquidthreads_labswiki' => 'LiquidThreads Labs',
+ 'wikiorg_readerfeedback_labswiki' => 'ReaderFeedback Labs',
+ 'wikiorg_securepoll_labswiki' => 'SecurePoll Labs',
+ 'wikiorg_translatewiki' => 'Wikis Translate',
+ 'wikiorg_histaawiki' => 'History Alternative Assessment',
),
'wgMetaNamespace' => array(
@@ -90,12 +117,22 @@
'wikiorg_incubatorwiki' => 'Incubator',
'wikiorg_metawiki' => 'Meta',
'wikiorg_labswiki' => 'Labs',
- 'wikiorg_centralauth-labswiki' => 'Labs',
- 'wikiorg_en-centralauth-labswiki' => 'Labs',
- 'wikiorg_simple-centralauth-labswiki' => 'Labs',
- 'wikiorg_ang-centralauth-labswiki' => 'Labs',
+ 'wikiorg_centralauth_labswiki' => 'Labs',
+ 'wikiorg_en_centralauth_labswiki' => 'Labs',
+ 'wikiorg_simple_centralauth_labswiki' => 'Labs',
+ 'wikiorg_ang_centralauth_labswiki' => 'Labs',
'wikiorg_historywiki' => 'Wikihistory',
'wikiorg_enwikihistory' => 'Wikihistory',
+ 'wikiorg_zhaawiki' => 'Chinese',
+ 'wikiorg_helpwiki' => 'Wikihelp',
+ 'wikiorg_semanticmediawiki_labswiki' => 'Labs',
+ 'wikiorg_uploadwizard_labswiki' => 'Labs',
+ 'wikiorg_litaawiki' => 'Literature',
+ 'wikiorg_flaggedrevs_labswiki' => 'Labs',
+ 'wikiorg_liquidthreads_labswiki' => 'Labs',
+ 'wikiorg_readerfeedback_labswiki' => 'Labs',
+ 'wikiorg_securepoll_labswiki' => 'Labs',
+ 'wikiorg_histaawiki' => 'History',
),
'wgLanguageCode' => array(
@@ -113,12 +150,11 @@
'wgLogo' => array(
'default' => 'http://upload.wikisorg.tk/wikisorg/main/b/bc/Wiki.png',
'wikiorg_wiki' => 'http://upload.wikisorg.tk/wikisorg/main/b/bc/Wiki.png',
- 'wikiorg_privatewiki' => 'http://upload.wikisorg.tk/wikisorg/main/b/bc/Wiki.png',
'wikiorg_metawiki' => 'http://upload.wikisorg.tk/wikisorg/meta/b/bc/Wiki.png',
'wikiorg_incubatorwiki' => 'http://upload.wikisorg.tk/wikisorg/incubator/b/bc/Wiki.png',
'wikiorg_commonswiki' => 'http://upload.wikisorg.tk/wikisorg/commons/b/bc/Wiki.png',
'wikiorg_testwiki' => 'http://upload.wikisorg.tk/wikisorg/test/b/bc/Wiki.png',
- 'wikiorg_trans' => 'http://upload.wikisorg.tk/wikisorg/translate/b/bc/Wiki.png',
+ 'wikiorg_translatewiki' => 'http://upload.wikisorg.tk/wikisorg/translate/b/bc/Wiki.png',
'wikiorg_wikitechwiki' => 'http://upload.wikisorg.tk/wikisorg/wikitech/b/bc/Wiki.png',
'wikiorg_wikiswiki' => 'http://upload.wikisorg.tk/wikisorg/wikis/b/bc/Wiki.png',
'wikiorg_compowiki' => 'http://upload.wikisorg.tk/wikicompo/main/b/bc/Wiki.png',
@@ -131,14 +167,7 @@
'wikiorg_itwiki' => 'http://upload.wikisorg.tk/wikicompo/it/b/bc/Wiki.png',
'wikiorg_foodwiki' => 'http://upload.wikisorg.tk/wikifood/main/b/bc/Wiki.png',
'wikiorg_historywiki' => 'http://upload.wikisorg.tk/wikihistory/main/b/bc/Wiki.png',
- 'wikiorg_outreachwiki' => 'http://upload.wikisorg.tk/wikisorg/main/b/bc/Wiki.png',
- 'wikiorg_secretwiki' => 'http://upload.wikisorg.tk/wikisorg/main/b/bc/Wiki.png',
- 'wikiorg_enwikihistory' => 'http://upload.wikisorg.tk/wikihistory/main/b/bc/Wiki.png',
- 'wikiorg_notfoundwiki' => 'http://upload.wikisorg.tk/wikihistory/main/b/bc/Wiki.png',
- 'wikiorg_centralauth-labswiki' => 'http://upload.wikisorg.tk/wikihistory/main/b/bc/Wiki.png',
- 'wikiorg_en-centralauth-labswiki' => 'http://upload.wikisorg.tk/wikihistory/main/b/bc/Wiki.png',
- 'wikiorg_simple-centralauth-labswiki' => 'http://upload.wikisorg.tk/wikihistory/main/b/bc/Wiki.png',
- 'wikiorg_ang-centralauth-labswiki' => 'http://upload.wikisorg.tk/wikihistory/main/b/bc/Wiki.png',
+ 'wikiorg_helpwiki' => 'http://upload.wikisorg.tk/wikisorg/help/b/bc/Wiki.png',
),
'wgDBuser' => array(
@@ -176,6 +205,18 @@
'rollback' => true,
),
),
+
+ '+wikiorg_zhaawiki' => array(
+ '*' => array(
+ 'read' => false,
+ ),
+ ),
+
+ '+wikiorg_annualreportwiki' => array(
+ '*' => array(
+ 'read' => false,
+ ),
+ ),
// Disallow anonymous users to create pages.
// Note: the 'default' key should never have a "+" in front of it
@@ -188,7 +229,7 @@
),
'wgAddGroups' => array(
// The '+' in front of the DB name means 'add to the default'. It saves us duplicating
- // changes to the default across all overrides --Andrew 2009-04-28
+ // changes to the default across all overrides
'default' => array(
'bureaucrat' => array( 'sysop', 'bureaucrat', 'bot' ),
'sysop' => array( 'ipblock-exempt' ),
@@ -197,7 +238,7 @@
'wgRemoveGroups' => array(
// The '+' in front of the DB name means 'add to the default'. It saves us duplicating
- // changes to the default across all overrides --Andrew 2009-04-28
+ // changes to the default across all overrides
'default' => array(
'bureaucrat' => array( 'sysop', 'bot' ),
'sysop' => array( 'ipblock-exempt' ),
@@ -272,7 +313,7 @@
402 => "Review",
403 => "Review_Talk",
),
- 'wikiorg_trans' => array(
+ 'wikiorg_translatewiki' => array(
400 => "Translate",
401 => "Translate_Talk",
),
@@ -287,7 +328,7 @@
'wikiorg_commonswiki' => 'http://upload.wikisorg.tk/wikisorg/commons',
'wikiorg_testwiki' => 'http://upload.wikisorg.tk/wikisorg/test',
'wikiorg_labswiki' => 'http://upload.wikisorg.tk/wikisorg/labs',
- 'wikiorg_trans' => 'http://upload.wikisorg.tk/wikisorg/translate',
+ 'wikiorg_translatewiki' => 'http://upload.wikisorg.tk/wikisorg/translate',
'wikiorg_wikitechwiki' => 'http://upload.wikisorg.tk/wikisorg/wikitech',
'wikiorg_wikiswiki' => 'http://upload.wikisorg.tk/wikisorg/wikis',
'wikiorg_compowiki' => 'http://upload.wikisorg.tk/wikicompo/main',
@@ -305,10 +346,22 @@
'wikiorg_enwikihistory' => 'http://upload.wikisorg.tk/wikihistory/en',
'wikiorg_notfoundwiki' => 'http://upload.wikisorg.tk/wikisorg/notfound',
'wikiorg_photoswiki' => 'http://upload.wikisorg.tk/wikisorg/photos',
- 'wikiorg_centralauth-labswiki' => 'http://upload.wikisorg.tk/wikisorg/centralauth-labs',
- 'wikiorg_en-centralauth-labswiki' => 'http://upload.wikisorg.tk/wikisorg/en-centralauth-labs',
- 'wikiorg_simple-centralauth-labswiki' => 'http://upload.wikisorg.tk/wikisorg/simple-centralauth-labs',
- 'wikiorg_ang-centralauth-labswiki' => 'http://upload.wikisorg.tk/wikisorg/ang-centralauth-labs',
+ 'wikiorg_centralauth_labswiki' => 'http://upload.wikisorg.tk/wikisorg/centralauth-labs',
+ 'wikiorg_en_centralauth_labswiki' => 'http://upload.wikisorg.tk/wikisorg/en-centralauth-labs',
+ 'wikiorg_simple_centralauth_labswiki' => 'http://upload.wikisorg.tk/wikisorg/simple-centralauth-labs',
+ 'wikiorg_ang_centralauth_labswiki' => 'http://upload.wikisorg.tk/wikisorg/ang-centralauth-labs',
+ 'wikiorg_zhaawiki' => 'http://upload.wikisorg.tk/wikisorg/zhaa',
+ 'wikiorg_annualreportwiki' => 'http://upload.wikisorg.tk/wikisorg/annualreport',
+ 'wikiorg_internalwiki' => 'http://upload.wikisorg.tk/wikisorg/internal',
+ 'wikiorg_helpwiki' => 'http://upload.wikisorg.tk/wikisorg/help',
+ 'wikiorg_semanticmediawiki_labswiki' => 'http://upload.wikisorg.tk/wikisorg/semanticmediawiki-labs',
+ 'wikiorg_uploadwizard_labswiki' => 'http://upload.wikisorg.tk/wikisorg/uploadwizard-labs',
+ 'wikiorg_litaawiki' => 'http://upload.wikisorg.tk/wikisorg/litaa',
+ 'wikiorg_flaggedrevs_labswiki' => 'http://upload.wikisorg.tk/wikisorg/flaggedrevs-labs',
+ 'wikiorg_liquidthreads_labswiki' => 'http://upload.wikisorg.tk/wikisorg/liquidthreads-labs',
+ 'wikiorg_readerfeedback_labswiki' => 'http://upload.wikisorg.tk/wikisorg/readerfeedback-labs',
+ 'wikiorg_securepoll_labswiki' => 'http://upload.wikisorg.tk/wikisorg/securepoll-labs',
+ 'wikiorg_histaawiki' => 'http://upload.wikisorg.tk/wikisorg/histaa',
),
'wgUploadDirectory' => array(
@@ -320,7 +373,7 @@
'wikiorg_commonswiki' => '/home/wikiorg/public_html/upload/wikisorg/commons',
'wikiorg_testwiki' => '/home/wikiorg/public_html/upload/wikisorg/test',
'wikiorg_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/labs',
- 'wikiorg_trans' => '/home/wikiorg/public_html/upload/wikisorg/translate',
+ 'wikiorg_translatewiki' => '/home/wikiorg/public_html/upload/wikisorg/translate',
'wikiorg_wikitechwiki' => '/home/wikiorg/public_html/upload/wikisorg/wikitech',
'wikiorg_wikiswiki' => '/home/wikiorg/public_html/upload/wikisorg/wikis',
'wikiorg_compowiki' => '/home/wikiorg/public_html/upload/wikicompo/main',
@@ -338,10 +391,22 @@
'wikiorg_enwikihistory' => '/home/wikiorg/public_html/upload/wikihistory/en',
'wikiorg_notfoundwiki' => '/home/wikiorg/public_html/upload/wikisorg/notfound',
'wikiorg_photoswiki' => '/home/wikiorg/public_html/upload/wikisorg/photos',
- 'wikiorg_centralauth-labswiki' => '/home/wikiorg/public_html/upload/wikisorg/centralauth-labs',
- 'wikiorg_en-centralauth-labswiki' => '/home/wikiorg/public_html/upload/wikisorg/en-centralauth-labs',
- 'wikiorg_simple-centralauth-labswiki' => '/home/wikiorg/public_html/upload/wikisorg/simple-centralauth-labs',
- 'wikiorg_ang-centralauth-labswiki' => '/home/wikiorg/public_html/upload/wikisorg/ang-centralauth-labs',
+ 'wikiorg_centralauth_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/centralauth-labs',
+ 'wikiorg_en_centralauth_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/en-centralauth-labs',
+ 'wikiorg_simple_centralauth_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/simple-centralauth-labs',
+ 'wikiorg_ang_centralauth_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/ang-centralauth-labs',
+ 'wikiorg_zhaawiki' => '/home/wikiorg/public_html/upload/wikisorg/zhaa',
+ 'wikiorg_annualreportwiki' => '/home/wikiorg/public_html/upload/wikisorg/annualreport',
+ 'wikiorg_internalwiki' => '/home/wikiorg/public_html/upload/wikisorg/internal',
+ 'wikiorg_helpwiki' => '/home/wikiorg/public_html/upload/wikisorg/help',
+ 'wikiorg_semanticmediawiki_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/semanticmediawiki-labs',
+ 'wikiorg_uploadwizard_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/uploadwizard-labs',
+ 'wikiorg_litaawiki' => '/home/wikiorg/public_html/upload/wikisorg/litaa',
+ 'wikiorg_flaggedrevs_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/flaggedrevs-labs',
+ 'wikiorg_liquidthreads_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/liquidthreads-labs',
+ 'wikiorg_readerfeedback_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/readerfeedback-labs',
+ 'wikiorg_securepoll_labswiki' => '/home/wikiorg/public_html/upload/wikisorg/securepoll-labs',
+ 'wikiorg_histaawiki' => '/home/wikiorg/public_html/upload/wikisorg/histaa',
),
'wgAllowUserCss' => array(
@@ -351,16 +416,160 @@
'wgAllowUserJs' => array(
'default' => true,
),
+
+// Set to the title of a wiki page that describes your license/copyright
+'wgRightsPage' => array(
+ 'default' => '',
+),
+
+'wgRightsUrl' => array(
+ 'default' => 'http://creativecommons.org/licenses/by-sa/3.0/',
+),
+
+'wgRightsText' => array(
+ 'default' => 'Attribution-ShareAlike 3.0 Unported',
+),
+
+'wgRightsIcon' => array(
+ 'default' => 'http://upload.wikisorg.tk/common/cc-by-sa.png', // To avoid using too much of CC's resources
+),
+
+'wgEnableCreativeCommonsRdf' => array(
+ 'default' => true,
+),
+
+'wgUseTeX' => array(
+ 'default' => true,
+),
+
+'wgMaxAnimatedGifArea' => array(
+ 'default' => '5.0e7', // Fix heavy GIF images
+),
+
+'wgSiteNotice' => array(
+ 'default' => '', // Use to set global notices
+// 'wikiorg_testwiki' => 'The software that runs {{SITENAME}} will undergo an upgrade today, sorry for the inconvenience caused.',
+),
+
'wgShowIPinHeader' => array(
'default' => false,
),
+
'wgUseInstantCommons' => array(
'default' => true,
),
-'wogUseRenameUser' => array(
+// Range blocking of IP addresses
+'wgSysopRangeBans' => array(
+ 'default' => true,
+),
+
+// Add entry to $wgUploadNavigationUrl if disabling on any wiki
+'wgEnableUploads' => array(
+ 'default' => true,
+),
+
+'wgUploadNavigationUrl' => array(
+ 'default' => false,
+),
+
+'wgPasswordSender' => array(
+ 'default' => 'wi...@wi...',
+),
+
+'wgShowSQLErrors' => array(
'default' => false,
- 'wikiorg_metawiki' => true,
+ 'wikiorg_metawiki' => true, // Enabled
+ 'wikiorg_testwiki' => true,
),
+
+'wgNoticeProject' => array(
+ 'default' => 'wikis',
+ 'wikiorg_commonswiki' => 'commons',
+ 'wikiorg_metawiki' => 'meta',
+ 'wikiorg_testwiki' => 'test',
+ 'wikiorg_compowiki' => 'wikicompo',
+ 'wikiorg_enwiki' => 'wikicompo',
+ 'wikiorg_simplewiki' => 'wikicompo',
+ 'wikiorg_dewiki' => 'wikicompo',
+ 'wikiorg_frwiki' => 'wikicompo',
+ 'wikiorg_jawiki' => 'wikicompo',
+ 'wikiorg_itwiki' => 'wikicompo',
+ 'wikiorg_foodwiki' => 'wikifood',
+ 'wikiorg_enwikifood' => 'wikifood',
+ 'wikiorg_historywiki' => 'wikihistory',
+ 'wikiorg_enwikihistory' => 'wikihistory',
+),
+
+// Allow raw HTML to be used in the wikitext editor. WARNING: Enable on private wikis only!
+'wgRawHtml' => array(
+ 'default' => false,
+ 'wikiorg_privatewiki' => true,
+),
+
+'wgUpgradeKey' => array(
+ 'default' => 'upgradekey',
+),
+
+// Limit number of account creation in 24 hours from a single IP address
+'wgAccountCreationThrottle' => array(
+ 'default' => '6', // Previously unlimited, bad...
+),
+
+// Patrol each edit, expensive for bandwidth though, but can be enabled on small wikis
+'wgUseRCPatrol' => array(
+ 'default' => false,
+ 'wikiorg_enwiki' => true,
+),
+
+// New pages patrol, listing here for reference
+'wgUseNPPatrol' => array(
+ 'default' => true,
+),
+
+'wgMinimalPasswordLength' => array(
+ 'default' => '1', // Prevents blank passwords
+),
+
+// Number of links to wanted page to list in Special:WantedPages, default 1
+'wgWantedPagesThreshold' => array(
+ 'default' => '2',
+ 'wikiorg_zhaawiki' => '1', // Want to know what pages are red
+),
+
+// Email user when someone posts on his/her talk page, can disable in preferences
+'wgEnotifUserTalk' => array(
+ 'default' => true, // Default false
+),
+
+'wgEnotifWatchlist' => array(
+ 'default' => false,
+),
+
+'wgEnotifMinorEdits' => array(
+ 'default' => false, // default true
+),
+
+// Language bar in Special:UserLogin to select preferred language of view wiki for that page
+'wgLoginLanguageSelector' => array(
+ 'default' => true, // default false
+),
+
+// Prevent running of database queries that may take long to run and break stuff, just for reference here
+'wgDisableQueryPageUpdate' => array(
+ 'default' => false,
+),
+
+'wgDeleteRevisionsLimit' => array(
+ 'default' => '5000',
+),
+
+'wgCheckUserForceSummary' => array(
+ 'default' => true,
+),
+
+'wgLocaltimezone' => array(
+ 'default' => 'UTC',
+),
-);
\ No newline at end of file
+);
Modified: LocalDatabases.php
===================================================================
--- LocalDatabases.php 2011-05-16 12:43:28 UTC (rev 294)
+++ LocalDatabases.php 2011-05-23 14:11:32 UTC (rev 295)
@@ -6,8 +6,10 @@
Please list by alphabetical order and by wiki family type.
-Total wikis: 25 <- PLEASE UPDATE THIS AFTER ADDING A NEW WIKI HERE!!! -->
+Please note that this file does not include prototype.wikisorg.tk wikis!
+Total wikis: 37 <- PLEASE UPDATE THIS AFTER ADDING A NEW WIKI HERE!!! -->
+
*/
$wgLocalDatabases = array(
@@ -23,12 +25,24 @@
'wikiorg_strategywiki',
'wikiorg_outreachwiki',
'wikiorg_secretwiki',
+ 'wikiorg_zhaawiki',
+ 'wikiorg_annualreportwiki',
+ 'wikiorg_internalwiki',
+ 'wikiorg_helpwiki',
+ 'wikiorg_litaawiki',
+ 'wikiorg_histaawiki',
// Wikis Labs wikis (*.labs.wikisorg.tk) wikis (the technology of these wikis are a little outdated)
- 'wikiorg_en-centralauth-labswiki',
- 'wikiorg_simple-centralauth-labswiki',
- 'wikiorg_ang-centralauth-labswiki',
- 'wikiorg_centralauth-labswiki',
+ 'wikiorg_en-centralauth_labswiki',
+ 'wikiorg_simple-centralauth_labswiki',
+ 'wikiorg_ang-centralauth_labswiki',
+ 'wikiorg_centralauth_labswiki',
+ 'wikiorg_semanticmediawiki_labswiki',
+ 'wikiorg_uploadwizard_labswiki',
+ 'wikiorg_flaggedrevs_labswiki',
+ 'wikiorg_liquidthreads_labswiki',
+ 'wikiorg_securepoll_labswiki',
+ 'wikiorg_readerfeedback_labswiki',
// WikiCompo (*.wikicompo.tk) wikis
'wikiorg_compowiki',
@@ -39,10 +53,13 @@
'wikiorg_itwiki',
'wikiorg_jawiki',
- // WikiFood (*.wikifood.tk) wikis
+ // WikiFood (*.wikifood.tk) wikis TODO: Recreate the language subdomains + databases
'wikiorg_foodwiki',
+ //'wikiorg_enwikifood',
+ //'wikiorg_dewikifood',
+ //'wikiorg_simplewikifood',
// Wikihistory (*.wikihistory.tk) wikis
'wikiorg_historywiki',
'wikiorg_enwikihistory',
-);
\ No newline at end of file
+);
Modified: UploadDir.php
===================================================================
--- UploadDir.php 2011-05-16 12:43:28 UTC (rev 294)
+++ UploadDir.php 2011-05-23 14:11:32 UTC (rev 295)
@@ -8,7 +8,7 @@
centre.
*/
-
+/* WARNING: THIS FILE IS OBSOLETE! IT HAS BEEN REPLACED BY INITIALISESETTINGS.PHP */
// WikiCompo
if ($wgDBname == "wikiorg_comen") {
$wgUploadDirectory = "/home/wikiorg/public_html/upload/wikicompo/en";
@@ -109,4 +109,4 @@
if ($wgDBname == "wikiorg_wikis") {
$wgUploadDirectory = "/home/wikiorg/public_html/upload/wikisorg/wikis";
$wgUploadPath = "http://upload.wikisorg.tk/wikisorg/wikis";
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|