http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99297
Revision: 99297
Author: aaron
Date: 2011-10-08 03:06:35 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Unclobber some whitespace (for viewvc at least)
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevs.config.php
trunk/extensions/FlaggedRevs/business/FRGenericSubmitForm.php
trunk/extensions/FlaggedRevs/business/PageStabilityForm.php
trunk/extensions/FlaggedRevs/business/RevisionReviewForm.php
trunk/extensions/FlaggedRevs/presentation/FlaggablePageView.php
trunk/extensions/FlaggedRevs/presentation/FlaggedRevsLogView.php
trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.config.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.config.php 2011-10-08 02:47:42 UTC
(rev 99296)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.config.php 2011-10-08 03:06:35 UTC
(rev 99297)
@@ -26,22 +26,22 @@
# Auto-review settings for edits/new pages:
# FR_AUTOREVIEW_NONE
-# Don't auto-review any edits or new pages
+# Don't auto-review any edits or new pages
# FR_AUTOREVIEW_CHANGES
-# Auto-review the following types of edits (to existing pages):
-# (a) changes directly to the stable version by users with
'autoreview'/'bot'
-# (b) reversions to old reviewed versions by users with 'autoreview'/'bot'
-# (c) self-reversions back to the stable version by any user
+# Auto-review the following types of edits (to existing pages):
+# (a) changes directly to the stable version by users with 'autoreview'/'bot'
+# (b) reversions to old reviewed versions by users with 'autoreview'/'bot'
+# (c) self-reversions back to the stable version by any user
# FR_AUTOREVIEW_CREATION
-# Auto-review new pages as minimally "checked"
+# Auto-review new pages as minimally "checked"
# FR_AUTOREVIEW_CREATION_AND_CHANGES
-# Combines FR_AUTOREVIEW_CHANGES and FR_AUTOREVIEW_CREATION
+# Combines FR_AUTOREVIEW_CHANGES and FR_AUTOREVIEW_CREATION
$wgFlaggedRevsAutoReview = FR_AUTOREVIEW_CREATION_AND_CHANGES;
# Define the tags we can use to rate an article, number of levels,
# and set the minimum level to have it become a "quality" or "pristine"
version.
# NOTE: When setting up new dimensions or levels, you will need to add some
-# MediaWiki messages for the UI to show properly; any sysop can
do this.
+# MediaWiki messages for the UI to show properly; any sysop can do this.
$wgFlaggedRevsTags = array(
'accuracy' => array( 'levels' => 3, 'quality' => 2, 'pristine' => 4 ),
'depth' => array( 'levels' => 3, 'quality' => 1, 'pristine' => 4 ),
@@ -54,8 +54,8 @@
# NOTE: Users with 'validate' (Reviewers) can set all tags to all levels.
$wgFlaggedRevsTagsRestrictions = array(
'accuracy' => array( 'review' => 1, 'autoreview' => 1 ),
- 'depth' => array( 'review' => 2, 'autoreview' => 2 ),
- 'style' => array( 'review' => 3, 'autoreview' => 3 ),
+ 'depth' => array( 'review' => 2, 'autoreview' => 2 ),
+ 'style' => array( 'review' => 3, 'autoreview' => 3 ),
);
# For each tag, what is the highest level that it can be auto-reviewed to?
# $wgFlaggedRevsAutoReview must be enabled for this to apply.
@@ -84,19 +84,19 @@
# Define when users get automatically promoted to Editors. Set as false to
disable.
# Once users meet these requirements they will be promoted, unless previously
demoted.
$wgFlaggedRevsAutopromote = array(
- 'days' => 60, # days since registration
- 'edits' => 250, # total edit count
- 'excludeLastDays' => 1, # exclude the last X days of
edits from edit counts
- 'benchmarks' => 15, # number of "spread out" edits
- 'spacing' => 3, # number of days between
these edits (the "spread")
+ 'days' => 60, # days since registration
+ 'edits' => 250, # total edit count
+ 'excludeLastDays' => 1, # exclude the last X days of edits from
edit counts
+ 'benchmarks' => 15, # number of "spread out" edits
+ 'spacing' => 3, # number of days between these edits (the
"spread")
// Either totalContentEdits reqs OR totalCheckedEdits requirements
needed
- 'totalContentEdits' => 300, # edits to pages in $wgContentNamespaces
- 'totalCheckedEdits' => 200, # edits before the stable version of
pages
- 'uniqueContentPages' => 14, # unique pages in $wgContentNamespaces
edited
- 'editComments' => 50, # number of manual edit
summaries used
- 'userpageBytes' => 0, # size of userpage (use 0 to not
require a userpage)
- 'neverBlocked' => true, # username was never blocked
before?
- 'maxRevertedEditRatio' => .03, # max fraction of edits reverted via
"rollback"/"undo"
+ 'totalContentEdits' => 300, # edits to pages in $wgContentNamespaces
+ 'totalCheckedEdits' => 200, # edits before the stable version of
pages
+ 'uniqueContentPages' => 14, # unique pages in $wgContentNamespaces
edited
+ 'editComments' => 50, # number of manual edit summaries used
+ 'userpageBytes' => 0, # size of userpage (use 0 to not require
a userpage)
+ 'neverBlocked' => true, # username was never blocked before?
+ 'maxRevertedEditRatio' => .03, # max fraction of edits reverted via
"rollback"/"undo"
);
# Define when users get to have their own edits auto-reviewed. Set to false to
disable.
@@ -105,17 +105,17 @@
$wgFlaggedRevsAutoconfirm = false;
/* (example usage)
$wgFlaggedRevsAutoconfirm = array(
- 'days' => 30, # days since registration
- 'edits' => 50, # total edit count
- 'benchmarks' => 7, # number of "spread out" edits
- 'spacing' => 3, # number of days between
these edits (the "spread")
+ 'days' => 30, # days since registration
+ 'edits' => 50, # total edit count
+ 'benchmarks' => 7, # number of "spread out" edits
+ 'spacing' => 3, # number of days between these edits (the
"spread")
// Either totalContentEdits reqs OR totalCheckedEdits requirements
needed
- 'totalContentEdits' => 150, # $wgContentNamespaces edits
OR...
- 'totalCheckedEdits' => 50, # ...Edits before the stable
version of pages
- 'uniqueContentPages' => 8, # $wgContentNamespaces unique pages edited
- 'editComments' => 20, # how many edit comments used?
- 'email' => false, # user must be
emailconfirmed?
- 'neverBlocked' => true, # Can users that were blocked
be promoted?
+ 'totalContentEdits' => 150, # $wgContentNamespaces edits OR...
+ 'totalCheckedEdits' => 50, # ...Edits before the stable version of
pages
+ 'uniqueContentPages' => 8, # $wgContentNamespaces unique pages edited
+ 'editComments' => 20, # how many edit comments used?
+ 'email' => false, # user must be emailconfirmed?
+ 'neverBlocked' => true, # Can users that were blocked be
promoted?
);
*/
@@ -151,18 +151,18 @@
# Configurable information to collect and display at
Special:ValidationStatistics
$wgFlaggedRevsStats = array(
- 'topReviewersCount' => 5, # how many top reviewers to list
- 'topReviewersHours' => 1, # how many hours of the last reviews to
count
+ 'topReviewersCount' => 5, # how many top reviewers to list
+ 'topReviewersHours' => 1, # how many hours of the last reviews to count
);
# How to handle templates and files used in stable versions:
# FR_INCLUDES_CURRENT
-# Always use the current version of templates/files
+# Always use the current version of templates/files
# FR_INCLUDES_FREEZE
-# Use the version of templates/files that the page used when reviewed
+# Use the version of templates/files that the page used when reviewed
# FR_INCLUDES_STABLE
-# For each template/file, check if a version of it was used when the page
was reviewed
-# and if the template/file itself has a stable version; use the
newest those versions
+# For each template/file, check if a version of it was used when the page
was reviewed
+# and if the template/file itself has a stable version; use the newest those
versions
# NOTE: We may have templates that do not have stable version. Also, given
situational
# inclusion of templates (e.g. parser functions selecting template X or Y
based on date),
# there may also be no "review time version" revision ID for a template used
on a page.
Modified: trunk/extensions/FlaggedRevs/business/FRGenericSubmitForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/business/FRGenericSubmitForm.php
2011-10-08 02:47:42 UTC (rev 99296)
+++ trunk/extensions/FlaggedRevs/business/FRGenericSubmitForm.php
2011-10-08 03:06:35 UTC (rev 99297)
@@ -3,19 +3,19 @@
* Class containing generic form business logic
* Note: edit tokens are the responsibility of the caller
* Usage: (a) set ALL form params before doing anything else
- * (b) call ready() when all params are set
- * (c) call preload() OR submit() as needed
+ * (b) call ready() when all params are set
+ * (c) call preload() OR submit() as needed
*/
abstract class FRGenericSubmitForm {
- const FOR_SUBMISSION = 1; # Notify
functions when we are submitting
+ const FOR_SUBMISSION = 1; # Notify functions when we are
submitting
/* Internal form state */
- const FORM_UNREADY = 0; # Params not
given yet
- const FORM_READY = 1; # Params given
and ready to submit
- const FORM_PRELOADED = 2; # Params
pre-loaded (likely from slave DB)
- const FORM_SUBMITTED = 3; # Form submitted
- private $state = self::FORM_UNREADY; # Form state (disallows bad
operations)
+ const FORM_UNREADY = 0; # Params not given yet
+ const FORM_READY = 1; # Params given and ready to
submit
+ const FORM_PRELOADED = 2; # Params pre-loaded (likely
from slave DB)
+ const FORM_SUBMITTED = 3; # Form submitted
+ private $state = self::FORM_UNREADY; # Form state (disallows bad
operations)
- protected $user = null; # User
performing the action
+ protected $user = null; # User performing the action
final public function __construct( User $user ) {
$this->user = $user;
Modified: trunk/extensions/FlaggedRevs/business/PageStabilityForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/business/PageStabilityForm.php 2011-10-08
02:47:42 UTC (rev 99296)
+++ trunk/extensions/FlaggedRevs/business/PageStabilityForm.php 2011-10-08
03:06:35 UTC (rev 99297)
@@ -4,15 +4,15 @@
*/
abstract class PageStabilityForm extends FRGenericSubmitForm {
/* Form parameters which can be user given */
- protected $page = false; # Target page obj
- protected $watchThis = null; # Watch checkbox
- protected $reviewThis = null; # Auto-review option...
- protected $reasonExtra = ''; # Custom/extra reason
- protected $reasonSelection = ''; # Reason dropdown key
- protected $expiryCustom = ''; # Custom expiry
- protected $expirySelection = ''; # Expiry dropdown key
- protected $override = -1; # Default version
- protected $autoreview = ''; # Autoreview restrictions...
+ protected $page = false; # Target page obj
+ protected $watchThis = null; # Watch checkbox
+ protected $reviewThis = null; # Auto-review option...
+ protected $reasonExtra = ''; # Custom/extra reason
+ protected $reasonSelection = ''; # Reason dropdown key
+ protected $expiryCustom = ''; # Custom expiry
+ protected $expirySelection = ''; # Expiry dropdown key
+ protected $override = -1; # Default version
+ protected $autoreview = ''; # Autoreview restrictions...
protected $oldConfig = array(); # Old page config
@@ -170,7 +170,7 @@
/*
* Can the user change the settings for this page?
* Note: if the current autoreview restriction is too high for this user
- * then this will return false. Useful for form selectors.
+ * then this will return false. Useful for form selectors.
* @return bool
*/
public function isAllowed() {
@@ -198,7 +198,7 @@
/*
* @return mixed (true on success, error string on failure)
- */
+ */
protected function reallyDoPreloadParameters() {
return true;
}
Modified: trunk/extensions/FlaggedRevs/business/RevisionReviewForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/business/RevisionReviewForm.php
2011-10-08 02:47:42 UTC (rev 99296)
+++ trunk/extensions/FlaggedRevs/business/RevisionReviewForm.php
2011-10-08 03:06:35 UTC (rev 99297)
@@ -4,23 +4,23 @@
*/
class RevisionReviewForm extends FRGenericSubmitForm {
/* Form parameters which can be user given */
- protected $page = null; # Target Title
obj
+ protected $page = null; # Target Title obj
protected $article = null; # Target Page obj
- protected $approve = false; # Approval
requested
- protected $unapprove = false; # De-approval requested
- protected $reject = false; # Rejection
requested
- protected $oldid = 0; # ID being
reviewed (last "bad" ID for rejection)
- protected $refid = 0; # Old, "last
good", ID (used for rejection)
- protected $templateParams = ''; # Included template
versions (flat string)
- protected $imageParams = ''; # Included file
versions (flat string)
- protected $fileVersion = ''; # File page file
version (flat string)
- protected $validatedParams = ''; # Parameter key
- protected $comment = ''; # Review
comments
- protected $dims = array(); # Review flags
(for approval)
- protected $lastChangeTime = null; # Conflict handling
- protected $newLastChangeTime = null; # Conflict handling
+ protected $approve = false; # Approval requested
+ protected $unapprove = false; # De-approval requested
+ protected $reject = false; # Rejection requested
+ protected $oldid = 0; # ID being reviewed (last "bad"
ID for rejection)
+ protected $refid = 0; # Old, "last good", ID (used
for rejection)
+ protected $templateParams = ''; # Included template versions
(flat string)
+ protected $imageParams = ''; # Included file versions (flat
string)
+ protected $fileVersion = ''; # File page file version (flat
string)
+ protected $validatedParams = ''; # Parameter key
+ protected $comment = ''; # Review comments
+ protected $dims = array(); # Review flags (for approval)
+ protected $lastChangeTime = null; # Conflict handling
+ protected $newLastChangeTime = null; # Conflict handling
- protected $oflags = array(); # Prior flags for Rev
with ID $oldid
+ protected $oflags = array(); # Prior flags for Rev with ID
$oldid
protected function initialize() {
foreach ( FlaggedRevs::getTags() as $tag ) {
@@ -378,17 +378,17 @@
# The new review entry...
$flaggedRevision = new FlaggedRevision( array(
- 'rev' => $rev,
- 'user_id' => $this->user->getId(),
- 'timestamp' => wfTimestampNow(),
- 'quality' => $quality,
- 'tags' =>
FlaggedRevision::flattenRevisionTags( $flags ),
- 'img_name' => $fileData['name'],
- 'img_timestamp' => $fileData['timestamp'],
- 'img_sha1' => $fileData['sha1'],
- 'templateVersions' => $tmpVersions,
- 'fileVersions' => $fileVersions,
- 'flags' => ''
+ 'rev' => $rev,
+ 'user_id' => $this->user->getId(),
+ 'timestamp' => wfTimestampNow(),
+ 'quality' => $quality,
+ 'tags' =>
FlaggedRevision::flattenRevisionTags( $flags ),
+ 'img_name' => $fileData['name'],
+ 'img_timestamp' => $fileData['timestamp'],
+ 'img_sha1' => $fileData['sha1'],
+ 'templateVersions' => $tmpVersions,
+ 'fileVersions' => $fileVersions,
+ 'flags' => ''
) );
# Delete the old review entry if it exists...
if ( $oldFrev ) {
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggablePageView.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggablePageView.php
2011-10-08 02:47:42 UTC (rev 99296)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggablePageView.php
2011-10-08 03:06:35 UTC (rev 99297)
@@ -1362,8 +1362,8 @@
* (a) Add the review form to the top of the page
* (b) Mark off which versions are checked or not
* (c) When comparing the stable revision to the current:
- * (i) Show a tag with some explanation for the diff
- * (ii) List any template/file changes pending review
+ * (i) Show a tag with some explanation for the diff
+ * (ii) List any template/file changes pending review
*/
public function addToDiffView( $diff, $oldRev, $newRev ) {
global $wgMemc, $wgParserCacheExpireTime;
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedRevsLogView.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedRevsLogView.php
2011-10-08 02:47:42 UTC (rev 99296)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedRevsLogView.php
2011-10-08 03:06:35 UTC (rev 99297)
@@ -1,7 +1,7 @@
<?php
class FlaggedRevsLogView {
- /**
+ /**
* Add setting change description to log line
* @return string
*/
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
2011-10-08 02:47:42 UTC (rev 99296)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
2011-10-08 03:06:35 UTC (rev 99297)
@@ -45,26 +45,26 @@
$localModulePath = dirname( __FILE__ ) . '/modules/';
$remoteModulePath = 'FlaggedRevs/presentation/modules';
$modules['ext.flaggedRevs.basic'] = array(
- 'styles' => array( 'flaggedrevs.css' ),
+ 'styles' => array( 'flaggedrevs.css' ),
'localBasePath' => $localModulePath,
'remoteExtPath' => $remoteModulePath,
);
$modules['ext.flaggedRevs.advanced'] = array(
- 'scripts' => array( 'flaggedrevs.js' ),
- 'messages' => array(
+ 'scripts' => array( 'flaggedrevs.js' ),
+ 'messages' => array(
'revreview-toggle-show',
'revreview-toggle-hide',
'revreview-diff-toggle-show',
'revreview-diff-toggle-hide',
'revreview-log-toggle-show',
'revreview-log-toggle-hide',
'revreview-log-details-show',
'revreview-log-details-hide'
),
- 'dependencies' => array( 'mediawiki.util' ),
- 'localBasePath' => $localModulePath,
- 'remoteExtPath' => $remoteModulePath,
+ 'dependencies' => array( 'mediawiki.util' ),
+ 'localBasePath' => $localModulePath,
+ 'remoteExtPath' => $remoteModulePath,
);
$modules['ext.flaggedRevs.review'] = array(
- 'scripts' => array( 'review.js' ),
- 'styles' => array( 'review.css' ),
- 'messages' => array(
+ 'scripts' => array( 'review.js' ),
+ 'styles' => array( 'review.css' ),
+ 'messages' => array(
'savearticle', 'tooltip-save', 'accesskey-save',
'revreview-submitedit',
'revreview-submitedit-title',
'revreview-submit-review',
'revreview-submit-unreview',
@@ -74,9 +74,9 @@
'revreview-sadv-reviewing-p',
'revreview-sadv-reviewing-c',
'revreview-adv-start-link',
'revreview-adv-stop-link'
),
- 'dependencies' => array( 'mediawiki.util' ),
- 'localBasePath' => $localModulePath,
- 'remoteExtPath' => $remoteModulePath,
+ 'dependencies' => array( 'mediawiki.util' ),
+ 'localBasePath' => $localModulePath,
+ 'remoteExtPath' => $remoteModulePath,
);
}
@@ -766,7 +766,7 @@
array_unshift( $effectiveLevels, "none" );
# Show all restriction levels in a <select>...
$attribs = array(
- 'id' => 'mwStabilityLevel',
+ 'id' => 'mwStabilityLevel',
'name' => 'mwStabilityLevel',
'size' => count( $effectiveLevels ),
) + $disabledAttrib;
@@ -825,8 +825,8 @@
<td class='mw-input'>" .
Xml::tags( 'select',
array(
- 'id'
=> 'mwStabilizeExpirySelection',
- 'name'
=> 'mwStabilizeExpirySelection',
+ 'id' =>
'mwStabilizeExpirySelection',
+ 'name' =>
'mwStabilizeExpirySelection',
'onchange' =>
'onFRChangeExpiryDropdown()',
) + $disabledAttrib,
$expiryFormOptions ) .
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
2011-10-08 02:47:42 UTC (rev 99296)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedRevsXML.php
2011-10-08 03:06:35 UTC (rev 99297)
@@ -268,7 +268,7 @@
$box .= '<div id="mw-fr-revisiondetails-wrapper"
style="position:relative;">';
$box .= Xml::openElement( 'div',
array(
- 'id' => 'mw-fr-revisiondetails',
+ 'id' => 'mw-fr-revisiondetails',
'class' => 'flaggedrevs_short_details',
'style' => 'display:none' )
);
Modified: trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
2011-10-08 02:47:42 UTC (rev 99296)
+++ trunk/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php
2011-10-08 03:06:35 UTC (rev 99297)
@@ -320,7 +320,7 @@
$attribs = array( 'class' =>
"fr-rating-option-$i",
'onchange' =>
"FlaggedRevsReview.updateRatingForm()" );
$item .= Xml::radioLabel(
FlaggedRevs::getTagMsg( $name ), "wp$quality",
- $i, "wp$quality" .
$i, ( $i == $selected ), $attribs ) . "\n";
+ $i, "wp$quality" . $i,
( $i == $selected ), $attribs ) . "\n";
}
# Otherwise make checkboxes (two levels
available for current user)
} elseif ( $numLevels == 2 ) {
@@ -389,10 +389,10 @@
}
$s = Xml::submitButton( wfMsgHtml( 'revreview-submit-review' ),
array(
- 'name' => 'wpApprove',
- 'id' => 'mw-fr-submit-accept',
+ 'name' => 'wpApprove',
+ 'id' => 'mw-fr-submit-accept',
'accesskey' => wfMsg( 'revreview-ak-review' ),
- 'title' => wfMsg( 'revreview-tt-flag' )
. ' [' .
+ 'title' => wfMsg( 'revreview-tt-flag' ) . '
[' .
wfMsg( 'revreview-ak-review' ) . ']'
) + ( ( $disabled || !$applicable ) ? $disAttrib :
array() )
);
@@ -402,7 +402,7 @@
$s .= Xml::submitButton( wfMsgHtml(
'revreview-submit-reject' ),
array(
'name' => 'wpReject',
- 'id' => 'mw-fr-submit-reject',
+ 'id' => 'mw-fr-submit-reject',
'title' => wfMsg( 'revreview-tt-reject'
),
) + ( $disabled ? $disAttrib : array() )
);
@@ -413,7 +413,7 @@
$s .= Xml::submitButton( wfMsgHtml( 'revreview-submit-unreview'
),
array(
'name' => 'wpUnapprove',
- 'id' => 'mw-fr-submit-unaccept',
+ 'id' => 'mw-fr-submit-unaccept',
'title' => wfMsg( 'revreview-tt-unflag' ),
'style' => $frev ? '' : 'display:none'
) + ( $disabled ? $disAttrib : array() )
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
