Fix underscore for JSON

Signed-off-by: Matthias Held <matthias.held@uni-konstanz.de>

2 files changed, 12 insertions, 12 deletions

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index a2d7990..052ba30 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -47,24 +47,24 @@ class Admin implements ISettings
      */
     public function getForm()
     {
-        $suspicionLevel = $this->config->getAppValue(Application::APP_ID, 'suspicionLevel', 3);
+        $suspicionLevel = $this->config->getAppValue(Application::APP_ID, 'suspicion_level', 2);
 
-        if ($suspicionLevel === 1) {
+        $activeSuspicionLevel = [];
+        $suspicionLevels = [['code' => 1, 'name' => 'Maybe suspicious'], ['code' => 2, 'name' => 'Suspicious']];
+
+        if (intval($suspicionLevel) === 1) {
             $activeSuspicionLevel = ['code' => 1, 'name' => 'Maybe suspicious'];
             $suspicionLevels = [['code' => 2, 'name' => 'Suspicious']];
-        } elseif ($suspicionLevel === 2) {
+        } elseif (intval($suspicionLevel) === 2) {
             $activeSuspicionLevel = ['code' => 2, 'name' => 'Suspicious'];
             $suspicionLevels = [['code' => 1, 'name' => 'Maybe suspicious']];
-        } else {
-            $activeSuspicionLevel = [];
-            $suspicionLevels = [];
         }
 
         return new TemplateResponse(Application::APP_ID, 'admin', [
-            'minimumSequenceLength' => $this->config->getAppValue(Application::APP_ID, 'minimum_sequence_length', 5),
-            'activeSuspicionLevel' => $activeSuspicionLevel,
-            'suspicionLevels' => $suspicionLevels,
-            'expireDays' => $this->config->getAppValue(Application::APP_ID, 'expire_days', 7),
+            'minimum_sequence_length' => $this->config->getAppValue(Application::APP_ID, 'minimum_sequence_length', 5),
+            'active_suspicion_level' => $activeSuspicionLevel,
+            'suspicion_levels' => $suspicionLevels,
+            'expire_days' => $this->config->getAppValue(Application::APP_ID, 'expire_days', 7),
         ], '');
     }
 
diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
index 11c8198..2d06957 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/Personal.php
@@ -69,7 +69,7 @@ class Personal implements ISettings
     {
         $colorMode = $this->config->getUserValue($this->userId, Application::APP_ID, 'color_mode', 0);
 
-        if ($colorMode === 0) {
+        if (intval($colorMode) === 0) {
             $colorActive = ['code' => 0, 'name' => 'Normal'];
             $color = ['code' => 1, 'name' => 'Color blind'];
         } else {
@@ -78,7 +78,7 @@ class Personal implements ISettings
         }
 
         return new TemplateResponse(Application::APP_ID, 'personal', [
-            'colorActive' => $colorActive,
+            'color_active' => $colorActive,
             'color' => $color,
         ], '');
     }