X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FLogPage.php;h=3f38301afc5d7802aa7112431c376b18b0d7bf8f;hb=3fd48996554076bf4a85dd56bfa4cb87e5412990;hp=f025742c6de36128be3c30ade73a57800dfd273e;hpb=12683a093ecf2580eb700757cf6f6a09fe67544b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/LogPage.php b/includes/LogPage.php
index f025742c6d..3f38301afc 100644
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -15,13 +15,12 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
 /**
  * Contain log classes
- *
- * @package MediaWiki
+ * @file
  */
 
 /**
@@ -29,11 +28,14 @@
  * The logs are now kept in a table which is easier to manage and trim
  * than ever-growing wiki pages.
  *
- * @package MediaWiki
  */
 class LogPage {
+	const DELETED_ACTION = 1;
+	const DELETED_COMMENT = 2;
+	const DELETED_USER = 4;
+    const DELETED_RESTRICTED = 8;
 	/* @access private */
-	var $type, $action, $comment, $params, $target;
+	var $type, $action, $comment, $params, $target, $doer;
 	/* @acess public */
 	var $updateRecentChanges;
 
@@ -44,170 +46,187 @@ class LogPage {
 	  *               'upload', 'move'
 	  * @param bool $rc Whether to update recent changes as well as the logging table
 	  */
-	function LogPage( $type, $rc = true ) {
+	function __construct( $type, $rc = true ) {
 		$this->type = $type;
 		$this->updateRecentChanges = $rc;
 	}
 
-	function saveContent() {
-		if( wfReadOnly() ) return;
-
-		global $wgUser;
+	protected function saveContent() {
+		global $wgUser, $wgLogRestrictions;
 		$fname = 'LogPage::saveContent';
 
-		$dbw =& wfGetDB( DB_MASTER );
-		$uid = $wgUser->getID();
+		$dbw = wfGetDB( DB_MASTER );
+		$log_id = $dbw->nextSequenceValue( 'log_log_id_seq' );
 
 		$this->timestamp = $now = wfTimestampNow();
-		$dbw->insert( 'logging',
-			array(
-				'log_type' => $this->type,
-				'log_action' => $this->action,
-				'log_timestamp' => $dbw->timestamp( $now ),
-				'log_user' => $uid,
-				'log_namespace' => $this->target->getNamespace(),
-				'log_title' => $this->target->getDBkey(),
-				'log_comment' => $this->comment,
-				'log_params' => $this->params
-			), $fname
+		$data = array(
+			'log_id' => $log_id,
+			'log_type' => $this->type,
+			'log_action' => $this->action,
+			'log_timestamp' => $dbw->timestamp( $now ),
+			'log_user' => $this->doer->getId(),
+			'log_namespace' => $this->target->getNamespace(),
+			'log_title' => $this->target->getDBkey(),
+			'log_comment' => $this->comment,
+			'log_params' => $this->params
 		);
+		$dbw->insert( 'logging', $data, $fname );
+		$newId = !is_null($log_id) ? $log_id : $dbw->insertId();
 
+		if( !($dbw->affectedRows() > 0) ) {
+			wfDebugLog( "logging", "LogPage::saveContent failed to insert row - Error {$dbw->lastErrno()}: {$dbw->lastError()}" );
+		}
 		# And update recentchanges
-		if ( $this->updateRecentChanges ) {
-			$titleObj = Title::makeTitle( NS_SPECIAL, 'Log/' . $this->type );
-			$rcComment = $this->actionText;
-			if( '' != $this->comment ) {
-				if ($rcComment == '')
-					$rcComment = $this->comment;
-				else
-					$rcComment .= ': ' . $this->comment;
+		if( $this->updateRecentChanges ) {
+			# Don't add private logs to RC!
+			if( !isset($wgLogRestrictions[$this->type]) || $wgLogRestrictions[$this->type]=='*' ) {
+				$titleObj = SpecialPage::getTitleFor( 'Log', $this->type );
+				$rcComment = $this->getRcComment();
+				RecentChange::notifyLog( $now, $titleObj, $this->doer, $rcComment, '',
+					$this->type, $this->action, $this->target, $this->comment, $this->params, $newId );
 			}
-
-			require_once( 'RecentChange.php' );
-			RecentChange::notifyLog( $now, $titleObj, $wgUser, $rcComment );
 		}
 		return true;
 	}
 
+	/**
+	 * Get the RC comment from the last addEntry() call
+	 */
+	public function getRcComment() {
+		$rcComment = $this->actionText;
+		if( '' != $this->comment ) {
+			if ($rcComment == '')
+				$rcComment = $this->comment;
+			else
+				$rcComment .= wfMsgForContent( 'colon-separator' ) . $this->comment;
+		}
+		return $rcComment;
+	}
+
+	/**
+	 * Get the comment from the last addEntry() call
+	 */
+	public function getComment() {
+		return $this->comment;
+	}
+
 	/**
 	 * @static
 	 */
-	function validTypes() {
-		static $types = array( '', 'block', 'protect', 'rights', 'delete', 'upload', 'move' );
-		wfRunHooks( 'LogPageValidTypes', array( &$types ) );
-		return $types;
+	public static function validTypes() {
+		global $wgLogTypes;
+		return $wgLogTypes;
 	}
 
 	/**
 	 * @static
 	 */
-	function isLogType( $type ) {
+	public static function isLogType( $type ) {
 		return in_array( $type, LogPage::validTypes() );
 	}
 
 	/**
 	 * @static
 	 */
-	function logName( $type ) {
-		static $typeText = array(
-			''        => 'log',
-			'block'   => 'blocklogpage',
-			'protect' => 'protectlogpage',
-			'rights'  => 'bureaucratlog',
-			'delete'  => 'dellogpage',
-			'upload'  => 'uploadlogpage',
-			'move'    => 'movelogpage'
-		);
-		wfRunHooks( 'LogPageLogName', array( &$typeText ) );
+	public static function logName( $type ) {
+		global $wgLogNames, $wgMessageCache;
 
-		return str_replace( '_', ' ', wfMsg( $typeText[$type] ) );
+		if( isset( $wgLogNames[$type] ) ) {
+			$wgMessageCache->loadAllMessages();
+			return str_replace( '_', ' ', wfMsg( $wgLogNames[$type] ) );
+		} else {
+			// Bogus log types? Perhaps an extension was removed.
+			return $type;
+		}
 	}
 
 	/**
-	 * @static
+	 * @todo handle missing log types
+	 * @param string $type logtype
+	 * @return string Headertext of this logtype
 	 */
-	function logHeader( $type ) {
-		static $headerText = array(
-			''        => 'alllogstext',
-			'block'   => 'blocklogtext',
-			'protect' => 'protectlogtext',
-			'rights'  => 'rightslogtext',
-			'delete'  => 'dellogpagetext',
-			'upload'  => 'uploadlogpagetext',
-			'move'    => 'movelogpagetext'
-		);
-		wfRunHooks( 'LogPageLogHeader', array( &$headerText ) );
-
-		return wfMsg( $headerText[$type] );
+	static function logHeader( $type ) {
+		global $wgLogHeaders, $wgMessageCache;
+		$wgMessageCache->loadAllMessages();
+		return wfMsgExt($wgLogHeaders[$type],array('parseinline'));
 	}
 
 	/**
 	 * @static
+	 * @return HTML string
 	 */
-	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',
-			'upload/revert'     => 'uploadedimage',
-			'move/move'         => '1movedto2',
-			'move/move_redir'   => '1movedto2_redir'
-		);
-		wfRunHooks( 'LogPageActionText', array( &$actions ) );
+	static function actionText( $type, $action, $title = NULL, $skin = NULL, 
+		$params = array(), $filterWikilinks = false ) 
+	{
+		global $wgLang, $wgContLang, $wgLogActions, $wgMessageCache;
 
+		$wgMessageCache->loadAllMessages();
 		$key = "$type/$action";
-		if( isset( $actions[$key] ) ) {
+		# Defer patrol log to PatrolLog class
+		if( $key == 'patrol/patrol' ) {
+			return PatrolLog::makeActionText( $title, $params, $skin );
+		}
+		if( isset( $wgLogActions[$key] ) ) {
 			if( is_null( $title ) ) {
-				$rv=wfMsg( $actions[$key] );
+				$rv = wfMsg( $wgLogActions[$key] );
 			} else {
-				if( $skin ) {
-
-					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':
-							$titleText = $title->getText();
-							if( substr( $titleText, 0, 1 ) == '#' ) {
-								$titleLink = $titleText;
-							} else {
-								$titleLink = $skin->makeLinkObj( $title, $titleText );
-								$titleLink .= ' (' . $skin->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions/' . urlencode( $titleText ) ), wfMsg( 'contribslink' ) ) . ')';
-							}
-							break;
-						default:
-							$titleLink = $skin->makeLinkObj( $title );
+				$titleLink = self::getTitleLink( $type, $skin, $title, $params );
+				if( $key == 'rights/rights' ) {
+					if( $skin ) {
+						$rightsnone = wfMsg( 'rightsnone' );
+						foreach ( $params as &$param ) {
+							$groupArray = array_map( 'trim', explode( ',', $param ) );
+							$groupArray = array_map( array( 'User', 'getGroupName' ), $groupArray );
+							$param = $wgLang->listToText( $groupArray );
+						}
+					} else {
+						$rightsnone = wfMsgForContent( 'rightsnone' );
 					}
-
-				} else {
-					$titleLink = $title->getPrefixedText();
+					if( !isset( $params[0] ) || trim( $params[0] ) == '' )
+						$params[0] = $rightsnone;
+					if( !isset( $params[1] ) || trim( $params[1] ) == '' )
+						$params[1] = $rightsnone;
 				}
 				if( count( $params ) == 0 ) {
-					$rv = wfMsg( $actions[$key], $titleLink );
+					if ( $skin ) {
+						$rv = wfMsg( $wgLogActions[$key], $titleLink );
+					} else {
+						$rv = wfMsgForContent( $wgLogActions[$key], $titleLink );
+					}
 				} else {
+					$details = '';
 					array_unshift( $params, $titleLink );
-					if ( $translate && $key == 'block/block' ) {
-						$params[1] = $wgLang->translateBlockExpiry($params[1]);
+					if ( $key == 'block/block' || $key == 'suppress/block' || $key == 'block/reblock' ) {
+						if ( $skin ) {
+							$params[1] = '<span title="' . htmlspecialchars( $params[1] ). '">' . 
+								$wgLang->translateBlockExpiry( $params[1] ) . '</span>';
+						} else {
+							$params[1] = $wgContLang->translateBlockExpiry( $params[1] );
+						}
+						$params[2] = isset( $params[2] ) ? 
+							self::formatBlockFlags( $params[2], is_null( $skin ) ) : '';
+					} else if ( $type == 'protect' && count($params) == 3 ) {
+						$details .= " {$params[1]}"; // restrictions and expiries
+						if( $params[2] ) {
+							$details .= ' ['.wfMsg('protect-summary-cascade').']';
+						}
+					} else if ( $type == 'move' && count( $params ) == 3 ) {
+						if( $params[2] ) {
+							$details .= ' [' . wfMsg( 'move-redirect-suppressed' ) . ']';
+						}
 					}
-					$rv = wfMsgReal( $actions[$key], $params, true, false ); // FIXME: use wfMsgForContent() ?
+					$rv = wfMsgReal( $wgLogActions[$key], $params, true, !$skin ) . $details;
 				}
 			}
 		} else {
-			wfDebug( "LogPage::actionText - unknown action $key\n" );
-			$rv = "$action";
+			global $wgLogActionsHandlers;
+			if( isset( $wgLogActionsHandlers[$key] ) ) {
+				$args = func_get_args();
+				$rv = call_user_func_array( $wgLogActionsHandlers[$key], $args );
+			} else {
+				wfDebug( "LogPage::actionText - unknown action $key\n" );
+				$rv = "$action";
+			}
 		}
 		if( $filterWikilinks ) {
 			$rv = str_replace( "[[", "", $rv );
@@ -215,6 +234,59 @@ class LogPage {
 		}
 		return $rv;
 	}
+	
+	protected static function getTitleLink( $type, $skin, $title, &$params ) {
+		global $wgLang, $wgContLang;
+		if( !$skin ) {
+			return $title->getPrefixedText();
+		}
+		switch( $type ) {
+			case 'move':
+				$titleLink = $skin->makeLinkObj( $title, 
+					htmlspecialchars( $title->getPrefixedText() ), 'redirect=no' );
+				$targetTitle = Title::newFromText( $params[0] );
+				if ( !$targetTitle ) {
+					# Workaround for broken database
+					$params[0] = htmlspecialchars( $params[0] );
+				} else {
+					$params[0] = $skin->makeLinkObj( $targetTitle, htmlspecialchars( $params[0] ) );
+				}
+				break;
+			case 'block':
+				if( substr( $title->getText(), 0, 1 ) == '#' ) {
+					$titleLink = $title->getText();
+				} else {
+					// TODO: Store the user identifier in the parameters
+					// to make this faster for future log entries
+					$id = User::idFromName( $title->getText() );
+					$titleLink = $skin->userLink( $id, $title->getText() )
+						. $skin->userToolLinks( $id, $title->getText(), false, Linker::TOOL_LINKS_NOBLOCK );
+				}
+				break;
+			case 'rights':
+				$text = $wgContLang->ucfirst( $title->getText() );
+				$titleLink = $skin->makeLinkObj( Title::makeTitle( NS_USER, $text ) );
+				break;
+			case 'merge':
+				$titleLink = $skin->makeLinkObj( $title, $title->getPrefixedText(), 'redirect=no' );
+				$params[0] = $skin->makeLinkObj( Title::newFromText( $params[0] ), htmlspecialchars( $params[0] ) );
+				$params[1] = $wgLang->timeanddate( $params[1] );
+				break;
+			default:
+				if( $title->getNamespace() == NS_SPECIAL ) {
+					list( $name, $par ) = SpecialPage::resolveAliasWithSubpage( $title->getDBKey() );
+					# Use the language name for log titles, rather than Log/X
+					if( $name == 'Log' ) {
+						$titleLink = '('.$skin->makeLinkObj( $title, LogPage::logName( $par ) ).')';
+					} else {
+						$titleLink = $skin->makeLinkObj( $title );
+					}
+				} else {
+					$titleLink = $skin->makeLinkObj( $title );
+				}
+		}
+		return $titleLink;
+	}
 
 	/**
 	 * Add a log entry
@@ -222,16 +294,26 @@ class LogPage {
 	 * @param object &$target A title object.
 	 * @param string $comment Description associated
 	 * @param array $params Parameters passed later to wfMsg.* functions
+	 * @param User $doer The user doing the action
 	 */
-	function addEntry( $action, &$target, $comment, $params = array() ) {
+	function addEntry( $action, $target, $comment, $params = array(), $doer = null ) {
 		if ( !is_array( $params ) ) {
 			$params = array( $params );
 		}
 
 		$this->action = $action;
-		$this->target =& $target;
+		$this->target = $target;
 		$this->comment = $comment;
 		$this->params = LogPage::makeParamBlob( $params );
+		
+		if ($doer === null) {
+			global $wgUser;
+			$doer = $wgUser;
+		} elseif (!is_object( $doer ) ) {
+			$doer = User::newFromId( $doer );
+		}
+		
+		$this->doer = $doer;
 
 		$this->actionText = LogPage::actionText( $this->type, $action, $target, NULL, $params );
 
@@ -242,7 +324,7 @@ class LogPage {
 	 * Create a blob from a parameter array
 	 * @static
 	 */
-	function makeParamBlob( $params ) {
+	static function makeParamBlob( $params ) {
 		return implode( "\n", $params );
 	}
 
@@ -250,13 +332,60 @@ class LogPage {
 	 * Extract a parameter array from a blob
 	 * @static
 	 */
-	function extractParams( $blob ) {
+	static function extractParams( $blob ) {
 		if ( $blob === '' ) {
 			return array();
 		} else {
 			return explode( "\n", $blob );
 		}
 	}
+
+	/**
+	 * Convert a comma-delimited list of block log flags
+	 * into a more readable (and translated) form
+	 *
+	 * @param $flags Flags to format
+	 * @param $forContent Whether to localize the message depending of the user
+	 *                    language
+	 * @return string
+	 */
+	public static function formatBlockFlags( $flags, $forContent = false ) {
+		$flags = explode( ',', trim( $flags ) );
+		if( count( $flags ) > 0 ) {
+			for( $i = 0; $i < count( $flags ); $i++ )
+				$flags[$i] = self::formatBlockFlag( $flags[$i], $forContent );
+			return '(' . implode( ', ', $flags ) . ')';
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Translate a block log flag if possible
+	 *
+	 * @param $flag Flag to translate
+	 * @param $forContent Whether to localize the message depending of the user
+	 *                    language
+	 * @return string
+	 */
+	public static function formatBlockFlag( $flag, $forContent = false ) {
+		static $messages = array();
+		if( !isset( $messages[$flag] ) ) {
+			$k = 'block-log-flags-' . $flag;
+			if( $forContent )
+				$msg = wfMsgForContent( $k );
+			else
+				$msg = wfMsg( $k );
+			$messages[$flag] = htmlspecialchars( wfEmptyMsg( $k, $msg ) ? $flag : $msg );
+		}
+		return $messages[$flag];
+	}
 }
 
-?>
+/**
+ * Aliases for backwards compatibility with 1.6
+ */
+define( 'MW_LOG_DELETED_ACTION', LogPage::DELETED_ACTION );
+define( 'MW_LOG_DELETED_USER', LogPage::DELETED_USER );
+define( 'MW_LOG_DELETED_COMMENT', LogPage::DELETED_COMMENT );
+define( 'MW_LOG_DELETED_RESTRICTED', LogPage::DELETED_RESTRICTED );