Explorar o código

fix for empty web domain alias

Serghey Rodin %!s(int64=9) %!d(string=hai) anos
pai
achega
b0c07020db
Modificáronse 2 ficheiros con 4 adicións e 2 borrados
  1. 3 2
      bin/v-add-web-domain
  2. 1 0
      web/add/web/index.php

+ 3 - 2
bin/v-add-web-domain

@@ -121,9 +121,10 @@ if [ ! -z "$WEB_BACKEND" ]; then
 fi
 fi
 
 
 # Preparing domain variables
 # Preparing domain variables
-ALIAS="$aliases"
 if [ "$aliases" != 'none' ]; then
 if [ "$aliases" != 'none' ]; then
     ALIAS="www.$domain,$aliases,$(get_ip_alias $domain)"
     ALIAS="www.$domain,$aliases,$(get_ip_alias $domain)"
+else
+    ALIAS=''
 fi
 fi
 prepare_web_domain_values
 prepare_web_domain_values
 
 
@@ -157,7 +158,7 @@ time=$(echo "$time_n_date" |cut -f 1 -d \ )
 date=$(echo "$time_n_date" |cut -f 2 -d \ )
 date=$(echo "$time_n_date" |cut -f 2 -d \ )
 
 
 # Adding domain in web.conf
 # Adding domain in web.conf
-echo "DOMAIN='$domain' IP='$ip' IP6='' ALIAS='$aliases' TPL='$WEB_TEMPLATE' \
+echo "DOMAIN='$domain' IP='$ip' IP6='' ALIAS='$ALIAS' TPL='$WEB_TEMPLATE' \
 SSL='no' SSL_HOME='same' FTP_USER='' FTP_MD5='' BACKEND='$BACKEND_TEMPLATE' \
 SSL='no' SSL_HOME='same' FTP_USER='' FTP_MD5='' BACKEND='$BACKEND_TEMPLATE' \
 PROXY='$PROXY_TEMPLATE' PROXY_EXT='$PROXY_EXT' STATS='' STATS_USER='' \
 PROXY='$PROXY_TEMPLATE' PROXY_EXT='$PROXY_EXT' STATS='' STATS_USER='' \
 STATS_CRYPT='' U_DISK='0' U_BANDWIDTH='0' SUSPENDED='no' \
 STATS_CRYPT='' U_DISK='0' U_BANDWIDTH='0' SUSPENDED='no' \

+ 1 - 0
web/add/web/index.php

@@ -58,6 +58,7 @@ if (!empty($_POST['ok'])) {
     $aliases_arr = array_filter($aliases_arr);
     $aliases_arr = array_filter($aliases_arr);
     $aliases = implode(",",$aliases_arr);
     $aliases = implode(",",$aliases_arr);
     $aliases = escapeshellarg($aliases);
     $aliases = escapeshellarg($aliases);
+    if (empty($_POST['v_aliases'])) $aliases = 'none';
 
 
     // Define proxy extensions
     // Define proxy extensions
     $v_proxy_ext = $_POST['v_proxy_ext'];
     $v_proxy_ext = $_POST['v_proxy_ext'];