diff --git a/server/controllers/article/edit.php b/server/controllers/article/edit.php index b91ba489..51ab4dc5 100755 --- a/server/controllers/article/edit.php +++ b/server/controllers/article/edit.php @@ -55,7 +55,7 @@ class EditArticleController extends Controller { if (!$newArticleTopic->isNull()) { $article->topic = $newArticleTopic; } else { - Response::respondError(ERRORS::INVALID_TOPIC); + throw new RequestException(ERRORS::INVALID_TOPIC); return; } } diff --git a/server/controllers/staff/add.php b/server/controllers/staff/add.php index d11c7b5e..df2b1baa 100755 --- a/server/controllers/staff/add.php +++ b/server/controllers/staff/add.php @@ -97,7 +97,7 @@ class AddStaffController extends Controller { return; } - Response::respondError(ERRORS::ALREADY_A_STAFF); + throw new RequestException(ERRORS::ALREADY_A_STAFF); } public function storeRequestData() { diff --git a/server/controllers/staff/assign-ticket.php b/server/controllers/staff/assign-ticket.php index febc65d5..1e270740 100755 --- a/server/controllers/staff/assign-ticket.php +++ b/server/controllers/staff/assign-ticket.php @@ -54,22 +54,22 @@ class AssignStaffController extends Controller { $this->staffToAssign = Staff::getDataStore($staffId, 'id'); if($this->staffToAssign->isNull()) { - throw new Exception(ERRORS::INVALID_STAFF); + throw new RequestException(ERRORS::INVALID_STAFF); } if(!$this->staffToAssign->sharedDepartmentList->includesId($this->ticket->department->id)) { - throw new Exception(ERRORS::INVALID_DEPARTMENT); + throw new RequestException(ERRORS::INVALID_DEPARTMENT); } } else { $this->staffToAssign = Controller::getLoggedUser(); } if($this->ticket->owner) { - throw new Exception(ERRORS::TICKET_ALREADY_ASSIGNED); + throw new RequestException(ERRORS::TICKET_ALREADY_ASSIGNED); } if(!$this->ticketHasStaffDepartment()) { - throw new Exception(ERRORS::INVALID_DEPARTMENT); + throw new RequestException(ERRORS::INVALID_DEPARTMENT); } else { $this->staffToAssign->sharedTicketList->add($this->ticket); $this->ticket->owner = $this->staffToAssign; diff --git a/server/controllers/staff/delete.php b/server/controllers/staff/delete.php index 033d19a7..8f454861 100755 --- a/server/controllers/staff/delete.php +++ b/server/controllers/staff/delete.php @@ -46,7 +46,7 @@ class DeleteStaffController extends Controller { $staff = Staff::getDataStore($staffId); if($staffId === Controller::getLoggedUser()->id) { - Response::respondError(ERRORS::INVALID_STAFF); + throw new RequestException(ERRORS::INVALID_STAFF); return; } diff --git a/server/controllers/staff/edit.php b/server/controllers/staff/edit.php index 77ae9b48..e3b1f2f7 100755 --- a/server/controllers/staff/edit.php +++ b/server/controllers/staff/edit.php @@ -63,11 +63,11 @@ class EditStaffController extends Controller { $this->staffInstance = Staff::getDataStore($staffId, 'id'); if($this->staffInstance->isNull()) { - Response::respondError(ERRORS::INVALID_STAFF); + throw new RequestException(ERRORS::INVALID_STAFF); return; } } else { - Response::respondError(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); return; } diff --git a/server/controllers/staff/un-assign-ticket.php b/server/controllers/staff/un-assign-ticket.php index a162d4d4..92f6de9e 100755 --- a/server/controllers/staff/un-assign-ticket.php +++ b/server/controllers/staff/un-assign-ticket.php @@ -65,7 +65,7 @@ class UnAssignStaffController extends Controller { $ticket->store(); Response::respondSuccess(); } else { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } } } diff --git a/server/controllers/system/add-api-key.php b/server/controllers/system/add-api-key.php index 62477979..c9944058 100755 --- a/server/controllers/system/add-api-key.php +++ b/server/controllers/system/add-api-key.php @@ -57,7 +57,7 @@ class AddAPIKeyController extends Controller { $apiInstance->store(); Response::respondSuccess($token); } else { - Response::respondError(ERRORS::NAME_ALREADY_USED); + throw new RequestException(ERRORS::NAME_ALREADY_USED); } } diff --git a/server/controllers/system/check-requirements.php b/server/controllers/system/check-requirements.php index 4e732c5c..e5509f5e 100755 --- a/server/controllers/system/check-requirements.php +++ b/server/controllers/system/check-requirements.php @@ -31,7 +31,7 @@ class CheckRequirementsController extends Controller { public function handler() { if(InstallationDoneController::isInstallationDone()) { - throw new Exception(ERRORS::INIT_SETTINGS_DONE); + throw new RequestException(ERRORS::INIT_SETTINGS_DONE); } Response::respondSuccess([ diff --git a/server/controllers/system/csv-import.php b/server/controllers/system/csv-import.php index 8a348a3e..51f5f7ca 100755 --- a/server/controllers/system/csv-import.php +++ b/server/controllers/system/csv-import.php @@ -36,7 +36,7 @@ class CSVImportController extends Controller { $fileUploader = $this->uploadFile(true); if(!$fileUploader instanceof FileUploader) { - throw new Exception(ERRORS::INVALID_FILE); + throw new RequestException(ERRORS::INVALID_FILE); } $file = fopen($fileUploader->getFullFilePath(),'r'); diff --git a/server/controllers/system/delete-all-users.php b/server/controllers/system/delete-all-users.php index db8c83b1..7b1e4bea 100755 --- a/server/controllers/system/delete-all-users.php +++ b/server/controllers/system/delete-all-users.php @@ -37,7 +37,7 @@ class DeleteAllUsersController extends Controller { $password = Controller::request('password'); if(!Hashing::verifyPassword($password, Controller::getLoggedUser()->password)) { - Response::respondError(ERRORS::INVALID_PASSWORD); + throw new RequestException(ERRORS::INVALID_PASSWORD); return; } diff --git a/server/controllers/system/delete-api-key.php b/server/controllers/system/delete-api-key.php index 43b179e6..e4c6b272 100755 --- a/server/controllers/system/delete-api-key.php +++ b/server/controllers/system/delete-api-key.php @@ -44,7 +44,7 @@ class DeleteAPIKeyController extends Controller { $keyInstance = APIKey::getDataStore($name, 'name'); if($keyInstance->isNull()) { - Response::respondError(ERRORS::INVALID_NAME); + throw new RequestException(ERRORS::INVALID_NAME); return; } diff --git a/server/controllers/system/delete-department.php b/server/controllers/system/delete-department.php index 0c44792d..9808c5fb 100755 --- a/server/controllers/system/delete-department.php +++ b/server/controllers/system/delete-department.php @@ -53,7 +53,7 @@ class DeleteDepartmentController extends Controller { $this->transferDepartmentId = Controller::request('transferDepartmentId'); if ($this->departmentId === $this->transferDepartmentId) { - Response::respondError(ERRORS::SAME_DEPARTMENT); + throw new RequestException(ERRORS::SAME_DEPARTMENT); return; } diff --git a/server/controllers/system/disable-registration.php b/server/controllers/system/disable-registration.php index 777bb461..7c7b0dba 100755 --- a/server/controllers/system/disable-registration.php +++ b/server/controllers/system/disable-registration.php @@ -36,7 +36,7 @@ class DisableRegistrationController extends Controller { $password = Controller::request('password'); if(!Hashing::verifyPassword($password, Controller::getLoggedUser()->password)) { - Response::respondError(ERRORS::INVALID_PASSWORD); + throw new RequestException(ERRORS::INVALID_PASSWORD); return; } diff --git a/server/controllers/system/disable-user-system.php b/server/controllers/system/disable-user-system.php index f3b5cfd3..c9dd1396 100755 --- a/server/controllers/system/disable-user-system.php +++ b/server/controllers/system/disable-user-system.php @@ -37,12 +37,12 @@ class DisableUserSystemController extends Controller { $password = Controller::request('password'); if(!Hashing::verifyPassword($password, Controller::getLoggedUser()->password)) { - throw new Exception(ERRORS::INVALID_PASSWORD); + throw new RequestException(ERRORS::INVALID_PASSWORD); } if(!Controller::isUserSystemEnabled()) { - throw new Exception(ERRORS::SYSTEM_USER_IS_ALREADY_DISABLED); + throw new RequestException(ERRORS::SYSTEM_USER_IS_ALREADY_DISABLED); } $userSystemEnabled = Setting::getSetting('user-system-enabled'); diff --git a/server/controllers/system/edit-mail-template.php b/server/controllers/system/edit-mail-template.php index b452cccb..b7a187e3 100755 --- a/server/controllers/system/edit-mail-template.php +++ b/server/controllers/system/edit-mail-template.php @@ -74,7 +74,7 @@ class EditMailTemplateController extends Controller { $mailTemplate = MailTemplate::findOne(' language = ? AND template = ?', [$this->language, $this->templateType]); if($mailTemplate->isNull()) { - throw new Exception(ERRORS::INVALID_TEMPLATE); + throw new RequestException(ERRORS::INVALID_TEMPLATE); } $this->validateReplacements(); @@ -96,21 +96,21 @@ class EditMailTemplateController extends Controller { $this->getReplacementStrings($originalText[1]), $this->getReplacementStrings($this->texts[0]) )) { - throw new Exception(ERRORS::INVALID_TEXT_1); + throw new RequestException(ERRORS::INVALID_TEXT_1); } if(!$this->includes( $this->getReplacementStrings($originalText[2]), $this->getReplacementStrings($this->texts[1]) )) { - throw new Exception(ERRORS::INVALID_TEXT_2); + throw new RequestException(ERRORS::INVALID_TEXT_2); } if(!$this->includes( $this->getReplacementStrings($originalText[3]), $this->getReplacementStrings($this->texts[2]) )) { - throw new Exception(ERRORS::INVALID_TEXT_3); + throw new RequestException(ERRORS::INVALID_TEXT_3); } } diff --git a/server/controllers/system/edit-settings.php b/server/controllers/system/edit-settings.php index 51157fa7..16b73f58 100755 --- a/server/controllers/system/edit-settings.php +++ b/server/controllers/system/edit-settings.php @@ -75,7 +75,7 @@ class EditSettingsController extends Controller { $supported = json_decode(Controller::request('supportedLanguages')); if (array_diff($supported, $allowed)) { - throw new Exception(ERRORS::INVALID_SUPPORTED_LANGUAGES); + throw new RequestException(ERRORS::INVALID_SUPPORTED_LANGUAGES); } foreach(Language::LANGUAGES as $languageCode) { diff --git a/server/controllers/system/enable-registration.php b/server/controllers/system/enable-registration.php index 7f568d48..b7228e12 100755 --- a/server/controllers/system/enable-registration.php +++ b/server/controllers/system/enable-registration.php @@ -37,7 +37,7 @@ class EnableRegistrationController extends Controller { $password = Controller::request('password'); if(!Hashing::verifyPassword($password,Controller::getLoggedUser()->password)) { - Response::respondError(ERRORS::INVALID_PASSWORD); + throw new RequestException(ERRORS::INVALID_PASSWORD); return; } diff --git a/server/controllers/system/enable-user-system.php b/server/controllers/system/enable-user-system.php index 22cc4237..3b86de96 100755 --- a/server/controllers/system/enable-user-system.php +++ b/server/controllers/system/enable-user-system.php @@ -37,12 +37,12 @@ class EnableUserSystemController extends Controller { $password = Controller::request('password'); if(!Hashing::verifyPassword($password, Controller::getLoggedUser()->password)) { - throw new Exception(ERRORS::INVALID_PASSWORD); + throw new RequestException(ERRORS::INVALID_PASSWORD); } if(Controller::isUserSystemEnabled()) { - throw new Exception(ERRORS::SYSTEM_USER_IS_ALREADY_ENABLED); + throw new RequestException(ERRORS::SYSTEM_USER_IS_ALREADY_ENABLED); } $userSystemEnabled = Setting::getSetting('user-system-enabled'); diff --git a/server/controllers/system/get-mail-template.php b/server/controllers/system/get-mail-template.php index 86b63e6a..689c2d9b 100755 --- a/server/controllers/system/get-mail-template.php +++ b/server/controllers/system/get-mail-template.php @@ -49,7 +49,7 @@ class GetMailTemplateController extends Controller { $mailTemplate = MailTemplate::findOne(' language = ? AND template = ?', [$language, $type]); if($mailTemplate->isNull()) { - throw new Exception(ERRORS::INVALID_TEMPLATE); + throw new RequestException(ERRORS::INVALID_TEMPLATE); } Response::respondSuccess($mailTemplate->toArray()); diff --git a/server/controllers/system/get-stats.php b/server/controllers/system/get-stats.php index 4f432cbb..8c400f4a 100755 --- a/server/controllers/system/get-stats.php +++ b/server/controllers/system/get-stats.php @@ -48,7 +48,7 @@ class GetStatsController extends Controller { if($staffId) { if($staffId !== Controller::getLoggedUser()->id && !Controller::isStaffLogged(3)) { - Response::respondError(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); return; } diff --git a/server/controllers/system/init-admin.php b/server/controllers/system/init-admin.php index 7e61d2bb..edc4c5aa 100755 --- a/server/controllers/system/init-admin.php +++ b/server/controllers/system/init-admin.php @@ -53,7 +53,7 @@ class InitAdminController extends Controller { public function handler() { if(!Staff::isTableEmpty()) { - throw new Exception(ERRORS::INIT_SETTINGS_DONE); + throw new RequestException(ERRORS::INIT_SETTINGS_DONE); } $staff = new Staff(); diff --git a/server/controllers/system/init-database.php b/server/controllers/system/init-database.php index 3d5a8793..95ae640b 100755 --- a/server/controllers/system/init-database.php +++ b/server/controllers/system/init-database.php @@ -40,7 +40,7 @@ class InitDatabaseController extends Controller { public function handler() { if(defined('MYSQL_HOST')) { - throw new Exception(ERRORS::INIT_SETTINGS_DONE); + throw new RequestException(ERRORS::INIT_SETTINGS_DONE); } $dbHost = Controller::request('dbHost'); @@ -56,7 +56,7 @@ class InitDatabaseController extends Controller { RedBean::selectDatabase($dbName); if(!RedBean::testConnection()) { - throw new Exception(ERRORS::DATABASE_CONNECTION); + throw new RequestException(ERRORS::DATABASE_CONNECTION); } } else { $dbName = 'opensupports_' . Hashing::generateRandomNumber(100, 999); @@ -65,7 +65,7 @@ class InitDatabaseController extends Controller { RedBean::selectDatabase($dbName); if(!RedBean::testConnection()) { - throw new Exception(ERRORS::DATABASE_CREATION); + throw new RequestException(ERRORS::DATABASE_CREATION); } } diff --git a/server/controllers/system/init-settings.php b/server/controllers/system/init-settings.php index a0d468cb..91e7f58a 100755 --- a/server/controllers/system/init-settings.php +++ b/server/controllers/system/init-settings.php @@ -59,7 +59,7 @@ class InitSettingsController extends Controller { Response::respondSuccess(); } else { - Response::respondError(ERRORS::INIT_SETTINGS_DONE); + throw new RequestException(ERRORS::INIT_SETTINGS_DONE); } } diff --git a/server/controllers/system/recover-mail-template.php b/server/controllers/system/recover-mail-template.php index 8768d7e9..2dd90ead 100755 --- a/server/controllers/system/recover-mail-template.php +++ b/server/controllers/system/recover-mail-template.php @@ -51,7 +51,7 @@ class RecoverMailTemplateController extends Controller { $mailTemplate = MailTemplate::findOne(' language = ? AND template = ?', [$language, $templateType]); if($mailTemplate->isNull()) { - throw new Exception(ERRORS::INVALID_TEMPLATE); + throw new RequestException(ERRORS::INVALID_TEMPLATE); } $mailTexts = MailTexts::getTexts()[$language][$templateType]; diff --git a/server/controllers/system/test-smtp.php b/server/controllers/system/test-smtp.php index 1bd3921b..18318678 100644 --- a/server/controllers/system/test-smtp.php +++ b/server/controllers/system/test-smtp.php @@ -48,7 +48,7 @@ class TestSMTPController extends Controller { if($mailSender->isConnected()) { Response::respondSuccess(); } else { - throw new Exception(ERRORS::SMTP_CONNECTION); + throw new RequestException(ERRORS::SMTP_CONNECTION); } } } diff --git a/server/controllers/ticket/change-department.php b/server/controllers/ticket/change-department.php index 47021b06..b934bbe4 100755 --- a/server/controllers/ticket/change-department.php +++ b/server/controllers/ticket/change-department.php @@ -53,7 +53,7 @@ class ChangeDepartmentController extends Controller { $user = Controller::getLoggedUser(); if($ticket->owner && $ticket->owner->id !== $user->id && $user->level == 1){ - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } $event = Ticketevent::getEvent(Ticketevent::DEPARTMENT_CHANGED); diff --git a/server/controllers/ticket/change-priority.php b/server/controllers/ticket/change-priority.php index ac7d47b0..f0bd0718 100755 --- a/server/controllers/ticket/change-priority.php +++ b/server/controllers/ticket/change-priority.php @@ -65,7 +65,7 @@ class ChangePriorityController extends Controller { Log::createLog('PRIORITY_CHANGED', $ticket->ticketNumber); Response::respondSuccess(); } else { - Response::respondError(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } } diff --git a/server/controllers/ticket/check.php b/server/controllers/ticket/check.php index 59f1dd8b..e896291b 100755 --- a/server/controllers/ticket/check.php +++ b/server/controllers/ticket/check.php @@ -55,7 +55,7 @@ class CheckTicketController extends Controller { public function handler() { if (Controller::isUserSystemEnabled() || Controller::isStaffLogged()) { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } $email = Controller::request('email'); @@ -70,7 +70,7 @@ class CheckTicketController extends Controller { 'ticketNumber' => $ticket->ticketNumber ]); } else { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } } } \ No newline at end of file diff --git a/server/controllers/ticket/close.php b/server/controllers/ticket/close.php index 9cacd543..f76de9c5 100755 --- a/server/controllers/ticket/close.php +++ b/server/controllers/ticket/close.php @@ -67,7 +67,7 @@ class CloseController extends Controller { !$this->ticket->isOwner(Controller::getLoggedUser()) && !$this->ticket->isAuthor(Controller::getLoggedUser()) ) { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } $this->markAsUnread(); diff --git a/server/controllers/ticket/comment.php b/server/controllers/ticket/comment.php index 7be2b248..24841505 100755 --- a/server/controllers/ticket/comment.php +++ b/server/controllers/ticket/comment.php @@ -83,7 +83,7 @@ class CommentController extends Controller { $isOwner = $this->ticket->isOwner(Controller::getLoggedUser()); if((Controller::isUserSystemEnabled() || Controller::isStaffLogged()) && !$isOwner && !$isAuthor) { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } $this->storeComment(); diff --git a/server/controllers/ticket/delete.php b/server/controllers/ticket/delete.php index ee35d34c..766b2d3f 100644 --- a/server/controllers/ticket/delete.php +++ b/server/controllers/ticket/delete.php @@ -45,15 +45,15 @@ class DeleteController extends Controller { $ticketAuthor = $ticket->authorToArray(); if($ticket->owner) { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } if(Controller::isStaffLogged() && $user->level < 3) { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } if(!Controller::isStaffLogged() && ($user->email !== $ticketAuthor['email'] || $ticketAuthor['staff'])) { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } $ticket->delete(); diff --git a/server/controllers/ticket/get.php b/server/controllers/ticket/get.php index 6bc30d2a..24410fb3 100755 --- a/server/controllers/ticket/get.php +++ b/server/controllers/ticket/get.php @@ -65,7 +65,7 @@ class TicketGetController extends Controller { if(Controller::isUserSystemEnabled() || Controller::isStaffLogged()) { if ($this->shouldDenyPermission()) { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } else { Response::respondSuccess($this->ticket->toArray()); } diff --git a/server/controllers/ticket/re-open.php b/server/controllers/ticket/re-open.php index e7956cff..194575a5 100755 --- a/server/controllers/ticket/re-open.php +++ b/server/controllers/ticket/re-open.php @@ -44,7 +44,7 @@ class ReOpenController extends Controller { $this->ticket = Ticket::getByTicketNumber(Controller::request('ticketNumber')); if($this->shouldDenyPermission()) { - Response::respondError(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); return; } diff --git a/server/controllers/ticket/seen.php b/server/controllers/ticket/seen.php index 90851994..16ca4b84 100755 --- a/server/controllers/ticket/seen.php +++ b/server/controllers/ticket/seen.php @@ -45,7 +45,7 @@ class SeenController extends Controller { $ticket = Ticket::getByTicketNumber($ticketnumber); if(!$ticket->isOwner($user) && !$ticket->isAuthor($user)) { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } if ($ticket->isOwner($user)) { diff --git a/server/controllers/user/ban.php b/server/controllers/user/ban.php index c769070e..bf53cefb 100755 --- a/server/controllers/user/ban.php +++ b/server/controllers/user/ban.php @@ -55,7 +55,7 @@ class BanUserController extends Controller { Response::respondSuccess(); } else { - Response::respondError(ERRORS::ALREADY_BANNED); + throw new RequestException(ERRORS::ALREADY_BANNED); } } } \ No newline at end of file diff --git a/server/controllers/user/delete.php b/server/controllers/user/delete.php index ee24df2e..43f7cec9 100755 --- a/server/controllers/user/delete.php +++ b/server/controllers/user/delete.php @@ -44,7 +44,7 @@ class DeleteUserController extends Controller { public function handler() { if(!Controller::isUserSystemEnabled()) { - throw new Exception(ERRORS::USER_SYSTEM_DISABLED); + throw new RequestException(ERRORS::USER_SYSTEM_DISABLED); } $userId = Controller::request('userId'); diff --git a/server/controllers/user/disable.php b/server/controllers/user/disable.php index f135e81b..9caa45ac 100644 --- a/server/controllers/user/disable.php +++ b/server/controllers/user/disable.php @@ -41,7 +41,7 @@ class DisableUserController extends Controller { public function handler() { $user = User::getDataStore(Controller::request('userId')); if($user->disabled) { - throw new Exception(ERRORS::ALREADY_DISABLED); + throw new RequestException(ERRORS::ALREADY_DISABLED); } $user->disabled = 1; diff --git a/server/controllers/user/edit-password.php b/server/controllers/user/edit-password.php index ef46c8b7..b98dd0ea 100755 --- a/server/controllers/user/edit-password.php +++ b/server/controllers/user/edit-password.php @@ -58,7 +58,7 @@ class EditPassword extends Controller { Response::respondSuccess(); } else{ - Response::respondError(ERRORS::INVALID_OLD_PASSWORD); + throw new RequestException(ERRORS::INVALID_OLD_PASSWORD); } } } \ No newline at end of file diff --git a/server/controllers/user/enable.php b/server/controllers/user/enable.php index d870970a..9993cc06 100644 --- a/server/controllers/user/enable.php +++ b/server/controllers/user/enable.php @@ -42,7 +42,7 @@ class EnableUserController extends Controller { $user = User::getDataStore(Controller::request('userId')); if(!$user->disabled) { - throw new Exception(ERRORS::ALREADY_ENABLED); + throw new RequestException(ERRORS::ALREADY_ENABLED); } $user->disabled = 0; diff --git a/server/controllers/user/get-user.php b/server/controllers/user/get-user.php index de56b46b..5544ac1e 100755 --- a/server/controllers/user/get-user.php +++ b/server/controllers/user/get-user.php @@ -47,7 +47,7 @@ class GetUserByIdController extends Controller { public function handler() { if(!Controller::isUserSystemEnabled()) { - throw new Exception(ERRORS::USER_SYSTEM_DISABLED); + throw new RequestException(ERRORS::USER_SYSTEM_DISABLED); } $userId = Controller::request('userId'); diff --git a/server/controllers/user/get-users.php b/server/controllers/user/get-users.php index b709206e..48fe46b1 100755 --- a/server/controllers/user/get-users.php +++ b/server/controllers/user/get-users.php @@ -54,7 +54,7 @@ class GetUsersController extends Controller { public function handler() { if(!Controller::isUserSystemEnabled()) { - throw new Exception(ERRORS::USER_SYSTEM_DISABLED); + throw new RequestException(ERRORS::USER_SYSTEM_DISABLED); } $userList = $this->getUserList(); diff --git a/server/controllers/user/get.php b/server/controllers/user/get.php index a7f8126f..754132ba 100755 --- a/server/controllers/user/get.php +++ b/server/controllers/user/get.php @@ -39,7 +39,7 @@ class GetUserController extends Controller { public function handler() { if (Controller::isStaffLogged()) { - Response::respondError(ERRORS::INVALID_CREDENTIALS); + throw new RequestException(ERRORS::INVALID_CREDENTIALS); return; } diff --git a/server/controllers/user/login.php b/server/controllers/user/login.php index 6b289775..12afce5b 100755 --- a/server/controllers/user/login.php +++ b/server/controllers/user/login.php @@ -51,22 +51,22 @@ class LoginController extends Controller { public function handler() { if(!Controller::isUserSystemEnabled() && !Controller::request('staff')) { - throw new Exception(ERRORS::USER_SYSTEM_DISABLED); + throw new RequestException(ERRORS::USER_SYSTEM_DISABLED); } if ($this->isAlreadyLoggedIn()) { - throw new Exception(ERRORS::SESSION_EXISTS); + throw new RequestException(ERRORS::SESSION_EXISTS); } $this->clearOldRememberTokens(); if ($this->checkInputCredentials() || $this->checkRememberToken()) { if($this->userInstance->verificationToken !== null) { - throw new Exception(ERRORS::UNVERIFIED_USER); + throw new RequestException(ERRORS::UNVERIFIED_USER); } if($this->userInstance->disabled) { - throw new Exception(ERRORS::USER_DISABLED); + throw new RequestException(ERRORS::USER_DISABLED); } $this->createUserSession(); @@ -78,7 +78,7 @@ class LoginController extends Controller { Response::respondSuccess($this->getUserData()); } else { - throw new Exception(ERRORS::INVALID_CREDENTIALS); + throw new RequestException(ERRORS::INVALID_CREDENTIALS); } } diff --git a/server/controllers/user/recover-password.php b/server/controllers/user/recover-password.php index 59f83430..612f0ae2 100755 --- a/server/controllers/user/recover-password.php +++ b/server/controllers/user/recover-password.php @@ -57,7 +57,7 @@ class RecoverPasswordController extends Controller { public function handler() { if(!Controller::isUserSystemEnabled()) { - throw new Exception(ERRORS::USER_SYSTEM_DISABLED); + throw new RequestException(ERRORS::USER_SYSTEM_DISABLED); } $this->requestData(); @@ -90,7 +90,7 @@ class RecoverPasswordController extends Controller { $this->sendMail(); Response::respondSuccess(['staff' => $recoverPassword->staff]); } else { - Response::respondError(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } } public function sendMail() { diff --git a/server/controllers/user/send-recover-password.php b/server/controllers/user/send-recover-password.php index 1f075c52..4ee26bf7 100755 --- a/server/controllers/user/send-recover-password.php +++ b/server/controllers/user/send-recover-password.php @@ -50,7 +50,7 @@ class SendRecoverPasswordController extends Controller { public function handler() { if(!Controller::isUserSystemEnabled()) { - throw new Exception(ERRORS::USER_SYSTEM_DISABLED); + throw new RequestException(ERRORS::USER_SYSTEM_DISABLED); } $this->staff = Controller::request('staff'); @@ -77,7 +77,7 @@ class SendRecoverPasswordController extends Controller { Response::respondSuccess(); } else { - Response::respondError(ERRORS::INVALID_EMAIL); + throw new RequestException(ERRORS::INVALID_EMAIL); } } diff --git a/server/controllers/user/signup.php b/server/controllers/user/signup.php index b9815888..196f420e 100755 --- a/server/controllers/user/signup.php +++ b/server/controllers/user/signup.php @@ -80,7 +80,7 @@ class SignUpController extends Controller { public function handler() { if(!Controller::isUserSystemEnabled()) { - throw new Exception(ERRORS::USER_SYSTEM_DISABLED); + throw new RequestException(ERRORS::USER_SYSTEM_DISABLED); } $this->storeRequestData(); @@ -89,16 +89,16 @@ class SignUpController extends Controller { $existentUser = User::getUser($this->userEmail, 'email'); if (!$existentUser->isNull()) { - throw new Exception(ERRORS::USER_EXISTS); + throw new RequestException(ERRORS::USER_EXISTS); } $banRow = Ban::getDataStore($this->userEmail,'email'); if (!$banRow->isNull()) { - throw new Exception(ERRORS::ALREADY_BANNED); + throw new RequestException(ERRORS::ALREADY_BANNED); } if (!Setting::getSetting('registration')->value && $apiKey->isNull() && !Controller::isStaffLogged(2) && !$this->csvImported) { - throw new Exception(ERRORS::NO_PERMISSION); + throw new RequestException(ERRORS::NO_PERMISSION); } $userId = $this->createNewUserAndRetrieveId(); diff --git a/server/controllers/user/un-ban.php b/server/controllers/user/un-ban.php index 3d66e18e..033f9e41 100755 --- a/server/controllers/user/un-ban.php +++ b/server/controllers/user/un-ban.php @@ -43,7 +43,7 @@ class UnBanUserController extends Controller { $banRow = Ban::getDataStore($email,'email'); if($banRow->isNull()) { - Response::respondError(ERRORS::INVALID_EMAIL); + throw new RequestException(ERRORS::INVALID_EMAIL); } else { $banRow->delete(); diff --git a/server/controllers/user/verify.php b/server/controllers/user/verify.php index b6981e00..204a3244 100755 --- a/server/controllers/user/verify.php +++ b/server/controllers/user/verify.php @@ -42,7 +42,7 @@ class VerifyController extends Controller{ public function handler() { if(!Controller::isUserSystemEnabled()) { - throw new Exception(ERRORS::USER_SYSTEM_DISABLED); + throw new RequestException(ERRORS::USER_SYSTEM_DISABLED); } $email = Controller::request('email'); @@ -51,11 +51,11 @@ class VerifyController extends Controller{ $userRow = User::getDataStore($email, 'email'); if(!$userRow) { - throw new Exception(ERRORS::INVALID_EMAIL); + throw new RequestException(ERRORS::INVALID_EMAIL); } if($userRow->verificationToken !== $token) { - throw new Exception(ERRORS::INVALID_TOKEN); + throw new RequestException(ERRORS::INVALID_TOKEN); } $userRow->verificationToken = null; diff --git a/server/libs/Controller.php b/server/libs/Controller.php index 85f8809a..a3472bfa 100755 --- a/server/libs/Controller.php +++ b/server/libs/Controller.php @@ -110,7 +110,7 @@ abstract class Controller { $allImagesValidSize = $allImagesValidSize && $fileUploader->isSizeValid($_FILES["image_$i"]); } - if(!$allImagesValidSize) throw new Exception(ERRORS::INVALID_FILE); + if(!$allImagesValidSize) throw new RequestException(ERRORS::INVALID_FILE); $imagePaths = []; $url = Setting::getSetting('url')->getValue(); @@ -137,7 +137,7 @@ abstract class Controller { return $fileUploader; } else { - throw new Exception(ERRORS::INVALID_FILE); + throw new RequestException(ERRORS::INVALID_FILE); } } diff --git a/server/libs/RequestException.php b/server/libs/RequestException.php new file mode 100644 index 00000000..540eae80 --- /dev/null +++ b/server/libs/RequestException.php @@ -0,0 +1,2 @@ +