http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76230
Revision: 76230
Author: aaron
Date: 2010-11-07 03:30:48 +0000 (Sun, 07 Nov 2010)
Log Message:
-----------
* "sighted" -> "checked" (in comments and qqq)
* FR_SIGHTED -> FR_CHECKED
* fixed undefined var in expandRevisionTags(), validate params a bit more
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevision.php
trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
trunk/extensions/FlaggedRevs/FlaggedRevs.php
trunk/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php
trunk/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php
trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
trunk/extensions/FlaggedRevs/language/Stabilization.i18n.php
trunk/extensions/FlaggedRevs/maintenance/reviewAllPages.inc
trunk/extensions/FlaggedRevs/specialpages/PendingChanges_body.php
trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevision.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevision.php 2010-11-07 02:58:53 UTC
(rev 76229)
+++ trunk/extensions/FlaggedRevs/FlaggedRevision.php 2010-11-07 03:30:48 UTC
(rev 76230)
@@ -739,23 +739,23 @@
* @return Array
*/
public static function expandRevisionTags( $tags ) {
- # Set all flags to zero
$flags = array();
foreach ( FlaggedRevs::getTags() as $tag ) {
- $flags[$tag] = 0;
+ $flags[$tag] = 0; // init all flags values to zero
}
$tags = str_replace( '\n', "\n", $tags ); // B/C, old broken
rows
+ // Tag string format is <tag:val\ntag:val\n...>
$tags = explode( "\n", $tags );
foreach ( $tags as $tuple ) {
$set = explode( ':', $tuple, 2 );
if ( count( $set ) == 2 ) {
list( $tag, $value ) = $set;
- $value = intval( $value );
- # Add only currently recognized ones
+ $value = max( 0, (int)$value ); // validate
+ # Add only currently recognized tags
if ( isset( $flags[$tag] ) ) {
- # If a level was removed, default to
the highest
- $flags[$tag] = $value < count( $levels
) ?
- $value : count( $levels ) - 1;
+ $levels = FlaggedRevs::getTagLevels(
$tag );
+ # If a level was removed, default to
the highest...
+ $flags[$tag] = min( $value, count(
$levels ) - 1 );
}
}
}
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2010-11-07 02:58:53 UTC
(rev 76229)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.class.php 2010-11-07 03:30:48 UTC
(rev 76230)
@@ -771,7 +771,7 @@
$data = array();
$level = self::pristineVersions() ? FR_PRISTINE : FR_QUALITY;
if ( !self::qualityVersions() ) {
- $level = FR_SIGHTED;
+ $level = FR_CHECKED;
}
# Get the latest revision ID if not set
if ( !$latest ) {
@@ -798,13 +798,13 @@
);
# If there is a revision of this level, track it...
# Revisions reviewed to one level count as reviewed
- # at the lower levels (i.e. quality -> sighted).
+ # at the lower levels (i.e. quality -> checked).
if ( $row ) {
$id = $row->fr_rev_id;
$ts = $row->rev_timestamp;
} else {
- $id = $higherLevelId; // use previous (quality
-> sighted)
- $ts = $higherLevelTS; // use previous (quality
-> sighted)
+ $id = $higherLevelId; // use previous (quality
-> checked)
+ $ts = $higherLevelTS; // use previous (quality
-> checked)
}
# Get edits that actually are pending...
if ( $id && $latest > $id ) {
@@ -1156,7 +1156,7 @@
/**
* Get the quality tier of review flags
* @param array $flags
- * @return int, flagging tier (-1 for non-sighted)
+ * @return int, flagging tier (-1 for non-checked)
*/
public static function getLevelTier( array $flags ) {
if ( self::isPristine( $flags ) ) {
@@ -1164,7 +1164,7 @@
} elseif ( self::isQuality( $flags ) ) {
return FR_QUALITY; // 1
} elseif ( self::isSighted( $flags ) ) {
- return FR_SIGHTED; // 0
+ return FR_CHECKED; // 0
}
return -1;
}
@@ -1326,7 +1326,7 @@
$flags = self::getAutoReviewTags(
$user, $oldSv->getTags() );
}
} else { // new page?
- $flags = self::quickTags( FR_SIGHTED ); // use
minimal level
+ $flags = self::quickTags( FR_CHECKED ); // use
minimal level
}
if ( !is_array( $flags ) ) {
wfProfileOut( __METHOD__ );
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2010-11-07 02:58:53 UTC
(rev 76229)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2010-11-07 03:30:48 UTC
(rev 76230)
@@ -876,7 +876,7 @@
$quality = FlaggedRevs::getRevQuality(
$rc->mAttribs['rc_cur_id'], $revId, FR_MASTER );
// Reviewed => patrolled
- if ( $quality !== false && $quality >= FR_SIGHTED ) {
+ if ( $quality !== false && $quality >= FR_CHECKED ) {
RevisionReviewForm::updateRecentChanges(
$rc->getTitle(), $revId );
$rc->mAttribs['rc_patrolled'] = 1; // make sure
irc/email notifs know status
}
@@ -1122,7 +1122,7 @@
}
}
}
- # Check implicitly sighted edits
+ # Check implicitly checked edits
if ( $totalCheckedEditsNeeded &&
$wgFlaggedRevsAutoconfirm['totalCheckedEdits'] ) {
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( array( 'revision', 'flaggedpages'
), '1',
@@ -1316,7 +1316,7 @@
return true;
}
}
- # Check implicitly sighted edits
+ # Check implicitly checked edits
if ( $totalCheckedEditsNeeded &&
$wgFlaggedRevsAutopromote['totalCheckedEdits'] ) {
$dbr = isset( $dbr ) ? $dbr : wfGetDB( DB_SLAVE );
$res = $dbr->select( array( 'revision', 'flaggedpages'
), '1',
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.php 2010-11-07 02:58:53 UTC
(rev 76229)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.php 2010-11-07 03:30:48 UTC
(rev 76230)
@@ -37,8 +37,8 @@
define( 'FR_TEXT', 3 );
# Level constants...
-if ( !defined( 'FR_SIGHTED' ) )
- define( 'FR_SIGHTED', 0 ); // "basic"/"checked"
+if ( !defined( 'FR_CHECKED' ) )
+ define( 'FR_CHECKED', 0 ); // "basic"/"checked"
if ( !defined( 'FR_QUALITY' ) )
define( 'FR_QUALITY', 1 );
if ( !defined( 'FR_PRISTINE' ) )
@@ -64,7 +64,7 @@
# IMPORTANT: DO NOT EDIT THIS FILE
# When configuring globals, set them at LocalSettings.php instead
-# This will only distinguish "sighted", "quality", and unreviewed
+# This will only distinguish "checked", "quality", and unreviewed
# A small icon will show in the upper right hand corner
$wgSimpleFlaggedRevsUI = true; // @TODO: remove when ready
# For visitors, only show tags/icons for unreviewed/outdated pages
@@ -91,7 +91,7 @@
# (a) directly to the stable version by users with 'autoreview'/'bot'
# (b) self-reversions back to the stable version by any user
$wgFlaggedRevsAutoReview = true;
-# If $wgFlaggedRevsAutoReview, auto-review new pages as minimally "sighted"?
+# If $wgFlaggedRevsAutoReview, auto-review new pages as minimally "checked"?
$wgFlaggedRevsAutoReviewNew = true;
# Define the tags we can use to rate an article, number of levels,
@@ -589,15 +589,15 @@
$wgLogNames['review'] = 'review-logpage';
$wgLogHeaders['review'] = 'review-logpagetext';
# Various actions are used for log filtering ...
-$wgLogActions['review/approve'] = 'review-logentry-app'; // sighted (again)
+$wgLogActions['review/approve'] = 'review-logentry-app'; // checked (again)
$wgLogActions['review/approve2'] = 'review-logentry-app'; // quality (again)
-$wgLogActions['review/approve-i'] = 'review-logentry-app'; // sighted (first
time)
+$wgLogActions['review/approve-i'] = 'review-logentry-app'; // checked (first
time)
$wgLogActions['review/approve2-i'] = 'review-logentry-app'; // quality (first
time)
-$wgLogActions['review/approve-a'] = 'review-logentry-app'; // sighted (auto)
+$wgLogActions['review/approve-a'] = 'review-logentry-app'; // checked (auto)
$wgLogActions['review/approve2-a'] = 'review-logentry-app'; // quality (auto)
-$wgLogActions['review/approve-ia'] = 'review-logentry-app'; // sighted
(initial & auto)
+$wgLogActions['review/approve-ia'] = 'review-logentry-app'; // checked
(initial & auto)
$wgLogActions['review/approve2-ia'] = 'review-logentry-app'; // quality
(initial & auto)
-$wgLogActions['review/unapprove'] = 'review-logentry-dis'; // was sighted
+$wgLogActions['review/unapprove'] = 'review-logentry-dis'; // was checked
$wgLogActions['review/unapprove2'] = 'review-logentry-dis'; // was quality
# Add stable version log
Modified: trunk/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php
===================================================================
--- trunk/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php 2010-11-07
02:58:53 UTC (rev 76229)
+++ trunk/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php 2010-11-07
03:30:48 UTC (rev 76230)
@@ -173,7 +173,7 @@
'end' => 'Stop listing at this page id.',
'namespace' => 'The namespaces to enumerate.',
'filterredir' => 'How to filter for redirects',
- 'filterlevel' => 'How to filter by quality
(0=sighted,1=quality)',
+ 'filterlevel' => 'How to filter by quality
(0=checked,1=quality)',
'limit' => 'How many total pages to return.',
'dir' => array(
'In which direction to list.',
Modified: trunk/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php
===================================================================
--- trunk/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php
2010-11-07 02:58:53 UTC (rev 76229)
+++ trunk/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php
2010-11-07 03:30:48 UTC (rev 76230)
@@ -164,7 +164,7 @@
'end' => 'Stop listing at this page title.',
'namespace' => 'The namespaces to enumerate.',
'filterredir' => 'How to filter for redirects',
- 'filterlevel' => 'How to filter by quality
(0=sighted,1=quality)',
+ 'filterlevel' => 'How to filter by quality
(0=checked,1=quality)',
'limit' => 'How many total pages to return.',
);
}
Modified: trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php 2010-11-07
02:58:53 UTC (rev 76229)
+++ trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php 2010-11-07
03:30:48 UTC (rev 76230)
@@ -644,7 +644,7 @@
}
$oldFlags = $frev
? $frev->getTags() // existing tags
- : FlaggedRevs::quickTags( FR_SIGHTED ); // basic tags
+ : FlaggedRevs::quickTags( FR_CHECKED ); // basic tags
# If we are reviewing updates to a page, start off with the
stable revision's
# flags. Otherwise, we just fill them in with the selected
revision's flags.
Modified: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
===================================================================
--- trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php 2010-11-07
02:58:53 UTC (rev 76229)
+++ trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php 2010-11-07
03:30:48 UTC (rev 76230)
@@ -358,7 +358,7 @@
'revreview-hist-quality' => '{{Flagged Revs-small}}
The accuracy "quality", as displayed on the page history after a revision with
this setting.',
'revreview-hist-basic' => '{{Flagged Revs-small}}
-The accuracy "sighted", as displayed on the page history after a revision with
this setting.',
+The accuracy "checked", as displayed on the page history after a revision with
this setting.',
'revreview-hist-quality-user' => '{{Flagged Revs}}',
'revreview-hist-basic-user' => '{{Flagged Revs}}',
'revreview-hist-basic-auto' => '{{Flagged Revs}}',
@@ -391,7 +391,7 @@
'revreview-accuracy-0' => '{{Flagged Revs-small}}
This is the default configuration, i.e. the revision has not (yet) been
reviewed.',
'revreview-accuracy-1' => '{{Flagged Revs-small}}
-A basic check on vandalism ("sighted" as "has been seen/checked"). This
configuration is considered as "flagged".',
+A basic check on vandalism ("checked" as "has been seen/checked"). This
configuration is considered as "flagged".',
'revreview-accuracy-2' => '{{Flagged Revs}}',
'revreview-accuracy-3' => '{{Flagged Revs}}',
'revreview-accuracy-4' => '{{Flagged Revs}}
@@ -407,7 +407,7 @@
'revreview-basic-same' => '{{Flagged Revs}}
* Parameter $2 is the date of the approval',
'revreview-basic-source' => '{{Flagged Revs-small}}
-Displayed on the top of a page when you are viewing an old sighted version.
+Displayed on the top of a page when you are viewing an old checked version.
* Example:
[http://de.wikipedia.org/w/index.php?title=Deutsche_Sprache&oldid=46894374
de.wikipedia].
* Parameter $2 is the date of the approval',
'revreview-failed' => '{{Flagged Revs}}',
@@ -443,7 +443,7 @@
{{Identical|Content page}}',
'revreview-newest-basic' => '{{Flagged Revs}}',
'revreview-newest-basic-i' => '{{Flagged Revs-small}}
-Used in the "flagged revs box" when you are viewing the latest draft version,
but when there is a sighted revision, the stable version.
+Used in the "flagged revs box" when you are viewing the latest draft version,
but when there is a checked revision, the stable version.
Example: [http://de.wikipedia.org/w/index.php?title=Deutsche_Sprache&stable=0
de.wikipedia].
* Note, the example seems not to work, currently.',
@@ -466,7 +466,7 @@
'revreview-quality-same' => '{{Flagged Revs}}',
'revreview-quality-source' => "{{Flagged Revs-small}}
Displayed on the top of a page when you are viewing an old quality version.
-* Example:
[http://de.wikipedia.org/w/index.php?title=Deutsche_Sprache&oldid=46894374
de.wikipedia] (this is a sighted version, but it's the same for a quality
version).
+* Example:
[http://de.wikipedia.org/w/index.php?title=Deutsche_Sprache&oldid=46894374
de.wikipedia] (this is a checked version, but it's the same for a quality
version).
* Parameter $2 is the date of the approval",
'revreview-quality-title' => '{{Flagged Revs}}',
'revreview-quick-basic' => '{{Flagged Revs}}',
@@ -474,7 +474,7 @@
'revreview-quick-basic-same' => '{{Flagged Revs}}',
'revreview-quick-invalid' => '{{Flagged Revs}}',
'revreview-quick-none' => '{{Flagged Revs-small}}
-Shown in the "flagged revs box" on the content page when there isn\'t any
sighted or quality revision yet.',
+Shown in the "flagged revs box" on the content page when there isn\'t any
checked or quality revision yet.',
'revreview-quick-quality' => '{{Flagged Revs-small}}
Used in the "flagged revs box" when viewing a quality version, while there are
new changes (in a draft version) to be reviewed.',
'revreview-quick-quality-old' => '{{Flagged Revs}}',
@@ -507,9 +507,9 @@
'revreview-submit-reviewed' => '{{Flagged Revs}}',
'revreview-submit-unreviewed' => '{{Flagged Revs}}',
'revreview-successful' => '{{Flagged Revs-small}}
-Shown when a reviewer/editor has marked a revision as stable/sighted/... See
also {{msg|revreview-successful2|pl=yes}}.',
+Shown when a reviewer/editor has marked a revision as stable/checked/... See
also {{msg|revreview-successful2|pl=yes}}.',
'revreview-successful2' => '{{Flagged Revs-small}}
-Shown when a reviewer/editor has marked a stable/sighted/... revision as
unstable/unsighted/... After that, it can normally be reviewed again. See also
{{msg|revreview-successful|pl=yes}}.',
+Shown when a reviewer/editor has marked a stable/checked/... revision as
unstable/unchecked/... After that, it can normally be reviewed again. See also
{{msg|revreview-successful|pl=yes}}.',
'revreview-text' => "{{Flagged Revs-small}}
Displayed in the review box for the reviewers' information.",
'revreview-toggle-show' => '{{Optional}}
Modified: trunk/extensions/FlaggedRevs/language/Stabilization.i18n.php
===================================================================
--- trunk/extensions/FlaggedRevs/language/Stabilization.i18n.php
2010-11-07 02:58:53 UTC (rev 76229)
+++ trunk/extensions/FlaggedRevs/language/Stabilization.i18n.php
2010-11-07 03:30:48 UTC (rev 76230)
@@ -60,7 +60,7 @@
$messages['qqq'] = array(
'stabilization-tab' => '{{Flagged Revs-small}}
-Some skins (e.g. standard/classic) display an additional tab to control
visibility of the page revisions, e.g. whether last revision should be included
or perhaps the last sighted or published version.',
+Some skins (e.g. standard/classic) display an additional tab to control
visibility of the page revisions, e.g. whether last revision should be included
or perhaps the last checked or published version.',
'stabilization' => '{{Flagged Revs-small}}
Page title of Special:Stabilization.',
'stabilization-text' => '{{Flagged Revs-small}}
Modified: trunk/extensions/FlaggedRevs/maintenance/reviewAllPages.inc
===================================================================
--- trunk/extensions/FlaggedRevs/maintenance/reviewAllPages.inc 2010-11-07
02:58:53 UTC (rev 76229)
+++ trunk/extensions/FlaggedRevs/maintenance/reviewAllPages.inc 2010-11-07
03:30:48 UTC (rev 76230)
@@ -21,7 +21,7 @@
$blockEnd = $start + $BATCH_SIZE - 1;
$count = 0;
$changed = 0;
- $flags = FlaggedRevs::quickTags( FR_SIGHTED ); // Assume basic level
+ $flags = FlaggedRevs::quickTags( FR_CHECKED ); // Assume basic level
while( $blockEnd <= $end ) {
echo "...doing page_id from $blockStart to $blockEnd\n";
$cond = "page_id BETWEEN $blockStart AND $blockEnd";
Modified: trunk/extensions/FlaggedRevs/specialpages/PendingChanges_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/PendingChanges_body.php
2010-11-07 02:58:53 UTC (rev 76229)
+++ trunk/extensions/FlaggedRevs/specialpages/PendingChanges_body.php
2010-11-07 03:30:48 UTC (rev 76230)
@@ -302,7 +302,7 @@
$namespace = $vnamespaces;
}
$this->namespace = $namespace;
- # Sanity check level: 0 = sighted; 1 = quality; 2 = pristine
+ # Sanity check level: 0 = checked; 1 = quality; 2 = pristine
$this->level = ( $level >= 0 && $level <= 2 ) ? $level : - 1;
$this->category = $category ? str_replace( ' ', '_', $category
) : null;
$this->size = ( $size !== null ) ? intval( $size ) : null;
Modified: trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2010-11-07 02:58:53 UTC (rev 76229)
+++ trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2010-11-07 03:30:48 UTC (rev 76230)
@@ -278,7 +278,7 @@
$this->mForm = $form;
# Must be a content page...
$this->namespace = FlaggedRevs::getReviewNamespaces();
- # Sanity check level: 0 = sighted; 1 = quality; 2 = pristine
+ # Sanity check level: 0 = checked; 1 = quality; 2 = pristine
$this->level = ( $level >= 0 && $level <= 2 ) ? $level : - 1;
$this->tag = $tag;
$this->category = $category ? str_replace( ' ', '_', $category
) : null;
Modified: trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
2010-11-07 02:58:53 UTC (rev 76229)
+++ trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
2010-11-07 03:30:48 UTC (rev 76230)
@@ -90,7 +90,7 @@
private function getActions() {
$actions = array( 'approve' => 1, 'approve2' => 1, 'approve-a'
=> 1, 'approve-i' => 1,
'approve-ia' => 1, 'approve2-i' => 1, 'unapprove' => 1,
'unapprove2' => 1 );
- if ( $this->level === 0 ) { // sighted revisions
+ if ( $this->level === 0 ) { // checked revisions
$actions['approve2'] = 0;
$actions['approve2-i'] = 0;
$actions['unapprove2'] = 0;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
