[Web] Small adjustments to presets

data/web/css/build/0081-custom-mailcow.css

@@ -0,0 +1 @@
+/* Autogenerated by mailcow */

data/web/inc/functions.presets.inc.php

@@ -1,56 +1,38 @@
 <?php
-function presets($_action, $_kind, $_object)
+function presets($_action, $_kind) {
-{
+  global $lang;
-  if ($_SESSION['mailcow_cc_role'] !== 'admin') {
+  switch ($_action) {
-    $_SESSION['return'][] = [
+    case 'get':
-      'type' => 'danger',
+      if ($_SESSION['mailcow_cc_role'] != "admin") {
-      'log' => [__FUNCTION__, $_action, $_data_log],
-      'msg' => 'access_denied',
-    ];
-
         return false;
       }
-
+      $presets = array();
-  global $lang;
-  if ($_action === 'get') {
       $kind = strtolower(trim($_kind));
-    $langSection = 'admin';
+      $lang_base = 'admin';
-    $presetsPath = __DIR__ . '/presets/' . $kind;
+      $presets_path = __DIR__ . '/presets/' . $kind;
-
+      if (!in_array($kind, ['rspamd', 'sieve'], true)) {
-    if (!in_array($kind, ['admin-rspamd', 'mailbox-sieve'], true)) {
+        return array();
-      return [];
       }
-
+      if ($kind === 'sieve') {
-    if ($kind === 'mailbox-sieve') {
+        $lang_base = 'mailbox';
-      $langSection = 'mailbox';
       }
-
+      foreach (glob($presets_path . '/*.yml') as $filename) {
-    if ($_object !== 'all') {
+        $presets[] = getPresetFromFilePath($filename, $lang_base);
-      return getPresetFromFilePath($presetsPath . '/' . $_object . '.yml', $langSection);
       }
-
-    $presets = [];
-    foreach (glob($presetsPath . '/*.yml') as $filename) {
-      $presets[] = getPresetFromFilePath($filename, $langSection);
-    }
-
       return $presets;
+    break;
   }
-
+  return array();
-  return [];
 }
-
+function getPresetFromFilePath($filePath, $lang_base) {
-function getPresetFromFilePath($filePath, $langSection)
-{
   global $lang;
   $preset = Spyc::YAMLLoad($filePath);
   $preset = ['name' => basename($filePath, '.yml')] + $preset;
-
   /* get translated headlines */
   if (isset($preset['headline']) && strpos($preset['headline'], 'lang.') === 0) {
     $langTextName = trim(substr($preset['headline'], 5));
-    if (isset($lang[$langSection][$langTextName])) {
+    if (isset($lang[$lang_base][$langTextName])) {
-      $preset['headline'] = $lang[$langSection][$langTextName];
+      $preset['headline'] = $lang[$lang_base][$langTextName];
     }
   }
   return $preset;

data/web/inc/presets/admin-rspamd/preset_1.yml

@@ -1,7 +0,0 @@
-headline: lang.rsettings_preset_1
-content: |
-  priority = 10;
-  authenticated = yes;
-  apply "default" {
-   symbols_enabled = ["DKIM_SIGNED", "RATELIMITED", "RATELIMIT_UPDATE", "RATELIMIT_CHECK", "DYN_RL_CHECK", "HISTORY_SAVE", "MILTER_HEADERS", "ARC_SIGNED"];
-  }

data/web/inc/presets/rspamd/preset_1.yml

@@ -0,0 +1,7 @@
+headline: lang.rsettings_preset_1
+content: |
+  priority = 10;
+  authenticated = yes;
+  apply "default" {
+    symbols_enabled = ["DKIM_SIGNED", "RATELIMITED", "RATELIMIT_UPDATE", "RATELIMIT_CHECK", "DYN_RL_CHECK", "HISTORY_SAVE", "MILTER_HEADERS", "ARC_SIGNED"];
+  }

data/web/js/presets/rspamd.js

@@ -3,7 +3,7 @@ var rspamd_presetsElem = document.getElementById("rspamd_presets");
 if (rspamd_presetsElem) {
   $.ajax({
     dataType: 'json',
-    url: '/api/v1/get/presets-admin-rspamd/all',
+    url: '/api/v1/get/presets/rspamd',
     jsonp: false,
     complete: function (data) {
       if (data.responseText !== '{}') {

data/web/js/presets/sieveMailbox.js

@@ -3,7 +3,7 @@ var sieve_presetsElem = document.getElementById("sieve_presets");
 if (sieve_presetsElem) {
   $.ajax({
     dataType: 'json',
-    url: '/api/v1/get/presets-mailbox-sieve/all',
+    url: '/api/v1/get/presets/sieve',
     jsonp: false,
     complete: function (data) {
       if (data.responseText !== '{}') {

data/web/json_api.php

@@ -1071,11 +1071,15 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
                   break;
             }
           break;
-          case "presets-admin-rspamd":
+          case "presets":
-            process_get_return(presets('get', 'admin-rspamd', $object));
+            switch ($object) {
+              case "rspamd":
+                process_get_return(presets('get', 'rspamd'));
+              case "sieve":
               break;
-          case "presets-mailbox-sieve":
+                process_get_return(presets('get', 'sieve'));
-            process_get_return(presets('get', 'mailbox-sieve', $object));
+              break;
+            }
           break;
         break;
         // return no route found if no case is matched