diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain
index 09d5b571..f43891a6 100755
--- a/bin/v-add-dns-domain
+++ b/bin/v-add-dns-domain
@@ -15,15 +15,8 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g')
-if [[ "$domain" =~ [[:upper:]] ]]; then
- domain=$(echo "$domain" |tr '[:upper:]' '[:lower:]')
-fi
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
+domain=$2
+domain_idn=$2
ip=$3
ns1=$4
ns2=$5
@@ -40,6 +33,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -56,37 +53,35 @@ template=$(get_user_value '$DNS_TEMPLATE')
is_dns_template_valid $template
if [ ! -z "$ns1" ]; then
- ns1=$(echo $4 | sed -e 's/\.*$//g' -e 's/^\.*//g')
+ ns1=$(echo $4 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns1'
fi
if [ ! -z "$ns2" ]; then
- ns2=$(echo $5 | sed -e 's/\.*$//g' -e 's/^\.*//g')
+ ns2=$(echo $5 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns2'
fi
-
if [ ! -z "$ns3" ]; then
- ns3=$(echo $6 | sed -e 's/\.*$//g' -e 's/^\.*//g')
+ ns3=$(echo $6 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns3'
fi
if [ ! -z "$ns4" ]; then
- ns4=$(echo $7 | sed -e 's/\.*$//g' -e 's/^\.*//g')
+ ns4=$(echo $7 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns4'
fi
if [ ! -z "$ns5" ]; then
- ns5=$(echo $8 | sed -e 's/\.*$//g' -e 's/^\.*//g')
+ ns5=$(echo $8 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns5'
fi
if [ ! -z "$ns6" ]; then
- ns6=$(echo $9 | sed -e 's/\.*$//g' -e 's/^\.*//g')
+ ns6=$(echo $9 |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns6'
fi
if [ ! -z "$ns7" ]; then
- ns7=$(echo ${10} | sed -e 's/\.*$//g' -e 's/^\.*//g')
+ ns7=$(echo ${10} |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns7'
fi
-
if [ ! -z "$ns8" ]; then
- ns8=$(echo ${11} | sed -e 's/\.*$//g' -e 's/^\.*//g')
+ ns8=$(echo ${11} |sed -e 's/\.*$//g' -e 's/^\.*//g')
is_format_valid 'ns8'
fi
@@ -203,10 +198,8 @@ increase_user_value "$user" '$U_DNS_DOMAINS'
increase_user_value "$user" '$U_DNS_RECORDS' "$records"
# Restart named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "DNS restart failed"
-fi
+$BIN/v-restart-dns $restart
+check_result $? "DNS restart failed"
# Logging
log_history "added dns domain $domain"
diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record
index b785973c..3b6e6e95 100755
--- a/bin/v-add-dns-record
+++ b/bin/v-add-dns-record
@@ -26,11 +26,6 @@ if [ -z "$priority" ]; then
priority=10
fi
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
-
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
@@ -55,6 +50,10 @@ if [[ "$dvalue" =~ [\;[:space:]] ]]; then
dvalue='"'"$dvalue"'"'
fi
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -121,10 +120,8 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
increase_user_value "$user" '$U_DNS_RECORDS'
# Restart named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? $E_RESTART 'dns failed to restart'
-fi
+$BIN/v-restart-dns $restart
+check_result $? $E_RESTART 'dns failed to restart'
# Logging
log_history "added $rtype dns record $record for $domain"
diff --git a/bin/v-add-domain b/bin/v-add-domain
index 49b105be..e383481a 100755
--- a/bin/v-add-domain
+++ b/bin/v-add-domain
@@ -64,16 +64,14 @@ if [ ! -z "$MAIL_SYSTEM" ]; then
fi
# Restarting services
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "can't restart web" > /dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "can't restart proxy" > /dev/null
- fi
- $BIN/v-restart-dns
- check_result $? "can't restart dns" > /dev/null
-fi
+$BIN/v-restart-web $restart
+check_result $? "can't restart web" > /dev/null
+
+$BIN/v-restart-proxy $restart
+check_result $? "can't restart proxy" > /dev/null
+
+$BIN/v-restart-dns $restart
+check_result $? "can't restart dns" > /dev/null
#----------------------------------------------------------#
diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account
index 586871a4..44925680 100755
--- a/bin/v-add-mail-account
+++ b/bin/v-add-mail-account
@@ -11,10 +11,8 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
-account=$(echo $3 | tr '[:upper:]' '[:lower:]')
+domain=$2
+account=$3
password=$4; HIDE=4
quota=${5-unlimited}
@@ -23,6 +21,11 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+if [[ "$account" =~ [[:upper:]] ]]; then
+ account=$(echo "$account" |tr '[:upper:]' '[:lower:]')
+fi
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias
index 004e6e4d..03ecaec9 100755
--- a/bin/v-add-mail-account-alias
+++ b/bin/v-add-mail-account-alias
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
malias=$4
@@ -22,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply
index 88070f7c..f8c8f62b 100755
--- a/bin/v-add-mail-account-autoreply
+++ b/bin/v-add-mail-account-autoreply
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
autoreply=$4
@@ -29,6 +27,10 @@ else
MAIL_USER=exim
fi
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward
index 1a990a31..6be94b22 100755
--- a/bin/v-add-mail-account-forward
+++ b/bin/v-add-mail-account-forward
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
forward=$4
@@ -22,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-add-mail-account-fwd-only b/bin/v-add-mail-account-fwd-only
index 277776ba..02704cfb 100755
--- a/bin/v-add-mail-account-fwd-only
+++ b/bin/v-add-mail-account-fwd-only
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
# Includes
@@ -28,6 +26,10 @@ else
MAIL_USER=exim
fi
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain
index eedc02d9..2676e750 100755
--- a/bin/v-add-mail-domain
+++ b/bin/v-add-mail-domain
@@ -11,15 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | sed -e 's/\.*$//g' -e 's/^\.*//g')
-if [[ "$domain" =~ [[:upper:]] ]]; then
- domain=$(echo "$domain" |tr '[:upper:]' '[:lower:]')
-fi
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
+domain=$2
antispam=${3-yes}
antivirus=${4-yes}
dkim=${5-yes}
@@ -37,6 +29,10 @@ else
MAIL_USER=exim
fi
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -123,10 +119,10 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$dkim" = 'yes' ]; then
p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n')
record='_domainkey'
policy="\"t=y; o=~;\""
- $BIN/v-add-dns-record $user $domain $record TXT "$policy"
+ $BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
record='mail._domainkey'
- selector="\"k=rsa\; p=$p\""
+ selector="\"v=DKIM1\; k=rsa\; p=$p\""
$BIN/v-add-dns-record $user $domain $record TXT "$selector"
fi
fi
diff --git a/bin/v-add-mail-domain-antispam b/bin/v-add-mail-domain-antispam
index 916f1540..4ca81f94 100755
--- a/bin/v-add-mail-domain-antispam
+++ b/bin/v-add-mail-domain-antispam
@@ -11,15 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-add-mail-domain-antivirus b/bin/v-add-mail-domain-antivirus
index d18857cb..c0acd82d 100755
--- a/bin/v-add-mail-domain-antivirus
+++ b/bin/v-add-mail-domain-antivirus
@@ -11,15 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall
index 91dc0354..f827449f 100755
--- a/bin/v-add-mail-domain-catchall
+++ b/bin/v-add-mail-domain-catchall
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
email="$3"
# Includes
@@ -21,6 +19,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim
index 4a71870c..4c0a095e 100755
--- a/bin/v-add-mail-domain-dkim
+++ b/bin/v-add-mail-domain-dkim
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
dkim_size=${3-1024}
# Includes
@@ -28,6 +26,10 @@ else
MAIL_USER=exim
fi
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -63,12 +65,12 @@ fi
# Adding dns records
if [ ! -z "$DNS_SYSTEM" ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
p=$(cat $USER_DATA/mail/$domain.pub |grep -v ' KEY---' |tr -d '\n')
- record="_domainkey.$domain_idn"
+ record="_domainkey"
policy="\"t=y; o=~;\""
- $BIN/v-add-dns-record $user $domain $record TXT "$policy"
+ $BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
- record="mail._domainkey.$domain_idn"
- selector="\"k=rsa\; p=$p\""
+ record="mail._domainkey"
+ selector="\"v=DKIM1\; k=rsa\; p=$p\""
$BIN/v-add-dns-record $user $domain $record TXT "$selector"
fi
diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain
index 6313674f..62619a42 100755
--- a/bin/v-add-web-domain
+++ b/bin/v-add-web-domain
@@ -18,37 +18,23 @@
# Argument definition
user=$1
domain=$2
+domain_idn=$2
ip=$3
restart=$4 # will be moved to the end soon
aliases=$5
proxy_ext=$6
-# Additional argument formatting
-if [[ "$domain" =~ [[:upper:]] ]]; then
- domain=$(echo "$domain" |tr '[:upper:]' '[:lower:]')
-fi
-if [[ "$domain" =~ ^www\..* ]]; then
- domain=$(echo "$domain" |sed -e "s/^www.//")
-fi
-if [[ "$domain" =~ .*\.$ ]]; then
- domain=$(echo "$domain" |sed -e "s/\.$//")
-fi
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
-if [ ! -z "$aliases" ] && [ "$aliases" != 'none' ]; then
- aliases=$(echo $aliases |tr '[:upper:]' '[:lower:]' |tr ',' '\n')
- aliases=$(echo "$aliases" |sed -e "s/\.$//" |sort -u |grep -v www.$domain)
- aliases=$(echo "$aliases" |sed -e "/^$/d" |tr '\n' ',' |sed -e "s/,$//")
-fi
-
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+format_aliases
+
#----------------------------------------------------------#
# Verifications #
@@ -178,10 +164,8 @@ $BIN/v-restart-web $restart
check_result $? "Web restart failed" >/dev/null
# Restarting proxy server
-if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy $restart
- check_result $? "Proxy restart failed" >/dev/null
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "added web domain $domain"
diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias
index 59e077ca..932e1ffa 100755
--- a/bin/v-add-web-domain-alias
+++ b/bin/v-add-web-domain-alias
@@ -12,13 +12,8 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
-dom_alias=$(idn -t --quiet -u "$3" )
-dom_alias=$(echo $dom_alias | sed -e 's/\.*$//g' -e 's/^\.*//g')
-dom_alias=$(echo $dom_alias | tr '[:upper:]' '[:lower:]')
-dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
+domain=$2
+aliases=$3
restart="$4"
# Includes
@@ -27,6 +22,11 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+format_aliases
+
#----------------------------------------------------------#
# Verifications #
@@ -39,7 +39,7 @@ is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain"
-is_domain_new 'web' "$dom_alias"
+is_domain_new 'web' "$aliases"
is_package_full 'WEB_ALIASES'
@@ -53,9 +53,9 @@ get_domain_values 'web'
# Preparing domain values for the template substitution
local_ip=$(get_real_ip $IP)
if [ -z "$ALIAS" ]; then
- ALIAS="$dom_alias"
+ ALIAS="$aliases"
else
- ALIAS="$ALIAS,$dom_alias"
+ ALIAS="$ALIAS,$aliases"
fi
prepare_web_domain_values
@@ -87,17 +87,15 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ALIAS' "$ALIAS"
increase_user_value "$user" '$U_WEB_ALIASES'
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+# Restarting proxy server
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
-log_history "added $dom_alias as alias for $domain"
+
+log_history "added $aliases for $domain"
log_event "$OK" "$ARGUMENTS"
exit
diff --git a/bin/v-add-web-domain-backend b/bin/v-add-web-domain-backend
index 301b10d6..1c415bb3 100755
--- a/bin/v-add-web-domain-backend
+++ b/bin/v-add-web-domain-backend
@@ -67,10 +67,8 @@ cat $WEBTPL/$WEB_BACKEND/$template.tpl |\
#----------------------------------------------------------#
# Restart backend server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web-backend
- check_result $? "Web backend restart failed" >/dev/null
-fi
+$BIN/v-restart-web-backend $restart
+check_result $? "Web backend restart failed" >/dev/null
# Logging
log_history "added $WEB_BACKEND backend configuration for $domain"
diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp
index 67afc644..1c118706 100755
--- a/bin/v-add-web-domain-ftp
+++ b/bin/v-add-web-domain-ftp
@@ -11,8 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ftp_user=${1}_${3}
password=$4; HIDE=4
ftp_path=$5
@@ -22,6 +21,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy
index ff6a12fa..9bd42746 100755
--- a/bin/v-add-web-domain-proxy
+++ b/bin/v-add-web-domain-proxy
@@ -72,10 +72,8 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY' "$template"
update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
log_history "enabled proxy support for $domain"
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl
index fa8de5c6..4f1e83c0 100755
--- a/bin/v-add-web-domain-ssl
+++ b/bin/v-add-web-domain-ssl
@@ -16,18 +16,35 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ssl_dir=$3
ssl_home=${4-same}
restart="$5"
+# Additional argument formatting
+if [[ "$domain" =~ [[:upper:]] ]]; then
+ domain=$(echo "$domain" |tr '[:upper:]' '[:lower:]')
+fi
+if [[ "$domain" =~ ^www\..* ]]; then
+ domain=$(echo "$domain" |sed -e "s/^www.//")
+fi
+if [[ "$domain" =~ .*\.$ ]]; then
+ domain=$(echo "$domain" |sed -e "s/\.$//")
+fi
+
+domain=$(idn -t --quiet -u "$domain" )
+domain_idn=$(idn -t --quiet -a "$domain")
+
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -97,15 +114,11 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "enabled ssl support for $domain"
diff --git a/bin/v-add-web-domain-stats b/bin/v-add-web-domain-stats
index deec1646..60caf0c1 100755
--- a/bin/v-add-web-domain-stats
+++ b/bin/v-add-web-domain-stats
@@ -15,8 +15,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
type=$3
# Includes
@@ -24,6 +23,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-backup-user b/bin/v-backup-user
index 98995e9f..786941a9 100755
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@@ -137,7 +137,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
mkdir -p $tmpdir/web/$domain/vesta
# Get domain variables
- domain_idn=$(idn -t --quiet -a "$domain")
+ format_domain_idn
get_domain_values 'web'
# Backup web.conf
@@ -286,7 +286,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then
echo -e "$(date "+%F %T") $domain" |tee -a $BACKUP/$user.log
mkdir -p $tmpdir/mail/$domain/conf
mkdir -p $tmpdir/mail/$domain/vesta
- domain_idn=$(idn -t --quiet -a "$domain")
+ format_domain_idn
# Backup exim config
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
diff --git a/bin/v-change-dns-domain-exp b/bin/v-change-dns-domain-exp
index ec11acc9..e5b0c6a9 100755
--- a/bin/v-change-dns-domain-exp
+++ b/bin/v-change-dns-domain-exp
@@ -12,14 +12,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
exp=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip
index 47e01f42..fca3ecb7 100755
--- a/bin/v-change-dns-domain-ip
+++ b/bin/v-change-dns-domain-ip
@@ -11,8 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ip=$3
restart=$4
@@ -21,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -71,10 +74,8 @@ fi
#----------------------------------------------------------#
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "DNS restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed dns ip for $domain to $ip"
diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa
index 553bcfc9..e235a639 100755
--- a/bin/v-change-dns-domain-soa
+++ b/bin/v-change-dns-domain-soa
@@ -12,8 +12,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
soa=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g')
restart=$4
@@ -22,6 +21,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -65,10 +68,8 @@ fi
#----------------------------------------------------------#
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "DNS restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed soa record for $domain to $soa"
diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl
index 8af190f5..63c71e41 100755
--- a/bin/v-change-dns-domain-tpl
+++ b/bin/v-change-dns-domain-tpl
@@ -13,20 +13,19 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
+domain=$2
template=$3
restart=$4
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
-
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -121,10 +120,8 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$TPL' "$template"
update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "DNS restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed dns template for $domain to $template" '' 'admin'
diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl
index 0e85391f..131b7930 100755
--- a/bin/v-change-dns-domain-ttl
+++ b/bin/v-change-dns-domain-ttl
@@ -11,8 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ttl=$3
restart=$4
@@ -21,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -64,10 +67,8 @@ fi
#----------------------------------------------------------#
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "DNS restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed TTL for $domain to $ttl"
diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record
index 505a8a1f..612ffc6c 100755
--- a/bin/v-change-dns-record
+++ b/bin/v-change-dns-record
@@ -11,22 +11,21 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
+domain=$2
id=$3
dvalue=$(idn -t --quiet -u "$4" )
priority=$5
restart=$6
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
-
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -105,10 +104,8 @@ fi
#----------------------------------------------------------#
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "DNS restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed dns record on $domain to $dvalue"
diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id
index 4c321b0f..5dbcf299 100755
--- a/bin/v-change-dns-record-id
+++ b/bin/v-change-dns-record-id
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
id=$3
newid=$4
restart=$5
@@ -23,6 +21,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -71,10 +73,8 @@ fi
#----------------------------------------------------------#
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "DNS restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "DNS restart failed" >/dev/null
# Logging
log_history "changed dns record id on $domain"
diff --git a/bin/v-change-domain-owner b/bin/v-change-domain-owner
index 7a0f265b..8f267307 100755
--- a/bin/v-change-domain-owner
+++ b/bin/v-change-domain-owner
@@ -148,6 +148,18 @@ if [ ! -z "$mail_data" ]; then
$BIN/v-unsuspend-mail-domain $user $domain no >> /dev/null 2>&1
$BIN/v-rebuild-mail-domains $owner no
$BIN/v-rebuild-mail-domains $user
+
+ # Checking exim username for later chowning
+ exim_user="exim";
+ check_exim_username=$(grep -c '^Debian-exim:' /etc/passwd)
+ if [ "$check_exim_username" -eq 1 ]; then
+ exim_user="Debian-exim"
+ fi
+ # Chowning mail conf files to exim user
+ if [ -d "$HOMEDIR/$user/conf/mail/$domain" ]; then
+ find $HOMEDIR/$user/conf/mail/$domain -user root \
+ -exec chown $exim_user {} \;
+ fi
fi
# Update counters
diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password
index da6b788c..0540ac7b 100755
--- a/bin/v-change-mail-account-password
+++ b/bin/v-change-mail-account-password
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
password=$4; HIDE=4
@@ -22,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota
index 0d4f8d53..edbbabab 100755
--- a/bin/v-change-mail-account-quota
+++ b/bin/v-change-mail-account-quota
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
quota=$4
@@ -22,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall
index 25e0caaa..022dbf1d 100755
--- a/bin/v-change-mail-domain-catchall
+++ b/bin/v-change-mail-domain-catchall
@@ -11,16 +11,18 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
-email="$3"
+domain=$2
+email=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -53,7 +55,6 @@ fi
# Change catchall in config
update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
-
# Logging
log_history "changed catchall email for $domain to $email"
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat
index 8f681555..58232212 100755
--- a/bin/v-change-sys-ip-nat
+++ b/bin/v-change-sys-ip-nat
@@ -73,10 +73,8 @@ fi
#----------------------------------------------------------#
# Restart ftp server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-ftp
- check_result $? "FTP restart failed" >/dev/null
-fi
+$BIN/v-restart-ftp $restart
+check_result $? "FTP restart failed" >/dev/null
# Logging
log_history "changed associated nat address on $ip to $nat_ip" '' 'admin'
diff --git a/bin/v-change-user-package b/bin/v-change-user-package
index bb0b21d8..d0de98db 100755
--- a/bin/v-change-user-package
+++ b/bin/v-change-user-package
@@ -43,7 +43,7 @@ is_package_avalable() {
check_result $E_LIMIT "Package doesn't cover WEB_DOMAIN usage"
fi
fi
- if [ "$DNS_DOMAINS" ! = 'unlimited' ]; then
+ if [ "$DNS_DOMAINS" != 'unlimited' ]; then
if [ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ]; then
check_result $E_LIMIT "Package doesn't cover DNS_DOMAIN usage"
fi
diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl
index 67044d6d..36a15000 100755
--- a/bin/v-change-web-domain-backend-tpl
+++ b/bin/v-change-web-domain-backend-tpl
@@ -11,11 +11,9 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
template=$3
-restart="$4"
-
+restart=$4
# Includes
source $VESTA/func/main.sh
@@ -23,6 +21,10 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -143,13 +145,11 @@ fi
# Restarting web
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- $BIN/v-restart-web-backend
- check_result $? "Web backend restart failed" >/dev/null
-fi
+$BIN/v-restart-web-backend $restart
+check_result $? "Web backend restart failed" >/dev/null
# Logging
log_history "changed backend template for $domain to $template"
diff --git a/bin/v-change-web-domain-ftp-password b/bin/v-change-web-domain-ftp-password
index 1eabe0ef..c41fdde7 100755
--- a/bin/v-change-web-domain-ftp-password
+++ b/bin/v-change-web-domain-ftp-password
@@ -11,8 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ftp_user=$3
password=$4; HIDE=4
@@ -21,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-change-web-domain-ftp-path b/bin/v-change-web-domain-ftp-path
index 6ac0b7df..8cfefade 100755
--- a/bin/v-change-web-domain-ftp-path
+++ b/bin/v-change-web-domain-ftp-path
@@ -11,8 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ftp_user=$3
ftp_path=$4
@@ -21,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip
index b3e19432..05fde851 100755
--- a/bin/v-change-web-domain-ip
+++ b/bin/v-change-web-domain-ip
@@ -21,6 +21,10 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -44,12 +48,6 @@ is_ip_valid "$ip" "$user"
get_domain_values 'web'
old=$(get_real_ip $IP)
new=$ip
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-else
- domain_idn=$domain
-fi
-
# Replacing vhost
replace_web_config "$WEB_SYSTEM" "$TPL.tpl"
@@ -78,15 +76,11 @@ decrease_ip_value "$old"
update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$3"
# Restart web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "WEB restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "WEB restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "changed web domain $domain ip to $3"
diff --git a/bin/v-change-web-domain-name b/bin/v-change-web-domain-name
index 316c6a12..51215393 100755
--- a/bin/v-change-web-domain-name
+++ b/bin/v-change-web-domain-name
@@ -15,17 +15,16 @@ domain=$2
new_domain=$3
restart=$4
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
-
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl
index cb51169b..c2be52f1 100755
--- a/bin/v-change-web-domain-proxy-tpl
+++ b/bin/v-change-web-domain-proxy-tpl
@@ -11,21 +11,23 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
template=$3
default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\
exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm"
extentions=${4-$default_extentions}
restart="$5"
-
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -75,10 +77,8 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY' "$PROXY"
update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
# Restarting proxy
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "changed proxy template for $domain to $template"
diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert
index 67c1e0eb..444510c7 100755
--- a/bin/v-change-web-domain-sslcert
+++ b/bin/v-change-web-domain-sslcert
@@ -12,8 +12,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ssl_dir=$3
restart=$4
@@ -22,6 +21,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -71,15 +74,11 @@ fi
#----------------------------------------------------------#
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "changed ssl certificate for $domain"
diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome
index c5764629..f9768e32 100755
--- a/bin/v-change-web-domain-sslhome
+++ b/bin/v-change-web-domain-sslhome
@@ -7,8 +7,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ssl_home=$3
restart=$4
@@ -17,6 +16,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -67,15 +70,11 @@ fi
update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "changed ssl home for $domain to $ssl_home"
diff --git a/bin/v-change-web-domain-stats b/bin/v-change-web-domain-stats
index fcd661ff..afaa7fe7 100755
--- a/bin/v-change-web-domain-stats
+++ b/bin/v-change-web-domain-stats
@@ -12,8 +12,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
type=$3
# Includes
@@ -21,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl
index 93635230..ef88e7a4 100755
--- a/bin/v-change-web-domain-tpl
+++ b/bin/v-change-web-domain-tpl
@@ -12,8 +12,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
template=$3
restart=$4
@@ -23,6 +22,10 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -68,10 +71,8 @@ fi
update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template"
# Restarting web
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
-fi
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
# Logging
log_history "changed web domain template for $domain to $template" '' 'admin'
diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain
index 5281a10a..c82b0c00 100755
--- a/bin/v-delete-dns-domain
+++ b/bin/v-delete-dns-domain
@@ -72,10 +72,8 @@ decrease_user_value "$user" '$U_DNS_DOMAINS'
decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns $restart
- check_result $? "Bind restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "Bind restart failed" >/dev/null
# Logging
log_history "deleted dns domain $domain"
diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains
index f74b4e14..a98b3140 100755
--- a/bin/v-delete-dns-domains
+++ b/bin/v-delete-dns-domains
@@ -43,10 +43,8 @@ done
#----------------------------------------------------------#
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "Bind restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "Bind restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-delete-dns-domains-src b/bin/v-delete-dns-domains-src
index 6f1958c6..85a6c147 100755
--- a/bin/v-delete-dns-domains-src
+++ b/bin/v-delete-dns-domains-src
@@ -44,10 +44,8 @@ done
#----------------------------------------------------------#
# Restart named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "Bind restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "Bind restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-delete-dns-on-web-alias b/bin/v-delete-dns-on-web-alias
index 74cc49f4..b74fc900 100755
--- a/bin/v-delete-dns-on-web-alias
+++ b/bin/v-delete-dns-on-web-alias
@@ -11,11 +11,10 @@
# Argument definition
user=$1
-domain=$(echo $2 | sed -e 's/\.*$//g' -e 's/^\.*//g')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
dom_alias=$(idn -t --quiet -u "$3" )
-dom_alias=$(echo $dom_alias | sed -e 's/\.*$//g' -e 's/^\.*//g')
-dom_alias=$(echo $dom_alias | tr '[:upper:]' '[:lower:]')
+dom_alias=$(echo $dom_alias |sed -e 's/\.*$//g' -e 's/^\.*//g')
+dom_alias=$(echo $dom_alias |tr '[:upper:]' '[:lower:]')
dom_alias_idn=$(idn -t --quiet -a "$dom_alias" )
restart="$4"
@@ -24,6 +23,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -63,7 +66,7 @@ else
fi
if [ ! -z "$rec" ]; then
eval "$rec"
- $BIN/v-delete-dns-record $user "$root" "$ID"
+ $BIN/v-delete-dns-record $user "$root" "$ID" $restart
fi
fi
fi
diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record
index 1c713d01..16bb2b46 100755
--- a/bin/v-delete-dns-record
+++ b/bin/v-delete-dns-record
@@ -11,8 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
id=$3
restart=$4
@@ -21,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -70,10 +73,8 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
decrease_user_value "$user" '$U_DNS_RECORDS'
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "Bind restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "Bind restart failed" >/dev/null
# Logging
log_history "deleted dns record $id on $domain"
diff --git a/bin/v-delete-domain b/bin/v-delete-domain
index a315d3a8..b6294679 100755
--- a/bin/v-delete-domain
+++ b/bin/v-delete-domain
@@ -69,16 +69,14 @@ if [ -z "$domain_found" ]; then
fi
# Restarting services
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "can't restart web" > /dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "can't restart proxy" > /dev/null
- fi
- $BIN/v-restart-dns
- check_result $? "can't restart dns" > /dev/null
-fi
+$BIN/v-restart-web $restart
+check_result $? "can't restart web" > /dev/null
+
+$BIN/v-restart-proxy $restart
+check_result $? "can't restart proxy" > /dev/null
+
+$BIN/v-restart-dns $restart
+check_result $? "can't restart dns" > /dev/null
#----------------------------------------------------------#
diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account
index a16829a6..ffc22114 100755
--- a/bin/v-delete-mail-account
+++ b/bin/v-delete-mail-account
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
# Includes
@@ -21,6 +19,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias
index 470fa859..230d0113 100755
--- a/bin/v-delete-mail-account-alias
+++ b/bin/v-delete-mail-account-alias
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
malias=$4
@@ -22,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply
index 67e79d89..2169190a 100755
--- a/bin/v-delete-mail-account-autoreply
+++ b/bin/v-delete-mail-account-autoreply
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
malias=$4
@@ -22,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward
index ff289e35..c690e9a4 100755
--- a/bin/v-delete-mail-account-forward
+++ b/bin/v-delete-mail-account-forward
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
forward=$4
@@ -22,6 +20,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -38,9 +40,7 @@ is_object_valid "mail/$domain" 'ACCOUNT' "$account"
is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
fwd=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD')
if [ -z "$(echo $fwd | grep -w $forward)" ]; then
- echo "Error: forward $forward doesn't exist"
- log_event "$E_NOTEXIST $ARGUMENTS"
- exit $E_NOTEXIST
+ check_result $E_NOTEXIST "forward $forward doesn't exist"
fi
diff --git a/bin/v-delete-mail-account-fwd-only b/bin/v-delete-mail-account-fwd-only
index dbc9a727..f5147f9b 100755
--- a/bin/v-delete-mail-account-fwd-only
+++ b/bin/v-delete-mail-account-fwd-only
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
# Includes
@@ -21,6 +19,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain
index 4833e656..f128d752 100755
--- a/bin/v-delete-mail-domain
+++ b/bin/v-delete-mail-domain
@@ -12,14 +12,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-mail-domain-antispam b/bin/v-delete-mail-domain-antispam
index 8ba2cfd0..35568434 100755
--- a/bin/v-delete-mail-domain-antispam
+++ b/bin/v-delete-mail-domain-antispam
@@ -11,15 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-mail-domain-antivirus b/bin/v-delete-mail-domain-antivirus
index baea4575..e176a755 100755
--- a/bin/v-delete-mail-domain-antivirus
+++ b/bin/v-delete-mail-domain-antivirus
@@ -11,15 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall
index 549c5523..f5a7ddf8 100755
--- a/bin/v-delete-mail-domain-catchall
+++ b/bin/v-delete-mail-domain-catchall
@@ -11,15 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain
index 878ea472..6ef7280b 100755
--- a/bin/v-delete-web-domain
+++ b/bin/v-delete-web-domain
@@ -23,6 +23,10 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -48,10 +52,6 @@ fi
# Parsing domain values
get_domain_values 'web'
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
local_ip=$(get_real_ip $IP)
# Deleting domain from web.conf
@@ -121,16 +121,12 @@ if [ ! -z "$ALIAS" ]; then
fi
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- # Restartinh proxy server
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+# Restartinh proxy server
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "deleted web domain $domain"
diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias
index 2a218061..45bef00b 100755
--- a/bin/v-delete-web-domain-alias
+++ b/bin/v-delete-web-domain-alias
@@ -81,15 +81,11 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ALIAS' "$ALIAS"
decrease_user_value "$user" '$U_WEB_ALIASES'
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "deleted alias $dom_alias on $domain"
diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend
index 4b9b24ba..5b548096 100755
--- a/bin/v-delete-web-domain-backend
+++ b/bin/v-delete-web-domain-backend
@@ -11,14 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -66,10 +69,8 @@ rm -f $pool/$backend_type.conf
#----------------------------------------------------------#
# Restarting backend server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web-backend
- check_result $? "Backend restart failed" >/dev/null
-fi
+$BIN/v-restart-web-backend $restart
+check_result $? "Backend restart failed" >/dev/null
# Logging
log_history "deleting backend support for $domain"
diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp
index b53440c4..08130584 100755
--- a/bin/v-delete-web-domain-ftp
+++ b/bin/v-delete-web-domain-ftp
@@ -11,8 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ftp_user=$3
# Includes
@@ -20,6 +19,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy
index 558f67f4..215506cb 100755
--- a/bin/v-delete-web-domain-proxy
+++ b/bin/v-delete-web-domain-proxy
@@ -11,8 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
restart=$3
# Includes
@@ -20,6 +19,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -58,10 +61,8 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY' ''
update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' ''
# Restart proxy server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "disabled proxy support for $domain"
diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl
index d5f0e35b..131feb23 100755
--- a/bin/v-delete-web-domain-ssl
+++ b/bin/v-delete-web-domain-ssl
@@ -11,8 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
restart=$3
# Includes
@@ -20,6 +19,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -71,15 +74,11 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' 'no'
decrease_user_value "$user" '$U_WEB_SSL'
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "disabled ssl support for $domain"
diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats
index 34c35f56..00566999 100755
--- a/bin/v-delete-web-domain-stats
+++ b/bin/v-delete-web-domain-stats
@@ -12,14 +12,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains
index 1406abb9..8822ab0a 100755
--- a/bin/v-delete-web-domains
+++ b/bin/v-delete-web-domains
@@ -43,15 +43,11 @@ done
#----------------------------------------------------------#
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-get-dns-domain-value b/bin/v-get-dns-domain-value
index 1786e900..ec77df2f 100755
--- a/bin/v-get-dns-domain-value
+++ b/bin/v-get-dns-domain-value
@@ -11,13 +11,16 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
key=$(echo "$3"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/")
# Includes
source $VESTA/func/main.sh
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-get-mail-account-value b/bin/v-get-mail-account-value
index 556c61ce..f011875c 100755
--- a/bin/v-get-mail-account-value
+++ b/bin/v-get-mail-account-value
@@ -11,14 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
key=$(echo "$4"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/")
# Includes
source $VESTA/func/main.sh
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-get-mail-domain-value b/bin/v-get-mail-domain-value
index 616df282..e7ad584a 100755
--- a/bin/v-get-mail-domain-value
+++ b/bin/v-get-mail-domain-value
@@ -11,13 +11,16 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
key=$(echo "$3"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/")
# Includes
source $VESTA/func/main.sh
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain
index 0a83c205..b767b576 100755
--- a/bin/v-insert-dns-domain
+++ b/bin/v-insert-dns-domain
@@ -74,10 +74,8 @@ chmod 660 $USER_DATA/dns.conf
#----------------------------------------------------------#
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns $restart
- check_result $? "Bind restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "Bind restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-insert-dns-record b/bin/v-insert-dns-record
index 90205f61..1afdd520 100755
--- a/bin/v-insert-dns-record
+++ b/bin/v-insert-dns-record
@@ -45,10 +45,8 @@ echo "$data" >> $USER_DATA/dns/$domain.conf
#----------------------------------------------------------#
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns $restart
- check_result $? "Bind restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "Bind restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-insert-dns-records b/bin/v-insert-dns-records
index 3ce767f8..52c72c66 100755
--- a/bin/v-insert-dns-records
+++ b/bin/v-insert-dns-records
@@ -48,10 +48,8 @@ fi
#----------------------------------------------------------#
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "Bind restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "Bind restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs
index 5acc830d..40192b63 100755
--- a/bin/v-rebuild-cron-jobs
+++ b/bin/v-rebuild-cron-jobs
@@ -41,10 +41,8 @@ sync_cron_jobs
#----------------------------------------------------------#
# Restarting crond
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-cron
- check_result $? "Cron restart failed" >/dev/null
-fi
+$BIN/v-restart-cron $restart
+check_result $? "Cron restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain
index 2aa34f6f..53639268 100755
--- a/bin/v-rebuild-dns-domain
+++ b/bin/v-rebuild-dns-domain
@@ -82,10 +82,8 @@ update_user_value "$user" '$U_DNS_RECORDS' "$user_records"
update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns "$restart"
- check_result $? "Bind restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "Bind restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains
index 4bb537ab..0b03e819 100755
--- a/bin/v-rebuild-dns-domains
+++ b/bin/v-rebuild-dns-domains
@@ -83,10 +83,8 @@ update_user_value "$user" '$U_DNS_RECORDS' "$user_records"
update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
# Restarting named
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-dns
- check_result $? "Bind restart failed" >/dev/null
-fi
+$BIN/v-restart-dns $restart
+check_result $? "Bind restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains
index 5ba9ef48..fafcf602 100755
--- a/bin/v-rebuild-web-domains
+++ b/bin/v-rebuild-web-domains
@@ -75,15 +75,11 @@ done
$BIN/v-update-user-counters $user
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-restore-user b/bin/v-restore-user
index f2d4408c..fa93482e 100755
--- a/bin/v-restore-user
+++ b/bin/v-restore-user
@@ -517,6 +517,13 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
domains=$(echo "$backup_domains" |egrep -f $tmpdir/selected.txt)
fi
+ # Checking exim username for later chowning
+ exim_user="exim";
+ check_exim_username=$(grep -c '^Debian-exim:' /etc/passwd)
+ if [ "$check_exim_username" -eq 1 ]; then
+ exim_user="Debian-exim"
+ fi
+
# Restoring dns domain
for domain in $domains; do
echo -e "$(date "+%F %T") $domain" |tee -a $tmpdir/restore.log
@@ -579,6 +586,11 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
-exec chown -h $user:mail {} \;
fi
fi
+
+ # Chowning mail conf files to exim user
+ find $HOMEDIR/$user/conf/mail/$domain_idn -user root \
+ -exec chown $exim_user {} \;
+
done
fi
diff --git a/bin/v-suspend-cron-job b/bin/v-suspend-cron-job
index 499c0772..43074ef1 100755
--- a/bin/v-suspend-cron-job
+++ b/bin/v-suspend-cron-job
@@ -47,10 +47,8 @@ sync_cron_jobs
#----------------------------------------------------------#
# Restarting crond
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-cron
- check_result $? "Cron restart failed" >/dev/null
-fi
+$BIN/v-restart-cron $restart
+check_result $? "Cron restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-suspend-cron-jobs b/bin/v-suspend-cron-jobs
index 935347ad..8b3f4ad8 100755
--- a/bin/v-suspend-cron-jobs
+++ b/bin/v-suspend-cron-jobs
@@ -42,10 +42,8 @@ done
#----------------------------------------------------------#
# Restarting crond
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-cron
- check_result $? "Cron restart failed" >/dev/null
-fi
+$BIN/v-restart-cron $restart
+check_result $? "Cron restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain
index ebe45e3a..d016b786 100755
--- a/bin/v-suspend-dns-domain
+++ b/bin/v-suspend-dns-domain
@@ -11,14 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
restart="$3"
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record
index 0e9afa37..4de9ae40 100755
--- a/bin/v-suspend-dns-record
+++ b/bin/v-suspend-dns-record
@@ -11,20 +11,19 @@
# Argument definition
user=$1
-domain="$2"
+domain=$2
id=$3
-restart="$4"
-
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
+restart=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-suspend-domain b/bin/v-suspend-domain
index 6f017534..74e17f19 100755
--- a/bin/v-suspend-domain
+++ b/bin/v-suspend-domain
@@ -71,16 +71,14 @@ if [ -z "$domain_found" ]; then
fi
# Restarting services
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "can't restart web" > /dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "can't restart proxy" > /dev/null
- fi
- $BIN/v-restart-dns
- check_result $? "can't restart dns" > /dev/null
-fi
+$BIN/v-restart-web $restat
+check_result $? "can't restart web" > /dev/null
+
+$BIN/v-restart-proxy $restart
+check_result $? "can't restart proxy" > /dev/null
+
+$BIN/v-restart-dns $restart
+check_result $? "can't restart dns" > /dev/null
#----------------------------------------------------------#
diff --git a/bin/v-suspend-mail-account b/bin/v-suspend-mail-account
index ba11c8e0..803594eb 100755
--- a/bin/v-suspend-mail-account
+++ b/bin/v-suspend-mail-account
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
# Includes
@@ -21,6 +19,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-suspend-mail-accounts b/bin/v-suspend-mail-accounts
index a62069cf..bd282ca6 100755
--- a/bin/v-suspend-mail-accounts
+++ b/bin/v-suspend-mail-accounts
@@ -11,14 +11,15 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-suspend-mail-domain b/bin/v-suspend-mail-domain
index afdc1f3d..66fe8152 100755
--- a/bin/v-suspend-mail-domain
+++ b/bin/v-suspend-mail-domain
@@ -11,15 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-suspend-user b/bin/v-suspend-user
index 6d049056..6276ce5a 100755
--- a/bin/v-suspend-user
+++ b/bin/v-suspend-user
@@ -74,16 +74,14 @@ fi
#----------------------------------------------------------#
# Restarting system services
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- $BIN/v-restart-dns
- check_result $? "DNS restart failed" >/dev/null
+$BIN/v-restart-dns $restart
+check_result $? "DNS restart failed" >/dev/null
- $BIN/v-restart-cron
- check_result $? "Cron restart failed" >/dev/null
-fi
+$BIN/v-restart-cron $restart
+check_result $? "Cron restart failed" >/dev/null
# Changing suspend value
update_user_value "$user" '$SUSPENDED' 'yes'
diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain
index c3179604..15dbe9c4 100755
--- a/bin/v-suspend-web-domain
+++ b/bin/v-suspend-web-domain
@@ -13,8 +13,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
restart=$3
# Includes
@@ -23,6 +22,10 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -76,15 +79,11 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SUSPENDED' 'yes'
increase_user_value "$user" '$SUSPENDED_WEB'
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains
index be480390..de8b178d 100755
--- a/bin/v-suspend-web-domains
+++ b/bin/v-suspend-web-domains
@@ -43,15 +43,11 @@ done
#----------------------------------------------------------#
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-unsuspend-cron-job b/bin/v-unsuspend-cron-job
index 108ddf90..0e40a6ec 100755
--- a/bin/v-unsuspend-cron-job
+++ b/bin/v-unsuspend-cron-job
@@ -47,10 +47,8 @@ sync_cron_jobs
#----------------------------------------------------------#
# Restarting crond
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-cron
- check_result $? "Cron restart failed" >/dev/null
-fi
+$BIN/v-restart-cron $restart
+check_result $? "Cron restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-unsuspend-cron-jobs b/bin/v-unsuspend-cron-jobs
index bc4cfc4e..2f2d740e 100755
--- a/bin/v-unsuspend-cron-jobs
+++ b/bin/v-unsuspend-cron-jobs
@@ -42,10 +42,8 @@ done
#----------------------------------------------------------#
# Restarting crond
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-cron
- check_result $? "Cron restart failed" >/dev/null
-fi
+$BIN/v-restart-cron $restart
+check_result $? "Cron restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain
index 49a54091..e845b6a8 100755
--- a/bin/v-unsuspend-dns-domain
+++ b/bin/v-unsuspend-dns-domain
@@ -11,14 +11,16 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
-restart="$3"
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record
index 35b2d7b4..c84e7744 100755
--- a/bin/v-unsuspend-dns-record
+++ b/bin/v-unsuspend-dns-record
@@ -13,18 +13,17 @@
user=$1
domain=$2
id=$3
-restart="$4"
-
-domain_idn="$domain"
-if [[ "$domain" = *[![:ascii:]]* ]]; then
- domain_idn=$(idn -t --quiet -a $domain)
-fi
+restart=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-unsuspend-domain b/bin/v-unsuspend-domain
index 294b485c..a0a3b459 100755
--- a/bin/v-unsuspend-domain
+++ b/bin/v-unsuspend-domain
@@ -70,16 +70,14 @@ if [ -z "$domain_found" ]; then
fi
# Restarting services
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "can't restart web" > /dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "can't restart proxy" > /dev/null
- fi
- $BIN/v-restart-dns
- check_result $? "can't restart dns" > /dev/null
-fi
+$BIN/v-restart-web $restart
+check_result $? "can't restart web" > /dev/null
+
+$BIN/v-restart-proxy $restart
+check_result $? "can't restart proxy" > /dev/null
+
+$BIN/v-restart-dns $restart
+check_result $? "can't restart dns" > /dev/null
#----------------------------------------------------------#
diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account
index 0137f865..2e9a887f 100755
--- a/bin/v-unsuspend-mail-account
+++ b/bin/v-unsuspend-mail-account
@@ -11,9 +11,7 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
account=$3
# Includes
@@ -21,6 +19,10 @@ source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-unsuspend-mail-accounts b/bin/v-unsuspend-mail-accounts
index 5ad6285d..2c651b2c 100755
--- a/bin/v-unsuspend-mail-accounts
+++ b/bin/v-unsuspend-mail-accounts
@@ -11,14 +11,16 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain
index ad9df12e..9c688d6f 100755
--- a/bin/v-unsuspend-mail-domain
+++ b/bin/v-unsuspend-mail-domain
@@ -11,15 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user
index 1d3feecd..17c6683d 100755
--- a/bin/v-unsuspend-user
+++ b/bin/v-unsuspend-user
@@ -77,16 +77,14 @@ update_user_value "$user" '$SUSPENDED' 'no'
decrease_user_value 'admin' '$SUSPENDED_USERS'
# Restarting system services
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- $BIN/v-restart-dns
- check_result $? "DNS restart failed" >/dev/null
+$BIN/v-restart-dns $restart
+check_result $? "DNS restart failed" >/dev/null
- $BIN/v-restart-cron
- check_result $? "Cron restart failed" >/dev/null
-fi
+$BIN/v-restart-cron $restart
+check_result $? "Cron restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain
index 3b21248e..b47b67f4 100755
--- a/bin/v-unsuspend-web-domain
+++ b/bin/v-unsuspend-web-domain
@@ -11,9 +11,8 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
-restart="$3"
+domain=$2
+restart=$3
# Includes
source $VESTA/func/main.sh
@@ -21,6 +20,10 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -74,15 +77,11 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SUSPENDED' 'no'
decrease_user_value "$user" '$SUSPENDED_WEB'
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains
index b9f4d1e4..2d2676d0 100755
--- a/bin/v-unsuspend-web-domains
+++ b/bin/v-unsuspend-web-domains
@@ -44,15 +44,11 @@ done
#----------------------------------------------------------#
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-update-mail-domain-disk b/bin/v-update-mail-domain-disk
index 68d58a61..a1b6b3f4 100755
--- a/bin/v-update-mail-domain-disk
+++ b/bin/v-update-mail-domain-disk
@@ -11,14 +11,16 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain=$(echo $domain | tr '[:upper:]' '[:lower:]')
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip
index c2e6b2be..c7d4c982 100755
--- a/bin/v-update-sys-ip
+++ b/bin/v-update-sys-ip
@@ -100,7 +100,7 @@ for ip in $ip_list; do
check_ifconfig=$(/sbin/ifconfig |grep "$ip")
if [ ! -e "$VESTA/data/ips/$ip" ] && [ ! -z "$check_ifconfig" ]; then
interface=$(/sbin/ip addr |grep $ip |awk '{print $NF}')
- interface=$(echo $interface |cut -f 1 -d :)
+ interface=$(echo "$interface" |cut -f 1 -d : |head -n 1)
netmask=$(/sbin/ip addr |grep $ip |cut -f 2 -d / |cut -f 1 -d \ )
netmask=$(convert_cidr $netmask)
$BIN/v-add-sys-ip $ip $netmask $interface
diff --git a/bin/v-update-web-domain-disk b/bin/v-update-web-domain-disk
index 5317b3f0..252fac3c 100755
--- a/bin/v-update-web-domain-disk
+++ b/bin/v-update-web-domain-disk
@@ -11,14 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-update-web-domain-ssl b/bin/v-update-web-domain-ssl
index 6dffc281..8a3381a9 100755
--- a/bin/v-update-web-domain-ssl
+++ b/bin/v-update-web-domain-ssl
@@ -14,10 +14,9 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
ssl_dir=$3
-restart="$4"
+restart=$4
# Includes
source $VESTA/func/main.sh
@@ -25,6 +24,10 @@ source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
@@ -74,15 +77,11 @@ fi
#----------------------------------------------------------#
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "Web restart failed" >/dev/null
+$BIN/v-restart-web $restart
+check_result $? "Web restart failed" >/dev/null
- if [ ! -z "$PROXY_SYSTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "Proxy restart failed" >/dev/null
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "Proxy restart failed" >/dev/null
# Logging
log_history "update ssl certificate for $domain"
diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat
index 56dfc93a..24eba8cf 100755
--- a/bin/v-update-web-domain-stat
+++ b/bin/v-update-web-domain-stat
@@ -11,14 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-update-web-domain-traff b/bin/v-update-web-domain-traff
index fda546cc..299bafd2 100755
--- a/bin/v-update-web-domain-traff
+++ b/bin/v-update-web-domain-traff
@@ -11,14 +11,17 @@
# Argument definition
user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
+# Additional argument formatting
+format_domain
+format_domain_idn
+
#----------------------------------------------------------#
# Verifications #
diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates
index a526e0d4..3196c8b4 100755
--- a/bin/v-update-web-templates
+++ b/bin/v-update-web-templates
@@ -65,19 +65,13 @@ done
#----------------------------------------------------------#
# Restarting web server
-if [ "$restart" != 'no' ]; then
- $BIN/v-restart-web
- check_result $? "restart" >/dev/null 2>&1
+$BIN/v-restart-web $restart
+check_result $? "restart" >/dev/null 2>&1
- if [ ! -z "$PROXY_SYSTTEM" ]; then
- $BIN/v-restart-proxy
- check_result $? "restart" >/dev/null 2>&1
- fi
+$BIN/v-restart-proxy $restart
+check_result $? "restart" >/dev/null 2>&1
- if [ ! -z "$WEB_BACKEND" ]; then
- $BIN/v-restart-proxy
- check_result $? "restart" >/dev/null 2>&1
- fi
-fi
+$BIN/v-restart-proxy $restart
+check_result $? "restart" >/dev/null 2>&1
exit
diff --git a/func/main.sh b/func/main.sh
index 99fb90b2..b1761fd8 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -843,3 +843,37 @@ is_format_valid() {
fi
done
}
+
+# Domain argument formatting
+format_domain() {
+ if [[ "$domain" = *[![:ascii:]]* ]]; then
+ if [[ "$domain" =~ [[:upper:]] ]]; then
+ domain=$(echo "$domain" |sed 's/[[:upper:]].*/\L&/')
+ fi
+ else
+ if [[ "$domain" =~ [[:upper:]] ]]; then
+ domain=$(echo "$domain" |tr '[:upper:]' '[:lower:]')
+ fi
+ fi
+ if [[ "$domain" =~ ^www\..* ]]; then
+ domain=$(echo "$domain" |sed -e "s/^www.//")
+ fi
+ if [[ "$domain" =~ .*\.$ ]]; then
+ domain=$(echo "$domain" |sed -e "s/\.$//")
+ fi
+}
+
+format_domain_idn() {
+ if [[ "$domain_idn" = *[![:ascii:]]* ]]; then
+ domain_idn=$(idn -t --quiet -a $domain_idn)
+ fi
+}
+
+format_aliases() {
+ if [ ! -z "$aliases" ] && [ "$aliases" != 'none' ]; then
+ aliases=$(echo $aliases |tr '[:upper:]' '[:lower:]' |tr ',' '\n')
+ aliases=$(echo "$aliases" |sed -e "s/\.$//" |sort -u)
+ aliases=$(echo "$aliases" |grep -v www.$domain |sed -e "/^$/d")
+ aliases=$(echo "$aliases" |tr '\n' ',' |sed -e "s/,$//")
+ fi
+}
diff --git a/install/debian/8/roundcube/vesta.php b/install/debian/8/roundcube/vesta.php
index 3261f656..b3dd167f 100644
--- a/install/debian/8/roundcube/vesta.php
+++ b/install/debian/8/roundcube/vesta.php
@@ -46,6 +46,7 @@ class rcube_vesta_password {
$context = stream_context_create();
$result = stream_context_set_option($context, 'ssl', 'verify_peer', false);
+ $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
$result = stream_context_set_option($context, 'ssl', 'verify_host', false);
$result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
diff --git a/install/rhel/6/roundcube/vesta.php b/install/rhel/6/roundcube/vesta.php
index 4a8783e6..fee26078 100644
--- a/install/rhel/6/roundcube/vesta.php
+++ b/install/rhel/6/roundcube/vesta.php
@@ -48,6 +48,7 @@ class rcube_vesta_password
$context = stream_context_create();
$result = stream_context_set_option($context, 'ssl', 'verify_peer', false);
+ result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
$result = stream_context_set_option($context, 'ssl', 'verify_host', false);
$result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
diff --git a/install/rhel/7/roundcube/vesta.php b/install/rhel/7/roundcube/vesta.php
index 4a8783e6..1e9523a5 100644
--- a/install/rhel/7/roundcube/vesta.php
+++ b/install/rhel/7/roundcube/vesta.php
@@ -48,6 +48,7 @@ class rcube_vesta_password
$context = stream_context_create();
$result = stream_context_set_option($context, 'ssl', 'verify_peer', false);
+ $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
$result = stream_context_set_option($context, 'ssl', 'verify_host', false);
$result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
diff --git a/install/ubuntu/16.04/roundcube/vesta.php b/install/ubuntu/16.04/roundcube/vesta.php
index 8fb202a4..99e1d4bc 100644
--- a/install/ubuntu/16.04/roundcube/vesta.php
+++ b/install/ubuntu/16.04/roundcube/vesta.php
@@ -40,7 +40,16 @@
$send .= PHP_EOL;
$send .= $postdata . PHP_EOL . PHP_EOL;
- $fp = fsockopen('ssl://' . $vesta_host, $vesta_port);
+ //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port);
+ $errno = "";
+ $errstr = "";
+ $context = stream_context_create();
+ $result = stream_context_set_option($context, 'ssl', 'verify_peer', false);
+ $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
+ $result = stream_context_set_option($context, 'ssl', 'verify_host', false);
+ $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
+
+ $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context);
fputs($fp, $send);
$result = fread($fp, 2048);
fclose($fp);
diff --git a/install/ubuntu/16.10/clamav/clamd.conf b/install/ubuntu/16.10/clamav/clamd.conf
index ea982697..4e04356e 100644
--- a/install/ubuntu/16.10/clamav/clamd.conf
+++ b/install/ubuntu/16.10/clamav/clamd.conf
@@ -8,7 +8,7 @@ LocalSocketMode 666
# TemporaryDirectory is not set to its default /tmp here to make overriding
# the default with environment variables TMPDIR/TMP/TEMP possible
User clamav
-AllowSupplementaryGroups true
+# AllowSupplementaryGroups true
ScanMail true
ScanArchive true
ArchiveBlockEncrypted false
diff --git a/install/ubuntu/16.10/roundcube/vesta.php b/install/ubuntu/16.10/roundcube/vesta.php
index 8fb202a4..99e1d4bc 100644
--- a/install/ubuntu/16.10/roundcube/vesta.php
+++ b/install/ubuntu/16.10/roundcube/vesta.php
@@ -40,7 +40,16 @@
$send .= PHP_EOL;
$send .= $postdata . PHP_EOL . PHP_EOL;
- $fp = fsockopen('ssl://' . $vesta_host, $vesta_port);
+ //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port);
+ $errno = "";
+ $errstr = "";
+ $context = stream_context_create();
+ $result = stream_context_set_option($context, 'ssl', 'verify_peer', false);
+ $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
+ $result = stream_context_set_option($context, 'ssl', 'verify_host', false);
+ $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
+
+ $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context);
fputs($fp, $send);
$result = fread($fp, 2048);
fclose($fp);
diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index 6e334d28..19666573 100755
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -1081,6 +1081,9 @@ if [ "$spamd" = 'yes' ]; then
sed -i "s/ENABLED=0/ENABLED=1/" /etc/default/spamassassin
service spamassassin start
check_result $? "spamassassin start failed"
+ if [[ $(systemctl list-unit-files | grep spamassassin) =~ "disabled" ]]; then
+ systemctl enable spamassassin
+ fi
fi
diff --git a/web/add/web/index.php b/web/add/web/index.php
index c0d6a9fa..486b5e12 100644
--- a/web/add/web/index.php
+++ b/web/add/web/index.php
@@ -126,7 +126,7 @@ if (!empty($_POST['ok'])) {
// Add DNS domain
if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) {
- exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_public_ip, $output, $return_var);
+ exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_public_ip." '' '' '' '' '' '' '' '' 'no'", $output, $return_var);
check_return_code($return_var,$output);
unset($output);
}
diff --git a/web/inc/i18n/bg.php b/web/inc/i18n/bg.php
index cb92158e..b03cf2df 100644
--- a/web/inc/i18n/bg.php
+++ b/web/inc/i18n/bg.php
@@ -1,733 +1,731 @@
'Пакет',
+ 'Packages' => 'Пакети',
'IP' => 'IP',
'Graphs' => 'Графики',
'Statistics' => 'Статистика',
'Log' => 'Логове',
'Server' => 'Сървър',
'Services' => 'Услуги',
- 'Firewall' => 'Firewall',
- 'Updates' => 'Обновяване',
+ 'Firewall' => 'Защитна стена',
+ 'Updates' => 'Обновления',
'Log in' => 'Вход',
'Log out' => 'Изход',
- 'USER' => 'Клиенти',
- 'WEB' => 'WEB',
+ 'USER' => 'ПОТРЕБИТЕЛ',
+ 'WEB' => 'УЕБ',
'DNS' => 'DNS',
- 'MAIL' => 'Мейл',
- 'DB' => 'Бази Данни',
+ 'MAIL' => 'ПОЩА',
+ 'DB' => 'БАЗА ДАННИ',
'CRON' => 'CRON',
- 'BACKUP' => 'Архив',
+ 'BACKUP' => 'РЕЗЕРВНО КОПИЕ',
- 'LOGIN' => 'Вход',
- 'RESET PASSWORD' => 'Забравена парола',
- 'SEARCH' => 'Търси',
- 'PACKAGE' => 'Пакет',
+ 'LOGIN' => 'ВХОД',
+ 'RESET PASSWORD' => 'ЗАБРАВЕНА ПАРОЛА',
+ 'SEARCH' => 'ТЪРСЕНЕ',
+ 'PACKAGE' => 'ПАКЕТ',
'RRD' => 'RRD',
- 'STATS' => 'Статистика',
- 'LOG' => 'Логове',
- 'UPDATES' => 'Обновяване',
- 'FIREWALL' => 'FIREWALL',
- 'SERVER' => 'Сървър',
- 'MEMORY' => 'Памет',
- 'DISK' => 'Диск',
- 'NETWORK' => 'Мрежа',
- 'Web Log Manager' => 'Web Log Manager',
-
- 'no notifications' => 'no notifications',
+ 'STATS' => 'СТАТИСТИКА',
+ 'LOG' => 'ЛОГОВЕ',
+ 'UPDATES' => 'ОБНОВЛЕНИЯ',
+ 'FIREWALL' => 'ЗАЩИТНА СТЕНА',
+ 'SERVER' => 'СЪРВЪР',
+ 'MEMORY' => 'ПАМЕТ',
+ 'DISK' => 'ДИСК',
+ 'NETWORK' => 'МРЕЖА',
+ 'Web Log Manager' => 'МЕНИДЖЪР НА УЕБ ЛОГОВЕ',
'Add User' => 'Добави потребител',
'Add Domain' => 'Добави домейн',
- 'Add Web Domain' => 'Добави домейн',
- 'Add DNS Domain' => 'Добави DNS',
+ 'Add Web Domain' => 'Добави уеб домейн',
+ 'Add DNS Domain' => 'Добави DNS домейн',
'Add DNS Record' => 'Добави DNS запис',
- 'Add Mail Domain' => 'Добави мейл',
- 'Add Mail Account' => 'Добави мейл адрес',
- 'Add Database' => 'Добави база',
- 'Add Cron Job' => 'Добави задача',
- 'Create Backup' => 'Направи архив',
- 'Configure' => 'Конфигурация',
- 'Restore All' => 'Възстанови всички',
+ 'Add Mail Domain' => 'Добави пощенски домейн',
+ 'Add Mail Account' => 'Добави пощенски акаунт',
+ 'Add Database' => 'Добави база данни',
+ 'Add Cron Job' => 'Добави Cron Job',
+ 'Create Backup' => 'Създай резервно копие',
+ 'Configure' => 'Конфигурирай',
+ 'Restore All' => 'Възобнови всичко',
'Add Package' => 'Добави пакет',
- 'Add IP' => 'Добави IP',
+ 'Add IP' => 'Добави IP адрес',
'Add Rule' => 'Добави правило',
- 'Ban IP Address' => 'Бан IP Address',
- 'Search' => 'Търси',
- 'Add one more FTP Account' => 'Добави FTP потребител',
- 'Overall Statistics' => 'Статистика',
- 'Daily' => 'Дневно',
- 'Weekly' => 'Седмица',
- 'Monthly' => 'Месец',
- 'Yearly' => 'Година',
+ 'Ban IP Address' => 'Блокирай IP адрес',
+ 'Search' => 'Търсене',
+ 'Add one more FTP Account' => 'Добави допълнителен FTP акаунт',
+ 'Overall Statistics' => 'Обща статистика',
+ 'Daily' => 'Всеки ден',
+ 'Weekly' => 'Всяка седмица',
+ 'Monthly' => 'Всеки месец',
+ 'Yearly' => 'Всяка година',
'Add' => 'Добави',
'Back' => 'Назад',
'Save' => 'Запази',
- 'Submit' => 'Изпрати',
+ 'Submit' => 'Вложи',
- 'toggle all' => 'Избери всички',
- 'apply to selected' => 'изпълни маркираните',
- 'rebuild' => 'поправи',
- 'rebuild web' => 'поправи web',
- 'rebuild dns' => 'поправи dns',
- 'rebuild mail' => 'поправи mail',
- 'rebuild db' => 'поправи db',
- 'rebuild cron' => 'поправи cron',
- 'update counters' => 'оибнови брочи',
- 'suspend' => 'Забрани',
- 'unsuspend' => 'Разреши',
- 'delete' => 'изтриване',
- 'show per user' => 'покажи за всеки',
- 'login as' => 'Влез като',
- 'logout' => 'Изход',
- 'edit' => 'Редакция',
- 'open webstats' => 'отвори статистика',
- 'view logs' => 'виж логовете',
- 'list records' => 'list %s records',
- 'add record' => 'нов запис',
- 'list accounts' => 'list %s accounts',
- 'add account' => 'add account',
- 'open webmail' => 'open webmail',
- 'list fail2ban' => 'list fail2ban',
- 'open %s' => 'open %s',
- 'download' => 'сваляне',
- 'restore' => 'възстанови',
- 'configure restore settings' => 'configure restore settings',
+ 'toggle all' => 'избери всичко',
+ 'apply to selected' => 'приложи за избраните',
+ 'rebuild' => 'възстанови',
+ 'rebuild web' => 'възстанови уеб',
+ 'rebuild dns' => 'възстанови dns',
+ 'rebuild mail' => 'възстанови поща',
+ 'rebuild db' => 'възстанови база данни',
+ 'rebuild cron' => 'възстанови cron',
+ 'update counters' => 'обнови броячите',
+ 'suspend' => 'спри',
+ 'unsuspend' => 'активирай',
+ 'delete' => 'изтрий',
+ 'show per user' => 'покажи за потребителя',
+ 'login as' => 'влез като',
+ 'logout' => 'излез',
+ 'edit' => 'редактирай',
+ 'open webstats' => 'отвори уеб статистика',
+ 'view logs' => 'прегледай логове',
+ 'list records' => 'покажи списък с %s записи',
+ 'add record' => 'добави запис',
+ 'list accounts' => 'покажи списък с %s акаунта',
+ 'add account' => 'добави акаунт',
+ 'open webmail' => 'oтвори уеб поща',
+ 'list fail2ban' => 'покажи fail2ban списък',
+ 'open %s' => 'отвори %s',
+ 'download' => 'изтегли',
+ 'restore' => 'възобнови',
+ 'configure restore settings' => 'конфигурирай настройките за възобновяване',
'stop' => 'стоп',
'start' => 'старт',
'restart' => 'рестарт',
'update' => 'обнови',
- 'generate' => 'generate',
- 'Generate CSR' => 'Generate CSR',
- 'reread IP' => 'reread IP',
- 'enable autoupdate' => 'enable autoupdate',
- 'disable autoupdate' => 'disable autoupdate',
- 'turn on notifications' => 'turn on notifications',
- 'turn off notifications' => 'turn off notifications',
- 'configure' => 'configure',
+ 'generate' => 'генерирай',
+ 'Generate CSR' => 'Генерирай CSR',
+ 'reread IP' => 'зареди наново IP адреса',
+ 'enable autoupdate' => 'позволи автоматичното обновяване',
+ 'disable autoupdate' => 'забрани автоматичното обновяване',
+ 'turn on notifications' => 'включи известията',
+ 'turn off notifications' => 'изключи известията',
- 'Adding User' => 'Adding User',
- 'Editing User' => 'Editing User',
- 'Adding Domain' => 'Adding Domain',
- 'Editing Domain' => 'Editing Domain',
- 'Adding DNS Domain' => 'Adding DNS Domain',
- 'Editing DNS Domain' => 'Editing DNS Domain',
- 'Adding DNS Record' => 'Adding DNS Record',
- 'Editing DNS Record' => 'Editing DNS Record',
- 'Adding Mail Domain' => 'Adding Mail Domain',
- 'Editing Mail Domain' => 'Editing Mail Domain',
- 'Adding Mail Account' => 'Adding Mail Account',
- 'Editing Mail Account' => 'Editing Mail Account',
- 'Adding database' => 'Adding database',
- 'Editing Cron Job' => 'Editing Cron Job',
- 'Adding Cron Job' => 'Adding Cron Job',
- 'Editing Database' => 'Editing Database',
- 'Adding Package' => 'Adding Package',
- 'Editing Package' => 'Editing Package',
- 'Adding IP address' => 'Adding IP address',
- 'Editing IP Address' => 'Editing IP Address',
- 'Editing Backup Exclusions' => 'Editing Backup Exclusions',
- 'Generating CSR' => 'Generating CSR',
- 'Listing' => 'Listing',
- 'Search Results' => 'Search Results',
- 'Adding Firewall Rule' => 'Adding Firewall Rule',
- 'Editing Firewall Rule' => 'Editing Firewall Rule',
- 'Adding IP Address to Banlist' => 'Adding IP Address to Banlist',
+ 'Adding User' => 'Добавяне на потребител',
+ 'Editing User' => 'Редактиране на потребител',
+ 'Adding Domain' => 'Добавяне на домейн',
+ 'Editing Domain' => 'Редактиране на домейн',
+ 'Adding DNS Domain' => 'Добавяне на DNS домейн',
+ 'Editing DNS Domain' => 'Редактиране на DNS домейн',
+ 'Adding DNS Record' => 'Добавяне на DNS запис',
+ 'Editing DNS Record' => 'Редактиране на DNS запис',
+ 'Adding Mail Domain' => 'Добавяне на пощенски домейн',
+ 'Editing Mail Domain' => 'Редактиране на пощенски домейн',
+ 'Adding Mail Account' => 'Добавяне на пощенски акаунт',
+ 'Editing Mail Account' => 'Редактиране на пощенски акаунт',
+ 'Adding database' => 'Добавяне на база данни',
+ 'Editing Cron Job' => 'Добавяне на Cron Job',
+ 'Adding Cron Job' => 'Редактиране на Cron Job',
+ 'Editing Database' => 'Редактиране на база данни',
+ 'Adding Package' => 'Добавяне на пакет',
+ 'Editing Package' => 'Редактиране на пакет',
+ 'Adding IP address' => 'Добавяне на IP адрес',
+ 'Editing IP Address' => 'Редактиране на IP адрес',
+ 'Editing Backup Exclusions' => 'Редактиране на изключения от резервно копие',
+ 'Generating CSR' => 'Генериране на CSR',
+ 'Listing' => 'Показване на списък',
+ 'Search Results' => 'Търси резултати',
+ 'Adding Firewall Rule' => 'Добавяне на правило за защитната стена',
+ 'Editing Firewall Rule' => 'Редактиране на правилото за защитната стена',
+ 'Adding IP Address to Banlist' => 'Добавяне на IP адрес към черния списък',
+ 'active' => 'активен',
+ 'spnd' => 'деактивиран',
+ 'suspended' => 'деактивиран',
+ 'running' => 'работещ',
+ 'stopped' => 'спрян',
+ 'outdated' => 'неактуален',
+ 'updated' => 'актуален',
- 'active' => 'active',
- 'spnd' => 'suspended',
- 'suspended' => 'suspended',
- 'running' => 'running',
- 'stopped' => 'stopped',
- 'outdated' => 'outdated',
- 'updated' => 'updated',
-
- 'yes' => 'yes',
- 'no' => 'no',
- 'none' => 'none',
+ 'yes' => 'да',
+ 'no' => 'не',
+ 'none' => 'няма',
'pb' => 'pb',
'tb' => 'tb',
'gb' => 'gb',
'mb' => 'mb',
- 'minute' => 'minute',
- 'hour' => 'hour',
- 'day' => 'day',
- 'days' => 'days',
- 'hours' => 'hours',
- 'minutes' => 'minutes',
- 'month' => 'month',
- 'package' => 'package',
- 'Bandwidth' => 'Bandwidth',
- 'Disk' => 'Disk',
- 'Web' => 'Web',
- 'Mail' => 'Mail',
- 'Databases' => 'Databases',
- 'User Directories' => 'User Directories',
- 'Template' => 'Template',
- 'Web Template' => 'Web Template',
- 'Backend Template' => 'Backend Template',
- 'Proxy Template' =>'Proxy Template',
- 'DNS Template' => 'DNS Template',
- 'Web Domains' => 'Web Domains',
- 'SSL Domains' => 'SSL Domains',
- 'Web Aliases' => 'Web Aliases',
- 'per domain' => 'per domain',
- 'DNS Domains' => 'DNS Domains',
- 'DNS domains' => 'DNS domains',
- 'DNS records' => 'DNS records',
- 'Name Servers' => 'Name Servers',
- 'Mail Domains' => 'Mail Domains',
- 'Mail Accounts' => 'Mail Accounts',
+ 'minute' => 'минута',
+ 'hour' => 'час',
+ 'day' => 'ден',
+ 'days' => 'дни',
+ 'hours' => 'часове',
+ 'minutes' => 'минути',
+ 'month' => 'месец',
+ 'package' => 'пакет',
+ 'Bandwidth' => 'Трафик',
+ 'Disk' => 'Диск',
+ 'Web' => 'Уеб',
+ 'Mail' => 'Поща',
+ 'Databases' => 'Бази данни',
+ 'User Directories' => 'Потребителски директории',
+ 'Template' => 'Шаблон',
+ 'Web Template' => 'Уеб шаблон',
+ 'Backend Template' => 'Готов шаблон',
+ 'Proxy Template' =>'Прокси шаблон',
+ 'DNS Template' => 'DNS шаблон',
+ 'Web Domains' => 'Уеб домейни',
+ 'SSL Domains' => 'SSL домейни',
+ 'Web Aliases' => 'Уеб наименувания',
+ 'per domain' => 'на домейн',
+ 'DNS Domains' => 'DNS Домейни',
+ 'DNS domains' => 'DNS домейни',
+ 'DNS records' => 'DNS записи',
+ 'Name Servers' => 'Сървъри за имена',
+ 'Mail Domains' => 'Пощенски домейни',
+ 'Mail Accounts' => 'Пощенски акаунти',
'Cron Jobs' => 'Cron Jobs',
- 'SSH Access' => 'SSH Access',
- 'IP Address' => 'IP Address',
- 'IP Addresses' => 'IP Addresses',
- 'Backups' => 'Backups',
- 'Backup System' => 'Backup System',
- 'backup exclusions' => 'backup exclusions',
- 'template' => 'template',
- 'SSL Support' => 'SSL Support',
- 'SSL Home Directory' => 'SSL Home',
- 'Lets Encrypt Support' => 'Lets Encrypt Support',
+ 'SSH Access' => 'SSH достъп',
+ 'IP Address' => 'IP адрес',
+ 'IP Addresses' => 'IP адреси',
+ 'Backups' => 'Резервни копия',
+ 'Backup System' => 'Система за резервни копия',
+ 'backup exclusions' => 'Резервни копия - изключения',
+ 'template' => 'шаблон',
+ 'SSL Support' => 'SSL поддръжка',
+ 'SSL Home Directory' => 'SSL начало',
+ 'Lets Encrypt Support' => 'Lets Encrypt поддръжка',
'Lets Encrypt' => 'Lets Encrypt',
- 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes',
- 'Proxy Support' => 'Proxy Support',
- 'Proxy Extensions' => 'Proxy Extensions',
- 'Web Statistics' => 'Web Statistics',
- 'Additional FTP Account' => 'Additional FTP',
- 'Path' => 'Path',
+ 'Proxy Support' => 'Прокси поддръжка',
+ 'Proxy Extensions' => 'Прокси разширения',
+ 'Web Statistics' => 'Уеб статистики',
+ 'Additional FTP Account' => 'Допълнителни FTP акаунти',
+ 'Path' => 'Път',
'SOA' => 'SOA',
'TTL' => 'TTL',
- 'Expire' => 'Expire',
- 'Records' => 'Records',
- 'Serial' => 'Serial',
- 'Catchall email' => 'Catchall email',
- 'AntiVirus Support' => 'AntiVirus Support',
- 'AntiSpam Support' => 'AntiSpam Support',
- 'DKIM Support' => 'DKIM Support',
- 'Accounts' => 'Accounts',
- 'Quota' => 'Quota',
- 'Autoreply' => 'Autoreply',
- 'Forward to' => 'Forward to',
- 'Do not store forwarded mail' => 'Do not store forwarded mail',
- 'IMAP hostname' => 'IMAP hostname',
- 'IMAP port' => 'IMAP port',
- 'IMAP security' => 'IMAP security',
- 'IMAP auth method' => 'IMAP auth method',
- 'SMTP hostname' => 'SMTP hostname',
- 'SMTP port' => 'SMTP port',
- 'SMTP security' => 'SMTP security',
- 'SMTP auth method' => 'SMTP auth method',
+ 'Expire' => 'Изтича',
+ 'Records' => 'Записи',
+ 'Serial' => 'Сериен',
+ 'Catchall email' => 'Универсална поща',
+ 'AntiVirus Support' => 'Антивирусна поддръжка',
+ 'AntiSpam Support' => 'Антиспам поддръжка',
+ 'DKIM Support' => 'DKIM поддръжка',
+ 'Accounts' => 'Акаунти',
+ 'Quota' => 'Квота',
+ 'Autoreply' => 'Автоматичен отговор',
+ 'Forward to' => 'Препрати до',
+ 'Do not store forwarded mail' => 'Не съхранявай препратена поща',
+ 'IMAP hostname' => 'IMAP име на хост',
+ 'IMAP port' => 'IMAP порт',
+ 'IMAP security' => 'IMAP защита',
+ 'IMAP auth method' => 'IMAP идентификация',
+ 'SMTP hostname' => 'SMTP име на хост',
+ 'SMTP port' => 'SMTP порт',
+ 'SMTP security' => 'SMTP защита',
+ 'SMTP auth method' => 'SMTP идентификация',
'STARTTLS' => 'STARTTLS',
- 'Normal password' => 'Normal password',
- 'database' => 'database',
- 'User' => 'User',
- 'Host' => 'Host',
- 'Charset' => 'Charset',
- 'Min' => 'Min',
- 'Hour' => 'Hour',
- 'Day' => 'Day',
- 'Month' => 'Month',
- 'Day of week' => 'Day of week',
- 'local' => 'local',
- 'Run Time' => 'Run Time',
- 'Backup Size' => 'Backup Size',
+ 'Normal password' => 'Нормална парола',
+ 'database' => 'база данни',
+ 'User' => 'Потребител',
+ 'Host' => 'Хост',
+ 'Charset' => 'Символи',
+ 'Min' => 'Минути',
+ 'Hour' => 'Час',
+ 'Day' => 'Ден',
+ 'Month' => 'Месец',
+ 'Day of week' => 'Ден от седмицата',
+ 'local' => 'локално',
+ 'Run Time' => 'Време на изпълнение',
+ 'Backup Size' => 'Размер на резервното копие',
'SYS' => 'SYS',
- 'Domains' => 'Domains',
- 'Status' => 'Status',
- 'shared' => 'shared',
- 'dedicated' => 'dedicated',
- 'Owner' => 'Owner',
- 'Users' => 'Users',
- 'Load Average' => 'Load Average',
- 'Memory Usage' => 'Memory Usage',
- 'APACHE2 Usage' => 'APACHE2 Usage',
- 'HTTPD Usage' => 'HTTPD Usage',
- 'NGINX Usage' => 'NGINX Usage',
- 'MySQL Usage on localhost' => 'MySQL Usage on localhost',
- 'PostgreSQL Usage on localhost' => 'PostgreSQL Usage on localhost',
- 'Bandwidth Usage eth0' => 'Bandwidth Usage eth0',
- 'Bandwidth Usage eth1' => 'Bandwidth Usage eth1',
- 'Exim Usage' => 'Exim Usage',
- 'FTP Usage' => 'FTP Usage',
- 'SSH Usage' => 'SSH Usage',
- 'reverse proxy' => 'reverse proxy',
- 'web server' => 'web server',
- 'dns server' => 'dns server',
- 'mail server' => 'mail server',
- 'pop/imap server' => 'pop/imap server',
- 'email antivirus' => 'email antivirus',
- 'email antispam' => 'email antispam',
- 'database server' => 'database server',
- 'ftp server' => 'ftp server',
- 'job scheduler' => 'job scheduler',
- 'firewall' => 'firewall',
- 'brute-force monitor' => 'brute-force monitor',
- 'CPU' => 'CPU',
- 'Memory' => 'Memory',
- 'Uptime' => 'Uptime',
- 'core package' => 'core package',
- 'php interpreter' => 'php interpreter',
- 'internal web server' => 'internal web server',
- 'Version' => 'Version',
- 'Release' => 'Release',
- 'Architecture' => 'Architecture',
- 'Object' => 'Object',
- 'Username' => 'Username',
- 'Password' => 'Password',
+ 'Domains' => 'Домейни',
+ 'Status' => 'Статус',
+ 'shared' => 'споделен',
+ 'dedicated' => 'отдаден',
+ 'Owner' => 'Собственик',
+ 'Users' => 'Потребители',
+ 'Load Average' => 'Общи данни',
+ 'Memory Usage' => 'Използване на памет',
+ 'APACHE2 Usage' => 'Използване на APACHE2',
+ 'HTTPD Usage' => 'Използване на HTTPD',
+ 'NGINX Usage' => 'Използване на NGINX',
+ 'MySQL Usage on localhost' => 'Използване на MySQL на локалната машина',
+ 'PostgreSQL Usage on localhost' => 'Използване на PostgreSQL на локалната машина',
+ 'Bandwidth Usage eth0' => 'Използване на честотна лента eth0',
+ 'Bandwidth Usage eth1' => 'Използване на честотна лента eth1',
+ 'Exim Usage' => 'Използване на Exim',
+ 'FTP Usage' => 'Използване на FTP',
+ 'SSH Usage' => 'Използване на SSH',
+ 'reverse proxy' => 'обърни прокси',
+ 'web server' => 'уеб сървър',
+ 'dns server' => 'dns сървър',
+ 'mail server' => 'пощенски сървър',
+ 'pop/imap server' => 'pop/imap сървър',
+ 'email antivirus' => 'email антивирус',
+ 'email antispam' => 'email антиспам',
+ 'database server' => 'сървър на база данни',
+ 'ftp server' => 'ftp сървър',
+ 'job scheduler' => 'органайзер за работа',
+ 'firewall' => 'защитна стена',
+ 'brute-force monitor' => 'brute-force монитор',
+ 'CPU' => 'Процесор',
+ 'Memory' => 'Памет',
+ 'Uptime' => 'Време на работа',
+ 'core package' => 'пакет на ядрото',
+ 'php interpreter' => 'php интерпретатор',
+ 'internal web server' => 'вътрешен уеб сървър',
+ 'Version' => 'Версия',
+ 'Release' => 'Рилийз',
+ 'Architecture' => 'Архитектура',
+ 'Object' => 'Обект',
+ 'Username' => 'Потребителско име',
+ 'Password' => 'Парола',
'Email' => 'Email',
- 'Package' => 'Package',
- 'Language' => 'Language',
- 'First Name' => 'First Name',
- 'Last Name' => 'Last Name',
- 'Send login credentials to email address' => 'Send login credentials to email address',
- 'Default Template' => 'Default Template',
- 'Default Name Servers' => 'Default Name Servers',
- 'Domain' => 'Domain',
- 'DNS Support' => 'DNS Support',
- 'Mail Support' => 'Mail Support',
- 'Advanced options' => 'Advanced options',
- 'Basic options' => 'Basic options',
- 'Aliases' => 'Aliases',
- 'SSL Certificate' => 'SSL Certificate',
- 'SSL Key' => 'SSL Key',
- 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate',
+ 'Package' => 'Пакет',
+ 'Language' => 'Език',
+ 'First Name' => 'Име',
+ 'Last Name' => 'Фамилив',
+ 'Send login credentials to email address' => 'Изпращай информация за вписвания на email',
+ 'Default Template' => 'Шаблон по подразбиране',
+ 'Default Name Servers' => 'Име на сървър по подразбиране',
+ 'Domain' => 'Домейн',
+ 'DNS Support' => 'DNS поддръжка',
+ 'Mail Support' => 'Поддръжка на поща',
+ 'Advanced options' => 'Разширени настройки',
+ 'Basic options' => 'Стандартни настройки',
+ 'Aliases' => 'Псевдоними',
+ 'SSL Certificate' => 'SSL сертификат',
+ 'SSL Key' => 'SSL ключ',
+ 'SSL Certificate Authority / Intermediate' => 'SSL сертификат / средно ниво',
'SSL CSR' => 'SSL CSR',
- 'optional' => 'optional',
- 'internal' => 'internal',
- 'Statistics Authorization' => 'Statistics Authorization',
- 'Statistics Auth' => 'Statistics Auth',
- 'Account' => 'Account',
- 'Prefix will be automaticaly added to username' => 'Prefix %s will be automaticaly added to username',
- 'Send FTP credentials to email' => 'Send FTP credentials to email',
- 'Expiration Date' => 'Expiration Date',
- 'YYYY-MM-DD' => 'YYYY-MM-DD',
- 'Name servers' => 'Name servers',
- 'Record' => 'Record',
- 'IP or Value' => 'IP or Value',
- 'Priority' => 'Priority',
- 'Record Number' => 'Record Number',
- 'in megabytes' => 'in megabytes',
- 'Message' => 'Message',
- 'use local-part' => 'use local-part',
- 'one or more email addresses' => 'one or more email addresses',
- 'Prefix will be automaticaly added to database name and database user' => 'Prefix %s will be automaticaly added to database name and database user.',
- 'Database' => 'Database',
- 'Type' => 'Type',
- 'Minute' => 'Minute',
- 'Command' => 'Command',
- 'Package Name' => 'Package Name',
+ 'optional' => 'незадължителен',
+ 'internal' => 'вътрешвн',
+ 'Statistics Authorization' => 'Идентификация за статистики',
+ 'Statistics Auth' => 'Идентификация за статистики',
+ 'Account' => 'Акаунт',
+ 'Prefix will be automaticaly added to username' => 'Префикс %s ще бъде автоматично добавен към потребителското име',
+ 'Send FTP credentials to email' => 'Изпращай информация относно FTP на email',
+ 'Expiration Date' => 'Крайна дата',
+ 'YYYY-MM-DD' => 'ГГГГ-ММ-ДД',
+ 'Name servers' => 'Сървъри с имена',
+ 'Record' => 'Запис',
+ 'IP or Value' => 'IP или стойност',
+ 'Priority' => 'Приоритет',
+ 'Record Number' => 'Запиши номер',
+ 'in megabytes' => 'в мегабайти',
+ 'Message' => 'Съобщение',
+ 'use local-part' => 'използвай local-part',
+ 'one or more email addresses' => 'един или повече email адреса',
+ 'Prefix will be automaticaly added to database name and database user' => 'Префикс %s ще бъде автоматично добавен към името на базата данни и потребителското име.',
+ 'Database' => 'База данни',
+ 'Type' => 'Въведи',
+ 'Minute' => 'Минута',
+ 'Command' => 'Команда',
+ 'Package Name' => 'Номер на пакет',
'Netmask' => 'Netmask',
- 'Interface' => 'Interface',
- 'Shared' => 'Shared',
- 'Assigned user' => 'Assigned user',
- 'Assigned domain' => 'Assigned domain',
- 'NAT IP association' => 'NAT IP association',
+ 'Interface' => 'Интерфейс',
+ 'Shared' => 'Споделен',
+ 'Assigned user' => 'Назначен потребител',
+ 'Assigned domain' => 'Назначен домейн',
+ 'NAT IP association' => 'NAT IP асоциация',
'shell' => 'shell',
- 'web domains' => 'web domains',
- 'web aliases' => 'web aliases',
- 'dns records' => 'dns records',
- 'mail domains' => 'mail domains',
- 'mail accounts' => 'mail accounts',
- 'accounts' => 'accounts',
- 'databases' => 'databases',
+ 'web domains' => 'уеб домейни',
+ 'web aliases' => 'уеб псевдоними',
+ 'dns records' => 'dns записи',
+ 'mail domains' => 'пощенски домейни',
+ 'mail accounts' => 'пощенски акаунти',
+ 'accounts' => 'акаунти',
+ 'databases' => 'бази данни',
'cron jobs' => 'cron jobs',
- 'backups' => 'backups',
- 'quota' => 'quota',
- 'day of week' => 'day of week',
+ 'backups' => 'резервни копия',
+ 'quota' => 'квота',
+ 'day of week' => 'ден от седмицата',
'cmd' => 'cmd',
- 'users' => 'users',
- 'domains' => 'domains',
- 'aliases' => 'aliases',
- 'records' => 'records',
- 'jobs' => 'jobs',
- 'username' => 'username',
- 'password' => 'password',
- 'type' => 'type',
- 'charset' => 'charset',
- 'domain' => 'domain',
+ 'users' => 'потребители',
+ 'domains' => 'домейни',
+ 'aliases' => 'псевдоними',
+ 'records' => 'записи',
+ 'jobs' => 'работа',
+ 'username' => 'потребителско име',
+ 'password' => 'парола',
+ 'type' => 'тип',
+ 'charset' => 'символи',
+ 'domain' => 'домейн',
'ip' => 'ip',
- 'ip address' => 'ip address',
- 'IP address' => 'IP address',
+ 'ip address' => 'ip адрес',
+ 'IP address' => 'IP адрес',
'netmask' => 'netmask',
- 'interface' => 'interface',
- 'assigned user' => 'assigned user',
+ 'interface' => 'интерфейс',
+ 'assigned user' => 'назначен потребител',
'ns1' => 'ns1',
'ns2' => 'ns2',
- 'user' => 'user',
+ 'user' => 'потребител',
'email' => 'email',
- 'first name' => 'first name',
- 'last name' => 'last name',
- 'account' => 'account',
- 'ssl certificate' => 'ssl certificate',
- 'ssl key' => 'ssl key',
- 'stats user password' => 'stats user password',
- 'stats username' => 'stats username',
- 'stats password' => 'stats password',
- 'ftp user password' => 'ftp user password',
- 'ftp user' => 'ftp user',
- 'Last 70 lines of %s.%s.log' => 'Last 70 lines of %s.%s.log',
+ 'first name' => 'име',
+ 'last name' => 'фамилия',
+ 'account' => 'акаунт',
+ 'ssl certificate' => 'ssl сертификат',
+ 'ssl key' => 'ssl ключ',
+ 'stats user password' => 'статистика за потребителска парола',
+ 'stats username' => 'статистика за потребителско име',
+ 'stats password' => 'статистика за парола',
+ 'ftp user password' => 'ftp потребителска парола',
+ 'ftp user' => 'ftp потребител',
+ 'Last 70 lines of %s.%s.log' => 'Последните 70 реда от лога за %s.%',
'AccessLog' => 'AccessLog',
'ErrorLog' => 'ErrorLog',
- 'Download AccessLog' => 'Download AccessLog',
- 'Download ErrorLog' => 'Download ErrorLog',
- 'Country' => 'Country',
- '2 letter code' => '2 letter code',
- 'State / Province' => 'State / Province',
- 'City / Locality' => 'City / Locality',
- 'Organization' => 'Organization',
- 'Action' => 'Action',
- 'Protocol' => 'Protocol',
- 'Port' => 'Port',
- 'Comment' => 'Comment',
- 'Banlist' => 'Banlist',
- 'ranges are acceptable' => 'ranges are acceptable',
- 'CIDR format is supported' => 'CIDR format is supported',
- 'ACCEPT' => 'ACCEPT',
- 'DROP' => 'DROP',
+ 'Download AccessLog' => 'Изтегли AccessLog',
+ 'Download ErrorLog' => 'Изтегли ErrorLog',
+ 'Country' => 'Страна',
+ '2 letter code' => '2-буквен код',
+ 'State / Province' => 'Щат / Провинция',
+ 'City / Locality' => 'Град / Местност',
+ 'Organization' => 'Организация',
+ 'Action' => 'Начало',
+ 'Protocol' => 'Протокол',
+ 'Port' => 'Порт',
+ 'Comment' => 'Коментар',
+ 'Banlist' => 'Черен списък',
+ 'ranges are acceptable' => 'стойностите са приемливи',
+ 'CIDR format is supported' => 'CIDR форматът се поддържа',
+ 'ACCEPT' => 'ПРИЕМИ',
+ 'DROP' => 'ПУСНИ',
'TCP' => 'TCP',
'UDP' => 'UDP',
'ICMP' => 'ICMP',
'SSH' => 'SSH',
'FTP' => 'FTP',
'VESTA' => 'VESTA',
- 'Add one more Name Server' => 'Add one more Name Server',
+ 'Add one more Name Server' => 'Добави допълнителен сървър за имена',
- 'web domain' => 'web domain',
- 'dns domain' => 'dns domain',
- 'dns record' => 'dns record',
- 'mail domain' => 'mail domain',
- 'mail account' => 'mail account',
+ 'web domain' => 'уеб домейн',
+ 'dns domain' => 'dns домейн',
+ 'dns record' => 'dns запис',
+ 'mail domain' => 'пощенски домейн',
+ 'mail account' => 'пощенски акаунт',
'cron job' => 'cron job',
'cron' => 'cron',
- 'user dir' => 'user dir',
+ 'user dir' => 'потребителска директория',
- 'unlimited' => 'unlimited',
- '1 account' => '1 account',
- '%s accounts' => '%s accounts',
- '1 domain' => '1 domain',
- '%s domains' => '%s domains',
- '1 record' => '1 record',
- '%s records' => '%s records',
- '1 mail account' => '1 mail account',
- '%s mail accounts' => '%s mail accounts',
- '1 database' => '1 database',
- '%s databases' => '%s databases',
+ 'unlimited' => 'неограничен',
+ '1 account' => '1 акаунт',
+ '%s accounts' => '%s акаунта',
+ '1 domain' => '1 домейн',
+ '%s domains' => '%s домейна',
+ '1 record' => '1 запис',
+ '%s records' => '%s записи',
+ '1 mail account' => '1 пощенски акаунт',
+ '%s mail accounts' => '%s пощенски акаунта',
+ '1 database' => '1 база данни',
+ '%s databases' => '%s бази данни',
'1 cron job' => '1 cron job',
'%s cron jobs' => '%s cron jobs',
- '1 archive' => '1 archive',
- '%s archives' => '%s archives',
- '1 item' => '1 item',
- '%s items' => '%s items',
- '1 package' => '1 package',
- '%s packages' => '%s packages',
- '1 IP address' => '1 IP address',
- '%s IP addresses' => '%s IP addresses',
- '1 month' => '1 month',
- '%s months' => '%s months',
- '1 log record' => '1 log record',
- '%s log records' => '%s log records',
- '1 object' => '1 object',
- '%s objects' => '%s objects',
- 'no exclusions' => 'no exclusions',
- '1 rule' => '1 rule',
- '%s rules' => '%s rules',
- 'There are no currently banned IP' => 'There are no currently banned IP',
+ '1 archive' => '1 архив',
+ '%s archives' => '%s архива',
+ '1 item' => '1 артикул',
+ '%s items' => '%s артикула',
+ '1 package' => '1 пакет',
+ '%s packages' => '%s пакета',
+ '1 IP address' => '1 IP адрес',
+ '%s IP addresses' => '%s IP адреса',
+ '1 month' => '1 месец',
+ '%s months' => '%s месеца',
+ '1 log record' => '1 log запис',
+ '%s log records' => '%s log записа',
+ '1 object' => '1 обект',
+ '%s objects' => '%s обекта',
+ 'no exclusions' => 'без изключения',
+ '1 rule' => '1 правило',
+ '%s rules' => '%s правила',
+ 'There are no currently banned IP' => 'Няма блокирани IP-та',
- 'USER_CREATED_OK' => 'User %s has been created successfully.',
- 'WEB_DOMAIN_CREATED_OK' => 'Domain %s has been created successfully.',
- 'DNS_DOMAIN_CREATED_OK' => 'DNS domain %s has been created successfully.',
- 'DNS_RECORD_CREATED_OK' => 'Record %s.%s has been created successfully.',
- 'MAIL_DOMAIN_CREATED_OK' => 'Mail domain %s has been created successfully.',
- 'MAIL_ACCOUNT_CREATED_OK' => 'Mail account %s@%s has been created successfully.',
- 'DATABASE_CREATED_OK' => 'Database %s has been created successfully.',
- 'CRON_CREATED_OK' => 'Cron job has been created successfully.',
- 'IP_CREATED_OK' => 'IP address %s has been created successfully.',
- 'PACKAGE_CREATED_OK' => 'Package %s has been created successfully.',
- 'SSL_GENERATED_OK' => 'Certificate has been generated successfully.',
- 'RULE_CREATED_OK' => 'Rule has been created successfully.',
- 'BANLIST_CREATED_OK' => 'IP address has been banned successfully',
- 'Autoupdate has been successfully enabled' => 'Autoupdate has been successfully enabled.',
- 'Autoupdate has been successfully disabled' => 'Autoupdate has been successfully disabled.',
- 'Cronjob email reporting has been successfully enabled' => 'Cronjob email reporting has been successfully enabled',
- 'Cronjob email reporting has been successfully disabled' => 'Cronjob email reporting has been successfully disabled',
- 'Changes has been saved.' => 'Changes have been saved.',
- 'Confirmation' => 'Confirmation',
- 'DELETE_USER_CONFIRMATION' => 'Are you sure you want to delete user %s?',
- 'SUSPEND_USER_CONFIRMATION' => 'Are you sure you want to suspend user %s?',
- 'UNSUSPEND_USER_CONFIRMATION' => 'Are you sure you want to unsuspend user %s?',
- 'DELETE_DOMAIN_CONFIRMATION' => 'Are you sure you want to delete domain %s?',
- 'SUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure you want to suspend domain %s?',
- 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure you want to unsuspend domain %s?',
- 'DELETE_RECORD_CONFIRMATION' => 'Are you sure you want to delete record %s?',
- 'SUSPEND_RECORD_CONFIRMATION' => 'Are you sure you want to suspend record %s?',
- 'UNSUSPEND_RECORD_CONFIRMATION' => 'Are you sure you want to unsuspend record %s?',
- 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure you want to delete %s?',
- 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure you want to suspend %s?',
- 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure you want to unsuspend %s?',
- 'DELETE_DATABASE_CONFIRMATION' => 'Are you sure you want to delete database %s?',
- 'SUSPEND_DATABASE_CONFIRMATION' => 'Are you sure you want to suspend database %s?',
- 'UNSUSPEND_DATABASE_CONFIRMATION' => 'Are you sure you want to unsuspend database %s?',
- 'DELETE_CRON_CONFIRMATION' => 'Are you sure you want to delete cron job?',
- 'SUSPEND_CRON_CONFIRMATION' => 'Are you sure you want to suspend cron job?',
- 'UNSUSPEND_CRON_CONFIRMATION' => 'Are you sure you want to unsuspend cron job?',
- 'DELETE_BACKUP_CONFIRMATION' => 'Are you sure you want to delete %s backup?',
- 'DELETE_EXCLUSION_CONFIRMATION' => 'Are you sure you want to delete %s exclusion?',
- 'DELETE_PACKAGE_CONFIRMATION' => 'Are you sure you want to delete package %s?',
- 'DELETE_IP_CONFIRMATION' => 'Are you sure you want to delete IP address %s?',
- 'DELETE_RULE_CONFIRMATION' => 'Are you sure you want to delete rule #%s?',
- 'SUSPEND_RULE_CONFIRMATION' => 'Are you sure you want to suspend rule #%s?',
- 'UNSUSPEND_RULE_CONFIRMATION' => 'Are you sure you want to unsuspend rule #%s?',
- 'LEAVE_PAGE_CONFIRMATION' => 'Leave Page?',
- 'RESTART_CONFIRMATION' => 'Are you sure you want to restart %s?',
- 'Welcome' => 'Welcome',
- 'LOGGED_IN_AS' => 'Logged in as user %s',
- 'Error' => 'Error',
- 'Invalid username or password' => 'Invalid username or password.',
- 'Invalid username or code' => 'Invalid username or code.',
- 'Passwords not match' => 'Passwords do not match.',
- 'Please enter valid email address.' => 'Please enter a valid email address.',
- 'Field "%s" can not be blank.' => 'Field "%s" can not be blank.',
- 'Password is too short.' => 'Password is too short (minimum is 6 characters)',
- 'Error code:' => 'Error code: %s',
- 'SERVICE_ACTION_FAILED' => '"%s" "%s" failed',
- 'IP address is in use' => 'IP address is in use',
- 'BACKUP_SCHEDULED' => 'Task has been added to the queue. You will receive an email notification when your backup is ready for download.',
- 'BACKUP_EXISTS' => 'An existing backup is already running. Please wait for that backup to finish.',
- 'RESTORE_SCHEDULED' => 'Task has been added to the queue. You will receive an email notification when your restore has been completed.',
- 'RESTORE_EXISTS' => 'An existing restoration task is already running. Please wait for it to finish before launching it again.',
+ 'USER_CREATED_OK' => 'Потребител %s беше създаден успешно.',
+ 'WEB_DOMAIN_CREATED_OK' => 'Домейн %s беше създаден успешно .',
+ 'DNS_DOMAIN_CREATED_OK' => 'DNS домейн %s беше създаден успешно.',
+ 'DNS_RECORD_CREATED_OK' => 'Запис %s.%s беше създаден успешно.',
+ 'MAIL_DOMAIN_CREATED_OK' => 'Пощенски домейн %s беше създаден успешно.',
+ 'MAIL_ACCOUNT_CREATED_OK' => 'Пощенски акаунт %s@%s беше създаден успешно.',
+ 'DATABASE_CREATED_OK' => 'База данни %s беше създадена успешно.',
+ 'CRON_CREATED_OK' => 'Cron job беше създаден успешно.',
+ 'IP_CREATED_OK' => 'IP адрес %s беше създаден успешно.',
+ 'PACKAGE_CREATED_OK' => 'Пакет %s беше създаден успешно.',
+ 'SSL_GENERATED_OK' => 'Сертификатът беше генериран успешно.',
+ 'RULE_CREATED_OK' => 'Правилото беше създадено успешно.',
+ 'BANLIST_CREATED_OK' => 'IP адресът беше блокиран успешно', // I'm not sure about this text
+ 'Autoupdate has been successfully enabled' => 'Автоматичното обновяване беше включено успешно.',
+ 'Autoupdate has been successfully disabled' => 'Автоматичното обновяване беше изключено успешно.',
+ 'Cronjob email reporting has been successfully enabled' => 'Cronjob email reporting беше включен успешно',
+ 'Cronjob email reporting has been successfully disabled' => 'Cronjob email reporting беше изключен успешно',
+ 'Changes has been saved.' => 'Промените бяха запазени.',
+ 'Confirmation' => 'Потвърждение',
+ 'DELETE_USER_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете потребител %s?',
+ 'SUSPEND_USER_CONFIRMATION' => 'Сигурни ли сте, че искате да блокирате потребител %s?',
+ 'UNSUSPEND_USER_CONFIRMATION' => 'Сигурни ли сте, че искате да отблокирате потребител %s?',
+ 'DELETE_DOMAIN_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете домейн %s?',
+ 'SUSPEND_DOMAIN_CONFIRMATION' => 'Сигурни ли сте, че искате да блокирате домейн %s?',
+ 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Сигурни ли сте, че искате да отблокирате домейн %s?',
+ 'DELETE_RECORD_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете запис %s?',
+ 'SUSPEND_RECORD_CONFIRMATION' => 'Сигурни ли сте, че искате да блокирате запис %s?',
+ 'UNSUSPEND_RECORD_CONFIRMATION' => 'Сигурни ли сте, че искате да отблокирате запис %s?',
+ 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете %s?',
+ 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Сигурни ли сте, че искате да блокирате %s?',
+ 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Сигурни ли сте, че искате да отблокирате %s?',
+ 'DELETE_DATABASE_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете база данни %s?',
+ 'SUSPEND_DATABASE_CONFIRMATION' => 'Сигурни ли сте, че искате да блокирате база данни %s?',
+ 'UNSUSPEND_DATABASE_CONFIRMATION' => 'Сигурни ли сте, че искате да отблокирате база данни %s?',
+ 'DELETE_CRON_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете cron job?',
+ 'SUSPEND_CRON_CONFIRMATION' => 'Сигурни ли сте, че искате да блокирате cron job?',
+ 'UNSUSPEND_CRON_CONFIRMATION' => 'Сигурни ли сте, че искате да отблокирате cron job?',
+ 'DELETE_BACKUP_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете %s резервното копие?',
+ 'DELETE_EXCLUSION_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете %s изключението?',
+ 'DELETE_PACKAGE_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете пакет %s?',
+ 'DELETE_IP_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете IP адрес %s?',
+ 'DELETE_RULE_CONFIRMATION' => 'Сигурни ли сте, че искате да изтриете правило #%s?',
+ 'SUSPEND_RULE_CONFIRMATION' => 'Сигурни ли сте, че искате да блокирате правило #%s?',
+ 'UNSUSPEND_RULE_CONFIRMATION' => 'Сигурни ли сте, че искате да отблокирате правило #%s?',
+ 'LEAVE_PAGE_CONFIRMATION' => 'Напускане на страницата?',
+ 'RESTART_CONFIRMATION' => 'Сигурни ли сте, че искате да рестартирате %s?',
+ 'Welcome' => 'Добре дошли',
+ 'LOGGED_IN_AS' => 'Вписани сте като %s',
+ 'Error' => 'Грешка',
+ 'Invalid username or password' => 'Невалидно потребителско име или парола.',
+ 'Invalid username or code' => 'Невалидно потребителско име или код.',
+ 'Passwords not match' => 'Паролите не съвпадат.',
+ 'Please enter valid email address.' => 'Моля, въведете валиден email адрес.',
+ 'Field "%s" can not be blank.' => 'Поле "%s" е задължително.',
+ 'Password is too short.' => 'Паролата е твърде къса (минимум 6 символа)',
+ 'Error code:' => 'Код на грешката: %s',
+ 'SERVICE_ACTION_FAILED' => '"%s" "%s" отказа',
+ 'IP address is in use' => 'IP адресът се използва в момента',
+ 'BACKUP_SCHEDULED' => 'Задачата е на изчакване. Ще бъдете уведомени по email веднага щом резервното копие стане достъпно за изтегляне.',
+ 'BACKUP_EXISTS' => 'Друго резервно копие е в действие. Моля, изчакайте приключване.',
+ 'RESTORE_SCHEDULED' => 'Задачата е на изчакване. Ще бъдете уведомени по email веднага щом възстановяването приключи.',
+ 'RESTORE_EXISTS' => 'Друго възстановяване е в действие. Моля, изчакайте приключване преди повторно зареждане.',
- 'WEB_EXCLUSIONS' => 'Type domain name, one per line. To exclude all domains use *. To exclude specific dirs use following format: domain.com:public_html/cache:public_html/tmp',
- 'DNS_EXCLUSIONS' => 'Type domain name, one per line. To exclude all domains use *',
- 'MAIL_EXCLUSIONS' => 'Type domain name, one per line. To exclude all domains use *. To exclude specific accounts use following format: domain.com:info:support:postmaster',
- 'DB_EXCLUSIONS' => 'Type full database name, one per line. To exclude all databases use *',
- 'CRON_EXCLUSIONS' => 'To exclude all jobs use *',
- 'USER_EXCLUSIONS' => 'Type directory name, one per line. To exlude all dirs use *',
+ 'WEB_EXCLUSIONS' => 'Въведете име на домейн, по едно на ред. За да изключите използването всички домейни *. За изключване на конкретни директории: domain.com:public_html/cache:public_html/tmp',
+ 'DNS_EXCLUSIONS' => 'Въведете име на домейн, по едно на ред. За да изключите използването всички домейни *',
+ 'MAIL_EXCLUSIONS' => 'Въведете име на домейн, по едно на ред. За да изключите използването всички домейни *. За изключване на конкретни акаунти, използвайте: domain.com:info:support:postmaster',
+ 'DB_EXCLUSIONS' => 'Въведете пълно име на база данни, по едно на ред. За да изключите всички бази данни, използвайте *',
+ 'CRON_EXCLUSIONS' => 'За да изключите всички задачи, използвайте *',
+ 'USER_EXCLUSIONS' => 'Въведете име на директория, по едно на ред. За да изключите всички директории, използвайте *',
- 'Welcome to Vesta Control Panel' => 'Welcome to Vesta Control Panel',
- 'MAIL_FROM' => 'Vesta Control Panel ',
- 'GREETINGS_GORDON_FREEMAN' => "Hello, %s %s,\n",
- 'GREETINGS' => "Hello,\n",
- 'ACCOUNT_READY' => "Your account has been created and is ready for use.\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nVesta Control Panel\n",
+ 'Welcome to Vesta Control Panel' => 'Добре дошли във Контролния панел на Vesta',
+ 'MAIL_FROM' => 'Контролният панел на Vesta ',
+ 'GREETINGS_GORDON_FREEMAN' => "Здравейте, %s %s,\n",
+ 'GREETINGS' => "Здравейте,\n",
+ 'ACCOUNT_READY' => "Акаунтът ви беше създаден успешно и вече е готов за употреба.\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nVesta Control Panel\n",
+ 'FTP login credentials' => 'Данни за FTP вход',
+ 'FTP_ACCOUNT_READY' => "FTP акаунтът ви беше създаден успешно и вече е готов за употреба.\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n",
- 'FTP login credentials' => 'FTP login credentials',
- 'FTP_ACCOUNT_READY' => "FTP account has been created and is ready for use.\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n",
+ 'Database Credentials' => 'Информация за база дснни',
+ 'DATABASE_READY' => "Базата данни беше създадена успешно.\n\nDatabase: %s\nUser: %s\nPassword: %s\n%s\n\n--\nVesta Control Panel\n",
- 'Database Credentials' => 'Database Credentials',
- 'DATABASE_READY' => "Database has been created successfully.\n\nDatabase: %s\nUser: %s\nPassword: %s\n%s\n\n--\nVesta Control Panel\n",
+ 'forgot password' => 'забравена парола',
+ 'Confirm' => 'Потвърди',
+ 'New Password' => 'Нова парола',
+ 'Confirm Password' => 'Потвърди паролата',
+ 'Reset' => 'Възстанови',
+ 'Reset Code' => 'Код за възстановяване',
+ 'RESET_NOTICE' => '', // should we add something here? I don't think it's needed.
+ 'RESET_CODE_SENT' => 'Кодът за възстановяване на паролата беше изпратен успешно на вашия email
',
+ 'MAIL_RESET_SUBJECT' => 'Паролата е възстановена на %s',
+ 'PASSWORD_RESET_REQUEST' => "За да възстановите паролата за контролния панел, моля използвайте следния линк:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, you may go to https://%s/reset/?action=code&user=%s and enter the following reset code:\n%s\n\nIf you did not request password reset, please ignore this message and accept our apologies.\n\n--\nVesta Control Panel\n",
- 'forgot password' => 'forgot password',
- 'Confirm' => 'Confirm',
- 'New Password' => 'New Password',
- 'Confirm Password' => 'Confirm Password',
- 'Reset' => 'Reset',
- 'Reset Code' => 'Reset Code',
- 'RESET_NOTICE' => '',
- 'RESET_CODE_SENT' => 'Password reset code has been sent to your email address
',
- 'MAIL_RESET_SUBJECT' => 'Password Reset at %s',
- 'PASSWORD_RESET_REQUEST' => "To reset your control panel password, please follow this link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, you may go to https://%s/reset/?action=code&user=%s and enter the following reset code:\n%s\n\nIf you did not request password reset, please ignore this message and accept our apologies.\n\n--\nVesta Control Panel\n",
+ 'Jan' => 'Януари',
+ 'Feb' => 'Февруари',
+ 'Mar' => 'Март',
+ 'Apr' => 'Април',
+ 'May' => 'Май',
+ 'Jun' => 'Юни',
+ 'Jul' => 'Юли',
+ 'Aug' => 'Август',
+ 'Sep' => 'Септември',
+ 'Oct' => 'Октомври',
+ 'Nov' => 'Ноември',
+ 'Dec' => 'Декември',
- 'Jan' => 'Jan',
- 'Feb' => 'Feb',
- 'Mar' => 'Mar',
- 'Apr' => 'Apr',
- 'May' => 'May',
- 'Jun' => 'Jun',
- 'Jul' => 'Jul',
- 'Aug' => 'Aug',
- 'Sep' => 'Sep',
- 'Oct' => 'Oct',
- 'Nov' => 'Nov',
- 'Dec' => 'Dec',
-
- 'Configuring Server' => 'Configuring Server',
- 'Hostname' => 'Hostname',
- 'Time Zone' => 'Time Zone',
- 'Default Language' => 'Default Language',
- 'Proxy Server' => 'Proxy Server',
- 'Web Server' => 'Web Server',
- 'Backend Server' => 'Backend Server',
- 'Backend Pool Mode' => 'Backend Pool Mode',
- 'DNS Server' => 'DNS Server',
- 'DNS Cluster' => 'DNS Cluster',
- 'MAIL Server' => 'MAIL Server',
- 'Antivirus' => 'Antivirus',
- 'AntiSpam' => 'AntiSpam',
- 'Webmail URL' => 'Webmail URL',
- 'MySQL Support' => 'MySQL Support',
- 'phpMyAdmin URL' => 'phpMyAdmin URL',
- 'PostgreSQL Support' => 'PostgreSQL Support',
- 'phpPgAdmin URL' => 'phpPgAdmin URL',
- 'Maximum Number Of Databases' => 'Maximum Number Of Databases',
- 'Current Number Of Databases' => 'Current Number Of Databases',
- 'Local backup' => 'Local backup',
- 'Compression level' => 'Compression level',
- 'Directory' => 'Directory',
- 'Remote backup' => 'Remote backup',
+ 'Configuring Server' => 'Конфигуриране на сървъра',
+ 'Hostname' => 'Име на хост',
+ 'Time Zone' => 'Часова зона',
+ 'Default Language' => 'Език по подразбиране',
+ 'Proxy Server' => 'Прокси сървър',
+ 'Web Server' => 'Уеб сървър',
+ 'Backend Server' => 'Бекенд сървър',
+ 'Backend Pool Mode' => 'Backend Pool режим',
+ 'DNS Server' => 'DNS сървър',
+ 'DNS Cluster' => 'DNS клъстър',
+ 'MAIL Server' => 'Пощенски сървър',
+ 'Antivirus' => 'Антивирус',
+ 'AntiSpam' => 'Антиспам',
+ 'Webmail URL' => 'Уебмейл адрес',
+ 'MySQL Support' => 'MySQL поддръжкс',
+ 'phpMyAdmin URL' => 'phpMyAdmin адрес',
+ 'PostgreSQL Support' => 'PostgreSQL поддръжка',
+ 'phpPgAdmin URL' => 'phpPgAdmin адрес',
+ 'Maximum Number Of Databases' => 'Максимален брой бази данни',
+ 'Current Number Of Databases' => 'Текущ брой бази данни',
+ 'Local backup' => 'Местно резервно копие',
+ 'Compression level' => 'Ниво на компресия',
+ 'Directory' => 'Директория',
+ 'Remote backup' => 'Отдалечено резервно копие',
'ftp' => 'FTP',
'sftp' => 'SFTP',
'SFTP Chroot' => 'SFTP Chroot',
- 'FileSystem Disk Quota' => 'FileSystem Disk Quota',
- 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins',
- 'preview' => 'preview',
- 'Reseller Role' => 'Reseller Role',
- 'Web Config Editor' => 'Web Config Editor',
- 'Template Manager' => 'Template Manager',
- 'Backup Migration Manager' => 'Backup Migration Manager',
- 'FileManager' => 'FileManager',
- 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK',
+ 'FileSystem Disk Quota' => 'Квота на файловата система на диска',
+ 'Vesta Control Panel Plugins' => 'Допълнения за контролния панел на Vesta',
+ 'preview' => 'преглед',
+ 'Reseller Role' => 'Reseller роля',
+ 'Web Config Editor' => 'Web Config редактор',
+ 'Template Manager' => 'Мениджър на шаблони',
+ 'Backup Migration Manager' => 'Мениджър на преминаването към резервни копия',
+ 'FileManager' => 'Файлов мениджър',
+ 'show: CPU / MEM / NET / DISK' => 'покажи: CPU / MEM / NET / DISK',
- 'sort by' => 'sort by',
- 'Date' => 'Date',
- 'Starred' => 'Starred',
- 'Name' => 'Name',
+ 'sort by' => 'подреди по',
+ 'Date' => 'Дата',
+ 'Starred' => 'Използвани',
+ 'Name' => 'Име',
- 'save to favorites' => 'save to favorites',
+ 'save to favorites' => 'запази в любими',
- 'File Manager' => 'File Manager',
- 'size' => 'size',
- 'date' => 'date',
- 'name' => 'name',
- 'Initializing' => 'Initializing',
- 'UPLOAD' => 'UPLOAD',
- 'NEW FILE' => 'NEW FILE',
- 'NEW DIR' => 'NEW DIR',
- 'DELETE' => 'DELETE',
- 'RENAME' => 'RENAME',
- 'MOVE' => 'MOVE',
- 'RIGHTS' => 'RIGHTS',
- 'COPY' => 'COPY',
- 'ARCHIVE' => 'ARCHIVE',
- 'EXTRACT' => 'EXTRACT',
- 'DOWNLOAD' => 'DOWNLOAD',
- 'Are you sure?' => 'Are you sure?',
- 'Hit' => 'Hit',
- 'to reload the page' => 'to reload the page',
- 'Directory name cannot be empty' => 'Directory name cannot be empty',
- 'File name cannot be empty' => 'File name cannot be empty',
- 'No file selected' => 'No file selected',
- 'No file or folder selected' => 'No file or folder selected',
- 'File type not supported' => 'File type not supported',
- 'Directory download not available in current version' => 'Directory download not available in current version',
- 'Directory not available' => 'Directory not available',
- 'Done' => 'Done',
- 'Close' => 'Close',
- 'Copy' => 'Copy',
- 'Cancel' => 'Cancel',
- 'Rename' => 'Rename',
- 'Move' => 'Move',
- 'Change Rights' => 'Change Rights',
- 'Delete' => 'Delete',
- 'Extract' => 'Extract',
- 'Create' => 'Create',
- 'Compress' => 'Compress',
+ 'File Manager' => 'Файлов мениджър',
+ 'size' => 'размер',
+ 'date' => 'дата',
+ 'name' => 'име',
+ 'Initializing' => 'инициализиране',
+ 'UPLOAD' => 'КАЧИ',
+ 'NEW FILE' => 'НОВ ФАЙЛ',
+ 'NEW DIR' => 'НОВА ДИРЕКТОРИЯ',
+ 'DELETE' => 'ИЗТРИЙ',
+ 'RENAME' => 'ПРЕИМЕНУВАЙ',
+ 'MOVE' => 'ПРЕМЕСТИ',
+ 'RIGHTS' => 'ПРАВА',
+ 'COPY' => 'КОПИРАЙ',
+ 'ARCHIVE' => 'АРХИВИРАЙ',
+ 'EXTRACT' => 'ИЗВЛЕЧИ',
+ 'DOWNLOAD' => 'ИЗТЕГЛИ',
+ 'Are you sure?' => 'Сигурни ли сте?', // unused?
+ 'Hit' => 'Натисни',
+ 'to reload the page' => 'за да презаредите страницата',
+ 'Directory name cannot be empty' => 'Въведете име на директорията',
+ 'File name cannot be empty' => 'Въведете име на файла',
+ 'No file selected' => 'Не е избран файл',
+ 'No file or folder selected' => 'Не са избрани папка или файл',
+ 'File type not supported' => 'Този формат не се поддържа',
+ 'Directory download not available in current version' => 'Изтегляне на директория не се поддържа в тази версия',
+ 'Directory not available' => 'Директорията не е налична',
+ 'Done' => 'Готово',
+ 'Close' => 'Затвори',
+ 'Copy' => 'Копирай',
+ 'Cancel' => 'Отмени',
+ 'Rename' => 'Преименувай',
+ 'Move' => 'Премести',
+ 'Change Rights' => 'Смени правата',
+ 'Delete' => 'Изтрий',
+ 'Extract' => 'Извлечи',
+ 'Create' => 'Създай',
+ 'Compress' => 'Компресирай',
'OK' => 'OK',
- 'YOU ARE COPYING' => 'YOU ARE COPYING',
- 'YOU ARE REMOVING' => 'YOU ARE REMOVING',
- 'Delete items' => 'Delete items',
- 'Copy files' => 'Copy files',
- 'Move files' => 'Move files',
- 'Are you sure you want to copy' => 'Are you sure you want to copy',
- 'Are you sure you want to move' => 'Are you sure you want to move',
- 'Are you sure you want to delete' => 'Are you sure you want to delete',
- 'into' => 'into',
- 'existing files will be replaced' => 'existing files will be replaced',
- 'Original name' => 'Original name',
- 'File' => 'File',
- 'already exists' => 'already exists',
- 'Create file' => 'Create file',
- 'Create directory' => 'Create directory',
- 'read by owner' => 'read by owner',
- 'write by owner' => 'write by owner',
- 'execute/search by owner' => 'execute/search by owner',
- 'read by group' => 'read by group',
- 'write by group' => 'write by group',
- 'execute/search by group' => 'execute/search by group',
- 'read by others' => 'read by others',
- 'write by others' => 'write by others',
- 'execute/search by others' => 'execute/search by others',
+ 'YOU ARE COPYING' => 'ВИЕ КОПИРАТЕ', // unused?
+ 'YOU ARE REMOVING' => 'ВИЕ ПРЕМАХВАТЕ',
+ 'Delete items' => 'Изтрий избраните',
+ 'Copy files' => 'Копирай файловете',
+ 'Move files' => 'Премести файловете',
+ 'Are you sure you want to copy' => 'Сигурни ли сте, че искате да копирате',
+ 'Are you sure you want to move' => 'Сигурни ли сте, че искате да преместите',
+ 'Are you sure you want to delete' => 'Сигурни ли сте, че искате да премахнете',
+ 'into' => 'въведение',
+ 'existing files will be replaced' => 'съществуващите файлове ще бъдат заменени',
+ 'Original name' => 'Първоначално име',
+ 'File' => 'Файл',
+ 'already exists' => 'вече съществува',
+ 'Create file' => 'Създай файл',
+ 'Create directory' => 'Създай директория',
+ 'read by owner' => 'чети като собственик',
+ 'write by owner' => 'пиши като собственик',
+ 'execute/search by owner' => 'изпълни/търси като собственик',
+ 'read by group' => 'чети като група',
+ 'write by group' => 'пиши като група',
+ 'execute/search by group' => 'изпълни/търси като група',
+ 'read by others' => 'чети като други',
+ 'write by others' => 'пиши като други',
+ 'execute/search by others' => 'изпълни/търси като други',
- 'Shortcuts' => 'Shortcuts',
- 'Add New object' => 'Add New object',
- 'Save Form' => 'Save Form',
- 'Cancel saving form' => 'Cancel saving form',
- 'Go to USER list' => 'Go to USER list',
- 'Go to WEB list' => 'Go to WEB list',
- 'Go to DNS list' => 'Go to DNS list',
- 'Go to MAIL list' => 'Go to MAIL list',
- 'Go to DB list' => 'Go to DB list',
- 'Go to CRON list' => 'Go to CRON list',
- 'Go to BACKUP list' => 'Go to BACKUP list',
- 'Focus on search' => 'Focus on search',
- 'Display/Close shortcuts' => 'Display/Close shortcuts',
- 'Move backward through top menu' => 'Move backward through top menu',
- 'Move forward through top menu' => 'Move forward through top menu',
- 'Enter focused element' => 'Enter focused element',
- 'Move up through elements list' => 'Move up through elements list',
- 'Move down through elements list' => 'Move down through elements list',
+ 'Shortcuts' => 'Преки пътища',
+ 'Add New object' => 'Добави нов обект',
+ 'Save Form' => 'Запази формата',
+ 'Cancel saving form' => 'Отмени запазването на формата',
+ 'Go to USER list' => 'Отиди в USER списъка',
+ 'Go to WEB list' => 'Отиди в WEB списъка',
+ 'Go to DNS list' => 'Отиди в DNS списъка',
+ 'Go to MAIL list' => 'Отиди в MAIL списъка',
+ 'Go to DB list' => 'Отиди в DB списъка',
+ 'Go to CRON list' => 'Отиди в CRON списъка',
+ 'Go to BACKUP list' => 'Отиди в BACKUP списъка',
+ 'Focus on search' => 'Фокус при търсене',
+ 'Display/Close shortcuts' => 'Покажи/Скрий преките пътища',
+ 'Move backward through top menu' => 'Върни се назад в главното меню',
+ 'Move forward through top menu' => 'Напред към следващото меню',
+ 'Enter focused element' => 'Добави елемент на фокус',
+ 'Move up through elements list' => 'Придвижи се нагоре в списъка с елементи',
+ 'Move down through elements list' => 'Придвижи се надолу в списъка с елементи',
- 'Upload' => 'Upload',
- 'New File' => 'New File',
- 'New Folder' => 'New Folder',
- 'Download' => 'Download',
- 'Archive' => 'Archive',
- 'Save File (in text editor)' => 'Save File (in text editor)',
- 'Close Popup / Cancel' => 'Close Popup / Cancel',
- 'Move Cursor Up' => 'Move Cursor Up',
- 'Move Cursor Down' => 'Move Cursor Down',
- 'Switch to Left Tab' => 'Switch to Left Tab',
- 'Switch to Right Tab' => 'Switch to Right Tab',
- 'Switch Tab' => 'Switch Tab',
- 'Go to the Top of the File List' => 'Go to the Top of the File List',
- 'Go to the Last File' => 'Go to the Last File',
- 'Open File / Enter Directory' => 'Open File / Enter Directory',
- 'Edit File' => 'Edit File',
- 'Go to Parent Directory' => 'Go to Parent Directory',
- 'Select Current File' => 'Select Current File',
- 'Select Bunch of Files' => 'Select Bunch of Files',
- 'Add File to the Current Selection' => 'Add File to the Current Selection',
- 'Select All Files' => 'Select All Files',
- 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' =>
- 'shortcuts are inspired by magnificent GNU Midnight Commander file manager',
-
- 'Licence Key' => 'Licence Key',
- 'Enter License Key' => 'Enter License Key',
- 'Buy Licence' => 'Buy Licence',
- 'Buy Lifetime License' => 'Buy Lifetime License',
- 'Disable and Cancel Licence' => 'Disable and Cancel Licence',
- 'Licence Activated' => 'Licence Activated',
- 'Licence Deactivated' => 'Licence Deactivated',
- 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.',
- 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.',
- 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.',
-
- 'Minutes' => 'Minutes',
- 'Hourly' => 'Hourly',
- 'Run Command' => 'Run Command',
- 'every month' => 'every month',
- 'every odd month' => 'every odd month',
- 'every even month' => 'every even month',
- 'every day' => 'every day',
- 'every odd day' => 'every odd day',
- 'every even day' => 'every even day',
- 'weekdays (5 days)' => 'weekdays (5 days)',
- 'weekend (2 days)' => 'weekend (2 days)',
- 'Monday' => 'Monday',
- 'Tuesday' => 'Tuesday',
- 'Wednesday' => 'Wednesday',
- 'Thursday' => 'Thursday',
- 'Friday' => 'Friday',
- 'Saturday' => 'Saturday',
- 'Sunday' => 'Sunday',
- 'every hour' => 'every hour',
- 'every two hours' => 'every two hours',
- 'every minute' => 'every minute',
- 'every two minutes' => 'every two minutes',
- 'every' => 'every',
- 'Generate' => 'Generate',
+ 'Upload' => 'Качи',
+ 'New File' => 'Нов файл',
+ 'New Folder' => 'Нова папка',
+ 'Download' => 'Изтегляне',
+ 'Archive' => 'Архивиране',
+ 'Save File (in text editor)' => 'Запази файла (в текстов редактор)',
+ 'Close Popup / Cancel' => 'Затвори изскачащия прозорец / Отмени',
+ 'Move Cursor Up' => 'Премести курсора нагоре',
+ 'Move Cursor Down' => 'Премести курсора надолу',
+ 'Switch to Left Tab' => 'Премини в левия раздел',
+ 'Switch to Right Tab' => 'Премини в десния раздел',
+ 'Switch Tab' => 'Смени раздел',
+ 'Go to the Top of the File List' => 'Отиди в началото на файловия списък',
+ 'Go to the Last File' => 'Кум последната страница',
+ 'Open File / Enter Directory' => 'Отвори файл / Влез в директория',
+ 'Edit File' => 'Редактирай файл',
+ 'Go to Parent Directory' => 'Към главната директория',
+ 'Select Current File' => 'Избери текущ файл',
+ 'Select Bunch of Files' => 'Избери няколко файла',
+ 'Add File to the Current Selection' => 'Добави файла към текущата селекция',
+ 'Select All Files' => 'Избери всички файлове',
+ 'shortcuts are inspired by magnificent GNU Midnight Commander файлов мениджър' =>
+ 'преките пътища са вдъхновени от великолепният GNU Midnight Commander файлов мениджър',
+ 'Licence Key' => 'Лицензен ключ',
+ 'Enter License Key' => 'Въведете лицензен ключ',
+ 'Buy Licence' => 'Купете лиценз',
+ 'Buy Lifetime License' => 'Купете доживотен лиценз',
+ 'Disable and Cancel Licence' => 'Деактивирайте и отменете лиценз',
+ 'Licence Activated' => 'Лицензът е активиран',
+ 'Licence Deactivated' => 'Лицензът е деактивиран',
+ 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Ограничавайте потребителите от използването на SSH, давайки им достъп единствено до личните им директории.',
+ 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Разглеждайте, копирайте, редактирайте, показвайте и извличайте всички уеб домейн файлове, използвайки напълно функциониращия ни файлов мениджър.',
+ 'This is a commercial module, you would need to purchace license key to enable it.' => 'Това е комерсиален модул, за чиито ползване е нужно да поръчате лицензионен ключ.',
+ 'Minutes' => 'Минути',
+ 'Hourly' => 'Всеки час',
+ 'Daily' => 'Всеки ден ',
+ 'Weekly' => 'Всяка седмица',
+ 'Monthly' => 'Всеки месец',
+ 'Run Command' => 'Изпълни команда',
+ 'every month' => 'всеки месец',
+ 'every odd month' => 'всеки нечетен месец',
+ 'every even month' => 'всеки четен месец',
+ 'every day' => 'всеки ден',
+ 'every odd day' => 'всеки нечетен ден',
+ 'every even day' => 'всеки четен ден',
+ 'weekdays (5 days)' => 'делници (5 дни)',
+ 'weekend (2 days)' => 'уикенд (2 дни)',
+ 'Monday' => 'Понеделник',
+ 'Tuesday' => 'Вторник',
+ 'Wednesday' => 'Сряда',
+ 'Thursday' => 'Четвъртък',
+ 'Friday' => 'Петък',
+ 'Saturday' => 'Събота',
+ 'Sunday' => 'Неделя',
+ 'every hour' => 'на всеки час',
+ 'every two hours' => 'на всеки два часа',
+ 'every minute' => 'всяка минута',
+ 'every two minutes' => 'всеки две минути',
+ 'every' => 'всеки',
+ 'Generate' => 'Генерирай',
'webalizer' => 'webalizer',
'awstats' => 'awstats',
@@ -741,13 +739,14 @@ $LANG['bg'] = array(
'PUB_KEY' => 'PUB_KEY',
'ISSUER' => 'ISSUER',
- 'Use server hostname' => 'Use server hostname',
- 'Use domain hostname' => 'Use domain hostname',
- 'Use STARTTLS' => 'Use STARTTLS',
- 'Use SSL' => 'Use SSL',
- 'No encryption' => 'No encryption',
- 'Do not use encryption' => 'Do not use encryption',
+ 'Use server hostname' => 'Използвай сървърното хост име',
+ 'Use domain hostname' => 'Използвай хост името на домейн',
+ 'Use STARTTLS' => 'Използвай STARTTLS',
+ 'Use SSL' => 'Използвай SSL',
+ 'No encryption' => 'Без криптиране',
+ 'Do not use encryption' => 'Не използвай криптиране',
- 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+ 'maximum characters length, including prefix' => 'максималната дължина е %s символа, включително префикса',
);
+
diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php
index 77a1a835..9f82a63b 100644
--- a/web/inc/i18n/pl.php
+++ b/web/inc/i18n/pl.php
@@ -2,6 +2,7 @@
/**
* Plik językowy panelu Vesta
* Marek Pikuła
+ * Michal Slepko
*/
$LANG['pl'] = array(
@@ -707,30 +708,30 @@ $LANG['pl'] = array(
'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Przeglądaj, kopiuj, edytuj i zarządzaj wszystkimi plikami należącymi do twojej domeny przy użyciu kompletnego Menedżera Plików.',
'This is a commercial module, you would need to purchace license key to enable it.' => 'To jest moduł komercyjny. Żeby go aktywować trzeba zakupić klucz licencyjny.',
- 'Minutes' => 'Minutes',
- 'Hourly' => 'Hourly',
- 'Run Command' => 'Run Command',
- 'every month' => 'every month',
- 'every odd month' => 'every odd month',
- 'every even month' => 'every even month',
- 'every day' => 'every day',
- 'every odd day' => 'every odd day',
- 'every even day' => 'every even day',
- 'weekdays (5 days)' => 'weekdays (5 days)',
- 'weekend (2 days)' => 'weekend (2 days)',
- 'Monday' => 'Monday',
- 'Tuesday' => 'Tuesday',
- 'Wednesday' => 'Wednesday',
- 'Thursday' => 'Thursday',
- 'Friday' => 'Friday',
- 'Saturday' => 'Saturday',
- 'Sunday' => 'Sunday',
- 'every hour' => 'every hour',
- 'every two hours' => 'every two hours',
- 'every minute' => 'every minute',
- 'every two minutes' => 'every two minutes',
- 'every' => 'every',
- 'Generate' => 'Generate',
+ 'Minutes' => 'Minuty',
+ 'Hourly' => 'Godziny',
+ 'Run Command' => 'Komenda',
+ 'every month' => 'co miesiąc',
+ 'every odd month' => 'w nieparzyste miesiące',
+ 'every even month' => 'w parzyste miesiące',
+ 'every day' => 'codziennie',
+ 'every odd day' => 'w dni nieparzyste',
+ 'every even day' => 'w dni parzyste',
+ 'weekdays (5 days)' => 'dni robocze (5 dni)',
+ 'weekend (2 days)' => 'weekend (2 dni)',
+ 'Monday' => 'Poniedziałek',
+ 'Tuesday' => 'Wtorek',
+ 'Wednesday' => 'Środa',
+ 'Thursday' => 'Czwartek',
+ 'Friday' => 'Piątek',
+ 'Saturday' => 'Sobota',
+ 'Sunday' => 'Niedziela',
+ 'every hour' => 'co godzinę',
+ 'every two hours' => 'co 2 godziny',
+ 'every minute' => 'co minutę',
+ 'every two minutes' => 'co 2 minuty',
+ 'every' => 'każdy',
+ 'Generate' => 'Generuj',
'webalizer' => 'webalizer',
'awstats' => 'awstats',
@@ -744,13 +745,13 @@ $LANG['pl'] = array(
'PUB_KEY' => 'PUB_KEY',
'ISSUER' => 'ISSUER',
- 'Use server hostname' => 'Use server hostname',
- 'Use domain hostname' => 'Use domain hostname',
+ 'Use server hostname' => 'Użyj hostname serwera',
+ 'Use domain hostname' => 'Użyj domeny serwera',
'Use STARTTLS' => 'Use STARTTLS',
'Use SSL' => 'Use SSL',
- 'No encryption' => 'No encryption',
- 'Do not use encryption' => 'Do not use encryption',
+ 'No encryption' => 'Brak szyfrowania',
+ 'Do not use encryption' => 'Nie korzystaj z szyfrowania',
- 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+ 'maximum characters length, including prefix' => 'maksymalna %s ilość znaków, łącznie z prefiksem',
);
diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php
index eb984d04..46f1eafb 100644
--- a/web/inc/i18n/ru.php
+++ b/web/inc/i18n/ru.php
@@ -3,6 +3,7 @@
* Vesta language file
* ZonD80 (zond80@gmail.com)
* skid (skid@vestacp.com)
+ * Alexandr Loskutov (alex_connor@icloud.com)
*/
$LANG['ru'] = array(
@@ -13,7 +14,7 @@ $LANG['ru'] = array(
'Log' => 'Журнал',
'Server' => 'Сервер',
'Services' => 'Службы',
- 'Firewall' => 'Фаервол',
+ 'Firewall' => 'Файрвол',
'Updates' => 'Обновления',
'Log in' => 'Войти',
'Log out' => 'Выйти',
@@ -26,22 +27,22 @@ $LANG['ru'] = array(
'CRON' => 'CRON',
'BACKUP' => 'BACKUP',
- 'LOGIN' => 'LOGIN',
- 'RESET PASSWORD' => 'RESET PASSWORD',
- 'SEARCH' => 'SEARCH',
- 'PACKAGE' => 'PACKAGE',
+ 'LOGIN' => 'ВОЙТИ',
+ 'RESET PASSWORD' => 'СБРОСИТЬ ПАРОЛЬ',
+ 'SEARCH' => 'ПОИСК',
+ 'PACKAGE' => 'ПАКЕТ',
'RRD' => 'RRD',
- 'STATS' => 'STATS',
- 'LOG' => 'LOG',
- 'UPDATES' => 'UPDATES',
- 'FIREWALL' => 'FIREWALL',
- 'SERVER' => 'SERVER',
- 'MEMORY' => 'MEMORY',
- 'DISK' => 'DISK',
- 'NETWORK' => 'NETWORK',
- 'Web Log Manager' => 'Web Log Manager',
+ 'STATS' => 'СТАТИСТИКА',
+ 'LOG' => 'ЖУРНАЛ',
+ 'UPDATES' => 'ОБНОВЛЕНИЯ',
+ 'FIREWALL' => 'ФАЙРВОЛ',
+ 'SERVER' => 'СЕРВЕР',
+ 'MEMORY' => 'ПАМЯТЬ',
+ 'DISK' => 'ДИСК',
+ 'NETWORK' => 'СЕТЬ',
+ 'Web Log Manager' => 'Менеджер Web журнала',
- 'no notifications' => 'no notifications',
+ 'no notifications' => 'без оповещений',
'Add User' => 'Добавить аккаунт',
'Add Domain' => 'Добавить домен',
@@ -62,10 +63,10 @@ $LANG['ru'] = array(
'Search' => 'Поиск',
'Add one more FTP Account' => 'Добавить еще один FTP аккаунт',
'Overall Statistics' => 'Сводная статистика',
- 'Daily' => 'ежедневно',
- 'Weekly' => 'еженедельно',
- 'Monthly' => 'ежемесячно',
- 'Yearly' => 'Ежегодные',
+ 'Daily' => 'Ежедневно',
+ 'Weekly' => 'Еженедельно',
+ 'Monthly' => 'Ежемесячно',
+ 'Yearly' => 'Ежегодно',
'Add' => 'Добавить',
'Back' => 'Назад',
'Save' => 'Сохранить',
@@ -151,10 +152,10 @@ $LANG['ru'] = array(
'yes' => 'да',
'no' => 'нет',
'none' => 'нет',
- 'pb' => 'пб',
- 'tb' => 'тб',
- 'gb' => 'гб',
- 'mb' => 'мб',
+ 'pb' => 'Пб',
+ 'tb' => 'Тб',
+ 'gb' => 'Гб',
+ 'mb' => 'Мб',
'minute' => 'мин.',
'hour' => 'час',
'day' => 'дн.',
@@ -201,7 +202,7 @@ $LANG['ru'] = array(
'Proxy Extensions' => 'Обработка Proxy',
'Web Statistics' => 'Статистика сайта',
'Additional FTP Account' => 'Дополнительный ftp',
- 'Path' => 'Path',
+ 'Path' => 'Путь',
'SOA' => 'SOA',
'TTL' => 'TTL',
'Expire' => 'Истекает',
@@ -247,16 +248,16 @@ $LANG['ru'] = array(
'Users' => 'Пользователи',
'Load Average' => 'Общая нагрузка',
'Memory Usage' => 'Использование памяти',
- 'APACHE2 Usage' => 'APACHE2 Usage',
- 'HTTPD Usage' => 'Веб сервер',
- 'NGINX Usage' => 'Proxy',
- 'MySQL Usage on localhost' => 'Сервер базы данных MySQL',
- 'PostgreSQL Usage on localhost' => 'Сервер базы данных PostgreSQL',
+ 'APACHE2 Usage' => 'Использование APACHE2',
+ 'HTTPD Usage' => 'Использование HTTPd',
+ 'NGINX Usage' => 'Использование NGINX',
+ 'MySQL Usage on localhost' => 'Использование локальной MySQL',
+ 'PostgreSQL Usage on localhost' => 'Использование локальной PostgreSQL',
'Bandwidth Usage eth0' => 'Использование cети: eth0',
'Bandwidth Usage eth1' => 'Использование cети: eth1',
- 'Exim Usage' => 'Exim Usage',
- 'FTP Usage' => 'FTP сервер',
- 'SSH Usage' => 'SSH сервер',
+ 'Exim Usage' => 'Использование Exim',
+ 'FTP Usage' => 'Использование FTP',
+ 'SSH Usage' => 'Использование SSH',
'reverse proxy' => 'обратный прокси',
'web server' => 'веб сервер',
'dns server' => 'сервер имен',
@@ -267,8 +268,8 @@ $LANG['ru'] = array(
'database server' => 'сервер баз данных',
'ftp server' => 'ftp сервер',
'job scheduler' => 'планировщик заданий',
- 'firewall' => 'firewall',
- 'brute-force monitor' => 'brute-force monitor',
+ 'firewall' => 'файрвол',
+ 'brute-force monitor' => 'brute-force монитор',
'CPU' => 'Процессор',
'Memory' => 'Память',
'Uptime' => 'Запущен',
@@ -297,7 +298,7 @@ $LANG['ru'] = array(
'Aliases' => 'Алиасы',
'SSL Certificate' => 'SSL сертификат',
'SSL Key' => 'Ключ SSL сертификата',
- 'SSL Certificate Authority / Intermediate' => 'Центр сертификации SSL / Intermediate',
+ 'SSL Certificate Authority / Intermediate' => 'Центр сертификации SSL / Промежуточный',
'SSL CSR' => 'SSL CSR запрос',
'optional' => 'опционально',
'internal' => 'внутренний',
@@ -399,15 +400,15 @@ $LANG['ru'] = array(
'VESTA' => 'VESTA',
'Add one more Name Server' => 'Добавить ещё один Сервер Имён',
- 'web domain' => 'web domain',
- 'dns domain' => 'dns domain',
- 'dns record' => 'dns record',
- 'mail domain' => 'mail domain',
- 'mail account' => 'mail account',
- 'cron job' => 'cron job',
+ 'web domain' => 'web домен',
+ 'dns domain' => 'dns домен',
+ 'dns record' => 'dns запись',
+ 'mail domain' => 'mail домен',
+ 'mail account' => 'mail аккаунт',
+ 'cron job' => 'cron задание',
'cron' => 'cron',
- 'user dir' => 'user dir',
+ 'user dir' => 'пользовательская папка',
'unlimited' => 'неограничено',
'1 account' => ' пользователей на странице: 1',
@@ -424,8 +425,8 @@ $LANG['ru'] = array(
'%s cron jobs' => 'заданий на странице: %s',
'1 archive' => 'архивов на странице: 1',
'%s archives' => 'архивов на странице: %s',
- '1 item' => '1 item',
- '%s items' => '%s items',
+ '1 item' => '1 элемент',
+ '%s items' => '%s элементы',
'1 package' => 'пакетов на странице: 1',
'%s packages' => 'пакетов на странице: %s',
'1 IP address' => 'IP адресов на странице: 1',
@@ -555,29 +556,30 @@ $LANG['ru'] = array(
'Web Server' => 'Web Server',
'Backend Server' => 'Backend Server',
'Backend Pool Mode' => 'Backend Pool Mode',
- 'DNS Server' => 'DNS Server',
- 'DNS Cluster' => 'DNS Cluster',
- 'MAIL Server' => 'MAIL Server',
- 'Antivirus' => 'Antivirus',
- 'AntiSpam' => 'AntiSpam',
+ 'DNS Server' => 'DNS Сервер',
+ 'DNS Cluster' => 'DNS Кластер',
+ 'MAIL Server' => 'MAIL Сервер',
+ 'Antivirus' => 'Антивирус',
+ 'AntiSpam' => 'АнтиСпам',
'Webmail URL' => 'Webmail URL',
- 'MySQL Support' => 'MySQL Support',
+ 'MySQL Support' => 'Поддержка MySQL',
'phpMyAdmin URL' => 'phpMyAdmin URL',
- 'PostgreSQL Support' => 'PostgreSQL Support',
+ 'PostgreSQL Support' => 'Поддержка PostgreSQL',
'phpPgAdmin URL' => 'phpPgAdmin URL',
- 'Maximum Number Of Databases' => 'Maximum Number Of Databases',
- 'Current Number Of Databases' => 'Current Number Of Databases',
- 'Local backup' => 'Local backup',
- 'Compression level' => 'Compression level',
- 'Directory' => 'Directory',
- 'Remote backup' => 'Remote backup',
+ 'Maximum Number Of Databases' => 'Максимальное количество БД',
+ 'Current Number Of Databases' => 'Текущее количество БД',
+ 'Local backup' => 'Локальный архив',
+ 'Compression level' => 'Уровень сжатия',
+ 'Directory' => 'Каталог',
+ 'Remote backup' => 'Удаленное архив',
'ftp' => 'FTP',
'sftp' => 'SFTP',
'SFTP Chroot' => 'SFTP Chroot',
- 'FileSystem Disk Quota' => 'FileSystem Disk Quota',
- 'Vesta Control Panel Plugins' => 'Vesta Control Panel Плагины',
- 'preview' => 'превью',
- 'Reseller Role' => 'Ресселер',
+ 'FileSystem Disk Quota' => 'Дисковая квота файловой системы',
+ 'Vesta Control Panel Plugins' => 'Плагины Vesta Control Panel',
+ 'preview' => 'предпросмотр',
+ 'Reseller Role' => 'Реселлер',
+ 'Reseller Role' => 'Реселлер',
'Web Config Editor' => 'Веб Редактор Конфигов',
'Template Manager' => 'Менеджер Шаблонов',
'Backup Migration Manager' => 'Менеджер Миграции Бэкапов',
@@ -595,7 +597,7 @@ $LANG['ru'] = array(
'size' => 'размер',
'date' => 'дата',
'name' => 'имя',
- 'Initializing' => 'В процессе',
+ 'Initializing' => 'Инициализация',
'UPLOAD' => 'ЗАГРУЗИТЬ',
'NEW FILE' => 'ФАЙЛ',
'NEW DIR' => 'ПАПКА',
@@ -607,7 +609,7 @@ $LANG['ru'] = array(
'ARCHIVE' => 'АРХИВ',
'EXTRACT' => 'РАСПАКОВАТЬ',
'DOWNLOAD' => 'СКАЧАТЬ',
- 'Are you sure?' => 'Are you sure?',
+ 'Are you sure?' => 'Вы уверенны?',
'Hit' => 'Нажмите',
'to reload the page' => 'чтобы перегрузить страницу',
'Directory name cannot be empty' => 'Название директории не может быть пустым',
@@ -629,10 +631,10 @@ $LANG['ru'] = array(
'Create' => 'Создать',
'Compress' => 'Запаковать',
'OK' => 'OK',
- 'YOU ARE COPYING' => 'YOU ARE COPYING',
- 'YOU ARE REMOVING' => 'YOU ARE REMOVING',
- 'Delete items' => 'Delete items',
- 'Copy files' => 'Copy files',
+ 'YOU ARE COPYING' => 'ВЫ КОПИРУЕТЕ',
+ 'YOU ARE REMOVING' => 'ВЫ УДАЛЯЕТЕ',
+ 'Delete items' => 'Удалить элементы',
+ 'Copy files' => 'Копировать файлы',
'Move files' => 'Переместить файлы',
'Are you sure you want to copy' => 'Вы уверены, что хотите скопировать',
'Are you sure you want to move' => 'Вы уверены, что хотите переместить',
@@ -654,7 +656,7 @@ $LANG['ru'] = array(
'write by others' => 'запись для остальных',
'execute/search by others' => 'запуск/поиск для остальных',
- 'Shortcuts' => 'Shortcuts',
+ 'Shortcuts' => 'Сокращения',
'Add New object' => 'Перейти к Форме Добавления',
'Save Form' => 'Сохрнанить Форму',
'Cancel saving form' => 'Отменить Сохранение',
@@ -704,8 +706,8 @@ $LANG['ru'] = array(
'Disable and Cancel Licence' => 'Отключить и Закрыть Лицензию',
'Licence Activated' => 'Лицензия Активирована',
'Licence Deactivated' => 'Лицензия Отключена',
- 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.',
- 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.',
+ 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Ограничить пользователей, так что они не могут использовать SSH и имеют доступ только к домашней папке.',
+ 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Просмотр, копирование, редактирование, просмотр и использование всех файлов веб-доменов с помощью полнофункционального Файлового менеджера.',
'This is a commercial module, you would need to purchace license key to enable it.' => 'Это коммерческий модуль, чтобы включить его, вам необходимо приобрести лицензию.',
'Minutes' => 'по минутам',
@@ -731,27 +733,27 @@ $LANG['ru'] = array(
'every minute' => 'каждую минуту',
'every two minutes' => 'каждые 2 минуты',
'every' => 'каждые',
- 'Generate' => 'Generate',
+ 'Generate' => 'Генерировать',
'webalizer' => 'webalizer',
'awstats' => 'awstats',
'Vesta SSL' => 'Vesta SSL',
- 'SUBJECT' => 'SUBJECT',
- 'ALIASES' => 'ALIASES',
- 'NOT_BEFORE' => 'NOT_BEFORE',
- 'NOT_AFTER' => 'NOT_AFTER',
- 'SIGNATURE' => 'SIGNATURE',
- 'PUB_KEY' => 'PUB_KEY',
- 'ISSUER' => 'ISSUER',
+ 'SUBJECT' => 'ОБЪЕКТ',
+ 'ALIASES' => 'АЛИАСЫ',
+ 'NOT_BEFORE' => 'НЕДОСТУПЕН ДО',
+ 'NOT_AFTER' => 'НЕДОСТУПЕН ПОСЛЕ',
+ 'SIGNATURE' => 'ПОДПИСЬ',
+ 'PUB_KEY' => 'ПУБЛИЧНЫЙ КЛЮЧ',
+ 'ISSUER' => 'ИЗДАТЕЛЬ',
- 'Use server hostname' => 'Use server hostname',
- 'Use domain hostname' => 'Use domain hostname',
- 'Use STARTTLS' => 'Use STARTTLS',
- 'Use SSL' => 'Use SSL',
- 'No encryption' => 'No encryption',
- 'Do not use encryption' => 'Do not use encryption',
+ 'Use server hostname' => 'Использовать серверное имя хоста',
+ 'Use domain hostname' => 'Использовать доменное имя хоста',
+ 'Use STARTTLS' => 'Использовать STARTTLS',
+ 'Use SSL' => 'Использовать SSL',
+ 'No encryption' => 'Без шифрования',
+ 'Do not use encryption' => 'Не использовать шифрование',
- 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+ 'maximum characters length, including prefix' => 'максимальное %s количество символов, включая префикс',
);
diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php
index 16fa107e..698f37be 100644
--- a/web/inc/i18n/ua.php
+++ b/web/inc/i18n/ua.php
@@ -13,7 +13,7 @@ $LANG['ua'] = array(
'Log' => 'Журнал',
'Server' => 'Сервер',
'Services' => 'Служби',
- 'Firewall' => 'Брандмауер',
+ 'Firewall' => 'Файрвол',
'Updates' => 'Оновлення',
'Log in' => 'Увійти',
'Log out' => 'Вийти',
@@ -41,7 +41,7 @@ $LANG['ua'] = array(
'NETWORK' => 'МЕРЕЖА',
'Web Log Manager' => 'Менеджер Web журналу',
- 'no notifications' => 'no notifications',
+ 'no notifications' => 'без сповіщень',
'Add User' => 'Додати користувача',
'Add Domain' => 'Додати домен',
@@ -194,14 +194,14 @@ $LANG['ua'] = array(
'template' => 'шаблон',
'SSL Support' => 'Підтримка SSL',
'SSL Home Directory' => 'Домашня тека SSL',
- 'Lets Encrypt Support' => 'Lets Encrypt Support',
+ 'Lets Encrypt Support' => 'Підтримка Lets Encrypt',
'Lets Encrypt' => 'Lets Encrypt',
- 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes',
+ 'Your certificate will be automatically issued in 5 minutes' => 'Ваш сертифікат буде автоматично виданий протягом 5-ти хвилин',
'Proxy Support' => 'Підтримка Proxy',
'Proxy Extensions' => 'Розширення Proxy',
'Web Statistics' => 'Веб статистика',
'Additional FTP Account' => 'Додатковий FTP акаунт',
- 'Path' => 'Path',
+ 'Path' => 'Шлях',
'SOA' => 'SOA',
'TTL' => 'TTL',
'Expire' => 'Спливає',
@@ -215,7 +215,7 @@ $LANG['ua'] = array(
'Quota' => 'Квота',
'Autoreply' => 'Автовідповідач',
'Forward to' => 'Перенаправлення',
- 'Do not store forwarded mail' => 'Не зберігати перенаправлені письма',
+ 'Do not store forwarded mail' => 'Не зберігати перенаправлені листи',
'IMAP hostname' => "Ім'я IMAP хоста",
'IMAP port' => 'Порт IMAP',
'IMAP security' => 'Безпека IMAP',
@@ -424,8 +424,8 @@ $LANG['ua'] = array(
'%s cron jobs' => '%s завдань',
'1 archive' => '1 архів',
'%s archives' => '%s архівів',
- '1 item' => '1 item',
- '%s items' => '%s items',
+ '1 item' => '1 елемент',
+ '%s items' => '%s елементи',
'1 package' => '1 пакет',
'%s packages' => '%s пакет',
'1 IP address' => '1 IP адреса',
@@ -589,7 +589,7 @@ $LANG['ua'] = array(
'Starred' => 'Вибране',
'Name' => "Ім'я",
- 'save to favorites' => 'save to favorites',
+ 'save to favorites' => 'зберегти до улюблених',
'File Manager' => 'Файловий менеджер',
'size' => 'розмір',
@@ -737,21 +737,21 @@ $LANG['ua'] = array(
'awstats' => 'awstats',
'Vesta SSL' => 'Vesta SSL',
- 'SUBJECT' => 'SUBJECT',
- 'ALIASES' => 'ALIASES',
- 'NOT_BEFORE' => 'NOT_BEFORE',
- 'NOT_AFTER' => 'NOT_AFTER',
- 'SIGNATURE' => 'SIGNATURE',
- 'PUB_KEY' => 'PUB_KEY',
- 'ISSUER' => 'ISSUER',
+ 'SUBJECT' => "ОБ'ЄКТ",
+ 'ALIASES' => 'АЛІАСИ',
+ 'NOT_BEFORE' => 'НЕДОСТУПНИЙ ДО',
+ 'NOT_AFTER' => 'НЕДОСТУПНИЙ ПІСЛЯ',
+ 'SIGNATURE' => 'ПІДПИС',
+ 'PUB_KEY' => 'ПУБЛІЧНИЙ КЛЮЧ',
+ 'ISSUER' => 'ВИДАВЕЦЬ',
- 'Use server hostname' => 'Use server hostname',
- 'Use domain hostname' => 'Use domain hostname',
- 'Use STARTTLS' => 'Use STARTTLS',
- 'Use SSL' => 'Use SSL',
- 'No encryption' => 'No encryption',
- 'Do not use encryption' => 'Do not use encryption',
+ 'Use server hostname' => "Використовувати серверне ім'я хоста",
+ 'Use domain hostname' => "Використовувати доменне ім'я хоста",
+ 'Use STARTTLS' => 'Використовувати STARTTLS',
+ 'Use SSL' => 'Використовувати SSL',
+ 'No encryption' => 'Без шифрування',
+ 'Do not use encryption' => 'Не використовувати шифрування',
- 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
+ 'maximum characters length, including prefix' => 'максимальна %s кількість символів, включаючи префікс',
);
diff --git a/web/list/server/index.php b/web/list/server/index.php
index c37448ae..b7150778 100644
--- a/web/list/server/index.php
+++ b/web/list/server/index.php
@@ -65,6 +65,7 @@ if (isset($_GET['web'])) {
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_server_info.html');
exec (VESTA_CMD.'v-list-sys-web-status', $output, $return_var);
foreach($output as $file) {
+ $file=str_replace('border="0"', 'border="1"', $file);
echo $file . "\n";
}
echo " \n\n