Revision: 46113
Author: aaron
Date: 2009-01-24 00:31:50 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
* Tweak "users watching" cond
* Style/whitespace tweaks
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/specialpages/LikedPages_body.php
trunk/extensions/FlaggedRevs/specialpages/OldReviewedPages_body.php
trunk/extensions/FlaggedRevs/specialpages/ProblemPages_body.php
trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
trunk/extensions/FlaggedRevs/specialpages/RatingHistory_body.php
trunk/extensions/FlaggedRevs/specialpages/ReaderFeedback_body.php
trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
trunk/extensions/FlaggedRevs/specialpages/Stabilization_body.php
trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php
trunk/extensions/FlaggedRevs/specialpages/StableVersions_body.php
trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php
trunk/extensions/FlaggedRevs/specialpages/UnstablePages_body.php
trunk/extensions/FlaggedRevs/specialpages/ValidationStatistics_body.php
Modified: trunk/extensions/FlaggedRevs/specialpages/LikedPages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/LikedPages_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/LikedPages_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,13 +6,13 @@
class LikedPages extends SpecialPage
{
- function __construct() {
+ public function __construct() {
SpecialPage::SpecialPage( 'LikedPages' );
wfLoadExtensionMessages( 'LikedPages' );
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
+ public function execute( $par ) {
global $wgRequest, $wgOut, $wgUser;
$this->setHeaders();
if( $wgUser->isAllowed( 'feedback' ) ) {
@@ -74,10 +74,11 @@
$hist = $this->skin->makeKnownLinkObj( $title,
wfMsgHtml('hist'), 'action=history' );
$stxt = '';
if( !is_null($size = $row->page_len) ) {
- if($size == 0)
+ if( $size == 0 )
$stxt = ' <small>' . wfMsgHtml('historyempty')
. '</small>';
else
- $stxt = ' <small>' . wfMsgExt('historysize',
array('parsemag'), $wgLang->formatNum( $size ) ) . '</small>';
+ $stxt = ' <small>' . wfMsgExt('historysize',
array('parsemag'),
+ $wgLang->formatNum( $size ) ) .
'</small>';
}
$ratinghist = SpecialPage::getTitleFor( 'RatingHistory' );
$graph = $this->skin->makeKnownLinkObj( $ratinghist,
wfMsg('likedpages-graphs'),
Modified: trunk/extensions/FlaggedRevs/specialpages/OldReviewedPages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/OldReviewedPages_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/OldReviewedPages_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,15 +6,15 @@
class OldReviewedPages extends SpecialPage
{
- function __construct() {
- parent::__construct( 'OldReviewedPages' );
+ public function __construct() {
+ parent::__construct( 'OldReviewedPages' );
// $this->includable( true );
wfLoadExtensionMessages( 'OldReviewedPages' );
wfLoadExtensionMessages( 'FlaggedRevs' );
- }
+ }
- function execute( $par ) {
- global $wgRequest, $wgUser, $wgOut;
+ public function execute( $par ) {
+ global $wgRequest, $wgUser, $wgOut;
$this->setHeaders();
$this->skin = $wgUser->getSkin();
$this->namespace = $wgRequest->getIntOrNull( 'namespace' );
@@ -39,7 +39,7 @@
$wgOut->setFeedAppendQuery( wfArrayToCGI( $queryParams ) );
}
- function showList( $par ) {
+ public function showList( $par ) {
global $wgOut, $wgScript, $wgUser, $wgFlaggedRevsNamespaces;
$limit = $this->parseParams( $par );
$pager = new OldReviewedPagesPager( $this, $this->namespace,
$this->category,
Modified: trunk/extensions/FlaggedRevs/specialpages/ProblemPages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ProblemPages_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/ProblemPages_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,14 +6,14 @@
class ProblemPages extends SpecialPage
{
- function __construct() {
- SpecialPage::SpecialPage( 'ProblemPages' );
+ public function __construct() {
+ SpecialPage::SpecialPage( 'ProblemPages' );
wfLoadExtensionMessages( 'ProblemPages' );
wfLoadExtensionMessages( 'FlaggedRevs' );
- }
+ }
- function execute( $par ) {
- global $wgRequest, $wgOut, $wgUser;
+ public function execute( $par ) {
+ global $wgRequest, $wgOut, $wgUser;
$this->setHeaders();
if( $wgUser->isAllowed( 'feedback' ) ) {
if( $wgUser->isBlocked() ) {
@@ -77,7 +77,8 @@
if($size == 0)
$stxt = ' <small>' . wfMsgHtml('historyempty')
. '</small>';
else
- $stxt = ' <small>' . wfMsgExt('historysize',
array('parsemag'), $wgLang->formatNum( $size ) ) . '</small>';
+ $stxt = ' <small>' . wfMsgExt('historysize',
array('parsemag'),
+ $wgLang->formatNum( $size ) ) .
'</small>';
}
$ratinghist = SpecialPage::getTitleFor( 'RatingHistory' );
$graph = $this->skin->makeKnownLinkObj( $ratinghist,
wfMsg('problempages-graphs'),
Modified: trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,13 +6,13 @@
class QualityOversight extends SpecialPage
{
- function __construct() {
+ public function __construct() {
SpecialPage::SpecialPage( 'QualityOversight' );
wfLoadExtensionMessages( 'FlaggedRevs' );
wfLoadExtensionMessages( 'QualityOversight' );
}
- function execute( $par ) {
+ public function execute( $par ) {
global $wgOut, $wgUser, $wgRequest, $wgFlaggedRevsNamespaces,
$wgFlaggedRevsOversightAge;
$this->setHeaders();
Modified: trunk/extensions/FlaggedRevs/specialpages/RatingHistory_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/RatingHistory_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/RatingHistory_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,14 +6,14 @@
class RatingHistory extends UnlistedSpecialPage
{
- function __construct() {
- parent::__construct( 'RatingHistory', 'feedback' );
+ public function __construct() {
+ parent::__construct( 'RatingHistory', 'feedback' );
wfLoadExtensionMessages( 'RatingHistory' );
wfLoadExtensionMessages( 'FlaggedRevs' );
- }
+ }
- function execute( $par ) {
- global $wgRequest, $wgUser, $wgOut;
+ public function execute( $par ) {
+ global $wgRequest, $wgUser, $wgOut;
$this->setHeaders();
if( $wgUser->isAllowed( 'feedback' ) ) {
if( $wgUser->isBlocked() ) {
Modified: trunk/extensions/FlaggedRevs/specialpages/ReaderFeedback_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ReaderFeedback_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/ReaderFeedback_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -13,12 +13,12 @@
var $validatedParams = '';
var $commentary = '';
- function __construct() {
+ public function __construct() {
UnlistedSpecialPage::UnlistedSpecialPage( 'ReaderFeedback', 'feedback'
);
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
+ public function execute( $par ) {
global $wgRequest, $wgUser, $wgOut;
$confirm = $wgRequest->wasPosted() && $wgUser->matchEditToken(
$wgRequest->getVal( 'wpEditToken' ) );
if( $wgUser->isAllowed( 'feedback' ) ) {
Modified: trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,14 +6,14 @@
class ReviewedPages extends SpecialPage
{
- function __construct() {
- SpecialPage::SpecialPage( 'ReviewedPages' );
+ public function __construct() {
+ SpecialPage::SpecialPage( 'ReviewedPages' );
wfLoadExtensionMessages( 'ReviewedPages' );
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
- global $wgRequest, $wgUser, $wgFlaggedRevValues, $wgFlaggedRevPristine;
+ public function execute( $par ) {
+ global $wgRequest, $wgUser, $wgFlaggedRevValues,
$wgFlaggedRevPristine;
$this->setHeaders();
$this->skin = $wgUser->getSkin();
@@ -28,7 +28,7 @@
$this->showPageList();
}
- function showForm() {
+ public function showForm() {
global $wgOut, $wgTitle, $wgScript, $wgFlaggedRevsNamespaces;
$form = Xml::openElement( 'form',
@@ -47,7 +47,7 @@
$wgOut->addHTML( $form );
}
- function showPageList() {
+ protected function showPageList() {
global $wgOut, $wgUser, $wgLang;
$pager = new ReviewedPagesPager( $this, array(), $this->type,
$this->namespace );
@@ -61,7 +61,7 @@
}
}
- function formatRow( $row ) {
+ public function formatRow( $row ) {
global $wgLang, $wgUser;
$title = Title::makeTitle( $row->page_namespace,
$row->page_title );
@@ -69,10 +69,11 @@
$stxt = '';
if( !is_null($size = $row->page_len) ) {
- if($size == 0)
+ if( $size == 0 )
$stxt = ' <small>' . wfMsgHtml('historyempty')
. '</small>';
else
- $stxt = ' <small>' . wfMsgExt('historysize',
array('parsemag'), $wgLang->formatNum( $size ) ) . '</small>';
+ $stxt = ' <small>' . wfMsgExt('historysize',
array('parsemag'),
+ $wgLang->formatNum( $size ) ) .
'</small>';
}
$SVtitle = SpecialPage::getTitleFor( 'Stableversions' );
Modified: trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -23,12 +23,12 @@
var $dims = array();
var $unapprovedTags = 0;
- function __construct() {
+ public function __construct() {
parent::__construct( 'RevisionReview', 'review' );
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
+ public function execute( $par ) {
global $wgRequest, $wgUser, $wgOut;
$confirm = $wgRequest->wasPosted() && $wgUser->matchEditToken(
$wgRequest->getVal( 'wpEditToken' ) );
if( $wgUser->isAllowed( 'review' ) ) {
Modified: trunk/extensions/FlaggedRevs/specialpages/Stabilization_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/Stabilization_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/Stabilization_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,14 +6,14 @@
class Stabilization extends UnlistedSpecialPage
{
- function __construct() {
- UnlistedSpecialPage::UnlistedSpecialPage( 'Stabilization',
'stablesettings' );
+ public function __construct() {
+ UnlistedSpecialPage::UnlistedSpecialPage( 'Stabilization',
'stablesettings' );
wfLoadExtensionMessages( 'Stabilization' );
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
- global $wgRequest, $wgUser, $wgOut;
+ public function execute( $par ) {
+ global $wgRequest, $wgUser, $wgOut;
$confirm = $wgRequest->wasPosted() &&
$wgUser->matchEditToken( $wgRequest->getVal(
'wpEditToken' ) );
@@ -80,7 +80,7 @@
}
}
- function showSettings( $err = null ) {
+ protected function showSettings( $err = null ) {
global $wgOut, $wgTitle, $wgUser;
$wgOut->setRobotPolicy( 'noindex,nofollow' );
@@ -170,7 +170,7 @@
LogEventsList::showLogExtract( $wgOut, 'stable',
$this->page->getPrefixedText() );
}
- function submit() {
+ protected function submit() {
global $wgOut, $wgUser, $wgParser, $wgFlaggedRevsOverride,
$wgFlaggedRevsPrecedence;
$changed = $reset = false;
Modified: trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/StablePages_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,13 +6,13 @@
class StablePages extends SpecialPage
{
- function __construct() {
+ public function __construct() {
SpecialPage::SpecialPage( 'StablePages' );
wfLoadExtensionMessages( 'StablePages' );
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
+ public function execute( $par ) {
global $wgRequest, $wgUser;
$this->setHeaders();
@@ -24,7 +24,7 @@
$this->showPageList();
}
- function showForm() {
+ protected function showForm() {
global $wgOut, $wgTitle, $wgScript, $wgFlaggedRevsNamespaces;
$wgOut->addHTML( wfMsgExt('stablepages-text',
array('parseinline') ) );
if( count($wgFlaggedRevsNamespaces) > 1 ) {
@@ -38,7 +38,7 @@
}
}
- function showPageList() {
+ protected function showPageList() {
global $wgOut, $wgUser, $wgLang;
# Take this opportunity to purge out expired configurations
FlaggedRevs::purgeExpiredConfigurations();
@@ -52,7 +52,7 @@
}
}
- function formatRow( $row ) {
+ public function formatRow( $row ) {
global $wgLang, $wgUser;
$title = Title::makeTitle( $row->page_namespace,
$row->page_title );
Modified: trunk/extensions/FlaggedRevs/specialpages/StableVersions_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/StableVersions_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/StableVersions_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,13 +6,13 @@
class StableVersions extends UnlistedSpecialPage
{
- function __construct() {
+ public function __construct() {
UnlistedSpecialPage::UnlistedSpecialPage( 'StableVersions' );
wfLoadExtensionMessages( 'StableVersions' );
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
+ public function execute( $par ) {
global $wgRequest, $wgUser, $wgOut;
$this->setHeaders();
@@ -32,7 +32,7 @@
$this->showStableList();
}
- function showStableList() {
+ protected function showStableList() {
global $wgOut, $wgUser;
# Must be a content page
if( !FlaggedRevs::isPageReviewable( $this->page ) ) {
@@ -53,7 +53,7 @@
}
}
- function formatRow( $row ) {
+ public function formatRow( $row ) {
global $wgLang, $wgUser;
$time = $wgLang->timeanddate( wfTimestamp(TS_MW,
$row->rev_timestamp), true );
Modified: trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,13 +6,13 @@
class UnreviewedPages extends SpecialPage
{
- function __construct() {
+ public function __construct() {
SpecialPage::SpecialPage( 'UnreviewedPages', 'unreviewedpages' );
wfLoadExtensionMessages( 'UnreviewedPages' );
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
+ public function execute( $par ) {
global $wgRequest, $wgUser, $wgOut;
$this->setHeaders();
if( !$wgUser->isAllowed( 'unreviewedpages' ) ) {
@@ -23,7 +23,7 @@
$this->showList( $wgRequest );
}
- function showList( $wgRequest ) {
+ protected function showList( $wgRequest ) {
global $wgOut, $wgScript, $wgTitle, $wgFlaggedRevsNamespaces;
# If no NS given, then just use the first of
$wgFlaggedRevsNamespaces
$defaultNS = empty($wgFlaggedRevsNamespaces) ? 0 :
$wgFlaggedRevsNamespaces[0];
@@ -77,7 +77,7 @@
}
}
- function formatRow( $result ) {
+ public function formatRow( $result ) {
global $wgLang, $wgUser;
$title = Title::makeTitle( $result->page_namespace,
$result->page_title );
$link = $this->skin->makeKnownLinkObj( $title, null,
'redirect=no' );
@@ -120,7 +120,7 @@
if( $count == -1 || $count <= 100 ) {
global $wgCookieExpiration;
# Get number of active editors watchling this
- $cutoff = $dbr->timestamp( wfTimestamp( TS_UNIX ) -
3*$wgCookieExpiration );
+ $cutoff = $dbr->timestamp( wfTimestamp( TS_UNIX ) -
2*$wgCookieExpiration );
$res = $dbr->select( array('watchlist','user'), '1',
array( 'wl_namespace' =>
$title->getNamespace(),
'wl_title' => $title->getDBKey(),
Modified: trunk/extensions/FlaggedRevs/specialpages/UnstablePages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/UnstablePages_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/UnstablePages_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,13 +6,13 @@
class Unstablepages extends SpecialPage
{
- function __construct() {
+ public function __construct() {
SpecialPage::SpecialPage( 'UnstablePages' );
wfLoadExtensionMessages( 'UnstablePages' );
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
+ public function execute( $par ) {
global $wgRequest, $wgUser;
$this->setHeaders();
@@ -24,7 +24,7 @@
$this->showPageList();
}
- function showForm() {
+ protected function showForm() {
global $wgOut, $wgTitle, $wgScript, $wgFlaggedRevsNamespaces;
$wgOut->addHTML( wfMsgExt('unstablepages-text',
array('parseinline') ) );
if( count($wgFlaggedRevsNamespaces) > 1 ) {
@@ -38,7 +38,7 @@
}
}
- function showPageList() {
+ protected function showPageList() {
global $wgOut, $wgUser, $wgLang;
# Take this opportunity to purge out expired configurations
FlaggedRevs::purgeExpiredConfigurations();
@@ -52,7 +52,7 @@
}
}
- function formatRow( $row ) {
+ public function formatRow( $row ) {
global $wgLang, $wgUser;
$title = Title::makeTitle( $row->page_namespace,
$row->page_title );
Modified:
trunk/extensions/FlaggedRevs/specialpages/ValidationStatistics_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ValidationStatistics_body.php
2009-01-24 00:16:05 UTC (rev 46112)
+++ trunk/extensions/FlaggedRevs/specialpages/ValidationStatistics_body.php
2009-01-24 00:31:50 UTC (rev 46113)
@@ -6,13 +6,13 @@
class ValidationStatistics extends IncludableSpecialPage
{
- function __construct() {
+ public function __construct() {
IncludableSpecialPage::IncludableSpecialPage(
'ValidationStatistics' );
wfLoadExtensionMessages( 'ValidationStatistics' );
wfLoadExtensionMessages( 'FlaggedRevs' );
}
- function execute( $par ) {
+ public function execute( $par ) {
global $wgRequest, $wgUser, $wgOut, $wgLang, $wgContLang,
$wgFlaggedRevsNamespaces;
$this->setHeaders();
$this->skin = $wgUser->getSkin();
@@ -71,10 +71,12 @@
htmlspecialchars(
$wgLang->formatnum( $row->total ) ) .
"</td>
<td>" .
- htmlspecialchars(
$wgLang->formatnum( $row->reviewed ) . $wgContLang->getDirMark() ) . "
<i>($percRev)</i>
+ htmlspecialchars(
$wgLang->formatnum( $row->reviewed ) .
+
$wgContLang->getDirMark() ) . " <i>($percRev)</i>
</td>
<td>" .
- htmlspecialchars(
$wgLang->formatnum( $row->synced ) . $wgContLang->getDirMark() ) . "
<i>($percLatest)</i>
+ htmlspecialchars(
$wgLang->formatnum( $row->synced ) .
+
$wgContLang->getDirMark() ) . " <i>($percLatest)</i>
</td>
<td>" .
$percSynced .
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
