X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FLogPage.php;h=647cc0115ce86631d47741aef73b1976b4a15901;hb=1dfc87b4cba658d178bcd9bb802bb818fc5acd8f;hp=b24611b590a5256cc5f24626679d38dc018e8618;hpb=910ad315b7ad91d751bb2df296aeeaf70890af03;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/LogPage.php b/includes/LogPage.php
index b24611b590..647cc0115c 100644
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -20,7 +20,7 @@
 
 /**
  * Contain log classes
- *
+ * @file
  */
 
 /**
@@ -35,7 +35,7 @@ class LogPage {
 	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;
 
@@ -51,42 +51,42 @@ class LogPage {
 		$this->updateRecentChanges = $rc;
 	}
 
-	function saveContent() {
-		if( wfReadOnly() ) return false;
-
+	protected function saveContent() {
 		global $wgUser, $wgLogRestrictions;
 		$fname = 'LogPage::saveContent';
 
 		$dbw = wfGetDB( DB_MASTER );
-		$uid = $wgUser->getID();
 		$log_id = $dbw->nextSequenceValue( 'log_log_id_seq' );
 
 		$this->timestamp = $now = wfTimestampNow();
 		$data = array(
+			'log_id' => $log_id,
 			'log_type' => $this->type,
 			'log_action' => $this->action,
 			'log_timestamp' => $dbw->timestamp( $now ),
-			'log_user' => $uid,
+			'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 = $dbw->insertId();
+		$newId = !is_null($log_id) ? $log_id : $dbw->insertId();
 
-		$ok = ($dbw->affectedRows() > 0);
+		if( !($dbw->affectedRows() > 0) ) {
+			wfDebugLog( "logging", "LogPage::saveContent failed to insert row - Error {$dbw->lastErrno()}: {$dbw->lastError()}" );
+		}
 		# And update recentchanges
-		if( $ok && $this->updateRecentChanges ) {
+		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, $wgUser, $rcComment, '',
+				RecentChange::notifyLog( $now, $titleObj, $this->doer, $rcComment, '',
 					$this->type, $this->action, $this->target, $this->comment, $this->params, $newId );
 			}
 		}
-		return $ok;
+		return true;
 	}
 
 	public function getRcComment() {
@@ -136,16 +136,19 @@ class LogPage {
 	 * @return string Headertext of this logtype
 	 */
 	static function logHeader( $type ) {
-		global $wgLogHeaders;
+		global $wgLogHeaders, $wgMessageCache;
+		$wgMessageCache->loadAllMessages();
 		return wfMsgExt($wgLogHeaders[$type],array('parseinline'));
 	}
 
 	/**
 	 * @static
+	 * @return HTML string
 	 */
 	static function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false ) {
-		global $wgLang, $wgContLang, $wgLogActions;
+		global $wgLang, $wgContLang, $wgLogActions, $wgMessageCache;
 
+		$wgMessageCache->loadAllMessages();
 		$key = "$type/$action";
 
 		if( $key == 'patrol/patrol' )
@@ -192,6 +195,11 @@ class LogPage {
 				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' );
 					}
@@ -222,8 +230,14 @@ class LogPage {
 				}
 			}
 		} 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 );
@@ -238,8 +252,9 @@ 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 );
 		}
@@ -248,6 +263,15 @@ class LogPage {
 		$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 );