Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react

# Conflicts:
#	server/controllers/system/get-settings.php

server/controllers/system/disable-registration.php

@@ -9,6 +9,7 @@ class DisableRegistrationController extends Controller {
             'requestData' => []
         ];
     }
+    
     public function handler() {
         $password = Controller::request('password');
 

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();
-    
     }
 }

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;