From bca641b07f6544a8a967242c3919b713a09d822c Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 11 Nov 2023 14:06:05 -0600
Subject: [PATCH] Update sites.inc

---
 inc/sites.inc | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/inc/sites.inc b/inc/sites.inc
index 60847cb2..d93b9c26 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -471,24 +471,34 @@ NEWSITE(){
 
 NEWPROXYSITE_CREATE(){
 	SITENAME=${1}
-	PROXYHOST=${2}
-	PROXYPORT=${3}
-	PROXYSCHEME=${4}
-	WEBSOCKET=${5}
-	HSTS=${6}
-	EXPLOITS=${7}
-	SECURE=${8}
+	SERVERNAMES=${2}
+	PROXYHOST=${3}
+	PROXYPORT=${4}
+	PROXYSCHEME=${5}
+	WEBSOCKET=${6}
+	HSTS=${7}
+	EXPLOITS=${8}
+	SECURE=${9}
 	
-	if [[ ${SITENAME} == *","* ]]; then
-		IFS=','; SITENAMES=(${SITENAME}); unset IFS
-		MAIN_SITE=${SITENAMES[0]}
-		NGINX_SERVERNAME=${SITENAMES//[,]/ }
+	if [[ ${SERVERNAMES} == *","* ]]; then
+		IFS=','; SERVERNAMES=(${SERVERNAMES}); unset IFS
+		MAIN_SITE=${SERVERNAMES[0]}
+		NGINX_SERVERNAME=${SERVERNAMES//[,]/ }
 	else
-		MAIN_SITE=${SITENAME}
-		NGINX_SERVERNAME=${SITENAME}
+		MAIN_SITE=${SERVERNAMES}
+		NGINX_SERVERNAME=${SERVERNAMES}
+	fi
+	nginxconfig=${NM_NGINXPATH}/sites-enabled/${MAIN_SITE}.conf
+	if [ "${MAIN_SITE}" != "${SITENAME}"] && [ -f ${nginxconfig} ]; then
+		echo -e "\n${idsCL[LightRed]}New site name already exists!${idsCL[Default]}\n"
+		exit 1
+	else
+		[ "${MAIN_SITE}" != "${SITENAME}"] && mv ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ${nginxconfig}
+		
+		echo "${SITENAME} ${SERVERNAMES} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} "
+		
 	fi
 	
-	echo "${SITENAME} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} "
 	
 	# cp ${NM_FOLDER}/templates/nginx.proxy.site ${nginxconfig}
 	# sed -i "s/<<SERVER_NAME>>/${NGINX_SERVERNAME}/g" ${nginxconfig}
@@ -709,9 +719,9 @@ SITEINFO(){
 								;;
 					        *)
 								echo -e "\n\n\n"
-								NEWPROXYSITE_CREATE ${site} ${server} ${port} ${scheme} ${wbskt} ${hsts} ${explt} ${lock}
+								NEWPROXYSITE_CREATE ${site} ${servernames} ${server} ${port} ${scheme} ${wbskt} ${hsts} ${explt} ${lock}
 							
-								edit=c
+								edit=E
 								;;
 					    esac