Fix repo change when running in forced mode

Fix: Domain Wide Disclaimer breaks attachments visualization on Gmail and Outlook #5529

data/conf/rspamd/lua/rspamd.local.lua

@@ -564,7 +564,7 @@ rspamd_config:register_symbol({
         else
           local footer = parser:get_object()
 
-          if footer and type(footer) == "table" and (footer.html or footer.plain) then
+          if footer and type(footer) == "table" and (footer.html and footer.html ~= "" or footer.plain and footer.plain ~= "")  then
             rspamd_logger.infox(rspamd_config, "found domain wide footer for user %s: html=%s, plain=%s", uname, footer.html, footer.plain)
 
             local envfrom_mime = task:get_from(2)
@@ -631,15 +631,19 @@ rspamd_config:register_symbol({
             end
             local out_parts = {}
             for _,o in ipairs(out) do
-               if type(o) ~= 'table' then
+              if type(o) ~= 'table' then
-                 out_parts[#out_parts + 1] = o
+                out_parts[#out_parts + 1] = o
-                 out_parts[#out_parts + 1] = newline_s
+                out_parts[#out_parts + 1] = newline_s
-               else
+              else
-                 out_parts[#out_parts + 1] = o[1]
+                local removePrefix = "--\x0D\x0AContent-Type"
-                 if o[2] then
+                if string.lower(string.sub(tostring(o[1]), 1, string.len(removePrefix))) == string.lower(removePrefix) then
-                   out_parts[#out_parts + 1] = newline_s
+                  o[1] = string.sub(tostring(o[1]), string.len("--\x0D\x0A") + 1)
-                 end
+                end
-               end
+                out_parts[#out_parts + 1] = o[1]
+                if o[2] then
+                  out_parts[#out_parts + 1] = newline_s
+                end
+              end
             end
             task:set_message(out_parts)
           else

data/web/js/site/quarantine.js

@@ -220,7 +220,7 @@ jQuery(function($){
             if (value.score > 0) highlightClass = 'negative';
             else if (value.score < 0) highlightClass = 'positive';
             else highlightClass = 'neutral';
-            $('#qid_detail_symbols').append('<span data-bs-toggle="tooltip" class="rspamd-symbol ' + highlightClass + '" title="' + (value.options ? value.options.join(', ') : '') + '">' + value.name + ' (<span class="score">' + value.score + '</span>)</span>');
+            $('#qid_detail_symbols').append('<span data-bs-toggle="tooltip" class="rspamd-symbol ' + highlightClass + '" title="' + (value.options ? escapeHtml(value.options.join(', ')) : '') + '">' + value.name + ' (<span class="score">' + value.score + '</span>)</span>');
           });
           $('[data-bs-toggle="tooltip"]').tooltip();
         }
@@ -295,3 +295,7 @@ jQuery(function($){
       $(".table_collapse_option").hide();
   }
 });
+
+
+
+

update.sh

@@ -891,9 +891,14 @@ if [ "$CURRENT_REPO" != "$DEFAULT_REPO" ]; then
   echo "The Repository currently used is not the default Mailcow Repository."
   echo "Currently Repository: $CURRENT_REPO"
   echo "Default Repository:   $DEFAULT_REPO"
-  read -r -p "Should it be changed back to default? [y/N] " repo_response
+  if [ ! $FORCE ]; then
-  if [[ "$repo_response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
+    read -r -p "Should it be changed back to default? [y/N] " repo_response
-    git remote set-url origin $DEFAULT_REPO
+    if [[ "$repo_response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
+      git remote set-url origin $DEFAULT_REPO
+    fi
+  else
+      echo "Running in forced mode... setting Repo to default!"
+      git remote set-url origin $DEFAULT_REPO
   fi
 fi