UploadErrorCode/UploadError use PHP UPLOAD_ERR_* numbers

dev/Common/Enums.js

@@ -48,10 +48,10 @@ export const Scope = {
 export const UploadErrorCode = {
 	Normal: 0,
 	FileIsTooBig: 1,
-	FilePartiallyUploaded: 2,
+	FilePartiallyUploaded: 3,
-	NoFileUploaded: 3,
+	NoFileUploaded: 4,
-	MissingTempFolder: 4,
+	MissingTempFolder: 6,
-	OnSavingFile: 5,
+	OnSavingFile: 7,
 	FileType: 98,
 	Unknown: 99
 };

dev/Common/Translator.js

@@ -114,19 +114,8 @@ export const
 	 * @returns {string}
 	 */
 	getUploadErrorDescByCode = code => {
-		let result = 'UNKNOWN';
+		let key = getKeyByValue(UploadErrorCode, parseInt(code, 10));
-		code = parseInt(code, 10) || 0;
+		return i18n('UPLOAD/ERROR_' + (key ? i18nKey(key) : 'UNKNOWN'));
-		switch (code) {
-			case UploadErrorCode.FileIsTooBig:
-			case UploadErrorCode.FilePartiallyUploaded:
-			case UploadErrorCode.NoFileUploaded:
-			case UploadErrorCode.MissingTempFolder:
-			case UploadErrorCode.OnSavingFile:
-			case UploadErrorCode.FileType:
-				result = i18nKey(getKeyByValue(UploadErrorCode, code));
-				break;
-		}
-		return i18n('UPLOAD/ERROR_' + result);
 	},
 
 	/**

snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -2,7 +2,6 @@
 
 namespace RainLoop;
 
-use RainLoop\Enumerations\UploadClientError;
 use RainLoop\Enumerations\UploadError;
 
 class Actions
@@ -994,7 +993,7 @@ class Actions
 	private function getUploadErrorMessageByCode(int $iError, int &$iClientError): string
 	{
 		$sError = '';
-		$iClientError = UploadClientError::NORMAL;
+		$iClientError = UploadError::NORMAL;
 		switch ($iError) {
 			case UPLOAD_ERR_OK:
 				break;
@@ -1003,34 +1002,34 @@ class Actions
 			case UploadError::CONFIG_SIZE:
 			case UploadError::EMPTY_FILES_DATA:
 				$sError = 'File is too big';
-				$iClientError = UploadClientError::FILE_IS_TOO_BIG;
+				$iClientError = UploadError::FILE_IS_TOO_BIG;
 				break;
 			case UPLOAD_ERR_PARTIAL:
 				$sError = 'File partially uploaded';
-				$iClientError = UploadClientError::FILE_PARTIALLY_UPLOADED;
+				$iClientError = UploadError::FILE_PARTIALLY_UPLOADED;
 				break;
 			case UPLOAD_ERR_NO_FILE:
 				$sError = 'No file uploaded';
-				$iClientError = UploadClientError::FILE_NO_UPLOADED;
+				$iClientError = UploadError::FILE_NO_UPLOADED;
 				break;
 			case UPLOAD_ERR_NO_TMP_DIR:
 			case UPLOAD_ERR_CANT_WRITE:
 			case UPLOAD_ERR_EXTENSION:
 				$sError = 'Missing temp folder';
-				$iClientError = UploadClientError::MISSING_TEMP_FOLDER;
+				$iClientError = UploadError::MISSING_TEMP_FOLDER;
 				break;
 			case UploadError::ON_SAVING:
 				$sError = 'Error on saving file';
-				$iClientError = UploadClientError::FILE_ON_SAVING_ERROR;
+				$iClientError = UploadError::FILE_ON_SAVING_ERROR;
 				break;
 			case UploadError::FILE_TYPE:
 				$sError = 'Invalid file type';
-				$iClientError = UploadClientError::FILE_TYPE;
+				$iClientError = UploadError::FILE_TYPE;
 				break;
 			case UploadError::UNKNOWN:
 			default:
 				$sError = 'Unknown error';
-				$iClientError = UploadClientError::UNKNOWN;
+				$iClientError = UploadError::UNKNOWN;
 				break;
 		}
 
@@ -1065,7 +1064,7 @@ class Actions
 		}
 
 		if (UPLOAD_ERR_OK !== $iError) {
-			$iClientError = Enumerations\UploadClientError::NORMAL;
+			$iClientError = Enumerations\UploadError::NORMAL;
 			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
 
 			if (!empty($sError)) {
@@ -1144,7 +1143,7 @@ class Actions
 		}
 
 		if (UPLOAD_ERR_OK !== $iError) {
-			$iClientError = Enumerations\UploadClientError::NORMAL;
+			$iClientError = Enumerations\UploadError::NORMAL;
 			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
 
 			if (!empty($sError)) {

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php

@@ -222,7 +222,7 @@ trait Contacts
 
 		if (UPLOAD_ERR_OK !== $iError)
 		{
-			$iClientError = \RainLoop\Enumerations\UploadClientError::NORMAL;
+			$iClientError = \RainLoop\Enumerations\UploadError::NORMAL;
 			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
 
 			if (!empty($sError))

snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadClientError.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace RainLoop\Enumerations;
-
-class UploadClientError
-{
-	const NORMAL = 0;
-	const FILE_IS_TOO_BIG = 1;
-	const FILE_PARTIALLY_UPLOADED = 2;
-	const FILE_NO_UPLOADED = 3;
-	const MISSING_TEMP_FOLDER = 4;
-	const FILE_ON_SAVING_ERROR = 5;
-	const FILE_TYPE = 98;
-	const UNKNOWN = 99;
-}
-

snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadError.php

@@ -2,12 +2,29 @@
 
 namespace RainLoop\Enumerations;
 
-class UploadError
+abstract class UploadError
 {
-	const UNKNOWN = 1000;
+	// UPLOAD_ERR_OK; There is no error, the file uploaded with success.
+	const NORMAL = 0;
+	// UPLOAD_ERR_INI_SIZE; The uploaded file exceeds the upload_max_filesize directive in php.ini.
+	const FILE_IS_TOO_BIG = 1;
+	// UPLOAD_ERR_FORM_SIZE; The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.
+//	const FORM_SIZE = 2;
+	// UPLOAD_ERR_PARTIAL; The uploaded file was only partially uploaded.
+	const FILE_PARTIALLY_UPLOADED = 3;
+	// UPLOAD_ERR_NO_FILE; No file was uploaded.
+	const FILE_NO_UPLOADED = 4;
+	// UPLOAD_ERR_NO_TMP_DIR; Missing a temporary folder.
+	const MISSING_TEMP_FOLDER = 6;
+	// UPLOAD_ERR_CANT_WRITE; Failed to write file to disk.
+	const FILE_ON_SAVING_ERROR = 7;
+	// UPLOAD_ERR_EXTENSION; A PHP extension stopped the file upload
+//	const EXTENSION = 8;
+
+	const FILE_TYPE = 98;
+	const UNKNOWN = 99;
+
 	const CONFIG_SIZE = 1001;
 	const ON_SAVING = 1002;
 	const EMPTY_FILES_DATA = 1003;
-	const FILE_TYPE = 1004;
 }
-