From 8719a54446c4cf0b733ded97861d017f7eceeb4a Mon Sep 17 00:00:00 2001
From: dampelz <59340295+dampelz@users.noreply.github.com>
Date: Tue, 22 Jun 2021 20:47:35 +0000
Subject: [PATCH] Update websiteFunctions.js

WWW to NON-WWW
---
 .../static/websiteFunctions/websiteFunctions.js     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
index 6a86b3fc6..1fa517a8b 100755
--- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js
+++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
@@ -2717,6 +2717,16 @@ RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 
 ### End CyberPanel Generated Rules.
 
+`;
+    
+    const WWWToNonWWW = `### Rewrite Rules Added by CyberPanel Rewrite Rule Generator
+
+RewriteEngine On
+RewriteCond %{HTTP_HOST} ^www\.(.*)$
+RewriteRule ^(.*)$ http://%1/$1 [L,R=301]
+
+### End CyberPanel Generated Rules.
+
 `;
 
     const nonWWWToWWW = `### Rewrite Rules Added by CyberPanel Rewrite Rule Generator
@@ -2736,6 +2746,9 @@ RewriteRule ^(.*)$ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
         } else if ($scope.rewriteTemplate === "Force NON-WWW -> WWW") {
             $scope.rewriteRules = nonWWWToWWW + $scope.rewriteRules;
         }
+        else if ($scope.rewriteTemplate === "Force WWW -> NON-WWW") {
+            $scope.rewriteRules = WWWToNonWWW + $scope.rewriteRules;
+        }
     };