From cbf29d43ddc8e4cc4c6d97efba84f23f31a14b90 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 2 Apr 2008 17:43:57 +0000 Subject: [PATCH] proper name --- includes/AutoLoader.php | 6 ++-- .../{LogEventList.php => LogEventsList.php} | 36 +++++++++---------- includes/SpecialLog.php | 8 ++--- includes/SpecialRevisiondelete.php | 10 +++--- includes/api/ApiQueryLogEvents.php | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) rename includes/{LogEventList.php => LogEventsList.php} (95%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 904f62055d..ffc1351885 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -135,9 +135,9 @@ function __autoload($className) { 'LoadBalancer' => 'includes/LoadBalancer.php', 'LoginForm' => 'includes/SpecialUserlogin.php', 'LogPage' => 'includes/LogPage.php', - 'LogEventList' => 'includes/LogEventList.php', - 'LogReader' => 'includes/LogEventList.php', - 'LogViewer' => 'includes/LogEventList.php', + 'LogEventsList' => 'includes/LogEventsList.php', + 'LogReader' => 'includes/LogEventsList.php', + 'LogViewer' => 'includes/LogEventsList.php', 'LonelyPagesPage' => 'includes/SpecialLonelypages.php', 'LongPagesPage' => 'includes/SpecialLongpages.php', 'MacBinary' => 'includes/MacBinary.php', diff --git a/includes/LogEventList.php b/includes/LogEventsList.php similarity index 95% rename from includes/LogEventList.php rename to includes/LogEventsList.php index f16a16a75b..a5f82ba475 100644 --- a/includes/LogEventList.php +++ b/includes/LogEventsList.php @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # http://www.gnu.org/copyleft/gpl.html -class LogEventList { +class LogEventsList { const NO_ACTION_LINK = 1; private $skin; public $flags; @@ -135,11 +135,11 @@ class LogEventList { return Xml::checkLabel( wfMsg( 'log-title-wildcard' ), 'pattern', 'pattern', $pattern ); } - public function beginLogEventList() { + public function beginLogEventsList() { return "\n"; } @@ -346,10 +346,10 @@ class LogEventList { */ class LogPager extends ReverseChronologicalPager { private $type = '', $user = '', $title = '', $pattern = ''; - public $mLogEventList; + public $mLogEventsList; /** * constructor - * @param LogEventList $loglist, + * @param LogEventsList $loglist, * @param string $type, * @param string $user, * @param string $page, @@ -360,7 +360,7 @@ class LogPager extends ReverseChronologicalPager { parent::__construct(); $this->mConds = $conds; - $this->mLogEventList = $loglist; + $this->mLogEventsList = $loglist; $this->limitType( $type ); $this->limitUser( $user ); @@ -375,7 +375,7 @@ class LogPager extends ReverseChronologicalPager { */ private function limitType( $type ) { // Don't show private logs to unpriviledged users - $hideLogs = LogEventList::getExcludeClause( $this->mDb ); + $hideLogs = LogEventsList::getExcludeClause( $this->mDb ); if( $hideLogs !== false ) { $this->mConds[] = $hideLogs; } @@ -457,7 +457,7 @@ class LogPager extends ReverseChronologicalPager { } function formatRow( $row ) { - return $this->mLogEventList->logLine( $row ); + return $this->mLogEventsList->logLine( $row ); } public function getType() { @@ -495,7 +495,7 @@ class LogReader { $title = $request->getText( 'page' ); $pattern = $request->getBool( 'pattern' ); - $loglist = new LogEventList( $wgUser->getSkin() ); + $loglist = new LogEventsList( $wgUser->getSkin() ); $this->pager = new LogPager( $loglist, $type, $user, $title, $pattern ); } @@ -524,16 +524,16 @@ class LogViewer { /** * @param LogReader &$reader where to get our data from * @param integer $flags Bitwise combination of flags: - * LogEventList::NO_ACTION_LINK Don't show restore/unblock/block links + * LogEventsList::NO_ACTION_LINK Don't show restore/unblock/block links */ function __construct( &$reader, $flags = 0 ) { global $wgUser; $this->skin = $wgUser->getSkin(); $this->reader =& $reader; - $this->reader->pager->mLogEventList->flags = $flags; + $this->reader->pager->mLogEventsList->flags = $flags; # Aliases for shorter code... $this->pager =& $this->reader->pager; - $this->logEventList =& $this->reader->pager->mLogEventList; + $this->logEventsList =& $this->reader->pager->mLogEventsList; } /** @@ -542,18 +542,18 @@ class LogViewer { public function show() { global $wgOut; # Set title and add header - $this->logEventList->showHeader( $wgOut, $pager->getType() ); + $this->logEventsList->showHeader( $wgOut, $pager->getType() ); # Show form options - $this->logEventList->showOptions( $wgOut, $this->pager->getType(), $this->pager->getUser(), + $this->logEventsList->showOptions( $wgOut, $this->pager->getType(), $this->pager->getUser(), $this->pager->getPage(), $this->pager->getPattern() ); # Insert list $logBody = $this->pager->getBody(); if( $logBody ) { $wgOut->addHTML( $this->pager->getNavigationBar() . - $this->logEventList->beginLogEventList() . + $this->logEventsList->beginLogEventsList() . $logBody . - $this->logEventList->endLogEventList() . + $this->logEventsList->endLogEventsList() . $this->pager->getNavigationBar() ); } else { @@ -571,9 +571,9 @@ class LogViewer { $logBody = $this->pager->getBody(); if( $logBody ) { $out->addHTML( - $this->logEventList->beginLogEventList() . + $this->logEventsList->beginLogEventsList() . $logBody . - $this->logEventList->endLogEventList() + $this->logEventsList->endLogEventsList() ); } else { $out->addWikiMsg( 'logempty' ); diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php index 349a6d1bb2..dea3ef9d90 100644 --- a/includes/SpecialLog.php +++ b/includes/SpecialLog.php @@ -32,9 +32,9 @@ function wfSpecialLog( $par = '' ) { $user = $wgRequest->getText( 'user' ); $title = $wgRequest->getText( 'page' ); $pattern = $wgRequest->getBool( 'pattern' ); - # Create a LogPager item to get the results and a LogEventList + # Create a LogPager item to get the results and a LogEventsList # item to format them... - $loglist = new LogEventList( $wgUser->getSkin() ); + $loglist = new LogEventsList( $wgUser->getSkin() ); $pager = new LogPager( $loglist, $type, $user, $title, $pattern ); # Set title and add header $loglist->showHeader( $wgOut, $pager->getType() ); @@ -45,9 +45,9 @@ function wfSpecialLog( $par = '' ) { if( $logBody ) { $wgOut->addHTML( $pager->getNavigationBar() . - $loglist->beginLogEventList() . + $loglist->beginLogEventsList() . $logBody . - $loglist->endLogEventList() . + $loglist->endLogEventsList() . $pager->getNavigationBar() ); } else { diff --git a/includes/SpecialRevisiondelete.php b/includes/SpecialRevisiondelete.php index f3a4ee12c1..bb0f9a7ab0 100644 --- a/includes/SpecialRevisiondelete.php +++ b/includes/SpecialRevisiondelete.php @@ -469,7 +469,7 @@ class RevisionDeleteForm { if( !isset( $logRows[$logid] ) || $logRows[$logid]->log_type=='suppress' ) { $wgOut->showErrorPage( 'revdelete-nooldid-title', 'revdelete-nooldid-text' ); return; - } else if( !LogEventList::userCan( $logRows[$logid],Revision::DELETED_RESTRICTED) ) { + } else if( !LogEventsList::userCan( $logRows[$logid],Revision::DELETED_RESTRICTED) ) { // If an event is hidden from sysops if( $action != 'submit') { $wgOut->permissionRequired( 'hiderevision' ); @@ -629,7 +629,7 @@ class RevisionDeleteForm { $loglink = $this->skin->makeKnownLinkObj( $logtitle, wfMsgHtml( 'log' ), wfArrayToCGI( array( 'page' => $title->getPrefixedUrl() ) ) ); // Action text - if( !LogEventList::userCan($row,LogPage::DELETED_ACTION) ) { + if( !LogEventsList::userCan($row,LogPage::DELETED_ACTION) ) { $action = '' . wfMsgHtml('rev-deleted-event') . ''; } else { $action = LogPage::actionText( $row->log_type, $row->log_action, $title, @@ -639,12 +639,12 @@ class RevisionDeleteForm { } // User links $userLink = $this->skin->userLink( $row->log_user, User::WhoIs($row->log_user) ); - if( LogEventList::isDeleted($row,LogPage::DELETED_USER) ) { + if( LogEventsList::isDeleted($row,LogPage::DELETED_USER) ) { $userLink = '' . $userLink . ''; } // Comment $comment = $wgContLang->getDirMark() . $this->skin->commentBlock( $row->log_comment ); - if( LogEventList::isDeleted($row,LogPage::DELETED_COMMENT) ) { + if( LogEventsList::isDeleted($row,LogPage::DELETED_COMMENT) ) { $comment = '' . $comment . ''; } return "
  • ($loglink) $date $userLink $action $comment
    • "; @@ -1080,7 +1080,7 @@ class RevisionDeleter { if( !isset($logRows[$logid]) ) { $success = false; continue; // Must exist - } else if( !LogEventList::userCan($logRows[$logid], Revision::DELETED_RESTRICTED) + } else if( !LogEventsList::userCan($logRows[$logid], Revision::DELETED_RESTRICTED) || $logRows[$logid]->log_type == 'suppress' ) { // Don't hide from oversight log!!! $userAllowedAll=false; diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index 164a2ff5bd..9f688cfea0 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -54,7 +54,7 @@ class ApiQueryLogEvents extends ApiQueryBase { list($tbl_logging, $tbl_page, $tbl_user) = $db->tableNamesN('logging', 'page', 'user'); - $hideLogs = LogEventList::getExcludeClause($db); + $hideLogs = LogEventsList::getExcludeClause($db); if($hideLogs !== false) $this->addWhere($hideLogs); -- 2.20.1