https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114855
Revision: 114855
Author: bsitu
Date: 2012-04-11 20:30:38 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
remove whitespaces and add array type hint to function parameter
Modified Paths:
--------------
trunk/extensions/PageTriage/PageTriage.hooks.php
trunk/extensions/PageTriage/PageTriage.i18n.php
trunk/extensions/PageTriage/PageTriage.php
trunk/extensions/PageTriage/SpecialPageTriage.php
trunk/extensions/PageTriage/api/ApiPageTriageAction.php
trunk/extensions/PageTriage/api/ApiPageTriageGetMetadata.php
trunk/extensions/PageTriage/api/ApiPageTriageList.php
trunk/extensions/PageTriage/api/ApiPageTriageStats.php
trunk/extensions/PageTriage/includes/ArticleMetadata.php
trunk/extensions/PageTriage/includes/PageTriage.php
trunk/extensions/PageTriage/includes/PageTriageUtil.php
trunk/extensions/PageTriage/modules/ext.pageTriage.article/ext.pageTriage.article.js
trunk/extensions/PageTriage/modules/ext.pageTriage.css
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.js
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.css
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.js
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.js
Modified: trunk/extensions/PageTriage/PageTriage.hooks.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.hooks.php 2012-04-11 18:57:23 UTC
(rev 114854)
+++ trunk/extensions/PageTriage/PageTriage.hooks.php 2012-04-11 20:30:38 UTC
(rev 114855)
@@ -40,7 +40,7 @@
public static function onNewRevisionFromEditComplete( $article, $rev,
$baseID, $user ) {
$prev = $rev->getPrevious();
if ( $prev && !$article->isRedirect() && $article->isRedirect(
$prev->getRawText() ) ) {
- self::addToPageTriageQueue( $article->getId(),
$article->mTitle, $user );
+ self::addToPageTriageQueue( $article->getId(),
$article->mTitle, $user );
}
return true;
}
@@ -123,7 +123,7 @@
// Without autopatrol right, we consider the system updates the
triage status to '0' or adds a brand new
// record with '0' triage status to the queue, hence we should
not pass a user for logging
if ( $patrolled ) {
- $pageTriage->addToPageTriageQueue( '1', $user );
+ $pageTriage->addToPageTriageQueue( '1', $user );
} else {
$pageTriage->addToPageTriageQueue( '0' );
}
@@ -183,7 +183,7 @@
$msg= wfMessage( 'pagetriage-reviewed' )->escaped();
} else {
// Do nothing as this page is not in PageTriage queue
- return true;
+ return true;
}
$wgOut->addModules( array('ext.pageTriage.article') );
@@ -194,7 +194,7 @@
return true;
}
-
+
/**
* Sync records from patrol queue to triage queue
*
@@ -214,4 +214,4 @@
return true;
}
-}
+}
\ No newline at end of file
Modified: trunk/extensions/PageTriage/PageTriage.i18n.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.i18n.php 2012-04-11 18:57:23 UTC
(rev 114854)
+++ trunk/extensions/PageTriage/PageTriage.i18n.php 2012-04-11 20:30:38 UTC
(rev 114855)
@@ -139,7 +139,5 @@
'pagetriage-filter-stat-non-autoconfirmed' => 'Status display component
for articles by non-autoconfirmed editors',
'pagetriage-filter-stat-blocked' => 'Status display component for
articles by blocked users',
'pagetriage-filter-stat-username' => 'Status display component for
filter by username. $1 is the username.',
-
-
);
Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php 2012-04-11 18:57:23 UTC (rev
114854)
+++ trunk/extensions/PageTriage/PageTriage.php 2012-04-11 20:30:38 UTC (rev
114855)
@@ -297,7 +297,7 @@
'ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.css',
),
'messages' => array(
-
+
)
);
Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-11 18:57:23 UTC
(rev 114854)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-11 20:30:38 UTC
(rev 114855)
@@ -11,14 +11,14 @@
// Holds the various options for viewing the list
protected $opts;
-
+
/**
* Initialize the special page.
*/
public function __construct() {
parent::__construct( 'PageTriage' );
}
-
+
/**
* Define what happens when the special page is loaded by the user.
* @param $sub string The subpage, if any
@@ -26,7 +26,7 @@
public function execute( $sub ) {
global $wgRequest, $wgPageTriageInfiniteScrolling;
$out = $this->getOutput();
-
+
// TODO: check user permissions, make sure they're logged in
and have the pagepatrol userright
global $wgUser;
@@ -36,7 +36,7 @@
// Output the title of the page
$out->setPageTitle( wfMessage( 'pagetriage' ) );
-
+
// Allow infinite scrolling override from query string parameter
// We don't use getBool() here since the param is optional
if ( $wgRequest->getText( 'infinite' ) === 'true' ) {
@@ -44,7 +44,7 @@
} else if ( $wgRequest->getText( 'infinite' ) === 'false' ) {
$wgPageTriageInfiniteScrolling = false;
}
-
+
// Set the infinite scrolling flag in JavaScript
$out->addScript( "<script
type=\"text/javascript\">mw.config.set({\"wgPageTriageInfiniteScrolling\":" .
$wgPageTriageInfiniteScrolling . "});</script>" );
@@ -58,7 +58,7 @@
$triageInterface .= "<div id='mwe-pt-list-control-nav'
class='mwe-pt-navigation-bar mwe-pt-control-gradient'>";
$triageInterface .= "<div
id='mwe-pt-list-control-nav-content'></div>";
$triageInterface .= "</div>";
-
+
// TODO: this should load with a spinner instead of "please
wait"
$triageInterface .= "<div id='mwe-pt-list-view'>Please
wait...</div>";
$triageInterface .= "<div id='mwe-pt-list-more' style='display:
none;'>";
@@ -69,7 +69,7 @@
$triageInterface .= "<div
id='mwe-pt-list-stats-nav-content'></div>";
$triageInterface .= "</div>";
$triageInterface .= "<div
id='mwe-pt-list-stats-nav-anchor'></div>";
-
+
// These are the templates that backbone/underscore render on
the client.
// It would be awesome if they lived in separate files, but we
need to figure out how to make RL do that for us.
// Syntax documentation can be found at
http://documentcloud.github.com/underscore/#template.
@@ -156,7 +156,7 @@
</div>
</div>
</script>
-
+
<!-- top nav template -->
<script type="text/template"
id="listControlNavTemplate">
<span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-showing' ) %></b> <%=
filterStatus %></span>
@@ -232,7 +232,7 @@
<a href="#"
id="mwe-pt-sort-oldest"><%= gM( 'pagetriage-oldest' ) %></a>
</span>
</script>
-
+
<!-- bottom nav template -->
<script type="text/template"
id="listStatsNavTemplate">
<div id="mwe-pt-stats-nav">
@@ -244,7 +244,7 @@
<%
var
triagerLinks = new Array();
for ( var m in
ptrTopTriager ) {
-
triagerLinks.push( "<a " + ptrTopTriager[m].linkCSS + " href=\"" +
ptrTopTriager[m].title.getUrl() + "\">" + mw.html.escape(
ptrTopTriager[m].userName ) + "</a>" );
+
triagerLinks.push( "<a " + ptrTopTriager[m].linkCSS + " href=\"" +
ptrTopTriager[m].title.getUrl() + "\">" +
mw.html.escape(ptrTopTriager[m].userName ) + "</a>" );
}
var triagers =
triagerLinks.join( gM( 'comma-separator' ) );
%>
@@ -258,12 +258,12 @@
</div>
</div>
</script>
-
+
HTML;
// Output the HTML for the page
$out->addHtml( $triageInterface );
-
+
}
}
Modified: trunk/extensions/PageTriage/api/ApiPageTriageAction.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageAction.php 2012-04-11
18:57:23 UTC (rev 114854)
+++ trunk/extensions/PageTriage/api/ApiPageTriageAction.php 2012-04-11
20:30:38 UTC (rev 114855)
@@ -1,7 +1,7 @@
<?php
class ApiPageTriageAction extends ApiBase {
-
+
public function execute() {
global $wgUser;
@@ -10,7 +10,7 @@
$article = Article::newFromID( $params['pageid'] );
if ( $article ) {
if ( !$article->getTitle()->quickUserCan( 'patrol' ) ) {
- $this->permissionError();
+ $this->permissionError();
}
} else {
$this->pageError();
@@ -28,11 +28,11 @@
}
private function permissionError() {
- $this->dieUsage( "You don't have permission to do that",
'permission-denied' );
+ $this->dieUsage( "You don't have permission to do that",
'permission-denied' );
}
private function pageError() {
- $this->dieUsage( "The page specified does not exist",
'bad-page' );
+ $this->dieUsage( "The page specified does not exist",
'bad-page' );
}
public function needsToken() {
@@ -85,4 +85,4 @@
public function getDescription() {
return 'Mark an article as reviewed or unreviewed';
}
-}
+}
\ No newline at end of file
Modified: trunk/extensions/PageTriage/api/ApiPageTriageGetMetadata.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageGetMetadata.php
2012-04-11 18:57:23 UTC (rev 114854)
+++ trunk/extensions/PageTriage/api/ApiPageTriageGetMetadata.php
2012-04-11 20:30:38 UTC (rev 114855)
@@ -1,7 +1,7 @@
<?php
class ApiPageTriageGetMetadata extends ApiBase {
-
+
public function execute() {
global $wgPageTriagePagesPerRequest;
@@ -10,7 +10,7 @@
if ( count( $params['page_id'] ) > $wgPageTriagePagesPerRequest
) {
$this->dieUsage( 'Too many pages in the request',
'exceed-page-limit' );
}
-
+
$articleMetadata = new ArticleMetadata( $params['page_id'] );
$metaData = $articleMetadata->getMetadata();
@@ -57,4 +57,4 @@
public function getDescription() {
return 'Get metadata for a list of articles';
}
-}
+}
\ No newline at end of file
Modified: trunk/extensions/PageTriage/api/ApiPageTriageList.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageList.php 2012-04-11
18:57:23 UTC (rev 114854)
+++ trunk/extensions/PageTriage/api/ApiPageTriageList.php 2012-04-11
20:30:38 UTC (rev 114855)
@@ -19,7 +19,7 @@
// fetch metadata for those pages
$articleMetadata = new ArticleMetadata( $pages );
$metaData = $articleMetadata->getMetadata();
-
+
// Sort data according to page order returned by our
query. Also convert it to a
// slightly different format that's more
Backbone-friendly.
foreach ( $pages as $page ) {
@@ -57,7 +57,7 @@
// Start building the massive filter which includes meta data
$tables = array( 'pagetriage_page', 'page' );
$conds = array( 'ptrp_page_id = page_id' );
-
+
// Include reviewed
if ( !$opts['showreviewed'] ) {
$conds['ptrp_reviewed'] = 0;
@@ -69,7 +69,7 @@
// Include marked for deletion
if ( !$opts['showdeleted'] ) {
$conds['ptrp_deleted'] = 0;
- }
+ }
// Show by namespace
if ( isset( $opts['namespace'] ) ) {
$conds['page_namespace'] = $opts['namespace'];
@@ -111,7 +111,7 @@
return $pages;
}
-
+
private static function buildTagQuery( $opts ) {
$dbr = wfGetDB( DB_SLAVE );
$tagConds = '';
@@ -184,16 +184,16 @@
ApiBase::PARAM_TYPE => 'integer',
),
'no_category' => array(
- ApiBase::PARAM_TYPE => 'boolean',
+ ApiBase::PARAM_TYPE => 'boolean',
),
'no_inbound_links' => array(
- ApiBase::PARAM_TYPE => 'boolean',
+ ApiBase::PARAM_TYPE => 'boolean',
),
'non_autoconfirmed_users' => array(
- ApiBase::PARAM_TYPE => 'boolean',
+ ApiBase::PARAM_TYPE => 'boolean',
),
'blocked_users' => array(
- ApiBase::PARAM_TYPE => 'boolean',
+ ApiBase::PARAM_TYPE => 'boolean',
),
'username' => array(
ApiBase::PARAM_TYPE => 'user',
@@ -233,4 +233,4 @@
public function getVersion() {
return __CLASS__ . ': $Id: ApiPageTriageList.php $';
}
-}
+}
\ No newline at end of file
Modified: trunk/extensions/PageTriage/api/ApiPageTriageStats.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageStats.php 2012-04-11
18:57:23 UTC (rev 114854)
+++ trunk/extensions/PageTriage/api/ApiPageTriageStats.php 2012-04-11
20:30:38 UTC (rev 114855)
@@ -34,4 +34,4 @@
return 'Get the stats for page triage';
}
-}
+}
\ No newline at end of file
Modified: trunk/extensions/PageTriage/includes/ArticleMetadata.php
===================================================================
--- trunk/extensions/PageTriage/includes/ArticleMetadata.php 2012-04-11
18:57:23 UTC (rev 114854)
+++ trunk/extensions/PageTriage/includes/ArticleMetadata.php 2012-04-11
20:30:38 UTC (rev 114855)
@@ -14,7 +14,7 @@
$pageId = self::validatePageId( $pageId );
if ( !$pageId ) {
- throw new MWArticleMetadataMissingPageIdException(
'Missing page id' );
+ throw new MWArticleMetadataMissingPageIdException(
'Missing page id' );
}
$this->mPageId = $pageId;
@@ -32,7 +32,7 @@
// $pageId can be an array or a single value.
$dbw = wfGetDB( DB_MASTER );
-
+
$dbw->begin();
$dbw->delete(
'pagetriage_page_tags',
@@ -40,7 +40,7 @@
__METHOD__,
array()
);
-
+
$dbw->delete(
'pagetriage_page',
array( 'ptrp_page_id' => $pageId ),
@@ -54,11 +54,11 @@
__METHOD__,
array()
);
-
+
// also remove it from the cache
$this->flushMetadataFromCache( $pageId );
$dbw->commit();
-
+
return true;
}
@@ -74,7 +74,7 @@
if ( is_null( $pageId ) ) {
foreach ( $this->mPageId as $pageId ) {
$wgMemc->delete( $keyPrefix . '-' . $pageId );
- }
+ }
} else {
$wgMemc->delete( $keyPrefix . '-' . $pageId );
}
@@ -110,9 +110,9 @@
$metaData[$pageId] = $metaDataCache;
}
}
- return $metaData;
+ return $metaData;
} else {
- return $wgMemc->get( $keyPrefix . '-' . $pageId );;
+ return $wgMemc->get( $keyPrefix . '-' . $pageId );
}
}
@@ -169,11 +169,11 @@
$pageData += $acp->compileMetadata();
}
}
-
+
foreach ( $pageData as $pageId => $val ) {
$this->setMetadataToCache( $pageId, $val );
}
-
+
$metaData += $pageData;
}
@@ -186,14 +186,14 @@
*/
public static function getValidTags() {
static $tags = array();
-
+
if ( count( $tags ) > 0 ) {
return $tags;
}
$dbr = wfGetDB( DB_SLAVE );
- $res = $dbr->select(
+ $res = $dbr->select(
array( 'pagetriage_tags' ),
array( 'ptrt_tag_id', 'ptrt_tag_name' ),
array( ),
@@ -206,13 +206,13 @@
return $tags;
}
-
+
/**
* Typecast the value in page id array to int
* @param $pageIds array
* @return array
*/
- public static function validatePageId( $pageIds = array() ) {
+ public static function validatePageId( array $pageIds ) {
$cleanUp = array();
foreach ( $pageIds as $val ) {
$casted = intval( $val );
@@ -222,7 +222,7 @@
}
return $cleanUp;
}
-
+
}
class MWArticleMetadataMissingPageIdException extends MWException {}
@@ -238,7 +238,7 @@
protected $defaultMode;
/**
- * @param $pageId array - list of page id
+ * @param $pageId array - list of page id
*/
private function __construct( array $pageId ) {
$this->mPageId = $pageId;
@@ -254,7 +254,7 @@
$this->metadata = array_fill_keys( $this->mPageId, array() );
$this->defaultMode = true;
}
-
+
/**
* Factory for creating an instance
* @param $pageId array
@@ -264,12 +264,12 @@
$pageId = ArticleMetadata::validatePageId( $pageId );
if ( $pageId ) {
- return new ArticleCompileProcessor( $pageId );
+ return new ArticleCompileProcessor( $pageId );
} else {
- return false;
+ return false;
}
}
-
+
/**
* Register a component to the processor for compiling
* @param $component string
@@ -277,10 +277,10 @@
public function registerComponent( $component ) {
$this->defaultMode = false;
if ( isset( $this->component[$component] ) ) {
- $this->component[$component] = 'on';
+ $this->component[$component] = 'on';
}
}
-
+
/**
* Wrapper function for compiling the data
* @return array
@@ -291,7 +291,7 @@
$this->save();
return $this->metadata;
}
-
+
/**
* Set up the data before compiling
*/
@@ -306,10 +306,9 @@
$this->component['CategoryCount'] = 'on';
$this->component['DeletionTag'] = 'on';
}
-
}
}
-
+
/**
* Compile all of the registered components in order
*/
@@ -321,7 +320,7 @@
$compClass = 'ArticleCompile' . $key;
$comp = new $compClass( $this->mPageId );
if ( !$comp->compile() ) {
- break;
+ break;
}
foreach ( $comp->getMetadata() as $pageId =>
$row ) {
$this->metadata[$pageId] += $row;
@@ -329,7 +328,7 @@
$completed[] = $key;
}
}
-
+
// Subtract deletion tags from category count
if ( in_array( 'CategoryCount', $completed ) ) {
$deletionTags =
ArticleCompileDeletionTag::getDeletionTags();
@@ -343,9 +342,8 @@
if ( $this->metadata[$pageId]['category_count']
< 0 ) {
$this->metadata[$pageId]['category_count'] = '0';
}
-
}
- }
+ }
}
/**
@@ -397,11 +395,11 @@
$this->mPageId = $pageId;
$this->metadata = array_fill_keys( $pageId, array() );
}
-
+
public abstract function compile();
public function getMetadata() {
- return $this->metadata;
+ return $this->metadata;
}
}
@@ -416,11 +414,11 @@
public function compile() {
$dbr = wfGetDB( DB_SLAVE );
-
+
$res = $dbr->select(
array ( 'page', 'revision', 'pagetriage_page' ),
array (
- 'page_id', 'page_namespace',
'page_title', 'page_len',
+ 'page_id', 'page_namespace',
'page_title', 'page_len',
'COUNT(rev_id) AS rev_count',
'ptrp_reviewed',
'MIN(rev_timestamp) AS creation_date'
),
@@ -442,10 +440,10 @@
if ( count( $this->metadata) == 0 ) {
return false;
} else {
- return true;
+ return true;
}
}
-
+
}
/**
@@ -463,10 +461,10 @@
$res = $dbr->select(
array( 'page', 'pagelinks' ),
array( 'page_id', 'COUNT(pl_from) AS linkcount'
),
- array(
- 'page_id' => $this->mPageId,
- 'page_namespace = pl_namespace',
- 'page_title = pl_title'
+ array(
+ 'page_id' => $this->mPageId,
+ 'page_namespace = pl_namespace',
+ 'page_title = pl_title'
),
__METHOD__,
array ( 'GROUP BY' => 'page_id' )
@@ -476,7 +474,7 @@
}
foreach ( $this->mPageId as $pageId ) {
if ( !isset( $this->metadata[$pageId]['linkcount'] ) ) {
- $this->metadata[$pageId]['linkcount'] = '0';
+ $this->metadata[$pageId]['linkcount'] = '0';
}
}
@@ -515,7 +513,7 @@
return true;
}
-
+
}
/**
@@ -538,12 +536,12 @@
__METHOD__
);
foreach ( $res as $row ) {
- $this->metadata[$row->page_id]['snippet'] =
self::generateArticleSnippet( $row->old_text );
+ $this->metadata[$row->page_id]['snippet'] =
self::generateArticleSnippet( $row->old_text );
}
-
+
return true;
}
-
+
/**
* Generate article snippet for listview from article text
* @param $text string - page text
@@ -562,30 +560,30 @@
// replace all templates with empty string
$text = preg_replace( '/\{\{[^\{]((?!\{\{).)*?\}\}/is',
'', $text );
- $openCurPos = strpos($text, '{{');
- $closeCurPos = strpos($text, '}}');
+ $openCurPos = strpos($text, '{{');
+ $closeCurPos = strpos($text, '}}');
- $attempt++;
- // only try 5 nested levels at max
+ $attempt++;
+ // only try 5 nested levels at max
if ( $attempt > 5 ) {
break;
- }
- }
+ }
+ }
- $text = trim( strip_tags( MessageCache::singleton()->parse(
$text )->getText() ) );
- // stip out non-useful data for snippet
- $text = str_replace( array('{', '}', '[edit]' ), '', $text );
+ $text = trim( strip_tags( MessageCache::singleton()->parse(
$text )->getText() ) );
+ // strip out non-useful data for snippet
+ $text = str_replace( array('{', '}', '[edit]' ), '', $text );
return $wgLang->truncate( $text, 150 );
}
-
+
}
/**
* Article User data
*/
class ArticleCompileUserData extends ArticleCompileInterface {
-
+
public function __construct( $pageId ) {
parent::__construct( $pageId );
}
@@ -602,27 +600,27 @@
);
$revId = array();
-
+
foreach ( $res as $row ) {
$revId[] = $row->rev_id;
}
$res = $dbr->select(
array( 'revision', 'user', 'ipblocks' ),
- array(
- 'rev_page AS page_id', 'user_id',
'user_name',
- 'user_real_name', 'user_registration',
'user_editcount',
- 'ipb_id', 'rev_user_text'
+ array(
+ 'rev_page AS page_id', 'user_id',
'user_name',
+ 'user_real_name', 'user_registration',
'user_editcount',
+ 'ipb_id', 'rev_user_text'
),
array( 'rev_id' => $revId ),
__METHOD__,
array(),
- array( 'user' => array(
- 'LEFT JOIN', 'rev_user
= user_id' ),
- 'ipblocks' => array(
'LEFT JOIN', 'rev_user = ipb_user AND rev_user_text = ipb_address' )
+ array( 'user' => array(
+ 'LEFT JOIN', 'rev_user
= user_id' ),
+ 'ipblocks' => array(
'LEFT JOIN', 'rev_user = ipb_user AND rev_user_text = ipb_address' )
)
);
-
+
foreach ( $res as $row ) {
if ( $row->user_id ) {
$user = User::newFromRow( $row );
@@ -638,7 +636,7 @@
$this->metadata[$row->page_id]['user_name'] =
$row->rev_user_text;
$this->metadata[$row->page_id]['user_autoconfirmed'] = '0';
$this->metadata[$row->page_id]['user_bot'] =
'0';
-
$this->metadata[$row->page_id]['user_block_status'] = $row->ipb_id ? '1' : '0';
+
$this->metadata[$row->page_id]['user_block_status'] = $row->ipb_id ? '1' : '0';
}
}
@@ -665,7 +663,7 @@
'Articles_for_deletion' => 'afd_status'
);
}
-
+
public function compile() {
$dbr = wfGetDB( DB_SLAVE );
@@ -696,4 +694,4 @@
return true;
}
-}
+}
\ No newline at end of file
Modified: trunk/extensions/PageTriage/includes/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/includes/PageTriage.php 2012-04-11 18:57:23 UTC
(rev 114854)
+++ trunk/extensions/PageTriage/includes/PageTriage.php 2012-04-11 20:30:38 UTC
(rev 114855)
@@ -55,7 +55,7 @@
'ptrp_reviewed' => $reviewed,
'ptrp_timestamp' => $res->creation_date
);
-
+
$dbw->insert( 'pagetriage_page', $row, __METHOD__, array(
'IGNORE' ) );
$this->mReviewed = $reviewed;
@@ -63,10 +63,10 @@
if ( !is_null( $user ) && !$user->isAnon() ) {
$this->logUserTriageAction( $user );
}
-
+
return true;
}
-
+
/**
* set the triage status of an article in pagetriage queue
* @param $reviewed string - '1'/'0'
@@ -78,7 +78,7 @@
if ( !in_array( $reviewed, array( '1', '0') ) ) {
$reviewed = '0';
}
-
+
if ( !$this->retrieve() || $this->mReviewed == $reviewed ) {
return;
}
@@ -108,7 +108,7 @@
$articleMetadata = new ArticleMetadata( array( $this->mPageId )
);
$articleMetadata->flushMetadataFromCache();
}
-
+
/**
* Set the deleted status
*/
@@ -127,7 +127,7 @@
__METHOD__
);
}
-
+
/**
* Load a page triage record
* @return bool
@@ -156,16 +156,16 @@
$this->mLoaded = true;
return true;
}
-
+
public function retrieveTriageLog() {
// get the triage log
}
-
+
public function loadMetadata() {
$metaData = new ArticleMetadata( array( $this->mPageId ) );
$this->mMetadata = $metaData->getMetadata();
}
-
+
/**
* Get the metadata for this page
* @return array
@@ -177,7 +177,7 @@
return $this->mMetadata;
}
-
+
/**
* Log the user triage action
* @param $user User
@@ -191,9 +191,9 @@
'ptrl_reviewed' => $this->mReviewed,
'ptrl_timestamp' => $dbw->timestamp( wfTimestampNow() )
);
-
+
$row['ptrl_id'] = $dbw->nextSequenceValue(
'pagetriage_log_ptrl_id' );
$dbw->insert( 'pagetriage_log', $row, __METHOD__ );
}
-}
+}
\ No newline at end of file
Modified: trunk/extensions/PageTriage/includes/PageTriageUtil.php
===================================================================
--- trunk/extensions/PageTriage/includes/PageTriageUtil.php 2012-04-11
18:57:23 UTC (rev 114854)
+++ trunk/extensions/PageTriage/includes/PageTriageUtil.php 2012-04-11
20:30:38 UTC (rev 114855)
@@ -131,7 +131,7 @@
return $topTriager;
}
-
+
/**
* Get the number of reviewed articles in last week
* @return int
@@ -158,14 +158,14 @@
if ( $res ) {
$reviewedArticleNum = $res->num;
} else {
- $reviewedArticleNum = 0;
+ $reviewedArticleNum = 0;
}
$wgMemc->set( $key, $reviewedArticleNum, 6 * 60 * 60 );
return $reviewedArticleNum;
}
-
+
/**
* Calculate the age of unreviewed articles by percentile
* @param $percentile int
@@ -189,7 +189,7 @@
} else {
$order = 'DESC';
}
-
+
$start = floor( ( $percentile / 100 ) * $count ) - 1;
if ( $start < 0 ) {
@@ -212,7 +212,7 @@
return false;
}
}
-
+
/**
* Check the existance of user page and talk page for a list of users
* @param $users array - contains user_name db keys
@@ -252,7 +252,7 @@
array( 'page_title' => array_keys( $title ),
'page_namespace' => array( NS_USER, NS_USER_TALK ) ),
__METHOD__
);
-
+
$dataToCache = array();
foreach ( $res as $row ) {
$user = $title[$row->page_title];
@@ -285,4 +285,4 @@
}
-class MWPageTriageUtilInvalidNumberException extends MWException {}
+class MWPageTriageUtilInvalidNumberException extends MWException {}
\ No newline at end of file
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.article/ext.pageTriage.article.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.article/ext.pageTriage.article.js
2012-04-11 18:57:23 UTC (rev 114854)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.article/ext.pageTriage.article.js
2012-04-11 20:30:38 UTC (rev 114855)
@@ -25,7 +25,7 @@
callback: function( data ) {
$( '.mw-pagetriage-markpatrolled' ).html(
data.error ?
- mw.msg(
'pagetriage-mark-as-reviewed-error' ) :
+ mw.msg(
'pagetriage-mark-as-reviewed-error' ) :
mw.msg( 'pagetriage-reviewed' )
);
}
@@ -36,4 +36,4 @@
mw.pageTriage.action.submit();
} )
.end();
-} ) ( jQuery );
+} ) ( jQuery );
\ No newline at end of file
Modified: trunk/extensions/PageTriage/modules/ext.pageTriage.css
===================================================================
--- trunk/extensions/PageTriage/modules/ext.pageTriage.css 2012-04-11
18:57:23 UTC (rev 114854)
+++ trunk/extensions/PageTriage/modules/ext.pageTriage.css 2012-04-11
20:30:38 UTC (rev 114855)
@@ -14,5 +14,5 @@
filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#e7f1f7', endColorstr='#b6bec3' ); /* for IE */
background: -webkit-gradient( linear, left top, left bottom, from(
#e7f1f7 ), to( #b6bec3 ) ); /* for webkit browsers */
- background: -moz-linear-gradient( top, #e7f1f7, #b6bec3 ); /* for
firefox 3.6+ */
+ background: -moz-linear-gradient( top, #e7f1f7, #b6bec3 ); /* for
firefox 3.6+ */
}
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
2012-04-11 18:57:23 UTC (rev 114854)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
2012-04-11 20:30:38 UTC (rev 114855)
@@ -8,11 +8,11 @@
title: 'Empty Article',
pageid: ''
},
-
+
initialize: function() {
this.bind( 'change', this.formatMetadata, this
);
},
-
+
formatMetadata: function ( article ) {
var creation_date_parsed = Date.parseExact(
article.get( 'creation_date' ), 'yyyyMMddHHmmss' );
article.set('creation_date_pretty',
creation_date_parsed.toString( gM( 'pagetriage-creation-dateformat' ) ) );
@@ -24,7 +24,7 @@
} else {
article.set(
'user_creation_date_pretty', '');
}
-
+
var userName = article.get( 'user_name' );
if( userName ) {
article.set( 'user_title', new
mw.Title( userName, mw.config.get('wgNamespaceIds')['user'] ) );
@@ -39,13 +39,13 @@
} )
};
-
+
// can't include this in the declaration above because it references the
// object created therein.
mw.pageTriage.ArticleList = Backbone.Collection.extend( {
moreToLoad: true,
model: mw.pageTriage.Article,
-
+
apiParams: {
namespace: 0,
limit: 20,
@@ -60,12 +60,12 @@
blocked_users: 1,
*/
},
-
+
initialize: function( options ) {
this.eventBus = options.eventBus;
this.eventBus.bind( "filterSet", this.setParams );
},
-
+
url: function() {
var url = mw.util.wikiScript( 'api' ) +
'?action=pagetriagelist&format=json&' + $.param( this.apiParams );
return url;
@@ -82,7 +82,7 @@
// We have no more pages to load.
this.moreToLoad = false;
}
-
+
// Check if user pages exist or should be redlinks
for ( var title in
response.pagetriagelist.userpagestatus ) {
mw.Title.exist.set( title );
@@ -90,19 +90,19 @@
// extract the useful bits of json.
return response.pagetriagelist.pages;
},
-
- setParams: function( apiParams ) {
+
+ setParams: function( apiParams ) {
this.apiParams = apiParams;
},
-
- setParam: function( paramName, paramValue ) {
+
+ setParam: function( paramName, paramValue ) {
this.apiParams[paramName] = paramValue;
},
getParam: function( key ) {
return this.apiParams[key];
}
-
+
} );
-
+
} );
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
2012-04-11 18:57:23 UTC (rev 114854)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
2012-04-11 20:30:38 UTC (rev 114855)
@@ -1,6 +1,6 @@
$( function() {
// controls navbar
-
+
mw.pageTriage.ListControlNav = Backbone.View.extend( {
tagName: "div",
template: _.template( $( "#listControlNavTemplate" ).html() ),
@@ -14,7 +14,7 @@
this.eventBus = options.eventBus; // access the eventBus
this.setWaypoint();
-
+
// do things that need doing on window resize
$( window ).resize( _.debounce(_this.resize, 100 ) );
@@ -33,7 +33,7 @@
render: function() {
var _this = this;
-
+
if(! this.filterStatus ) {
this.filterStatus = gM(
'pagetriage-filter-stat-all');
}
@@ -47,7 +47,7 @@
//
// now that the template's been inserted, set up some
events for controlling it
//
-
+
// make a button
$( ".mwe-pt-filter-set-button" ).button( {
label: mw.msg( 'pagetriage-filter-set-button' ),
@@ -55,16 +55,16 @@
} );
$( ".mwe-pt-filter-set-button" ).click( function( e ) {
_this.filterSync();
- _this.toggleFilterMenu();
+ _this.toggleFilterMenu();
e.stopPropagation();
} );
-
+
// the filter dropdown menu control
$( '#mwe-pt-filter-dropdown-control' ).click( function(
e ) {
_this.toggleFilterMenu();
e.stopPropagation();
} );
-
+
// Activate sort links
$( '#mwe-pt-sort-newest' ).click( function() {
_this.model.setParam( 'dir', 'newestfirst' );
@@ -81,7 +81,7 @@
return false;
} );
},
-
+
setWaypoint: function() {
// make a floating top navbar
$( '#mwe-pt-list-control-nav' ).waypoint('destroy');
// remove the old, maybe inaccurate ones.
@@ -97,11 +97,11 @@
} else {
$( '#mwe-pt-list-view'
).css('padding-top', 0 );
}
-
+
_this.resize();
event.stopPropagation();
} );
-
+
// Different browsers represent the document's scroll
position differently.
// I would expect jQuery to deal with this in some
graceful fashion, but nooo...
var scrollTop = $('body').scrollTop() ||
$('html').scrollTop() || $(window).scrollTop();
@@ -116,7 +116,7 @@
this.floatNav = true;
}
},
-
+
resize: function() {
// set the width of the floating bar when the window
resizes, if it's floating.
// the left nav is 176 pixels
@@ -124,7 +124,7 @@
// border is 2 pixels
$( '#mwe-pt-list-control-nav' ).css( 'width',
$(window).width() - 176 - 16 - 2 + "px" );
},
-
+
toggleFilterMenu: function( action ) {
var _this = this;
if( (action && action == 'close') ||
this.filterMenuVisible ) {
@@ -149,12 +149,12 @@
e.stopPropagation();
} );
- this.filterMenuVisible = 1;
+ this.filterMenuVisible = 1;
}
},
-
+
// sync the filters with the contents of the menu
- filterSync: function() {
+ filterSync: function() {
// fetch the values from the menu
var apiParams = {};
if( $('#mwe-pt-filter-namespace').val() ) {
@@ -165,7 +165,7 @@
if( $('#mwe-pt-filter-reviewed-edits').prop('checked')
) {
apiParams['showreviewed'] = '1';
}
-
+
if(
$('#mwe-pt-filter-nominated-for-deletion').prop('checked') ) {
apiParams['showdeleted'] = '1';
}
@@ -177,7 +177,7 @@
if( $('#mwe-pt-filter-redirects').prop('checked') ) {
apiParams['showredirs'] = '1';
}
-
+
if( $('#mwe-pt-filter-user-selected').prop('checked')
&& $('#mwe-pt-filter-user').val() ) {
apiParams['username'] =
$('#mwe-pt-filter-user').val();
}
@@ -214,7 +214,7 @@
this.menuSync(); // make sure the menu is now
up-to-date.
this.render();
},
-
+
// sync the menu with the contents of the filters
menuSync: function() {
this.newFilterStatus = [];
@@ -230,9 +230,9 @@
} else {
nsText = mw.config.get(
'wgFormattedNamespaces' )[ns];
}
- this.newFilterStatus.push( gM(
'pagetriage-filter-stat-namespace', nsText ) );
+ this.newFilterStatus.push( gM(
'pagetriage-filter-stat-namespace', nsText ) );
}
-
+
this.menuCheckboxUpdate( $(
'#mwe-pt-filter-reviewed-edits' ), 'showreviewed',
'pagetriage-filter-stat-reviewed');
this.menuCheckboxUpdate( $(
'#mwe-pt-filter-nominated-for-deletion' ), 'showdeleted',
'pagetriage-filter-stat-nominated-for-deletion');
this.menuCheckboxUpdate( $( '#mwe-pt-filter-bot-edits'
), 'showbots', 'pagetriage-filter-stat-bots');
@@ -261,7 +261,7 @@
$( '#mwe-pt-filter-all' ).prop( 'checked', true
);
}
},
-
+
menuCheckboxUpdate: function( $checkbox, param, message ) {
// update a checkbox in the menu with data from the
model.
$checkbox.prop( 'checked', this.model.getParam( param
)=="1"?true:false );
@@ -271,4 +271,4 @@
}
} );
-} );
+} );
\ No newline at end of file
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.js
2012-04-11 18:57:23 UTC (rev 114854)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listItem.js
2012-04-11 20:30:38 UTC (rev 114855)
@@ -15,7 +15,7 @@
// insert the template into the document. fill with
the current model.
this.$el.html( this.template( this.model.toJSON() ) );
return this;
- }
+ }
} );
} );
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.css
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.css
2012-04-11 18:57:23 UTC (rev 114854)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.css
2012-04-11 20:30:38 UTC (rev 114855)
@@ -12,5 +12,5 @@
}
.mwe-pt-stats-label {
- font-weight:bold;
+ font-weight:bold;
}
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.js
2012-04-11 18:57:23 UTC (rev 114854)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listStatsNav.js
2012-04-11 20:30:38 UTC (rev 114855)
@@ -1,6 +1,6 @@
$( function() {
// statistics bar
-
+
mw.pageTriage.ListStatsNav = Backbone.View.extend( {
tagName: "div",
template: _.template( $( "#listStatsNavTemplate" ).html() ),
@@ -9,7 +9,7 @@
initialize: function( options ) {
var _this = this;
this.eventBus = options.eventBus;
-
+
// make a floating bottom navbar
$.waypoints.settings.scrollThrottle = 30;
$( '#mwe-pt-list-stats-nav-anchor' ).waypoint(
function( event, direction ) {
@@ -18,12 +18,12 @@
_this.resize();
}
-
+
event.stopPropagation();
}, {
offset: '100%' // bottom of page
});
-
+
// do things that need doing on window resize
$( window ).resize( _.debounce( _this.resize, 100 ) );
@@ -32,7 +32,7 @@
this.eventBus.bind( "articleListChange", function() {
_this.setPosition();
} );
-
+
// set the navbar's initial size
this.resize();
$.waypoints('refresh');
@@ -44,13 +44,13 @@
$( "#mwe-pt-list-stats-nav-content" ).html(
this.template( this.model.toJSON() ) );
this.setPosition();
-
+
// broadcast the stats in case any other views want to
display bits of them.
// (the control view displays a summary)
this.eventBus.trigger( 'renderStats', this.model );
return this;
},
-
+
setPosition: function() {
if( $( '#mwe-pt-list-stats-nav-anchor' ).offset().top <
$.waypoints('viewportHeight') ) {
// turn off floating nav, bring the bar back
into the list.
@@ -62,7 +62,7 @@
this.floatNav = true;
}
},
-
+
resize: function() {
// set the width of the floating bar when the window
resizes, if it's floating.
// the left nav is 176 pixels
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.js
2012-04-11 18:57:23 UTC (rev 114854)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.js
2012-04-11 20:30:38 UTC (rev 114855)
@@ -1,12 +1,12 @@
$( function() {
// view for the article list
-
+
// create an event aggregator
var eventBus = _.extend( {}, Backbone.Events );
// instantiate the collection of articles
var articles = new mw.pageTriage.ArticleList( { eventBus: eventBus } );
-
+
// grab pageTriage statistics
var stats = new mw.pageTriage.Stats( { eventBus: eventBus } );
@@ -45,7 +45,7 @@
var controlNav = new mw.pageTriage.ListControlNav( {
eventBus: this.eventBus, model: articles } );
controlNav.render();
},
-
+
// make the article list infinitely scrolling
initializeInfiniteScrolling: function() {
var _this = this;
@@ -60,7 +60,7 @@
$( '#mwe-pt-list-more' ).empty();
$( '#mwe-pt-list-more' ).append( $.createSpinner(
'more-spinner' ) );
},
-
+
// load more method for infinite scrolling
automaticLoadMore: function() {
var _this = this;
@@ -85,7 +85,7 @@
}
} );
},
-
+
// manual load more method (i.e. infinite scrolling turned off)
manualLoadMore: function() {
var _this = this;
@@ -112,7 +112,7 @@
}
} );
},
-
+
// add stats data to the navigation
addStats: function( stats ) {
var statsNav = new mw.pageTriage.ListStatsNav( {
eventBus: this.eventBus, model: stats } );
@@ -140,7 +140,7 @@
// add all the items in the articles collection
// this only gets executed when the article collection list is
reset
addAll: function() {
-
+
// remove the spinner/wait message and any previously
displayed articles before loading
// new articles
$( '#mwe-pt-list-view' ).empty();
@@ -148,7 +148,7 @@
// load the new articles
articles.forEach( this.addOne, this );
$( '#mwe-pt-list-stats-nav' ).css( 'border-top', 'none'
);
-
+
// if there are more articles that can be loaded, set
up loading machanism
if ( articles.moreToLoad ) {
if ( mw.config.get(
'wgPageTriageInfiniteScrolling' ) ) {
@@ -160,7 +160,7 @@
} else {
$( '#mwe-pt-list-more' ).hide();
}
-
+
$.waypoints( 'refresh' );
this.eventBus.trigger( 'articleListChange' );
}
@@ -170,4 +170,4 @@
// create an instance of the list view, which makes everything go.
var list = new mw.pageTriage.ListView( { eventBus: eventBus } );
list.render();
-} );
+} );
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
