Merge pull request hestiacp#1940 from jaapmarcus/fix/1939-error-default-templates-missing

Fix 2 small bug

Author: jaapmarcus

CHANGELOG.md

@@ -13,6 +13,8 @@ All notable changes to this project will be documented in this file.
 - Fix PHP bug in /list/log/ 
 - Fix issue with time in /list/services as it was showing as 50 minute1 instead of minutes
 - Add missing back buttons + fix behavoir of back buttons on login page. 
+- Set "default" when WEB_TEMPLATE and PROXY_TEMPLATE is missing in user.conf 
+- Add BACKEND_TEMPLATE to default package
 
 ## [1.4.3] - Service release
 

bin/v-add-web-domain

@@ -169,6 +169,11 @@ fi
 # Preparing domain variables
 prepare_web_domain_values
 
+if [ -z "$WEB_TEMPLATE" ]; then 
+    WEB_TEMPLATE='default'
+    update_user_value "$user" '$WEB_TEMPLATE' "default"
+fi
+
 # Adding web server config
 add_web_config "$WEB_SYSTEM" "$WEB_TEMPLATE.tpl"
 
@@ -180,7 +185,12 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
         PROXY_EXT="$PROXY_EXT,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp"
         PROXY_EXT="$PROXY_EXT,rtf,js,mp3,avi,mpeg,flv,html,htm"
     fi
-    add_web_config "$PROXY_SYSTEM" "$PROXY_TEMPLATE.tpl"
+    if [ -z "$PROXY_TEMPLATE" ]; then 
+        PROXY_TEMPLATE='default'
+        update_user_value "$user" '$PROXY_TEMPLATE' "default"
+    fi
+    
+    add_web_config "$PROXY_SYSTEM" "$PROXY_TEMPLATE.tpl" 
 fi
 
 

bin/v-delete-web-domain

@@ -90,7 +90,7 @@ fi
 sed -i "/DOMAIN='$domain'/ d" $USER_DATA/web.conf
 
 # Deleting proxy
-if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
+if [ ! -z "$PROXY_SYSTEM" ]; then
     del_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
     if [ "$SSL" = 'yes' ]; then
         del_web_config "$PROXY_SYSTEM" "$PROXY.stpl"

install/deb/packages/default.pkg

@@ -1,5 +1,6 @@
 WEB_TEMPLATE='default'
 PROXY_TEMPLATE='default'
+BACKEND_TEMPLATE='default'
 DNS_TEMPLATE='default'
 WEB_DOMAINS='unlimited'
 WEB_ALIASES='unlimited'