From 40132f4b2e00dd7896d31247a40144bc85b11d28 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Tue, 21 Jul 2020 12:16:02 +0200
Subject: [PATCH] Remove legacy style preview uploader

---
 .../install/files/acp/templates/styleAdd.tpl  |  4 +-
 .../Core/Acp/Ui/Style/Image/Upload.js         | 62 ---------------
 .../lib/data/style/StyleAction.class.php      | 77 +------------------
 3 files changed, 3 insertions(+), 140 deletions(-)
 delete mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Style/Image/Upload.js

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 9aa280641b..05c5156c1d 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -6,10 +6,10 @@
 {js application='wcf' file='WCF.ColorPicker' bundle='WCF.Combined'}
 <script data-relocate="true">
 	require([
-		'WoltLabSuite/Core/Acp/Ui/Style/CoverPhoto/Delete', 'WoltLabSuite/Core/Acp/Ui/Style/CoverPhoto/Upload', 'WoltLabSuite/Core/Acp/Ui/Style/Favicon/Upload', 'WoltLabSuite/Core/Acp/Ui/Style/Image/Upload',
+		'WoltLabSuite/Core/Acp/Ui/Style/CoverPhoto/Delete', 'WoltLabSuite/Core/Acp/Ui/Style/CoverPhoto/Upload', 'WoltLabSuite/Core/Acp/Ui/Style/Favicon/Upload',
 		'WoltLabSuite/Core/Acp/Ui/Style/Editor', 'WoltLabSuite/Core/Ui/Toggle/Input', 'Language'
 	], function(
-		AcpUiStyleCoverPhotoDelete, AcpUiStyleCoverPhotoUpload, AcpUiStyleFaviconUpload, AcpUiStyleImageUpload,
+		AcpUiStyleCoverPhotoDelete, AcpUiStyleCoverPhotoUpload, AcpUiStyleFaviconUpload,
 		AcpUiStyleEditor, UiToggleInput, Language
 	) {
 		AcpUiStyleEditor.setup({
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Style/Image/Upload.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Style/Image/Upload.js
deleted file mode 100644
index fc71cc819e..0000000000
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Style/Image/Upload.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Handles uploading style preview images.
- * 
- * @author	Matthias Schmidt
- * @copyright	2001-2019 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @module	WoltLabSuite/Core/Acp/Ui/Style/Image/Upload
- */
-define(['Core', 'Dom/Traverse', 'Language', 'Ui/Notification', 'Upload'], function(Core, DomTraverse, Language, UiNotification, Upload) {
-	"use strict";
-	
-	/**
-	 * @constructor
-	 */
-	function AcpUiStyleImageUpload(styleId, tmpHash, is2x) {
-		this._is2x = (is2x === true);
-		this._styleId = ~~styleId;
-		this._tmpHash = tmpHash;
-		
-		Upload.call(this, 'uploadImage' + (this._is2x ? '2x' : ''), 'styleImage' + (this._is2x ? '2x' : ''), {
-			className: 'wcf\\data\\style\\StyleAction'
-		});
-	}
-	Core.inherit(AcpUiStyleImageUpload, Upload, {
-		/**
-		 * @see	WoltLabSuite/Core/Upload#_createFileElement
-		 */
-		_createFileElement: function(file) {
-			return this._target;
-		},
-		
-		/**
-		 * @see	WoltLabSuite/Core/Upload#_getParameters
-		 */
-		_getParameters: function() {
-			return {
-				is2x: this._is2x,
-				styleId: this._styleId,
-				tmpHash: this._tmpHash
-			};
-		},
-		
-		/**
-		 * @see	WoltLabSuite/Core/Upload#_success
-		 */
-		_success: function(uploadId, data) {
-			var errorMessage = '';
-			if (data.returnValues.url) {
-				elAttr(this._target, 'src', data.returnValues.url + '?timestamp=' + Date.now());
-				
-				UiNotification.show();
-			}
-			else if (data.returnValues.errorType) {
-				errorMessage = Language.get('wcf.acp.style.image.error.' + data.returnValues.errorType);
-			}
-			
-			elInnerError(this._button, errorMessage);
-		}
-	});
-	
-	return AcpUiStyleImageUpload;
-});
diff --git a/wcfsetup/install/files/lib/data/style/StyleAction.class.php b/wcfsetup/install/files/lib/data/style/StyleAction.class.php
index 9280b444a1..b8a0fb9242 100644
--- a/wcfsetup/install/files/lib/data/style/StyleAction.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleAction.class.php
@@ -5,7 +5,6 @@ use wcf\data\user\cover\photo\UserCoverPhoto;
 use wcf\data\user\UserAction;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\IToggleAction;
-use wcf\data\IUploadAction;
 use wcf\system\cache\builder\StyleCacheBuilder;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
@@ -34,7 +33,7 @@ use wcf\util\ImageUtil;
  * @method	StyleEditor[]	getObjects()
  * @method	StyleEditor	getSingleObject()
  */
-class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction, IUploadAction {
+class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction {
 	use TDatabaseObjectToggle;
 	
 	/**
@@ -428,80 +427,6 @@ BROWSERCONFIG;
 		$uploadHandler->validateFiles(new DefaultUploadFileValidationStrategy(PHP_INT_MAX, ['jpg', 'jpeg', 'png', 'gif', 'svg']));
 	}
 	
-	/**
-	 * @inheritDoc
-	 */
-	public function upload() {
-		// save files
-		/** @noinspection PhpUndefinedMethodInspection */
-		/** @var UploadFile[] $files */
-		$files = $this->parameters['__files']->getFiles();
-		$file = $files[0];
-		
-		$multiplier = ($this->parameters['is2x']) ? 2 : 1;
-		
-		try {
-			if (!$file->getValidationErrorType()) {
-				// shrink preview image if necessary
-				$fileLocation = $file->getLocation();
-				try {
-					if (($imageData = getimagesize($fileLocation)) === false) {
-						throw new UserInputException('image');
-					}
-					switch ($imageData[2]) {
-						case IMAGETYPE_PNG:
-						case IMAGETYPE_JPEG:
-						case IMAGETYPE_GIF:
-							// fine
-						break;
-						default:
-							throw new UserInputException('image');
-					}
-					
-					if ($imageData[0] > (Style::PREVIEW_IMAGE_MAX_WIDTH * $multiplier) || $imageData[1] > (Style::PREVIEW_IMAGE_MAX_HEIGHT * $multiplier)) {
-						$adapter = ImageHandler::getInstance()->getAdapter();
-						$adapter->loadFile($fileLocation);
-						$fileLocation = FileUtil::getTemporaryFilename();
-						$thumbnail = $adapter->createThumbnail(Style::PREVIEW_IMAGE_MAX_WIDTH * $multiplier, Style::PREVIEW_IMAGE_MAX_HEIGHT * $multiplier, false);
-						$adapter->writeImage($thumbnail, $fileLocation);
-					}
-				}
-				catch (SystemException $e) {
-					throw new UserInputException('image');
-				}
-				
-				// move uploaded file
-				if (@copy($fileLocation, WCF_DIR.'images/stylePreview-'.$this->parameters['tmpHash'].($this->parameters['is2x'] ? '@2x' : '').'.'.$file->getFileExtension())) {
-					@unlink($fileLocation);
-					
-					// store extension within session variables
-					WCF::getSession()->register('stylePreview-'.$this->parameters['tmpHash'].($this->parameters['is2x'] ? '@2x' : ''), $file->getFileExtension());
-					
-					if ($this->parameters['styleID']) {
-						$this->updateStylePreviewImage($this->style);
-						
-						return [
-							'url' => WCF::getPath().'images/stylePreview-'.$this->parameters['styleID'].($this->parameters['is2x'] ? '@2x' : '').'.'.$file->getFileExtension()
-						];
-					}
-					
-					// return result
-					return [
-						'url' => WCF::getPath().'images/stylePreview-'.$this->parameters['tmpHash'].($this->parameters['is2x'] ? '@2x' : '').'.'.$file->getFileExtension()
-					];
-				}
-				else {
-					throw new UserInputException('image', 'uploadFailed');
-				}
-			}
-		}
-		catch (UserInputException $e) {
-			$file->setValidationErrorType($e->getType());
-		}
-		
-		return ['errorType' => $file->getValidationErrorType()];
-	}
-	
 	/**
 	 * Validates parameters to update a logo.
 	 */
-- 
2.20.1