From 6aedba9d36ec7558c5ec09d894eccd64db026c26 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 11 Jan 2022 13:05:17 +0100 Subject: [PATCH] UploadErrorCode/UploadError use PHP UPLOAD_ERR_* numbers --- dev/Common/Enums.js | 8 +++--- dev/Common/Translator.js | 15 ++--------- .../0.0.0/app/libraries/RainLoop/Actions.php | 21 ++++++++-------- .../libraries/RainLoop/Actions/Contacts.php | 2 +- .../Enumerations/UploadClientError.php | 16 ------------ .../RainLoop/Enumerations/UploadError.php | 25 ++++++++++++++++--- 6 files changed, 38 insertions(+), 49 deletions(-) delete mode 100644 snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadClientError.php diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js index 26d593e8c..f3bb7f5b5 100644 --- a/dev/Common/Enums.js +++ b/dev/Common/Enums.js @@ -48,10 +48,10 @@ export const Scope = { export const UploadErrorCode = { Normal: 0, FileIsTooBig: 1, - FilePartiallyUploaded: 2, - NoFileUploaded: 3, - MissingTempFolder: 4, - OnSavingFile: 5, + FilePartiallyUploaded: 3, + NoFileUploaded: 4, + MissingTempFolder: 6, + OnSavingFile: 7, FileType: 98, Unknown: 99 }; diff --git a/dev/Common/Translator.js b/dev/Common/Translator.js index 45a029b3e..d34ac40bd 100644 --- a/dev/Common/Translator.js +++ b/dev/Common/Translator.js @@ -114,19 +114,8 @@ export const * @returns {string} */ getUploadErrorDescByCode = code => { - let result = 'UNKNOWN'; - code = parseInt(code, 10) || 0; - 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); + let key = getKeyByValue(UploadErrorCode, parseInt(code, 10)); + return i18n('UPLOAD/ERROR_' + (key ? i18nKey(key) : 'UNKNOWN')); }, /** diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 819069fad..9c94150c7 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/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)) { diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php index 6361e83a8..7f251fd41 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php +++ b/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)) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadClientError.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadClientError.php deleted file mode 100644 index 8f146eb27..000000000 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadClientError.php +++ /dev/null @@ -1,16 +0,0 @@ -