Merge pull request #124 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
bmsimp · Feb 27, 2025 · ea87c8b · ea87c8b
2 parents 9319c9b + 2998a81
commit ea87c8b
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 1 deletion.
diff --git a/src/data/standards.json b/src/data/standards.json
@@ -2268,6 +2268,82 @@
             "value": "DefaultFullAccessWithNotificationPolicy"
           }
         ]
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.IncreaseScoreWithImageLinks",
+        "label": "Increase score if message contains image links to remote websites",
+        "defaultValue": false
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.IncreaseScoreWithBizOrInfoUrls",
+        "label": "Increase score if message contains links to .biz or .info domains",
+        "defaultValue": false
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.MarkAsSpamFramesInHtml",
+        "label": "Mark as spam if message contains HTML or iframe tags",
+        "defaultValue": false
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.MarkAsSpamObjectTagsInHtml",
+        "label": "Mark as spam if message contains HTML object tags",
+        "defaultValue": false
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.MarkAsSpamEmbedTagsInHtml",
+        "label": "Mark as spam if message contains HTML embed tags",
+        "defaultValue": false
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.MarkAsSpamFormTagsInHtml",
+        "label": "Mark as spam if message contains HTML form tags",
+        "defaultValue": false
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.MarkAsSpamWebBugsInHtml",
+        "label": "Mark as spam if message contains web bugs (also known as web beacons)",
+        "defaultValue": false
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.MarkAsSpamSensitiveWordList",
+        "label": "Mark as spam if message contains words from the sensitive words list",
+        "defaultValue": false
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.EnableLanguageBlockList",
+        "label": "Enable language block list",
+        "defaultValue": false
+      },
+      {
+        "type": "autoComplete",
+        "multiple": true,
+        "creatable": true,
+        "required": false,
+        "name": "standards.SpamFilterPolicy.LanguageBlockList",
+        "label": "Languages to block (uppercase ISO 639-1 two-letter)"
+      },
+      {
+        "type": "switch",
+        "name": "standards.SpamFilterPolicy.EnableRegionBlockList",
+        "label": "Enable region block list",
+        "defaultValue": false
+      },
+      {
+        "type": "autoComplete",
+        "multiple": true,
+        "creatable": true,
+        "required": false,
+        "name": "standards.SpamFilterPolicy.RegionBlockList",
+        "label": "Regions to block (uppercase ISO 3166-1 two-letter)"
       }
     ],
     "label": "Default Spam Filter Policy",

diff --git a/src/pages/_app.js b/src/pages/_app.js
@@ -12,7 +12,6 @@ import { createEmotionCache } from "../utils/create-emotion-cache";
 import "../libs/nprogress";
 import { PrivateRoute } from "../components/PrivateRoute";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { useMediaPredicate } from "react-media-hook";
 import Error500 from "./500";
 import { ErrorBoundary } from "react-error-boundary";
@@ -25,10 +24,12 @@ import {
   Help as HelpIcon,
   BugReport as BugReportIcon,
   Feedback as FeedbackIcon,
+  AutoStories,
 } from "@mui/icons-material";
 import { SvgIcon } from "@mui/material";
 import discordIcon from "../../public/discord-mark-blue.svg";
 import React from "react";
+import { usePathname } from "next/navigation";
 TimeAgo.addDefaultLocale(en);
 
 const ReactQueryDevtoolsProduction = React.lazy(() =>
@@ -43,6 +44,7 @@ const App = (props) => {
   const { Component, emotionCache = clientSideEmotionCache, pageProps } = props;
   const getLayout = Component.getLayout ?? ((page) => page);
   const preferredTheme = useMediaPredicate("(prefers-color-scheme: dark)") ? "dark" : "light";
+  const pathname = usePathname();
 
   const speedDialActions = [
     {
@@ -69,6 +71,13 @@ const App = (props) => {
       href: "https://discord.gg/cyberdrain",
       onClick: () => window.open("https://discord.gg/cyberdrain", "_blank")
     },
+    {
+      id: "documentation",
+      icon: <AutoStories />,
+      name: "Check the Documentation",
+      href: `https://docs.cipp.app/user-documentation/${pathname}`,
+      onClick: () => window.open(`https://docs.cipp.app/user-documentation/${pathname}`, "_blank")
+    }
   ];
 
   return (