" .
+ // Newer self: Why not?
+ return "
" .
wfMessage( 'watchanalytics-unreview-complete' )->parse() .
"
";
-
}
-
-
- public function pageChart () {
-
+ public function pageChart() {
global $wgOut;
$wgOut->addModules( 'ext.watchanalytics.charts' );
@@ -273,26 +243,26 @@ public function pageChart () {
// $dateRangeStart = new MWTimestamp( date( 'YmdHis', strtotime( '2 weeks ago' ) ) );
// $dateRangeStart = $dateRangeStart->format('YmdHis');
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select(
- array( 'wtp' => 'watch_tracking_page' ),
- array(
+ [ 'wtp' => 'watch_tracking_page' ],
+ [
"DATE_FORMAT( wtp.tracking_timestamp, '%Y-%m-%d %H:%i:%s' ) AS timestamp",
"wtp.num_reviewed AS num_reviewed",
- ),
- array(
+ ],
+ [
'page_id' => $this->mTitle->getArticleID(),
// 'tracking_timestamp > ' . $dateRangeStart
- ),
+ ],
__METHOD__,
- array(
+ [
"ORDER BY" => "wtp.tracking_timestamp DESC",
"LIMIT" => "200", // MOST RECENT 100 changes
- ),
+ ],
null // join conditions
);
- $data = array();
+ $data = [];
while ( $row = $dbr->fetchObject( $res ) ) {
$data[ $row->timestamp ] = $row->num_reviewed;
}
@@ -302,7 +272,5 @@ public function pageChart () {
$html .= "";
$wgOut->addHTML( $html );
-
}
}
-
diff --git a/specials/SpecialPendingReviews.php b/specials/SpecialPendingReviews.php
index 83f6b46..3ce0107 100644
--- a/specials/SpecialPendingReviews.php
+++ b/specials/SpecialPendingReviews.php
@@ -33,12 +33,11 @@
class SpecialPendingReviews extends SpecialPage {
public $mMode;
- protected $header_links = array(
+ protected $header_links = [
'watchanalytics-pages-specialpage' => '',
'watchanalytics-users-specialpage' => 'users',
'watchanalytics-wikihistory-specialpage' => 'wikihistory',
- );
-
+ ];
/**
* Constructor for Special Page.
@@ -136,9 +135,9 @@ public function execute( $parser = null ) {
// been deleted)
if ( $item->title ) {
$html .= $this->getStandardChangeRow( $item, $rowCount );
- }
+
// page has been deleted (or moved w/o a redirect)
- else {
+ } else {
$html .= $this->getDeletedPageRow( $item, $rowCount );
}
@@ -161,10 +160,10 @@ public function execute( $parser = null ) {
* Handles case where user clicked a link to clear a pending review
* This will not display the pending reviews page.
*
+ * @param Title $clearNotifyTitle
* @return bool
*/
- public function handleClearNotification ( $clearNotifyTitle ) {
-
+ public function handleClearNotification( $clearNotifyTitle ) {
PendingReview::clearByUserAndTitle( $this->getUser(), $clearNotifyTitle );
$this->getOutput()->addHTML(
@@ -172,15 +171,14 @@ public function handleClearNotification ( $clearNotifyTitle ) {
'pendingreviews-clear-page-notification',
$clearNotifyTitle->getFullText(),
Xml::tags( 'a',
- array(
+ [
'href' => $this->getTitle()->getLocalUrl(),
'style' => 'font-weight:bold;',
- ),
+ ],
$this->getTitle()
)
)->text()
);
-
}
/**
@@ -188,8 +186,7 @@ public function handleClearNotification ( $clearNotifyTitle ) {
*
* @return bool
*/
- public function setPendingReviewsUser () {
-
+ public function setPendingReviewsUser() {
$viewingUser = $this->getUser();
// Check if a user has been specified.
@@ -198,14 +195,12 @@ public function setPendingReviewsUser () {
$this->mUser = User::newFromName( $requestUser );
if ( $this->mUser->getId() === $viewingUser ) {
$this->mUserIsViewer = true;
- }
- else {
+ } else {
$this->mUserIsViewer = false;
}
$this->getOutput()->setPageTitle( wfMessage( 'pendingreviews-user-page', $this->mUser->getName() )->text() );
- }
- else {
+ } else {
$this->mUser = $viewingUser;
}
@@ -217,11 +212,10 @@ public function setPendingReviewsUser () {
*
* @return null
*/
- public function setReviewLimit () {
+ public function setReviewLimit() {
if ( $this->getRequest()->getVal( 'limit' ) ) {
$this->reviewLimit = $this->getRequest()->getVal( 'limit' ); // FIXME: for consistency, shouldn't this be just "limit"
- }
- else {
+ } else {
$this->reviewLimit = 20;
}
}
@@ -231,11 +225,10 @@ public function setReviewLimit () {
*
* @return null
*/
- public function setReviewOffset () {
+ public function setReviewOffset() {
if ( $this->getRequest()->getVal( 'offset' ) ) {
$this->reviewOffset = $this->getRequest()->getVal( 'offset' );
- }
- else {
+ } else {
$this->reviewOffset = 0;
}
}
@@ -246,8 +239,7 @@ public function setReviewOffset () {
*
* @return Title|false
*/
- public function getClearNotificationTitle () {
-
+ public function getClearNotificationTitle() {
$clearNotifyTitle = $this->getRequest()->getVal( 'clearNotificationTitle' );
if ( ! $clearNotifyTitle ) {
@@ -263,7 +255,6 @@ public function getClearNotificationTitle () {
return $title;
}
-
/**
* Generates row for a particular page in PendingReviews.
*
@@ -271,15 +262,13 @@ public function getClearNotificationTitle () {
* @param int $rowCount used to determine if the row is odd or even
* @return string HTML for row
*/
- public function getStandardChangeRow ( PendingReview $item, $rowCount ) {
-
+ public function getStandardChangeRow( PendingReview $item, $rowCount ) {
$combinedList = $this->combineLogAndChanges( $item->log, $item->newRevisions, $item->title );
$changes = $this->getPendingReviewChangesList( $combinedList );
if ( $item->title->isRedirect() ) {
$reviewButton = $this->getAcceptRedirectButton( $item );
- }
- else {
+ } else {
$reviewButton = $this->getReviewButton( $item );
}
@@ -288,7 +277,6 @@ public function getStandardChangeRow ( PendingReview $item, $rowCount ) {
$displayTitle = '
' . $item->title->getFullText() . '';
return $this->getRowHTML( $item, $rowCount, $displayTitle, $reviewButton, $historyButton, $changes );
-
}
/**
@@ -300,16 +288,14 @@ public function getStandardChangeRow ( PendingReview $item, $rowCount ) {
* @param int $rowCount used to determine if the row is odd or even
* @return string HTML for row
*/
- public function getDeletedPageRow ( PendingReview $item, $rowCount ) {
-
+ public function getDeletedPageRow( PendingReview $item, $rowCount ) {
$pageWasMoved = false;
$deletionLogLength = count( $item->deletionLog );
for ( $i = $deletionLogLength - 1; $i >= 0; $i-- ) {
if ( $item->deletionLog[$i]->log_type == 'move' ) {
$pageWasMoved = true;
break;
- }
- else if ( $item->deletionLog[$i]->log_type == 'delete' ) {
+ } elseif ( $item->deletionLog[$i]->log_type == 'delete' ) {
$pageWasMoved = false;
break;
}
@@ -320,8 +306,7 @@ public function getDeletedPageRow ( PendingReview $item, $rowCount ) {
if ( $pageWasMoved ) {
$acceptDeletionButton = $this->getAcceptMoveWithoutRedirectButton( $item->deletedTitle, $item->deletedNS );
$displayMessage = 'pendingreviews-page-moved-no-redirect';
- }
- else {
+ } else {
$acceptDeletionButton = $this->getMarkDeleteReviewedButton( $item->deletedTitle, $item->deletedNS );
$displayMessage = 'pendingreviews-page-deleted';
}
@@ -347,25 +332,27 @@ public function getDeletedPageRow ( PendingReview $item, $rowCount ) {
* @param string $changes
* @return string HTML for pending review of a given page
*/
- public function getRowHTML ( PendingReview $item, $rowCount, $displayTitle, $buttonOne, $buttonTwo, $changes ) {
-
+ public function getRowHTML( PendingReview $item, $rowCount, $displayTitle, $buttonOne, $buttonTwo, $changes ) {
// FIXME: wow this is ugly
$rowClass = ( $rowCount % 2 === 0 ) ? 'pendingreviews-even-row' : 'pendingreviews-odd-row';
if ( $item->numReviewers > $GLOBALS['egPendingReviewsOrangePagesThreshold'] ) {
$reviewCriticality = 'green'; // page is "green" because it has lots of reviewers
- }
- else if ( $item->numReviewers > $GLOBALS['egPendingReviewsRedPagesThreshold'] ) {
+ } elseif ( $item->numReviewers > $GLOBALS['egPendingReviewsRedPagesThreshold'] ) {
$reviewCriticality = 'orange';
- }
- else {
+ } else {
$reviewCriticality = 'red'; // page is red because it has very few reviewers
}
$reviewCriticalityClass = 'pendingreviews-criticality-' . $reviewCriticality;
- $classAndAttr = "class='pendingreviews-row $rowClass $reviewCriticalityClass pendingreviews-row-$rowCount' pendingreviews-row-count='$rowCount'";
+ $classAndAttr = "class='pendingreviews-row $rowClass " .
+ "$reviewCriticalityClass pendingreviews-row-$rowCount' " .
+ "pendingreviews-row-count='$rowCount'";
- $html = "
| $displayTitle | $buttonOne $buttonTwo |
";
+ $html = "
| " .
+ "$displayTitle | " .
+ "" .
+ "$buttonOne $buttonTwo |
";
$html .= "
| $changes |
";
@@ -378,40 +365,37 @@ public function getRowHTML ( PendingReview $item, $rowCount, $displayTitle, $but
* @param PendingReview $item
* @return string HTML for button
*/
- public function getReviewButton ( $item ) {
-
+ public function getReviewButton( $item ) {
if ( count( $item->newRevisions ) > 0 ) {
// returns essentially the negative-oneth revision...the one before
// the wl_notificationtimestamp revision...or null/false if none exists?
$mostRecentReviewed = Revision::newFromRow( $item->newRevisions[0] )->getPrevious();
- }
- else {
+ } else {
$mostRecentReviewed = false; // no previous revision, the user has not reviewed the first!
}
if ( $mostRecentReviewed ) {
- $diffURL = $item->title->getLocalURL( array(
+ $diffURL = $item->title->getLocalURL( [
'diff' => '',
'oldid' => $mostRecentReviewed->getId()
- ) );
+ ] );
$diffLink = Xml::element( 'a',
- array( 'href' => $diffURL, 'class' => 'pendingreviews-green-button', 'target' => "_blank" ),
+ [ 'href' => $diffURL, 'class' => 'pendingreviews-green-button', 'target' => "_blank" ],
wfMessage(
'watchanalytics-pendingreviews-diff-revisions',
count( $item->newRevisions )
)->text()
);
- }
- else {
+ } else {
$latest = Revision::newFromTitle( $item->title );
- $diffURL = $item->title->getLocalURL( array( 'oldid' => $latest->getId() ) );
+ $diffURL = $item->title->getLocalURL( [ 'oldid' => $latest->getId() ] );
$diffLink = Xml::element( 'a',
- array( 'href' => $diffURL, 'class' => 'pendingreviews-green-button', 'target' => "_blank" ),
+ [ 'href' => $diffURL, 'class' => 'pendingreviews-green-button', 'target' => "_blank" ],
$this->msg( 'watchanalytics-pendingreviews-users-first-view' )->text()
);
@@ -426,18 +410,17 @@ public function getReviewButton ( $item ) {
* @param PendingReview $item
* @return string HTML for button
*/
- public function getHistoryButton ( $item ) {
+ public function getHistoryButton( $item ) {
return Xml::element( 'a',
- array(
- 'href' => $item->title->getLocalURL( array( 'action' => 'history' ) ),
+ [
+ 'href' => $item->title->getLocalURL( [ 'action' => 'history' ] ),
'class' => 'pendingreviews-dark-blue-button',
'target' => "_blank"
- ),
+ ],
wfMessage( 'watchanalytics-pendingreviews-history-link' )->text()
);
}
-
/**
* Creates a button which marks a deleted or redirected page as "reviewed"
* (e.g. nullifies notification timestamp in watchlist). This function is
@@ -457,17 +440,17 @@ public function getHistoryButton ( $item ) {
*
* @return string HTML for button
*/
- public function getClearNotificationButton ( $titleText, $namespace, $buttonMsg, $buttonClass ) {
+ public function getClearNotificationButton( $titleText, $namespace, $buttonMsg, $buttonClass ) {
return Xml::element( 'a',
- array(
- 'href' => $this->getTitle()->getLocalURL( array(
+ [
+ 'href' => $this->getTitle()->getLocalURL( [
'clearNotificationTitle' => $titleText,
'clearNotificationNS' => $namespace,
- ) ),
+ ] ),
'class' => $buttonClass,
'pending-namespace' => $namespace,
'pending-title' => $titleText,
- ),
+ ],
wfMessage( $buttonMsg )->text()
);
}
@@ -481,7 +464,7 @@ public function getClearNotificationButton ( $titleText, $namespace, $buttonMsg,
*
* @return string HTML for button
*/
- public function getMarkDeleteReviewedButton ( $titleText, $namespace ) {
+ public function getMarkDeleteReviewedButton( $titleText, $namespace ) {
return $this->getClearNotificationButton(
$titleText, $namespace, 'pendingreviews-accept-deletion',
'pendingreviews-red-button pendingreviews-accept-deletion'
@@ -499,7 +482,7 @@ public function getMarkDeleteReviewedButton ( $titleText, $namespace ) {
*
* @return string HTML for button
*/
- public function getAcceptMoveWithoutRedirectButton ( $titleText, $namespace ) {
+ public function getAcceptMoveWithoutRedirectButton( $titleText, $namespace ) {
return $this->getClearNotificationButton(
$titleText, $namespace, 'pendingreviews-accept-move-without-redirect',
'pendingreviews-orange-button pendingreviews-accept-deletion'
@@ -513,7 +496,7 @@ public function getAcceptMoveWithoutRedirectButton ( $titleText, $namespace ) {
*
* @return string HTML for button
*/
- public function getAcceptRedirectButton ( $item ) {
+ public function getAcceptRedirectButton( $item ) {
$titleText = $item->title->getDBkey();
$namespace = $item->title->getNamespace();
@@ -527,11 +510,10 @@ public function getAcceptRedirectButton ( $item ) {
* Creates a button bringing user to the talk page of the user who deleted
* the page, allowing them to ask questions about why the page was deleted.
*
- * @param $deletionLog
+ * @param array $deletionLog
* @return string HTML for button
*/
- public function getDeleterTalkButton ( $deletionLog ) {
-
+ public function getDeleterTalkButton( array $deletionLog ) {
if ( count( $deletionLog ) == 0 ) {
return '';
}
@@ -542,17 +524,16 @@ public function getDeleterTalkButton ( $deletionLog ) {
$userTalk = $user->getTalkPage();
if ( $userTalk->exists() ) {
- $talkQueryString = array();
- }
- else {
- $talkQueryString = array( 'action' => 'edit' );
+ $talkQueryString = [];
+ } else {
+ $talkQueryString = [ 'action' => 'edit' ];
}
return Xml::element( 'a',
- array(
+ [
'href' => $userTalk->getLocalURL( $talkQueryString ),
'class' => 'pendingreviews-dark-blue-button' // pendingreviews-delete-talk-button
- ),
+ ],
wfMessage( 'pendingreviews-page-deleted-talk', $user->getUserPage()->getFullText() )->text()
);
}
@@ -560,9 +541,10 @@ public function getDeleterTalkButton ( $deletionLog ) {
/**
* Creates simple header stating how many pending reviews the user has.
*
+ * @param User $user
* @return string HTML for header
*/
- public function getPageHeader( $user ) {
+ public function getPageHeader( User $user ) {
$userWatch = new UserWatchesQuery();
$watchStats = $userWatch->getUserWatchStats( $user );
$numPendingReviews = $watchStats['num_pending'];
@@ -580,12 +562,12 @@ public function getPageHeader( $user ) {
$html .= '';
$nextReviewSet = $this->reviewOffset + $this->reviewLimit;
- $prevReviewSet = max( array( 0, $this->reviewOffset - $this->reviewLimit ) );
+ $prevReviewSet = max( [ 0, $this->reviewOffset - $this->reviewLimit ] );
$currentURL = $this->getPageTitle()->getLocalUrl();
$viewingUser = '';
// if ( $this->mUser ) {
- // $viewingUser = '&user='.$this->mUser;
+ // $viewingUser = '&user='.$this->mUser;
// }
$linkClass = "pendingreviews-nav-link";
@@ -602,19 +584,19 @@ public function getPageHeader( $user ) {
$html .= Xml::element(
'a',
- array(
- 'href' => $currentURL.'?offset='.$prevReviewSet.$viewingUser,
+ [
+ 'href' => $currentURL . '?offset=' . $prevReviewSet . $viewingUser,
'class' => $prevLinkClass,
- ),
+ ],
wfMessage( 'watchanalytics-pendingreviews-prev-revisions' )->text()
);
$html .= Xml::element(
'a',
- array(
- 'href' => $currentURL.'?offset='.$nextReviewSet.$viewingUser,
+ [
+ 'href' => $currentURL . '?offset=' . $nextReviewSet . $viewingUser,
'class' => $nextLinkClass,
- ),
+ ],
wfMessage( 'watchanalytics-pendingreviews-next-revisions' )->text()
);
@@ -626,10 +608,9 @@ public function getPageHeader( $user ) {
*
* @return string HTML for legend (table)
*/
- public function getPendingReviewsLegend () {
-
+ public function getPendingReviewsLegend() {
$redMaxReviewers = $GLOBALS['egPendingReviewsRedPagesThreshold'] - 1;
- $orangeMaxReviewers = $GLOBALS['egPendingReviewsOrangePagesThreshold'] - 1;
+ $orangeMaxReviewers = $GLOBALS['egPendingReviewsOrangePagesThreshold'] - 1;
$redReviewersMsg = $this->msg(
'pendingreviews-reviewer-criticality-red',
@@ -651,7 +632,6 @@ public function getPendingReviewsLegend () {
| $orangeReviewersMsg |
| $greenReviewersMsg |
";
-
}
/**
@@ -660,24 +640,22 @@ public function getPendingReviewsLegend () {
* @todo FIXME: documentation...why does this do what it does?
* @todo FIXME: cleanup temporary code
*
- * @param $log
- * @param $revisions
- * @param $title
+ * @param array $log
+ * @param array $revisions
+ * @param Title $title
* @return array
*/
- protected function combineLogAndChanges( $log, $revisions, $title ) {
-
+ protected function combineLogAndChanges( array $log, array $revisions, Title $title ) {
// if ( $title->getNamespace() === NS_FILE ) {
// }
-
// $log = array_reverse( $log );
// $revisions = array_reverse( $revisions );
$logI = 0;
$revI = 0;
- $combinedArray = array();
+ $combinedArray = [];
while ( count( $log ) > 0 && count( $revisions ) > 0 ) {
@@ -686,8 +664,7 @@ protected function combineLogAndChanges( $log, $revisions, $title ) {
if ( $revTs > $logTs ) {
$combinedArray[] = array_shift( $log );
- }
- else {
+ } else {
$combinedArray[] = array_shift( $revisions );
}
@@ -699,7 +676,6 @@ protected function combineLogAndChanges( $log, $revisions, $title ) {
$combinedArray = array_merge( $combinedArray, $revisions, $log );
return $combinedArray;
-
}
/**
@@ -710,44 +686,43 @@ protected function combineLogAndChanges( $log, $revisions, $title ) {
* @param object $logEntry
* @return Message HTML for button
*/
- protected function getLogChangeMessage ( $logEntry ) {
-
+ protected function getLogChangeMessage( $logEntry ) {
// add pendingreviews-edited-by?
- $messages = array(
- 'approval' => array(
+ $messages = [
+ 'approval' => [
'approve' => 'pendingreviews-log-approved',
'unapprove' => 'pendingreviews-log-unapproved'
- ),
- 'delete' => array(
+ ],
+ 'delete' => [
'delete' => 'pendingreviews-log-delete',
'restore' => 'pendingreviews-log-restore',
- ),
- 'import' => array(
+ ],
+ 'import' => [
'upload' => 'pendingreviews-log-import-upload',
- ),
- 'move' => array(
+ ],
+ 'move' => [
'move' => 'pendingreviews-log-move',
'move_redir' => 'pendingreviews-log-move-redir',
- ),
- 'protect' => array(
+ ],
+ 'protect' => [
'protect' => 'pendingreviews-log-protect',
'unprotect' => 'pendingreviews-log-unprotect',
'modify' => 'pendingreviews-log-modify-protect',
- ),
- 'upload' => array(
+ ],
+ 'upload' => [
'upload' => 'pendingreviews-log-upload-new',
'overwrite' => 'pendingreviews-log-upload-overwrite',
- ),
- );
+ ],
+ ];
// get user page of user who created the log entry
- $userPage = Title::makeTitle( NS_USER , $logEntry->log_user_text )->getFullText();
+ $userPage = Title::makeTitle( NS_USER, $logEntry->log_user_text )->getFullText();
// if a message exists for the particular log type, handle it as follows
if ( isset( $messages[ $logEntry->log_type ][ $logEntry->log_action ] ) ) {
// all messages will use the executing users user-page
- $messageParams = array( $userPage );
+ $messageParams = [ $userPage ];
// if the log action is move or move_redir, the move target is in the message
if ( $logEntry->log_action == 'move' || $logEntry->log_action == 'move_redir' ) {
@@ -760,13 +735,10 @@ protected function getLogChangeMessage ( $logEntry ) {
return wfMessage( $messages[ $logEntry->log_type ][ $logEntry->log_action ], $messageParams );
- }
-
// if no message exists for the log type and action, handling with "unknown change"
- else {
+ } else {
return wfMessage( 'pendingreviews-log-unknown-change', $userPage );
}
-
}
/**
@@ -775,30 +747,28 @@ protected function getLogChangeMessage ( $logEntry ) {
* @param array $combinedList
* @return string HTML
*/
- public function getPendingReviewChangesList ( $combinedList ) {
- $changes = array();
+ public function getPendingReviewChangesList( $combinedList ) {
+ $changes = [];
foreach ( $combinedList as $change ) {
if ( isset( $change->log_timestamp ) ) {
$changeTs = $change->log_timestamp;
$changeText = $this->getLogChangeMessage( $change );
- }
- else {
+ } else {
$rev = Revision::newFromRow( $change );
$changeTs = $change->rev_timestamp;
- $userPage = Title::makeTitle( NS_USER , $change->rev_user_text )->getFullText();
+ $userPage = Title::makeTitle( NS_USER, $change->rev_user_text )->getFullText();
$comment = $rev->getComment();
if ( $comment ) {
$comment = '';
- $changeText = ' ' . wfMessage( 'pendingreviews-with-comment', array( $userPage ) )->parse() . ' ' . $comment;
- }
- else {
+ $changeText = ' ' . wfMessage( 'pendingreviews-with-comment', [ $userPage ] )->parse() . ' ' . $comment;
+ } else {
$changeText = ' ' . wfMessage( 'pendingreviews-edited-by', $userPage )->parse();
}
}
$changeTs = Xml::element( 'span',
- array( 'class' => 'pendingreviews-changes-list-time' ),
+ [ 'class' => 'pendingreviews-changes-list-time' ],
( new MWTimestamp( $changeTs ) )->getHumanTimestamp()
) . ' ';
diff --git a/specials/SpecialWatchAnalytics.php b/specials/SpecialWatchAnalytics.php
index 0332fc9..aab1cf4 100644
--- a/specials/SpecialWatchAnalytics.php
+++ b/specials/SpecialWatchAnalytics.php
@@ -3,13 +3,12 @@
class SpecialWatchAnalytics extends SpecialPage {
public $mMode;
- protected $header_links = array(
+ protected $header_links = [
'watchanalytics-pages-specialpage' => '',
'watchanalytics-users-specialpage' => 'users',
'watchanalytics-wikihistory-specialpage' => 'wikihistory',
'watchanalytics-watch-forcegraph-specialpage' => 'forcegraph',
- );
-
+ ];
public function __construct() {
parent::__construct(
@@ -19,7 +18,7 @@ public function __construct() {
);
}
- public function execute ( $parser = null ) {
+ public function execute( $parser = null ) {
global $wgRequest, $wgOut;
$this->setHeaders();
@@ -37,10 +36,10 @@ public function execute ( $parser = null ) {
$wgOut->addHTML( '
' . wfMessage( 'watchanalytics-all-wiki-stats-recorded' )->text() . '
' );
}
- $filters = array(
+ $filters = [
'groupfilter' => $wgRequest->getVal( 'groupfilter', '' ),
'categoryfilter' => $wgRequest->getVal( 'categoryfilter', '' ),
- );
+ ];
foreach ( $filters as &$filter ) {
if ( $filter === '' ) {
$filter = false;
@@ -50,50 +49,46 @@ public function execute ( $parser = null ) {
$wgOut->addHTML( $this->getPageHeader() );
if ( $this->mMode == 'users' ) {
$this->usersList( $filters );
- }
- else if ( $this->mMode == 'wikihistory' ) {
+ } elseif ( $this->mMode == 'wikihistory' ) {
$this->wikiHistory();
- }
- else if ( $this->mMode == 'forcegraph' ) {
+ } elseif ( $this->mMode == 'forcegraph' ) {
$this->forceGraph();
- }
- else {
+ } else {
$this->pagesList( $filters );
}
}
public function getPageHeader() {
-
// show the names of the four lists of pages, with the one
// corresponding to the current "mode" not being linked
// SELECT
- // COUNT(*) AS watches,
- // SUM( IF(watchlist.wl_notificationtimestamp IS NULL, 0, 1) ) AS num_pending,
- // SUM( IF(watchlist.wl_notificationtimestamp IS NULL, 0, 1) ) * 100 / COUNT(*) AS percent_pending
+ // COUNT(*) AS watches,
+ // SUM( IF(watchlist.wl_notificationtimestamp IS NULL, 0, 1) ) AS num_pending,
+ // SUM( IF(watchlist.wl_notificationtimestamp IS NULL, 0, 1) ) * 100 / COUNT(*) AS percent_pending
// FROM watchlist
// INNER JOIN page ON page.page_namespace = watchlist.wl_namespace AND page.page_title = watchlist.wl_title; $dbr = wfGetDB( DB_SLAVE );
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
// $res = $dbr->select(
- // array(
- // 'w' => 'watchlist',
- // 'p' => 'page',
- // ),
- // array(
- // "COUNT(*) AS watches",
- // "SUM( IF(watchlist.wl_notificationtimestamp IS NULL, 0, 1) ) AS num_pending",
- // "SUM( IF(watchlist.wl_notificationtimestamp IS NULL, 0, 1) ) * 100 / COUNT(*) AS percent_pending",
- // ),
- // null, // conditions
- // __METHOD__,
- // array(), // options
- // array(
- // 'page' => array(
- // 'INNER JOIN', 'p.page_namespace=w.wl_namespace AND p.page_title=w.wl_title'
- // )
- // )
+ // array(
+ // 'w' => 'watchlist',
+ // 'p' => 'page',
+ // ),
+ // array(
+ // "COUNT(*) AS watches",
+ // "SUM( IF(watchlist.wl_notificationtimestamp IS NULL, 0, 1) ) AS num_pending",
+ // "SUM( IF(watchlist.wl_notificationtimestamp IS NULL, 0, 1) ) * 100 / COUNT(*) AS percent_pending",
+ // ),
+ // null, // conditions
+ // __METHOD__,
+ // array(), // options
+ // array(
+ // 'page' => array(
+ // 'INNER JOIN', 'p.page_namespace=w.wl_namespace AND p.page_title=w.wl_title'
+ // )
+ // )
// );
$res = $dbr->query( '
@@ -107,11 +102,11 @@ public function getPageHeader() {
$allWikiData = $dbr->fetchRow( $res );
- list( $watches, $pending, $percent ) = array(
+ list( $watches, $pending, $percent ) = [
$allWikiData['num_watches'],
$allWikiData['num_pending'],
$allWikiData['percent_pending']
- );
+ ];
$percent = round( $percent, 1 );
$stateOf = "
The state of the Wiki: $watches watches of which $percent% ($pending) are pending";
@@ -124,12 +119,10 @@ public function getPageHeader() {
$header = '
' . wfMessage( 'watchanalytics-view' )->text() . '';
$header .= Xml::tags( 'ul', null, $navLinks ) . "\n";
- return $stateOf . Xml::tags( 'div', array( 'class' => 'special-watchanalytics-header' ), $header );
-
+ return $stateOf . Xml::tags( 'div', [ 'class' => 'special-watchanalytics-header' ], $header );
}
public function createHeaderLink( $msg, $query_param ) {
-
$WatchAnalyticsTitle = SpecialPage::getTitleFor( $this->getName() );
if ( $this->mMode == $query_param ) {
@@ -138,38 +131,37 @@ public function createHeaderLink( $msg, $query_param ) {
wfMessage( $msg )->text()
);
} else {
- $show = ( $query_param == '' ) ? array() : array( 'show' => $query_param );
+ $show = ( $query_param == '' ) ? [] : [ 'show' => $query_param ];
return Xml::element( 'a',
- array( 'href' => $WatchAnalyticsTitle->getLocalURL( $show ) ),
+ [ 'href' => $WatchAnalyticsTitle->getLocalURL( $show ) ],
wfMessage( $msg )->text()
);
}
-
}
- public function pagesList ( $filters ) {
+ public function pagesList( $filters ) {
return $this->createTablePager(
'watchanalytics-special-pages-pagetitle',
- new WatchAnalyticsPageTablePager( $this, array(), $filters )
+ new WatchAnalyticsPageTablePager( $this, [], $filters )
);
}
- public function usersList ( $filters ) {
+ public function usersList( $filters ) {
return $this->createTablePager(
'watchanalytics-special-users-pagetitle',
- new WatchAnalyticsUserTablePager( $this, array(), $filters )
+ new WatchAnalyticsUserTablePager( $this, [], $filters )
);
}
- public function wikiHistory () {
+ public function wikiHistory() {
return $this->createTablePager(
'watchanalytics-special-wikihistory-pagetitle',
- new WatchAnalyticsWikiTablePager( $this, array() )
+ new WatchAnalyticsWikiTablePager( $this, [] )
);
}
- public function createTablePager ( $titleMsg, WatchAnalyticsTablePager $tablePager ) {
- global $wgOut, $wgRequest;
+ public function createTablePager( $titleMsg, WatchAnalyticsTablePager $tablePager ) {
+ global $wgOut;
$wgOut->setPageTitle( wfMessage( $titleMsg )->text() );
@@ -181,71 +173,56 @@ public function createTablePager ( $titleMsg, WatchAnalyticsTablePager $tablePag
$html .= $tablePager->getNavigationBar();
$html .= $body;
$html .= $tablePager->getNavigationBar();
- }
- else {
+ } else {
$html .= '
' . wfMsgHTML( 'listusers-noresult' ) . '
';
}
$wgOut->addHTML( $html );
return true;
}
- public function forceGraph () {
-
+ public function forceGraph() {
global $wgOut;
$wgOut->setPageTitle( 'Watch Analytics: User/Page Watch Relationships' );
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_REPLICA );
// Load the module for the D3.js force directed graph
$wgOut->addModules( 'ext.watchanalytics.forcegraph.scripts' );
// Load the styles for the D3.js force directed graph
$wgOut->addModuleStyles( 'ext.watchanalytics.forcegraph.styles' );
- // SELECT
- // watchlist.wl_title AS title,
- // watchlist.wl_notificationtimestamp AS notification,
- // user.user_name AS user_name,
- // user.user_real_name AS real_name
- // FROM watchlist
- // LEFT JOIN user ON user.user_id = watchlist.wl_user
- // WHERE
- // wl_namespace = 0
- // AND user.user_name IN (\'Lwelsh\',\'Swray\',\'Balpert\',\'Ejmontal\',\'Cmavridi\', \'Sgeffert\', \'Smulhern\', \'Kgjohns1\', \'Bscheib\', \'Ssjohns5\')
- // LIMIT 20000
-
$res = $dbr->select(
- array(
+ [
'w' => 'watchlist',
'u' => 'user',
'p' => 'page',
- ),
- array(
+ ],
+ [
'w.wl_title AS title',
'w.wl_notificationtimestamp as notification',
'u.user_name as user_name',
'u.user_real_name AS real_name',
- ),
+ ],
'w.wl_namespace = 0 AND p.page_is_redirect = 0',
__METHOD__,
- array(
+ [
"LIMIT" => "100000",
- ),
- array(
- 'u' => array(
+ ],
+ [
+ 'u' => [
'LEFT JOIN', 'u.user_id = w.wl_user'
- ),
- 'p' => array(
+ ],
+ 'p' => [
'RIGHT JOIN', 'w.wl_title = p.page_title AND w.wl_namespace = p.page_namespace'
- ),
- )
+ ],
+ ]
);
-
- $nodes = array();
- $pages = array();
- $users = array();
- $links = array();
+ $nodes = [];
+ $pages = [];
+ $users = [];
+ $links = [];
while ( $row = $res->fetchRow() ) {
// if the page isn't in $pages, then it's also not in $nodes
@@ -256,11 +233,11 @@ public function forceGraph () {
$pages[ $row['title'] ] = $nextNode;
// $nodes[ $nextNode ] = $row['title'];
- $nodes[ $nextNode ] = array(
+ $nodes[ $nextNode ] = [
"name" => $row['title'],
"label" => $row['title'],
"group" => 1
- );
+ ];
}
// same for users...add to $users and $nodes accordingly
@@ -270,44 +247,41 @@ public function forceGraph () {
$users[ $row['user_name'] ] = $nextNode;
$nodes[ $nextNode ] = $row['user_name'];
- if ( $row['real_name'] !== NULL && trim( $row['real_name'] ) !== '' ) {
+ if ( $row['real_name'] !== null && trim( $row['real_name'] ) !== '' ) {
$displayName = $row['real_name'];
- }
- else {
+ } else {
$displayName = $row['user_name'];
}
- $nodes[ $nextNode ] = array(
+ $nodes[ $nextNode ] = [
"name" => $displayName,
"label" => $displayName,
"group" => 2,
"weight" => 1
- );
+ ];
- }
- else {
+ } else {
$userNodeIndex = $users[ $row['user_name'] ];
$nodes[ $userNodeIndex ]['weight']++;
}
- if ( $row['notification'] == NULL ) {
+ if ( $row['notification'] == null ) {
$linkClass = "link";
- }
- else {
+ } else {
$linkClass = "unreviewed";
}
// if ( $linkClass !== "unreviewed" ) {
- $links[] = array(
+ $links[] = [
"source" => $users[ $row['user_name'] ],
"target" => $pages[ $row['title'] ],
"value" => 1,
"linkclass" => $linkClass
- );
+ ];
// }
}
- $json = array( "nodes" => $nodes, "links" => $links );
+ $json = [ "nodes" => $nodes, "links" => $links ];
$json = json_encode( $json ); // , JSON_PRETTY_PRINT );
$html = '
' . wfMessage( 'watchanalytics-watch-forcegraph-header' )->text() . '
';
@@ -316,7 +290,5 @@ public function forceGraph () {
// $html .= "
$json
"; // easy testing
$html .= "";
$wgOut->addHTML( $html );
-
}
}
-