github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 13:54:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hotfixes for 0.9.7

Browse source
This commit is contained in:
Serghey Rodin 2012-04-18 12:06:35 +03:00
commit 2fe720fd06
10 changed files with 233 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v_change_user_contact
View file

@ -33,7 +33,7 @@ is_object_unsuspended 'user' 'USER' "$user"
#----------------------------------------------------------#
# Changing user contact email
old_email=$get_user_value '$CONTACT')
old_email=$(get_user_value '$CONTACT')
update_user_value "$user" '$CONTACT' "$email"
pw_str=$(grep -n "^$user:" /etc/passwd)
str=$(echo "$pw_str" | cut -f 1 -d :)

1
bin/v_change_user_package
View file

@ -99,6 +99,7 @@ U_WEB_ALIASES='$U_WEB_ALIASES'
U_DNS_DOMAINS='$U_DNS_DOMAINS'
U_DNS_RECORDS='$U_DNS_RECORDS'
U_MAIL_DOMAINS='$U_MAIL_DOMAINS'
U_MAIL_DKIM='$U_MAIL_DKIM'
U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS'
U_DATABASES='$U_DATABASES'
U_CRON_JOBS='$U_CRON_JOBS'

4
bin/v_list_users
View file

@ -30,9 +30,9 @@ json_list_users() {
else
if [ $i -lt $fileds_count ]; then
(( ++i))
echo -e "\t\t\"${field//$/}\": \"${value//,/, }\","
echo -e "\t\t\"${field//$/}\": \"$value\","
else
echo -e "\t\t\"${field//$/}\": \"${value//,/, }\""
echo -e "\t\t\"${field//$/}\": \"$value\""
data=1
fi
fi

2
bin/v_list_web_domains
View file

@ -36,7 +36,7 @@ conf=$USER_DATA/web.conf
# Defining fileds to select
fields="\$DOMAIN \$IP \$IP6 \$U_DISK \$U_BANDWIDTH \$TPL \$ALIAS \$PHP \$CGI"
fields="$fields \$ELOG \$STATS \$STATS_AUTH \$SSL \$SSL_HOME \$NGINX"
fields="$fields \$NGINX_EXT \$SUSPENDED \$DATE"
fields="$fields \$NGINX_EXT \$SUSPENDED \$TIME \$DATE"
# Listing domains
case $format in

4
bin/v_update_user_counters
View file

@ -52,12 +52,12 @@ for user in $user_list; do
IP_AVAIL=0
IP_OWNED=0
U_USERS=0
DISK=0
U_DISK=0
U_DISK_DIRS=$(get_user_value '$U_DISK_DIRS')
if [ -z "$U_DISK_DIRS" ]; then
U_DISK_DIRS=0
fi
DISK=$((DISK + U_DISK_DIRS))
U_DISK_WEB=0
U_DISK_MAIL=0
U_DISK_DB=0
@ -69,7 +69,7 @@ for user in $user_list; do
U_DNS_DOMAINS=0
U_DNS_RECORDS=0
U_MAIL_DOMAINS=0
U_MAIL_DKMI=0
U_MAIL_DKIM=0
U_MAIL_ACCOUNTS=0
U_DATABASES=0
U_CRON_JOBS=0