Skip to content

Commit

Permalink
Merge "Remove ArticleFeedbackv5 from Wikimedia wikis"
Browse files Browse the repository at this point in the history
  • Loading branch information
jenkins-bot authored and Gerrit Code Review committed Mar 3, 2014
2 parents ccac897 + 6f484bc commit 8f470d3
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 274 deletions.
58 changes: 0 additions & 58 deletions wmf-config/CommonSettings.php
View file
Expand Up @@ -1675,64 +1675,6 @@ function wmfLoadInitialiseSettings( $conf ) {
$wgDefaultUserOptions['uselivepreview'] = 1;
}

if ( $wmgUseArticleFeedbackv5 ) {
require_once( "$IP/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php" );

$wgArticleFeedbackv5Cluster = $wmgArticleFeedbackv5Cluster;
$wgArticleFeedbackv5Categories = $wmgArticleFeedbackv5Categories;
$wgArticleFeedbackv5BlacklistCategories = $wmgArticleFeedbackv5BlacklistCategories;
$wgArticleFeedbackv5OversightEmails = $wmgArticleFeedbackv5OversightEmails;
$wgArticleFeedbackv5OversightEmailHelp = $wmgArticleFeedbackv5OversightEmailHelp;
$wgArticleFeedbackv5AutoHelp = $wmgArticleFeedbackv5AutoHelp;
$wgArticleFeedbackv5LearnToEdit = $wmgArticleFeedbackv5LearnToEdit;
$wgArticleFeedbackv5Namespaces = $wmgArticleFeedbackv5Namespaces;
$wgArticleFeedbackv5LotteryOdds = $wmgArticleFeedbackv5LotteryOdds;
$wgArticleFeedbackv5EnableProtection = $wmgArticleFeedbackv5EnableProtection;
$wgArticleFeedbackv5AutoArchiveEnabled = $wmgArticleFeedbackv5AutoArchiveEnabled;
$wgArticleFeedbackv5AutoArchiveTtl = $wmgArticleFeedbackv5AutoArchiveTtl;
$wgArticleFeedbackv5Watchlist = $wmgArticleFeedbackv5Watchlist;
$wgArticleFeedbackv5ArticlePageLink = $wmgArticleFeedbackv5ArticlePageLink;

// clear default permissions set in ArticleFeedbackv5.php
foreach ( $wgGroupPermissions as $group => $permissions ) {
foreach ( $wmgArticleFeedbackv5Permissions as $permission => $groups ) {
if ( isset( $wgGroupPermissions[$group][$permission] ) ) {
unset( $wgGroupPermissions[$group][$permission] );
}
}
}

// set permissions as defined for selected wiki
foreach ( $wmgArticleFeedbackv5Permissions as $permission => $groups ) {
foreach ( (array) $groups as $group ) {
if ( isset( $wgGroupPermissions[$group] ) ) {
$wgGroupPermissions[$group][$permission] = true;
}
}
}

// test groups
$wgGroupPermissions['afttest'] = array(
'aft-reader' => true,
'aft-member' => true,
'aft-editor' => true,
'aft-monitor' => true,
'aft-administrator' => false,
'aft-oversighter' => false,
);
$wgGroupPermissions['afttest-hide'] = array(
'aft-reader' => true,
'aft-member' => true,
'aft-editor' => true,
'aft-monitor' => true,
'aft-administrator' => true,
'aft-oversighter' => true,
);

$wgArticleFeedbackv5AbuseFiltering = $wmgArticleFeedbackv5AbuseFiltering;
// $wgArticleFeedbackv5CTABuckets = $wmgArticleFeedbackv5CTABuckets;
}

$wgDefaultUserOptions['thumbsize'] = $wmgThumbsizeIndex;
$wgDefaultUserOptions['showhiddencats'] = $wmgShowHiddenCats;

Expand Down
17 changes: 0 additions & 17 deletions wmf-config/InitialiseSettings-labs.php
View file
Expand Up @@ -162,23 +162,6 @@ function wmfLabsSettings() {
'-wmgEnableCaptcha' => array(
'default' => true,
),
// Completely disabled AFTv4 & enable AFTv5
'-wmgArticleFeedbackLotteryOdds' => array(
'default' => 0,
),
'-wmgArticleFeedbackv5LotteryOdds' => array(
'default' => 100,
),
'-wmgArticleFeedbackv5Namespaces' => array(
'default' => array( NS_MAIN ),
'dewiki' => array( NS_MAIN ),
'enwiki' => array( NS_MAIN, NS_HELP, NS_PROJECT ),
'testwiki' => array( NS_MAIN, NS_HELP, NS_PROJECT ),
),
// On labs, there's no dedicated cluster for AFTv5's data; false will default to main MW db
'-wmgArticleFeedbackv5Cluster' => array(
'default' => false,
),
'-wmgEchoCluster' => array(
'default' => false,
),
Expand Down
198 changes: 0 additions & 198 deletions wmf-config/InitialiseSettings.php
View file
Expand Up @@ -10846,204 +10846,6 @@
'viwiktionary' => 'uca-vi', // bug 45979
),

