From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 includes/jobqueue/jobs/PublishStashedFileJob.php | 150 +++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 includes/jobqueue/jobs/PublishStashedFileJob.php

(limited to 'includes/jobqueue/jobs/PublishStashedFileJob.php')

diff --git a/includes/jobqueue/jobs/PublishStashedFileJob.php b/includes/jobqueue/jobs/PublishStashedFileJob.php
new file mode 100644
index 00000000..918a392d
--- /dev/null
+++ b/includes/jobqueue/jobs/PublishStashedFileJob.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Upload a file from the upload stash into the local file repo.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Upload
+ */
+
+/**
+ * Upload a file from the upload stash into the local file repo.
+ *
+ * @ingroup Upload
+ */
+class PublishStashedFileJob extends Job {
+	public function __construct( $title, $params ) {
+		parent::__construct( 'PublishStashedFile', $title, $params );
+		$this->removeDuplicates = true;
+	}
+
+	public function run() {
+		$scope = RequestContext::importScopedSession( $this->params['session'] );
+		$context = RequestContext::getMain();
+		try {
+			$user = $context->getUser();
+			if ( !$user->isLoggedIn() ) {
+				$this->setLastError( "Could not load the author user from session." );
+
+				return false;
+			}
+
+			if ( count( $_SESSION ) === 0 ) {
+				// Empty session probably indicates that we didn't associate
+				// with the session correctly. Note that being able to load
+				// the user does not necessarily mean the session was loaded.
+				// Most likely cause by suhosin.session.encrypt = On.
+				$this->setLastError( "Error associating with user session. " .
+					"Try setting suhosin.session.encrypt = Off" );
+
+				return false;
+			}
+
+			UploadBase::setSessionStatus(
+				$this->params['filekey'],
+				array( 'result' => 'Poll', 'stage' => 'publish', 'status' => Status::newGood() )
+			);
+
+			$upload = new UploadFromStash( $user );
+			// @todo initialize() causes a GET, ideally we could frontload the antivirus
+			// checks and anything else to the stash stage (which includes concatenation and
+			// the local file is thus already there). That way, instead of GET+PUT, there could
+			// just be a COPY operation from the stash to the public zone.
+			$upload->initialize( $this->params['filekey'], $this->params['filename'] );
+
+			// Check if the local file checks out (this is generally a no-op)
+			$verification = $upload->verifyUpload();
+			if ( $verification['status'] !== UploadBase::OK ) {
+				$status = Status::newFatal( 'verification-error' );
+				$status->value = array( 'verification' => $verification );
+				UploadBase::setSessionStatus(
+					$this->params['filekey'],
+					array( 'result' => 'Failure', 'stage' => 'publish', 'status' => $status )
+				);
+				$this->setLastError( "Could not verify upload." );
+
+				return false;
+			}
+
+			// Upload the stashed file to a permanent location
+			$status = $upload->performUpload(
+				$this->params['comment'],
+				$this->params['text'],
+				$this->params['watch'],
+				$user
+			);
+			if ( !$status->isGood() ) {
+				UploadBase::setSessionStatus(
+					$this->params['filekey'],
+					array( 'result' => 'Failure', 'stage' => 'publish', 'status' => $status )
+				);
+				$this->setLastError( $status->getWikiText() );
+
+				return false;
+			}
+
+			// Build the image info array while we have the local reference handy
+			$apiMain = new ApiMain(); // dummy object (XXX)
+			$imageInfo = $upload->getImageInfo( $apiMain->getResult() );
+
+			// Cleanup any temporary local file
+			$upload->cleanupTempFile();
+
+			// Cache the info so the user doesn't have to wait forever to get the final info
+			UploadBase::setSessionStatus(
+				$this->params['filekey'],
+				array(
+					'result' => 'Success',
+					'stage' => 'publish',
+					'filename' => $upload->getLocalFile()->getName(),
+					'imageinfo' => $imageInfo,
+					'status' => Status::newGood()
+				)
+			);
+		} catch ( MWException $e ) {
+			UploadBase::setSessionStatus(
+				$this->params['filekey'],
+				array(
+					'result' => 'Failure',
+					'stage' => 'publish',
+					'status' => Status::newFatal( 'api-error-publishfailed' )
+				)
+			);
+			$this->setLastError( get_class( $e ) . ": " . $e->getText() );
+			// To prevent potential database referential integrity issues.
+			// See bug 32551.
+			MWExceptionHandler::rollbackMasterChangesAndLog( $e );
+
+			return false;
+		}
+
+		return true;
+	}
+
+	public function getDeduplicationInfo() {
+		$info = parent::getDeduplicationInfo();
+		if ( is_array( $info['params'] ) ) {
+			$info['params'] = array( 'filekey' => $info['params']['filekey'] );
+		}
+
+		return $info;
+	}
+
+	public function allowRetries() {
+		return false;
+	}
+}
-- 
cgit v1.2.3-54-g00ecf