* Fix explicit s-maxage=0 on raw pages; should help with proxy issues in

[lhc/web/wiklou.git] / includes / LogPage.php

diff --git a/includes/LogPage.php b/includes/LogPage.php
index f1888c9..c44991c 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -32,17 +32,21 @@
  * @package MediaWiki
  */
 class LogPage {
-       /* private */ var $type, $action, $comment, $params, $target;
-       var $updateRecentChanges = true;
+       /* @access private */
+       var $type, $action, $comment, $params, $target;
+       /* @acess public */
+       var $updateRecentChanges;
 
        /**
          * Constructor
          *
          * @param string $type One of '', 'block', 'protect', 'rights', 'delete',
          *               'upload', 'move'
+         * @param bool $rc Whether to update recent changes as well as the logging table
          */
-       function LogPage( $type ) {
+       function LogPage( $type, $rc = true ) {
                $this->type = $type;
+               $this->updateRecentChanges = $rc;
        }
 
        function saveContent() {
@@ -79,6 +83,7 @@ class LogPage {
                                        $rcComment .= ': ' . $this->comment;
                        }
 
+                       require_once( 'RecentChange.php' );
                        RecentChange::notifyLog( $now, $titleObj, $wgUser, $rcComment );
                }
                return true;
@@ -89,26 +94,10 @@ class LogPage {
         */
        function validTypes() {
                static $types = array( '', 'block', 'protect', 'rights', 'delete', 'upload', 'move' );
-               wfRunHooks( 'LogPageValidTypes', array( &$types) );
+               wfRunHooks( 'LogPageValidTypes', array( &$types ) );
                return $types;
        }
 
-       /**
-        * @static
-        */
-       function validActions( $type ) {
-               static $actions = array(
-                       '' => NULL,
-                       'block' => array( 'block', 'unblock' ),
-                       'protect' => array( 'protect', 'unprotect' ),
-                       'rights' => array( 'rights' ),
-                       'delete' => array( 'delete', 'restore' ),
-                       'upload' => array( 'upload' ),
-                       'move' => array( 'move' )
-               );
-               return $actions[$type];
-       }
-
        /**
         * @static
         */
@@ -129,9 +118,14 @@ class LogPage {
                        'upload'  => 'uploadlogpage',
                        'move'    => 'movelogpage'
                );
-               wfRunHooks( 'LogPageLogName', array( &$typeText) );
-               
-               return str_replace( '_', ' ', wfMsg( $typeText[$type] ) );
+               wfRunHooks( 'LogPageLogName', array( &$typeText ) );
+
+               if( isset( $typeText[$type] ) ) {
+                       return str_replace( '_', ' ', wfMsg( $typeText[$type] ) );
+               } else {
+                       // Bogus log types? Perhaps an extension was removed.
+                       return $type;
+               }
        }
 
        /**
@@ -148,24 +142,27 @@ class LogPage {
                        'move'    => 'movelogpagetext'
                );
                wfRunHooks( 'LogPageLogHeader', array( &$headerText ) );
-               
+
                return wfMsg( $headerText[$type] );
        }
 
        /**
         * @static
         */
-       function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false ) {
+       function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false, $translate=false ) {
                global $wgLang;
                static $actions = array(
                        'block/block'       => 'blocklogentry',
                        'block/unblock'     => 'unblocklogentry',
                        'protect/protect'   => 'protectedarticle',
                        'protect/unprotect' => 'unprotectedarticle',
+
+                       // TODO: This whole section should be moved to extensions/Makesysop/SpecialMakesysop.php
                        'rights/rights'     => 'bureaucratlogentry',
                        'rights/addgroup'   => 'addgrouplogentry',
                        'rights/rngroup'    => 'renamegrouplogentry',
                        'rights/chgroup'    => 'changegrouplogentry',
+
                        'delete/delete'     => 'deletedarticle',
                        'delete/restore'    => 'undeletedarticle',
                        'upload/upload'     => 'uploadedimage',
@@ -173,20 +170,32 @@ class LogPage {
                        'move/move'         => '1movedto2',
                        'move/move_redir'   => '1movedto2_redir'
                );
+               wfRunHooks( 'LogPageActionText', array( &$actions ) );
+
                $key = "$type/$action";
                if( isset( $actions[$key] ) ) {
                        if( is_null( $title ) ) {
                                $rv=wfMsg( $actions[$key] );
                        } else {
                                if( $skin ) {
-                                       if ( $type == 'move' ) {
-                                               $titleLink = $skin->makeLinkObj( $title, $title->getPrefixedText(), 'redirect=no' );
-                                               // Change $param[0] into a link to the title specified in $param[0]
-                                               $movedTo = Title::newFromText( $params[0] );
-                                               $params[0] = $skin->makeLinkObj( $movedTo, $params[0] );
-                                       } else {
-                                               $titleLink = $skin->makeLinkObj( $title );
+
+                                       switch( $type ) {
+                                               case 'move':
+                                                       $titleLink = $skin->makeLinkObj( $title, $title->getPrefixedText(), 'redirect=no' );
+                                                       $params[0] = $skin->makeLinkObj( Title::newFromText( $params[0] ), $params[0] );
+                                                       break;
+                                               case 'block':
+                                                       if( substr( $title->getText(), 0, 1 ) == '#' ) {
+                                                               $titleLink = $title->getText();
+                                                       } else {
+                                                               $titleLink = $skin->makeLinkObj( $title, $title->getText() );
+                                                               $titleLink .= ' (' . $skin->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions/' . urlencode( $title->getDBkey() ) ), wfMsg( 'contribslink' ) ) . ')';
+                                                       }
+                                                       break;
+                                               default:
+                                                       $titleLink = $skin->makeLinkObj( $title );
                                        }
+
                                } else {
                                        $titleLink = $title->getPrefixedText();
                                }
@@ -194,10 +203,10 @@ class LogPage {
                                        $rv = wfMsg( $actions[$key], $titleLink );
                                } else {
                                        array_unshift( $params, $titleLink );
-                                       if ( $key == 'block/block' ) {
+                                       if ( $translate && $key == 'block/block' ) {
                                                $params[1] = $wgLang->translateBlockExpiry($params[1]);
                                        }
-                                       $rv = wfMsgReal( $actions[$key], $params, true, false );
+                                       $rv = wfMsgReal( $actions[$key], $params, true, false ); // FIXME: use wfMsgForContent() ?
                                }
                        }
                } else {