'wmgUseArticleFeedbackv5' => array(
'default' => false,
'dewiki' => false, // Bug 57605
'enwiki' => true,
'frwiki' => true,
'testwiki' => true,
),
/*
* AFTv5 data lives on its own dedicated database (ExternalLB).
* To connect to core MW db, this could be set to false.
*/
'wmgArticleFeedbackv5Cluster' => array(
'default' => 'extension1',
),
/*
* AFTv5 needs to be explicitly enabled per namespace. If a namespace is not
* listed here, the AFTv5 form will not show up on articles in that namespace,
* regardless of lottery odds and whitelist/blacklist categories (see below)
*/
'wmgArticleFeedbackv5Namespaces' => array(
'default' => array( NS_MAIN ),
'testwiki' => array( NS_MAIN, NS_HELP, NS_PROJECT ),
'enwiki' => array( NS_MAIN, NS_HELP, NS_PROJECT ),
'frwiki' => array( NS_MAIN, NS_HELP ),
),
/*
* The percentage of articles AFTv5 will be displayed on (based on the last 3 digits
* of the article id). This can either be an array of <namespace> => <percentage>
* tuples, or a simple integer for a fixed percentage over all enabled namespaces.
*/
'wmgArticleFeedbackv5LotteryOdds' => array(
'default' => 0,
'testwiki' => array( NS_MAIN => 10, NS_HELP => 100 ),
'frwiki' => array( NS_MAIN => 0, NS_HELP => 100 ),
),
/*
* Allow/disallow the ability to enable or disable AFTv5 on a per-article basis.
* This feature will add an AFTv5 entry in page protection settings (for admins)
* or a simple enable/disable link for editors.
* Disabling this will remove said links & entry in ?action=protect & ignore
* existing opt-in/-outs, leaving only lottery & whitelist/blacklist categories
* to define if an article should get AFTv5.
*/
'wmgArticleFeedbackv5EnableProtection' => array(
'default' => true,
),
/*
* Articles that include this category, will display AFTv5, regardless of lottery.
*/
'wmgArticleFeedbackv5Categories' => array(
'default' => array(),
'testwiki' => array( 'Article_Feedback_5', 'Article_Feedback_5_Additional_Articles' ),
'frwiki' => array( 'Wikipédia:Outil_de_retour_des_lecteurs' ),
),
/*
* Articles that include this category, will NOT display AFTv5, regardless of lottery.
*/
'wmgArticleFeedbackv5BlacklistCategories' => array(
'default' => array(),
'testwiki' => array( 'Article_Feedback_Blacklist' ),
'enwiki' => array( 'Article_Feedback_Blacklist' ),
'frwiki' => array( 'Wikipédia:Outil_de_retour_des_lecteurs/exclus' ),
),
/**
* Email address that oversight requests will mail to.
*
* @see http://meta.wikimedia.org/wiki/Oversight_policy/Requests_for_oversight
*/
'wmgArticleFeedbackv5OversightEmails' => array(
'default' => 'aft@wikimedia.org',
'enwiki' => 'oversight-en-wp@wikipedia.org',
'frwiki' => 'privacy-fr-wp@wikimedia.org',
),
'wmgArticleFeedbackv5OversightEmailHelp' => array(
'default' => 'https://en.wikipedia.org/wiki/Wikipedia:Article_Feedback_Tool/Version_5/Help/Feedback_page_Oversighters',
'frwiki' => 'https://fr.wikipedia.org/wiki/Aide:Outil_de_retour_des_lecteurs/Masqueurs',
),
'wmgArticleFeedbackv5AutoHelp' => array(
'default' => '//en.wikipedia.org/wiki/Wikipedia:Article_Feedback_Tool/Version_5/Help',
'frwiki' => '//fr.wikipedia.org/wiki/Aide:Outil_de_retour_des_lecteurs',
),
'wmgArticleFeedbackv5LearnToEdit' => array(
'default' => '//en.wikipedia.org/wiki/Wikipedia:Tutorial',
'frwiki' => '//fr.wikipedia.org/wiki/Aide:Comment_modifier_une_page',
),
'wmgArticleFeedbackv5AbuseFiltering' => array(
'default' => false,
'testwiki' => true,
'enwiki' => true,
'frwiki' => true,
),
'wmgArticleFeedbackv5CTABuckets' => array(
'default' => array(
'buckets' => array(
'0' => 100, // display nothing
'1' => 0, // display "Enticement to edit"
'2' => 0, // display "Learn more"
'3' => 0, // display "Take a survey"
'4' => 0, // display "Sign up or login"
'5' => 0, // display "View feedback"
'6' => 0, // display "Visit Teahouse"
),
// This version number is added to all tracking event names, so that
// changes in the software don't corrupt the data being collected. Bump
// this when you want to start a new "experiment".
'version' => 1,
// Users may constantly be rebucketed, giving them new CTAs each time.
'expires' => 0,
),
'enwiki' => array(
'buckets' => array(
'0' => 0, // display nothing
'1' => 49, // display "Enticement to edit"
'2' => 0, // display "Learn more"
'3' => 0, // display "Take a survey"
'4' => 50, // display "Sign up or login"
'5' => 0, // display "View feedback"
'6' => 1, // display "Visit Teahouse"
),
'version' => 7,
'expires' => 0,
),
'frwiki' => array(
'buckets' => array(
'0' => 0, // display nothing
'1' => 0, // display "Enticement to edit"
'2' => 0, // display "Learn more"
'3' => 0, // display "Take a survey"
'4' => 100, // display "Sign up or login"
'5' => 0, // display "View feedback"
'6' => 0, // display "Visit Teahouse"
),
'version' => 2,
'expires' => 0,
),
),
/**
* @see http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Access_and_permissions
*/
'wmgArticleFeedbackv5Permissions' => array(
'default' => array(
// every member (apart from blocked users) = reader
'aft-reader' => array( '*', 'user', 'confirmed', 'autoconfirmed', 'rollbacker', 'reviewer', 'sysop', 'oversight' ),
// registered member = member
'aft-member' => array( 'user', 'confirmed', 'autoconfirmed', 'rollbacker', 'reviewer', 'sysop', 'oversight' ),
// (auto-)confirmed user = editor
'aft-editor' => array( 'confirmed', 'autoconfirmed', 'rollbacker', 'reviewer', 'sysop', 'oversight' ),
// rollbacker/reviewer = monitor
'aft-monitor' => array( 'rollbacker', 'reviewer', 'sysop', 'oversight' ),
// administrator = administrator
'aft-administrator' => array( 'sysop', 'oversight' ),
// oversight = oversighter
'aft-oversighter' => array( 'oversight' ),
),
),
/*
* Enable/disable the "archive" filter & cronjob functionality.
* This should be manually set to true, to make sure the filter
* does not show up when the cronjob is not running.
*/
'wmgArticleFeedbackv5AutoArchiveEnabled' => array(
'default' => false,
// 'enwiki' => true, // Disabled due to repeated duplicate archiving
),
/*
* This is the TTL before an item is archived (if auto-archive is enabled);
* if there is a lot of feedback for a certain page, it makes sense to archive
* faster. For a fixed date, a simple integer can be passed instead of an
* array, to make it "amount of unreviewed feedback"-agnostic.
*/
'wmgArticleFeedbackv5AutoArchiveTtl' => array(
'default' => array(
0 => '+2 years', // < 9 unreviewed feedback
10 => '+1 month', // 10-19
20 => '+1 week', // 20-29
30 => '+3 days', // 30-39
40 => '+2 days', // > 40
),
),
/*
* Enable/disable AFTv5 watchlist (and the link to it from Special:Watchlist
* and central feedback page)
*/
'wmgArticleFeedbackv5Watchlist' => array(
'default' => false,
// Watchlist queries can be expensive (huge WHERE aft_page IN(...) clause)
// for people who have a serious amount of watchlisted pages -- disable for now.
'enwiki' => false,
'frwiki' => false,
),
/*
* Display a link to the page's Article Feedback list from the article page.
*/
'wmgArticleFeedbackv5ArticlePageLink' => array(
'default' => true,
'frwiki' => false,
),

'wmgUsePoolCounter' => array(
'default' => true,
),
Expand Down
1 change: 0 additions & 1 deletion wmf-config/extension-list
View file
Expand Up @@ -3,7 +3,6 @@ $IP/extensions/AccountAudit/AccountAudit.php
$IP/extensions/AntiBot/AntiBot.php
$IP/extensions/AntiSpoof/AntiSpoof.php
$IP/extensions/ApiSandbox/ApiSandbox.php
$IP/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
$IP/extensions/Babel/Babel.php
$IP/extensions/BetaFeatures/BetaFeatures.php
$IP/extensions/Calendar/Calendar.php
Expand Down

0 comments on commit 8f470d3

Please sign in to comment.