From d13ff185282c666ca17e406e6adcb6a5445c08bf Mon Sep 17 00:00:00 2001 From: AntonyAntonio Date: Tue, 13 Dec 2016 00:19:57 -0300 Subject: [PATCH 1/2] Guillermo - add new settings[skip ci] --- server/controllers/system/get-settings.php | 5 +++++ server/controllers/system/init-settings.php | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/server/controllers/system/get-settings.php b/server/controllers/system/get-settings.php index 5593282c..e0e555ab 100644 --- a/server/controllers/system/get-settings.php +++ b/server/controllers/system/get-settings.php @@ -14,6 +14,11 @@ class GetSettingsController extends Controller { Response::respondSuccess([ 'language' => Setting::getSetting('language')->getValue(), 'reCaptchaKey' => Setting::getSetting('recaptcha-public')->getValue(), + 'time-zone' => Setting::getSetting('time-zone')->getValue(), + 'maintenance-mode' => Setting::getSetting('maintenance-mode')->getValue(), + 'layout' => Setting::getSetting('layout')->getValue(), + 'allow-attachments' => Setting::getSetting('allow-attachments')->getValue(), + 'max-size' => Setting::getSetting('max-size')->getValue(), 'departments' => Department::getDepartmentNames() ]); } diff --git a/server/controllers/system/init-settings.php b/server/controllers/system/init-settings.php index ad954419..0f703b6f 100644 --- a/server/controllers/system/init-settings.php +++ b/server/controllers/system/init-settings.php @@ -33,6 +33,12 @@ class InitSettingsController extends Controller { 'smtp-port' => 7070, 'smtp-user' => '', 'smtp-pass' => '', + 'time-zone' => 0, + 'maintenance-mode' => false, + 'layout' => 'boxed', + 'allow-attachments' => 0, + 'max-size' => 0, + ]); } From 2a1176516cadddf9dd4a13ee1c4c768260fbcbc6 Mon Sep 17 00:00:00 2001 From: AntonyAntonio Date: Tue, 13 Dec 2016 00:21:06 -0300 Subject: [PATCH 2/2] Guillermo - additional settings[skip ci] --- server/controllers/system/init-settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/controllers/system/init-settings.php b/server/controllers/system/init-settings.php index 0f703b6f..aaf52287 100644 --- a/server/controllers/system/init-settings.php +++ b/server/controllers/system/init-settings.php @@ -34,7 +34,7 @@ class InitSettingsController extends Controller { 'smtp-user' => '', 'smtp-pass' => '', 'time-zone' => 0, - 'maintenance-mode' => false, + 'maintenance-mode' => 0, 'layout' => 'boxed', 'allow-attachments' => 0, 'max-size' => 0,