Fix underscore for JSON

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

5 files changed, 21 insertions, 21 deletions

diff --git a/js/admin.js b/js/admin.js
index 08e1ac6..99ed317 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -54,6 +54,6 @@ $(document).ready(function() {
 
         $('#sequence-suspicion-level').attr('class', 'suspicion-level-' + $field.val());
 
-        OCP.AppConfig.setValue('ransomware_detection', 'suspicionLevel', $field.val());
+        OCP.AppConfig.setValue('ransomware_detection', 'suspicion_level', $field.val());
     });
 });
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,
         ], '');
     }
diff --git a/templates/admin.php b/templates/admin.php
index 2f37eec..ee36fef 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -26,13 +26,13 @@ script('ransomware_detection', 'admin');
         <h3>
             <?php p($l->t('Number of days until a sequence will be deleted')); ?>
         </h3>
-        <input id="expire_days" type="text" name="expire_days" value="<?php p($_['expireDays']); ?>"/>
+        <input id="expire_days" type="text" name="expire_days" value="<?php p($_['expire_days']); ?>"/>
     </div>
     <div class="ransomware_detection_sequence">
         <h3>
             <?php p($l->t('Minimum number of file operations contained by a sequence, that it will be shown in recovery')); ?>
         </h3>
-        <input id="minimum_sequence_length" type="text" name="minimum_sequence_length" value="<?php p($_['minimumSequenceLength']); ?>"/>
+        <input id="minimum_sequence_length" type="text" name="minimum_sequence_length" value="<?php p($_['minimum_sequence_length']); ?>"/>
     </div>
 </div>
 <div id="ransomware_detection_notification" class="section">
@@ -41,11 +41,11 @@ script('ransomware_detection', 'admin');
         <h3>
             <?php p($l->t('Suspicion threshold for notifications')); ?>
         </h3>
-        <select id="sequence-suspicion-level" name="sequence-suspicion-level" class="suspicion-level-<?php p($_['activeSuspicionLevel']['code']); ?>" data-placeholder="<?php p($l->t('Sequence suspicion level'));?>">
-            <option class="suspicion-level-<?php p($_['activeSuspicionLevel']['code']); ?>" value="<?php p($_['activeSuspicionLevel']['code']); ?>">
-				<?php p($_['activeSuspicionLevel']['name']); ?>
+        <select id="sequence-suspicion-level" name="sequence-suspicion-level" class="suspicion-level-<?php p($_['active_suspicion_level']['code']); ?>" data-placeholder="<?php p($l->t('Sequence suspicion level'));?>">
+            <option class="suspicion-level-<?php p($_['active_suspicion_level']['code']); ?>" value="<?php p($_['active_suspicion_level']['code']); ?>">
+				<?php p($_['active_suspicion_level']['name']); ?>
 			</option>
-            <?php foreach ($_['suspicionLevels'] as $suspicionLevel): ?>
+            <?php foreach ($_['suspicion_levels'] as $suspicionLevel): ?>
 				<option class="suspicion-level-<?php p($suspicionLevel['code']); ?>" value="<?php p($suspicionLevel['code']); ?>">
 					<?php p($suspicionLevel['name']);?>
 				</option>
diff --git a/templates/personal.php b/templates/personal.php
index 4070ae3..84ed2d9 100644
--- a/templates/personal.php
+++ b/templates/personal.php
@@ -29,8 +29,8 @@ script('ransomware_detection', 'personal');
             <?php p($l->t('Current color mode')); ?>
         </h3>
         <select id="color-scheme" name="color-scheme" data-placeholder="<?php p($l->t('Color mode'));?>">
-            <option value="<?php p($_['colorActive']['code']); ?>">
-				<?php p($_['colorActive']['name']); ?>
+            <option value="<?php p($_['color_active']['code']); ?>">
+				<?php p($_['color_active']['name']); ?>
 			</option>
             <option value="<?php p($_['color']['code']); ?>">
 				<?php p($_['color']['name']); ?>