From 9383fd0d3e380b856ede616458cb12e0c44f3448 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 11 Jan 2017 03:50:47 -0300 Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react # Conflicts: # server/controllers/system/get-settings.php --- server/controllers/system/disable-registration.php | 1 + server/controllers/system/enable-registration.php | 3 ++- server/controllers/user/signup.php | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/controllers/system/disable-registration.php b/server/controllers/system/disable-registration.php index b7f1c951..4b9ab053 100644 --- a/server/controllers/system/disable-registration.php +++ b/server/controllers/system/disable-registration.php @@ -9,6 +9,7 @@ class DisableRegistrationController extends Controller { 'requestData' => [] ]; } + public function handler() { $password = Controller::request('password'); diff --git a/server/controllers/system/enable-registration.php b/server/controllers/system/enable-registration.php index 60f3fb15..6221daa9 100644 --- a/server/controllers/system/enable-registration.php +++ b/server/controllers/system/enable-registration.php @@ -3,12 +3,14 @@ use Respect\Validation\Validator as DataValidator; class EnableRegistrationController extends Controller { const PATH = '/enable-registration'; + public function validations() { return [ 'permission' => 'staff_3', 'requestData' => [] ]; } + public function handler() { $password = Controller::request('password'); @@ -23,6 +25,5 @@ class EnableRegistrationController extends Controller { $registrationRow->store(); Response::respondSuccess(); - } } \ No newline at end of file diff --git a/server/controllers/user/signup.php b/server/controllers/user/signup.php index 72f5e334..48e6e1c6 100644 --- a/server/controllers/user/signup.php +++ b/server/controllers/user/signup.php @@ -50,6 +50,7 @@ class SignUpController extends Controller { Response::respondError(ERRORS::ALREADY_BANNED); return; } + if (!Setting::getSetting('registration')->value) { Response::respondError(ERRORS::NO_PERMISSION); return;