diff --git a/bin/v_add_cron_job b/bin/v-add-cron-job similarity index 98% rename from bin/v_add_cron_job rename to bin/v-add-cron-job index e7394603..fd94c5b8 100755 --- a/bin/v_add_cron_job +++ b/bin/v-add-cron-job @@ -72,7 +72,7 @@ sync_cron_jobs increase_user_value $user '$U_CRON_JOBS' # Restart crond -$BIN/v_restart_cron "$EVENT" +$BIN/v-restart-cron "$EVENT" # Logging log_history "added cron job $job" diff --git a/bin/v_add_cron_report b/bin/v-add-cron-report similarity index 97% rename from bin/v_add_cron_report rename to bin/v-add-cron-report index 0b924ca6..fa1c0edc 100755 --- a/bin/v_add_cron_report +++ b/bin/v-add-cron-report @@ -45,7 +45,7 @@ sync_cron_jobs #----------------------------------------------------------# # Restart crond -$BIN/v_restart_cron "$EVENT" +$BIN/v-restart-cron "$EVENT" # Logging log_history "enabled cron reporting" diff --git a/bin/v_add_database b/bin/v-add-database similarity index 97% rename from bin/v_add_database rename to bin/v-add-database index e5a78fd7..c57d7f35 100755 --- a/bin/v_add_database +++ b/bin/v-add-database @@ -3,7 +3,7 @@ # options: user database dbuser dbpass type [host] [charset] # # The function creates the database concatenating username and user_db. -# Supported yypes of databases you can get using v_list_sys_config script. +# Supported yypes of databases you can get using v-list-sys-config script. # If the host isn't stated and there are few hosts configured on the server, # then the host will be defined by one of three algorithms. "First" will choose # the first host in the list. "Random" will chose the host by a chance. diff --git a/bin/v_add_database_server b/bin/v-add-database-server similarity index 100% rename from bin/v_add_database_server rename to bin/v-add-database-server diff --git a/bin/v_add_dns_domain b/bin/v-add-dns-domain similarity index 99% rename from bin/v_add_dns_domain rename to bin/v-add-dns-domain index 75558d21..92b65153 100755 --- a/bin/v_add_dns_domain +++ b/bin/v-add-dns-domain @@ -133,7 +133,7 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records" # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_add_dns_domain_record b/bin/v-add-dns-domain-record similarity index 98% rename from bin/v_add_dns_domain_record rename to bin/v-add-dns-domain-record index 92a11b51..ca9c6247 100755 --- a/bin/v_add_dns_domain_record +++ b/bin/v-add-dns-domain-record @@ -82,7 +82,7 @@ increase_user_value "$user" '$U_DNS_RECORDS' # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_add_dns_on_web_alias b/bin/v-add-dns-on-web-alias similarity index 90% rename from bin/v_add_dns_on_web_alias rename to bin/v-add-dns-on-web-alias index df9b92bb..dc00e3a8 100755 --- a/bin/v_add_dns_on_web_alias +++ b/bin/v-add-dns-on-web-alias @@ -49,15 +49,15 @@ get_domain_values 'web' # Check if it a simple domain if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then if [ ! -e "$USER_DATA/dns/$dom_alias.conf" ]; then - $BIN/v_add_dns_domain $user $dom_alias $IP '' '' '' '' '' $restart + $BIN/v-add-dns-domain $user $dom_alias $IP '' '' '' '' '' $restart fi else # Check subdomain sub=$(echo "$dom_alias" | cut -f1 -d . -s) dom=$(echo "$dom_alias" | sed -e "s/^$sub.//" ) if [ ! -e "$USER_DATA/dns/$dom.conf" ]; then - $BIN/v_add_dns_domain $user $dom $IP '' '' '' '' '' $restart - $BIN/v_add_dns_domain_record $user $dom "$sub" A $IP '' '' $restart + $BIN/v-add-dns-domain $user $dom $IP '' '' '' '' '' $restart + $BIN/v-add-dns-domain-record $user $dom "$sub" A $IP '' '' $restart else if [ "$sub" == '*' ]; then rec=$(grep -w "RECORD='\*'" $USER_DATA/dns/$dom.conf) @@ -65,7 +65,7 @@ else rec=$(grep -w "RECORD='$sub'" $USER_DATA/dns/$dom.conf) fi if [ -z "$rec" ]; then - $BIN/v_add_dns_domain_record $user $dom "$sub" A $IP '' '' $restart + $BIN/v-add-dns-domain-record $user $dom "$sub" A $IP '' '' $restart fi fi fi diff --git a/bin/v_add_mail_account b/bin/v-add-mail-account similarity index 100% rename from bin/v_add_mail_account rename to bin/v-add-mail-account diff --git a/bin/v_add_mail_account_alias b/bin/v-add-mail-account-alias similarity index 100% rename from bin/v_add_mail_account_alias rename to bin/v-add-mail-account-alias diff --git a/bin/v_add_mail_account_autoreply b/bin/v-add-mail-account-autoreply similarity index 100% rename from bin/v_add_mail_account_autoreply rename to bin/v-add-mail-account-autoreply diff --git a/bin/v_add_mail_account_forward b/bin/v-add-mail-account-forward similarity index 100% rename from bin/v_add_mail_account_forward rename to bin/v-add-mail-account-forward diff --git a/bin/v_add_mail_domain b/bin/v-add-mail-domain similarity index 96% rename from bin/v_add_mail_domain rename to bin/v-add-mail-domain index 3e26d9bf..3fbc253d 100755 --- a/bin/v_add_mail_domain +++ b/bin/v-add-mail-domain @@ -85,11 +85,11 @@ if [ "$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_domain_record $user $domain $record TXT "$policy" + $BIN/v-add-dns-domain-record $user $domain $record TXT "$policy" record='mail._domainkey' selector="\"k=rsa\; p=$p\"" - $BIN/v_add_dns_domain_record $user $domain $record TXT "$selector" + $BIN/v-add-dns-domain-record $user $domain $record TXT "$selector" fi fi diff --git a/bin/v_add_mail_domain_antispam b/bin/v-add-mail-domain-antispam similarity index 100% rename from bin/v_add_mail_domain_antispam rename to bin/v-add-mail-domain-antispam diff --git a/bin/v_add_mail_domain_antivirus b/bin/v-add-mail-domain-antivirus similarity index 100% rename from bin/v_add_mail_domain_antivirus rename to bin/v-add-mail-domain-antivirus diff --git a/bin/v_add_mail_domain_catchall b/bin/v-add-mail-domain-catchall similarity index 100% rename from bin/v_add_mail_domain_catchall rename to bin/v-add-mail-domain-catchall diff --git a/bin/v_add_mail_domain_dkim b/bin/v-add-mail-domain-dkim similarity index 95% rename from bin/v_add_mail_domain_dkim rename to bin/v-add-mail-domain-dkim index 39060ed1..e5be80f0 100755 --- a/bin/v_add_mail_domain_dkim +++ b/bin/v-add-mail-domain-dkim @@ -58,11 +58,11 @@ if [ "$?" -eq 0 ]; then p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n') record='_domainkey' policy="\"t=y; o=~;\"" - $BIN/v_add_dns_domain_record $user $domain $record TXT "$policy" + $BIN/v-add-dns-domain-record $user $domain $record TXT "$policy" record='mail._domainkey' selector="\"k=rsa\; p=$p\"" - $BIN/v_add_dns_domain_record $user $domain $record TXT "$selector" + $BIN/v-add-dns-domain-record $user $domain $record TXT "$selector" fi diff --git a/bin/v_add_sys_ip b/bin/v-add-sys-ip similarity index 98% rename from bin/v_add_sys_ip rename to bin/v-add-sys-ip index e7c1c22f..f4ade078 100755 --- a/bin/v_add_sys_ip +++ b/bin/v-add-sys-ip @@ -90,7 +90,7 @@ fi # Restart web server if [ "$web_restart" = 'yes' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_add_user b/bin/v-add-user similarity index 92% rename from bin/v_add_user rename to bin/v-add-user index 9570effb..c7fc8340 100755 --- a/bin/v_add_user +++ b/bin/v-add-user @@ -99,7 +99,7 @@ chmod a+x $HOMEDIR/$user # Checking quota if [ ! -z "$DISK_QUOTA" ] && [ "$DISK_QUOTA" != 'no' ]; then DISK_QUOTA=$(echo "$pkg_data" | grep 'DISK_QUOTA' | cut -f 2 -d \') - #$BIN/v_add_user_quota "$user" "$DISK_QUOTA" + #$BIN/v-add-user_quota "$user" "$DISK_QUOTA" fi @@ -119,16 +119,16 @@ chmod 660 $USER_DATA/history.log touch $USER_DATA/stats.log chmod 660 $USER_DATA/stats.log -echo "v_update_user_disk $user" >> $VESTA/data/queue/disk.pipe +echo "v-update-user-disk $user" >> $VESTA/data/queue/disk.pipe if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then mkdir $USER_DATA/ssl chmod 770 $USER_DATA/ssl touch $USER_DATA/web.conf chmod 660 $USER_DATA/web.conf - echo "$BIN/v_update_web_domains_traff $user" \ + echo "$BIN/v-update-web-domains-traff $user" \ >> $VESTA/data/queue/traffic.pipe - echo "v_update_web_domains_disk $user" >> $VESTA/data/queue/disk.pipe + echo "v-update-web-domains-disk $user" >> $VESTA/data/queue/disk.pipe fi if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then @@ -143,13 +143,13 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then chmod 770 $USER_DATA/mail touch $USER_DATA/mail.conf chmod 660 $USER_DATA/mail.conf - echo "v_update_mail_domains_disk $user" >> $VESTA/data/queue/disk.pipe + echo "v-update-mail-domains-disk $user" >> $VESTA/data/queue/disk.pipe fi if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then touch $USER_DATA/db.conf chmod 660 $USER_DATA/db.conf - echo "v_update_databases_disk $user" >> $VESTA/data/queue/disk.pipe + echo "v-update-databases-disk $user" >> $VESTA/data/queue/disk.pipe fi if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then @@ -159,7 +159,7 @@ fi # Filling user config if [ "$user" != 'admin' ]; then - ip_avail=$($BIN/v_list_user_ips admin plain |grep -w shared|wc -l) + ip_avail=$($BIN/v-list-user-ips admin plain |grep -w shared|wc -l) u_users=0 else ip_avail=0 diff --git a/bin/v_add_user_backup b/bin/v-add-user-backup similarity index 100% rename from bin/v_add_user_backup rename to bin/v-add-user-backup diff --git a/bin/v_add_user_package b/bin/v-add-user-package similarity index 100% rename from bin/v_add_user_package rename to bin/v-add-user-package diff --git a/bin/v_add_web_domain b/bin/v-add-web-domain similarity index 99% rename from bin/v_add_web_domain rename to bin/v-add-web-domain index 4854b20e..fd3b2b40 100755 --- a/bin/v_add_web_domain +++ b/bin/v-add-web-domain @@ -180,7 +180,7 @@ chmod 660 $USER_DATA/web.conf # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_add_web_domain_alias b/bin/v-add-web-domain-alias similarity index 98% rename from bin/v_add_web_domain_alias rename to bin/v-add-web-domain-alias index 4ef313ee..76f615eb 100755 --- a/bin/v_add_web_domain_alias +++ b/bin/v-add-web-domain-alias @@ -100,7 +100,7 @@ increase_user_value "$user" '$U_WEB_ALIASES' # Adding task to the vesta pipe if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi log_history "added $dom_alias as alias for $domain" diff --git a/bin/v_add_web_domain_cgi b/bin/v-add-web-domain-cgi similarity index 98% rename from bin/v_add_web_domain_cgi rename to bin/v-add-web-domain-cgi index 7df5455c..02c85133 100755 --- a/bin/v_add_web_domain_cgi +++ b/bin/v-add-web-domain-cgi @@ -71,7 +71,7 @@ fi update_object_value 'web' 'DOMAIN' "$domain" '$CGI' 'yes' # Restart web server -$BIN/v_restart_web "$EVENT" +$BIN/v-restart-web "$EVENT" # Logging log_history "enabled cgi support for $domain" diff --git a/bin/v_add_web_domain_elog b/bin/v-add-web-domain-elog similarity index 98% rename from bin/v_add_web_domain_elog rename to bin/v-add-web-domain-elog index 2a09d68c..e92dbdb8 100755 --- a/bin/v_add_web_domain_elog +++ b/bin/v-add-web-domain-elog @@ -89,7 +89,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ELOG' 'yes' # Adding task to the vesta pipe if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_add_web_domain_ftp b/bin/v-add-web-domain-ftp similarity index 100% rename from bin/v_add_web_domain_ftp rename to bin/v-add-web-domain-ftp diff --git a/bin/v_add_web_domain_nginx b/bin/v-add-web-domain-nginx similarity index 98% rename from bin/v_add_web_domain_nginx rename to bin/v-add-web-domain-nginx index b1af9d38..701f19ef 100755 --- a/bin/v_add_web_domain_nginx +++ b/bin/v-add-web-domain-nginx @@ -101,7 +101,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$NGINX_EXT' "$extentions" # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi log_history "enabled nginx support for $domain" diff --git a/bin/v_add_web_domain_ssl b/bin/v-add-web-domain-ssl similarity index 99% rename from bin/v_add_web_domain_ssl rename to bin/v-add-web-domain-ssl index e7660175..db7705bd 100755 --- a/bin/v_add_web_domain_ssl +++ b/bin/v-add-web-domain-ssl @@ -126,7 +126,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes" # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_add_web_domain_stats b/bin/v-add-web-domain-stats similarity index 94% rename from bin/v_add_web_domain_stats rename to bin/v-add-web-domain-stats index ac007369..fc89b7e5 100755 --- a/bin/v_add_web_domain_stats +++ b/bin/v-add-web-domain-stats @@ -6,7 +6,7 @@ # two types of these system is supported - awstats and webalizer. For viewing # the domain statistics use http://domain.tld/vstats/ link. Access this page # is not protected by default. If you want to secure it with passwords you -# should use v_add_web_domain_stat_auth script. +# should use v-add-web-domain_stat_auth script. #----------------------------------------------------------# @@ -71,7 +71,7 @@ cat $WEBTPL/$type.tpl |\ #----------------------------------------------------------# # Schedule statistic processing -echo "$BIN/v_update_web_domain_stat $user $domain" >> \ +echo "$BIN/v-update-web-domain-stat $user $domain" >> \ $VESTA/data/queue/webstats.pipe # Update config @@ -82,6 +82,6 @@ log_history "enabled web log analyzer for $domain" log_event "$OK" "$EVENT" # Build stats -exec $BIN/v_update_web_domain_stat $user $domain +exec $BIN/v-update-web-domain-stat $user $domain exit diff --git a/bin/v_add_web_domain_stats_user b/bin/v-add-web-domain-stats-user similarity index 100% rename from bin/v_add_web_domain_stats_user rename to bin/v-add-web-domain-stats-user diff --git a/bin/v_backup_user b/bin/v-backup-user similarity index 100% rename from bin/v_backup_user rename to bin/v-backup-user diff --git a/bin/v_backup_users b/bin/v-backup-users similarity index 94% rename from bin/v_backup_users rename to bin/v-backup-users index 196cbc2e..fd33721b 100755 --- a/bin/v_backup_users +++ b/bin/v-backup-users @@ -25,7 +25,7 @@ source $VESTA/func/main.sh for user in $(ls $VESTA/data/users); do check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf) if [ ! -z "$check_suspend" ]; then - $BIN/v_backup_user $user >> $VESTA/log/backup.log 2>&1 + $BIN/v-backup-user $user >> $VESTA/log/backup.log 2>&1 fi done diff --git a/bin/v_change_cron_job b/bin/v-change-cron-job similarity index 98% rename from bin/v_change_cron_job rename to bin/v-change-cron-job index 7afb1353..00d300de 100755 --- a/bin/v_change_cron_job +++ b/bin/v-change-cron-job @@ -64,7 +64,7 @@ sync_cron_jobs #----------------------------------------------------------# # Restart crond -$BIN/v_restart_cron "$EVENT" +$BIN/v-restart-cron "$EVENT" # Logging log_history "changed cron job $job" diff --git a/bin/v_change_database_password b/bin/v-change-database-password similarity index 100% rename from bin/v_change_database_password rename to bin/v-change-database-password diff --git a/bin/v_change_dns_domain_exp b/bin/v-change-dns-domain-exp similarity index 100% rename from bin/v_change_dns_domain_exp rename to bin/v-change-dns-domain-exp diff --git a/bin/v_change_dns_domain_ip b/bin/v-change-dns-domain-ip similarity index 98% rename from bin/v_change_dns_domain_ip rename to bin/v-change-dns-domain-ip index 245e0c12..6f4c6d93 100755 --- a/bin/v_change_dns_domain_ip +++ b/bin/v-change-dns-domain-ip @@ -55,7 +55,7 @@ update_domain_zone # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_change_dns_domain_record b/bin/v-change-dns-domain-record similarity index 98% rename from bin/v_change_dns_domain_record rename to bin/v-change-dns-domain-record index cf12ed0b..a694b9cb 100755 --- a/bin/v_change_dns_domain_record +++ b/bin/v-change-dns-domain-record @@ -68,7 +68,7 @@ update_domain_zone #----------------------------------------------------------# # Restart named -$BIN/v_restart_dns "$EVENT" +$BIN/v-restart-dns "$EVENT" # Logging log_history "changed dns record on $domain to $dvalue" diff --git a/bin/v_change_dns_domain_soa b/bin/v-change-dns-domain-soa similarity index 95% rename from bin/v_change_dns_domain_soa rename to bin/v-change-dns-domain-soa index 52998a20..867fd32e 100755 --- a/bin/v_change_dns_domain_soa +++ b/bin/v-change-dns-domain-soa @@ -3,7 +3,7 @@ # options: user domain soa # # The function for changing SOA record. This type of records can not be -# modified by v_change_dns_domain_record call. +# modified by v-change-dns-domain-record call. #----------------------------------------------------------# @@ -53,7 +53,7 @@ update_domain_zone # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_change_dns_domain_tpl b/bin/v-change-dns-domain-tpl similarity index 98% rename from bin/v_change_dns_domain_tpl rename to bin/v-change-dns-domain-tpl index 93cb80f9..00d3752b 100755 --- a/bin/v_change_dns_domain_tpl +++ b/bin/v-change-dns-domain-tpl @@ -75,7 +75,7 @@ update_domain_zone #----------------------------------------------------------# # Restart named -$BIN/v_restart_dns "$EVENT" +$BIN/v-restart-dns "$EVENT" # 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 similarity index 98% rename from bin/v_change_dns_domain_ttl rename to bin/v-change-dns-domain-ttl index d7ea90f8..f99e9492 100755 --- a/bin/v_change_dns_domain_ttl +++ b/bin/v-change-dns-domain-ttl @@ -52,7 +52,7 @@ update_domain_zone # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_change_mail_account_password b/bin/v-change-mail-account-password similarity index 100% rename from bin/v_change_mail_account_password rename to bin/v-change-mail-account-password diff --git a/bin/v_change_mail_account_quota b/bin/v-change-mail-account-quota similarity index 100% rename from bin/v_change_mail_account_quota rename to bin/v-change-mail-account-quota diff --git a/bin/v_change_mail_domain_catchall b/bin/v-change-mail-domain-catchall similarity index 100% rename from bin/v_change_mail_domain_catchall rename to bin/v-change-mail-domain-catchall diff --git a/bin/v_change_sys_config_value b/bin/v-change-sys-config-value similarity index 100% rename from bin/v_change_sys_config_value rename to bin/v-change-sys-config-value diff --git a/bin/v_change_sys_ip_name b/bin/v-change-sys-ip-name similarity index 100% rename from bin/v_change_sys_ip_name rename to bin/v-change-sys-ip-name diff --git a/bin/v_change_sys_ip_owner b/bin/v-change-sys-ip-owner similarity index 100% rename from bin/v_change_sys_ip_owner rename to bin/v-change-sys-ip-owner diff --git a/bin/v_change_sys_ip_status b/bin/v-change-sys-ip-status similarity index 100% rename from bin/v_change_sys_ip_status rename to bin/v-change-sys-ip-status diff --git a/bin/v_change_user_contact b/bin/v-change-user-contact similarity index 100% rename from bin/v_change_user_contact rename to bin/v-change-user-contact diff --git a/bin/v_change_user_name b/bin/v-change-user-name similarity index 100% rename from bin/v_change_user_name rename to bin/v-change-user-name diff --git a/bin/v_change_user_ns b/bin/v-change-user-ns similarity index 100% rename from bin/v_change_user_ns rename to bin/v-change-user-ns diff --git a/bin/v_change_user_package b/bin/v-change-user-package similarity index 100% rename from bin/v_change_user_package rename to bin/v-change-user-package diff --git a/bin/v_change_user_password b/bin/v-change-user-password similarity index 100% rename from bin/v_change_user_password rename to bin/v-change-user-password diff --git a/bin/v_change_user_shell b/bin/v-change-user-shell similarity index 100% rename from bin/v_change_user_shell rename to bin/v-change-user-shell diff --git a/bin/v_change_user_template b/bin/v-change-user-template similarity index 100% rename from bin/v_change_user_template rename to bin/v-change-user-template diff --git a/bin/v_change_web_domain_ftp b/bin/v-change-web-domain-ftp similarity index 100% rename from bin/v_change_web_domain_ftp rename to bin/v-change-web-domain-ftp diff --git a/bin/v_change_web_domain_ip b/bin/v-change-web-domain-ip similarity index 98% rename from bin/v_change_web_domain_ip rename to bin/v-change-web-domain-ip index 88be473a..936689d6 100755 --- a/bin/v_change_web_domain_ip +++ b/bin/v-change-web-domain-ip @@ -86,7 +86,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$ip" # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_change_web_domain_nginx_tpl b/bin/v-change-web-domain-nginx-tpl similarity index 98% rename from bin/v_change_web_domain_nginx_tpl rename to bin/v-change-web-domain-nginx-tpl index 503a84a7..23b6ed07 100755 --- a/bin/v_change_web_domain_nginx_tpl +++ b/bin/v-change-web-domain-nginx-tpl @@ -91,7 +91,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$NGINX_EXT' "$extentions" # Restart web if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_change_web_domain_sslcert b/bin/v-change-web-domain-sslcert similarity index 98% rename from bin/v_change_web_domain_sslcert rename to bin/v-change-web-domain-sslcert index 968a08c1..fbc8f03f 100755 --- a/bin/v_change_web_domain_sslcert +++ b/bin/v-change-web-domain-sslcert @@ -70,7 +70,7 @@ fi #----------------------------------------------------------# # Restart web server -$BIN/v_restart_web "$EVENT" +$BIN/v-restart-web "$EVENT" # Logging log_history "changed ssl certificate for $domain" diff --git a/bin/v_change_web_domain_sslhome b/bin/v-change-web-domain-sslhome similarity index 98% rename from bin/v_change_web_domain_sslhome rename to bin/v-change-web-domain-sslhome index 46d43bc3..633a602c 100755 --- a/bin/v_change_web_domain_sslhome +++ b/bin/v-change-web-domain-sslhome @@ -70,7 +70,7 @@ fi update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME" # Restart web server -$BIN/v_restart_web "$EVENT" +$BIN/v-restart-web "$EVENT" # 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 similarity index 98% rename from bin/v_change_web_domain_stats rename to bin/v-change-web-domain-stats index bcc17c48..4abcd200 100755 --- a/bin/v_change_web_domain_stats +++ b/bin/v-change-web-domain-stats @@ -90,6 +90,6 @@ log_history "changed web log stats for $domain to $type" log_event "$OK" "$EVENT" # Build stats -exec $BIN/v_update_web_domain_stat $user $domain +exec $BIN/v-update-web-domain-stat $user $domain exit diff --git a/bin/v_change_web_domain_tpl b/bin/v-change-web-domain-tpl similarity index 98% rename from bin/v_change_web_domain_tpl rename to bin/v-change-web-domain-tpl index fc3428a0..35964da7 100755 --- a/bin/v_change_web_domain_tpl +++ b/bin/v-change-web-domain-tpl @@ -100,7 +100,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template" # Restart web if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_check_user_password b/bin/v-check-user-password similarity index 100% rename from bin/v_check_user_password rename to bin/v-check-user-password diff --git a/bin/v_delete_cron_job b/bin/v-delete-cron-job similarity index 98% rename from bin/v_delete_cron_job rename to bin/v-delete-cron-job index 0ddf9568..fd71812f 100755 --- a/bin/v_delete_cron_job +++ b/bin/v-delete-cron-job @@ -53,7 +53,7 @@ sync_cron_jobs decrease_user_value "$user" '$U_CRON_JOBS' # Restart crond -$BIN/v_restart_cron "$EVENT" +$BIN/v-restart-cron "$EVENT" # Logging log_history "deleted cron job $job" diff --git a/bin/v_delete_cron_reports b/bin/v-delete-cron-reports similarity index 97% rename from bin/v_delete_cron_reports rename to bin/v-delete-cron-reports index 9ae82626..22fbc0b1 100755 --- a/bin/v_delete_cron_reports +++ b/bin/v-delete-cron-reports @@ -45,7 +45,7 @@ sync_cron_jobs #----------------------------------------------------------# # Restart crond -$BIN/v_restart_cron "$EVENT" +$BIN/v-restart-cron "$EVENT" # Logging log_history "disabled cron reporting" diff --git a/bin/v_delete_database b/bin/v-delete-database similarity index 100% rename from bin/v_delete_database rename to bin/v-delete-database diff --git a/bin/v_delete_database_server b/bin/v-delete-database-server similarity index 100% rename from bin/v_delete_database_server rename to bin/v-delete-database-server diff --git a/bin/v_delete_databases b/bin/v-delete-databases similarity index 96% rename from bin/v_delete_databases rename to bin/v-delete-databases index 374cc884..2069be0b 100755 --- a/bin/v_delete_databases +++ b/bin/v-delete-databases @@ -34,7 +34,7 @@ is_object_unsuspended 'user' 'USER' "$user" # Starting delete loop for database in $(search_objects 'db' 'SUSPENDED' "no" 'DB'); do - $BIN/v_delete_database "$user" "$database" + $BIN/v-delete-database "$user" "$database" done diff --git a/bin/v_delete_dns_domain b/bin/v-delete-dns-domain similarity index 98% rename from bin/v_delete_dns_domain rename to bin/v-delete-dns-domain index 0fc4e7d2..529764c7 100755 --- a/bin/v_delete_dns_domain +++ b/bin/v-delete-dns-domain @@ -59,7 +59,7 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records" # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi diff --git a/bin/v_delete_dns_domain_record b/bin/v-delete-dns-domain-record similarity index 98% rename from bin/v_delete_dns_domain_record rename to bin/v-delete-dns-domain-record index b94aeb7b..5b6aa1a0 100755 --- a/bin/v_delete_dns_domain_record +++ b/bin/v-delete-dns-domain-record @@ -55,7 +55,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records" decrease_user_value "$user" '$U_DNS_RECORDS' # Restart named -$BIN/v_restart_dns "$EVENT" +$BIN/v-restart-dns "$EVENT" # Logging log_history "deleted dns record $id on $domain" diff --git a/bin/v_delete_dns_domains b/bin/v-delete-dns-domains similarity index 93% rename from bin/v_delete_dns_domains rename to bin/v-delete-dns-domains index bac71fe7..378beb20 100755 --- a/bin/v_delete_dns_domains +++ b/bin/v-delete-dns-domains @@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user" # Starting delete loop for domain in $(search_objects 'dns' 'SUSPENDED' "no" 'DOMAIN'); do - $BIN/v_delete_dns_domain "$user" "$domain" 'no' + $BIN/v-delete-dns-domain "$user" "$domain" 'no' done @@ -42,7 +42,7 @@ done #----------------------------------------------------------# # Restart named -$BIN/v_restart_dns "$EVENT" +$BIN/v-restart-dns "$EVENT" # Logging log_event "$OK" "$EVENT" diff --git a/bin/v_delete_dns_on_web_alias b/bin/v-delete-dns-on-web-alias similarity index 94% rename from bin/v_delete_dns_on_web_alias rename to bin/v-delete-dns-on-web-alias index 5b845234..aac8ea1d 100755 --- a/bin/v_delete_dns_on_web_alias +++ b/bin/v-delete-dns-on-web-alias @@ -49,7 +49,7 @@ get_domain_values 'web' # Check if it a simple domain if [ $(echo -e "${dom_alias//\./\n}" | wc -l) -le 2 ]; then if [ -e "$USER_DATA/dns/$dom_alias.conf" ]; then - $BIN/v_delete_dns_domain $user $dom_alias $IP $restart + $BIN/v-delete-dns-domain $user $dom_alias $IP $restart fi else # Check subdomain @@ -63,7 +63,7 @@ else fi if [ ! -z "$rec" ]; then eval "$rec" - $BIN/v_delete_dns_domain_record $user "$root" "$ID" + $BIN/v-delete-dns-domain-record $user "$root" "$ID" fi fi fi diff --git a/bin/v_delete_mail_account b/bin/v-delete-mail-account similarity index 100% rename from bin/v_delete_mail_account rename to bin/v-delete-mail-account diff --git a/bin/v_delete_mail_account_alias b/bin/v-delete-mail-account-alias similarity index 100% rename from bin/v_delete_mail_account_alias rename to bin/v-delete-mail-account-alias diff --git a/bin/v_delete_mail_account_autoreply b/bin/v-delete-mail-account-autoreply similarity index 100% rename from bin/v_delete_mail_account_autoreply rename to bin/v-delete-mail-account-autoreply diff --git a/bin/v_delete_mail_account_forward b/bin/v-delete-mail-account-forward similarity index 100% rename from bin/v_delete_mail_account_forward rename to bin/v-delete-mail-account-forward diff --git a/bin/v_delete_mail_domain b/bin/v-delete-mail-domain similarity index 100% rename from bin/v_delete_mail_domain rename to bin/v-delete-mail-domain diff --git a/bin/v_delete_mail_domain_antispam b/bin/v-delete-mail-domain-antispam similarity index 100% rename from bin/v_delete_mail_domain_antispam rename to bin/v-delete-mail-domain-antispam diff --git a/bin/v_delete_mail_domain_antivirus b/bin/v-delete-mail-domain-antivirus similarity index 100% rename from bin/v_delete_mail_domain_antivirus rename to bin/v-delete-mail-domain-antivirus diff --git a/bin/v_delete_mail_domain_catchall b/bin/v-delete-mail-domain-catchall similarity index 100% rename from bin/v_delete_mail_domain_catchall rename to bin/v-delete-mail-domain-catchall diff --git a/bin/v_delete_mail_domain_dkim b/bin/v-delete-mail-domain-dkim similarity index 94% rename from bin/v_delete_mail_domain_dkim rename to bin/v-delete-mail-domain-dkim index 84082e66..6e639703 100755 --- a/bin/v_delete_mail_domain_dkim +++ b/bin/v-delete-mail-domain-dkim @@ -46,10 +46,10 @@ rm -f $HOMEDIR/$user/conf/mail/$domain/dkim.pem # Checking dns domain check_dns_domain=$(is_object_valid 'dns' 'DOMAIN' "$domain") if [ "$?" -eq 0 ]; then - records=$($BIN/v_list_dns_domain_records $user $domain plain) + records=$($BIN/v-list-dns-domain-records $user $domain plain) dkim_records=$(echo "$records" |grep -w '_domainkey' | cut -f 1 -d ' ') for id in $dkim_records; do - $BIN/v_delete_dns_domain_record $user $domain $id + $BIN/v-delete-dns-domain-record $user $domain $id done fi diff --git a/bin/v_delete_mail_domains b/bin/v-delete-mail-domains similarity index 96% rename from bin/v_delete_mail_domains rename to bin/v-delete-mail-domains index 773f41b8..27a9e129 100755 --- a/bin/v_delete_mail_domains +++ b/bin/v-delete-mail-domains @@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user" # Starting delete loop for domain in $(search_objects 'mail' 'SUSPENDED' "no" 'DOMAIN'); do - $BIN/v_delete_mail_domain "$user" "$domain" + $BIN/v-delete-mail-domain "$user" "$domain" done diff --git a/bin/v_delete_sys_ip b/bin/v-delete-sys-ip similarity index 98% rename from bin/v_delete_sys_ip rename to bin/v-delete-sys-ip index 8701f111..3089a918 100755 --- a/bin/v_delete_sys_ip +++ b/bin/v-delete-sys-ip @@ -84,7 +84,7 @@ fi # Adding task to the vesta pipe if [ "$web_restart" = 'yes' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_delete_user b/bin/v-delete-user similarity index 87% rename from bin/v_delete_user rename to bin/v-delete-user index 284f51fb..927f49c1 100755 --- a/bin/v_delete_user +++ b/bin/v-delete-user @@ -40,8 +40,8 @@ fi # Checking web system is enabled if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then - $BIN/v_unsuspend_web_domains $user $restart - $BIN/v_delete_web_domains $user $restart + $BIN/v-unsuspend-web-domains $user $restart + $BIN/v-delete-web-domains $user $restart rv="$?" if [ "$rv" -ne '0' ]; then exit $rv @@ -50,8 +50,8 @@ fi # Checking dns system is enabled if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then - $BIN/v_unsuspend_dns_domains $user $restart - $BIN/v_delete_dns_domains $user $restart + $BIN/v-unsuspend-dns-domains $user $restart + $BIN/v-delete-dns-domains $user $restart rv="$?" if [ "$rv" -ne '0' ]; then exit $rv @@ -60,8 +60,8 @@ fi # Checking mail system is enabled if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then - $BIN/v_unsuspend_mail_domains $user - $BIN/v_delete_mail_domains $user + $BIN/v-unsuspend-mail-domains $user + $BIN/v-delete-mail-domains $user rv="$?" if [ "$rv" -ne '0' ]; then exit $rv @@ -70,8 +70,8 @@ fi # Checking db system is enabled if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then - $BIN/v_unsuspend_databases $user - $BIN/v_delete_databases $user + $BIN/v-unsuspend-databases $user + $BIN/v-delete-databases $user rv="$?" if [ "$rv" -ne '0' ]; then exit $rv @@ -79,7 +79,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then fi # Checking ip -$BIN/v_delete_user_ips "$user" +$BIN/v-delete-user-ips "$user" rv="$?" if [ "$rv" -ne '0' ]; then exit $rv diff --git a/bin/v_delete_user_backup b/bin/v-delete-user-backup similarity index 100% rename from bin/v_delete_user_backup rename to bin/v-delete-user-backup diff --git a/bin/v_delete_user_ips b/bin/v-delete-user-ips similarity index 100% rename from bin/v_delete_user_ips rename to bin/v-delete-user-ips diff --git a/bin/v_delete_user_package b/bin/v-delete-user-package similarity index 100% rename from bin/v_delete_user_package rename to bin/v-delete-user-package diff --git a/bin/v_delete_web_domain b/bin/v-delete-web-domain similarity index 99% rename from bin/v_delete_web_domain rename to bin/v-delete-web-domain index a207e994..b888b80e 100755 --- a/bin/v_delete_web_domain +++ b/bin/v-delete-web-domain @@ -154,7 +154,7 @@ fi # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_delete_web_domain_alias b/bin/v-delete-web-domain-alias similarity index 98% rename from bin/v_delete_web_domain_alias rename to bin/v-delete-web-domain-alias index 90ae382c..7bb7d8fa 100755 --- a/bin/v_delete_web_domain_alias +++ b/bin/v-delete-web-domain-alias @@ -98,7 +98,7 @@ decrease_user_value "$user" '$U_WEB_ALIASES' # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_delete_web_domain_cgi b/bin/v-delete-web-domain-cgi similarity index 98% rename from bin/v_delete_web_domain_cgi rename to bin/v-delete-web-domain-cgi index 3f027b52..47b057cd 100755 --- a/bin/v_delete_web_domain_cgi +++ b/bin/v-delete-web-domain-cgi @@ -70,7 +70,7 @@ fi update_object_value 'web' 'DOMAIN' "$domain" '$CGI' 'no' # Restart web server -$BIN/v_restart_web "$EVENT" +$BIN/v-restart-web "$EVENT" # Logging log_history "disabled cgi support for $domain" diff --git a/bin/v_delete_web_domain_elog b/bin/v-delete-web-domain-elog similarity index 98% rename from bin/v_delete_web_domain_elog rename to bin/v-delete-web-domain-elog index 3bede3b5..4b33fa7f 100755 --- a/bin/v_delete_web_domain_elog +++ b/bin/v-delete-web-domain-elog @@ -87,7 +87,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ELOG' 'no' # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_delete_web_domain_ftp b/bin/v-delete-web-domain-ftp similarity index 100% rename from bin/v_delete_web_domain_ftp rename to bin/v-delete-web-domain-ftp diff --git a/bin/v_delete_web_domain_nginx b/bin/v-delete-web-domain-nginx similarity index 98% rename from bin/v_delete_web_domain_nginx rename to bin/v-delete-web-domain-nginx index 41ac0485..f7613ae2 100755 --- a/bin/v_delete_web_domain_nginx +++ b/bin/v-delete-web-domain-nginx @@ -77,7 +77,7 @@ fi # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_delete_web_domain_ssl b/bin/v-delete-web-domain-ssl similarity index 98% rename from bin/v_delete_web_domain_ssl rename to bin/v-delete-web-domain-ssl index 5857a964..c3361514 100755 --- a/bin/v_delete_web_domain_ssl +++ b/bin/v-delete-web-domain-ssl @@ -91,7 +91,7 @@ decrease_user_value "$user" '$U_WEB_SSL' # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_delete_web_domain_stats b/bin/v-delete-web-domain-stats similarity index 100% rename from bin/v_delete_web_domain_stats rename to bin/v-delete-web-domain-stats diff --git a/bin/v_delete_web_domain_stats_user b/bin/v-delete-web-domain-stats-user similarity index 100% rename from bin/v_delete_web_domain_stats_user rename to bin/v-delete-web-domain-stats-user diff --git a/bin/v_delete_web_domains b/bin/v-delete-web-domains similarity index 93% rename from bin/v_delete_web_domains rename to bin/v-delete-web-domains index 31f4b40f..fe791006 100755 --- a/bin/v_delete_web_domains +++ b/bin/v-delete-web-domains @@ -34,7 +34,7 @@ is_object_valid 'user' 'USER' "$user" # Starting delete loop for domain in $(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'); do - $BIN/v_delete_web_domain "$user" "$domain" 'no' + $BIN/v-delete-web-domain "$user" "$domain" 'no' done @@ -44,7 +44,7 @@ done # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_get_dns_domain_value b/bin/v-get-dns-domain-value similarity index 100% rename from bin/v_get_dns_domain_value rename to bin/v-get-dns-domain-value diff --git a/bin/v_get_user_value b/bin/v-get-user-value similarity index 100% rename from bin/v_get_user_value rename to bin/v-get-user-value diff --git a/bin/v_get_web_domain_value b/bin/v-get-web-domain-value similarity index 100% rename from bin/v_get_web_domain_value rename to bin/v-get-web-domain-value diff --git a/bin/v_list_cron_job b/bin/v-list-cron-job similarity index 100% rename from bin/v_list_cron_job rename to bin/v-list-cron-job diff --git a/bin/v_list_cron_jobs b/bin/v-list-cron-jobs similarity index 100% rename from bin/v_list_cron_jobs rename to bin/v-list-cron-jobs diff --git a/bin/v_list_database b/bin/v-list-database similarity index 100% rename from bin/v_list_database rename to bin/v-list-database diff --git a/bin/v_list_database_server b/bin/v-list-database-server similarity index 100% rename from bin/v_list_database_server rename to bin/v-list-database-server diff --git a/bin/v_list_database_servers b/bin/v-list-database-servers similarity index 100% rename from bin/v_list_database_servers rename to bin/v-list-database-servers diff --git a/bin/v_list_database_types b/bin/v-list-database-types similarity index 100% rename from bin/v_list_database_types rename to bin/v-list-database-types diff --git a/bin/v_list_databases b/bin/v-list-databases similarity index 100% rename from bin/v_list_databases rename to bin/v-list-databases diff --git a/bin/v_list_dns_domain b/bin/v-list-dns-domain similarity index 100% rename from bin/v_list_dns_domain rename to bin/v-list-dns-domain diff --git a/bin/v_list_dns_domain_records b/bin/v-list-dns-domain-records similarity index 100% rename from bin/v_list_dns_domain_records rename to bin/v-list-dns-domain-records diff --git a/bin/v_list_dns_domains b/bin/v-list-dns-domains similarity index 100% rename from bin/v_list_dns_domains rename to bin/v-list-dns-domains diff --git a/bin/v_list_dns_template b/bin/v-list-dns-template similarity index 100% rename from bin/v_list_dns_template rename to bin/v-list-dns-template diff --git a/bin/v_list_dns_templates b/bin/v-list-dns-templates similarity index 100% rename from bin/v_list_dns_templates rename to bin/v-list-dns-templates diff --git a/bin/v_list_mail_account b/bin/v-list-mail-account similarity index 100% rename from bin/v_list_mail_account rename to bin/v-list-mail-account diff --git a/bin/v_list_mail_account_autoreply b/bin/v-list-mail-account-autoreply similarity index 100% rename from bin/v_list_mail_account_autoreply rename to bin/v-list-mail-account-autoreply diff --git a/bin/v_list_mail_accounts b/bin/v-list-mail-accounts similarity index 100% rename from bin/v_list_mail_accounts rename to bin/v-list-mail-accounts diff --git a/bin/v_list_mail_domain b/bin/v-list-mail-domain similarity index 100% rename from bin/v_list_mail_domain rename to bin/v-list-mail-domain diff --git a/bin/v_list_mail_domain_dkim b/bin/v-list-mail-domain-dkim similarity index 100% rename from bin/v_list_mail_domain_dkim rename to bin/v-list-mail-domain-dkim diff --git a/bin/v_list_mail_domains b/bin/v-list-mail-domains similarity index 100% rename from bin/v_list_mail_domains rename to bin/v-list-mail-domains diff --git a/bin/v_list_sys_config b/bin/v-list-sys-config similarity index 100% rename from bin/v_list_sys_config rename to bin/v-list-sys-config diff --git a/bin/v_list_sys_interfaces b/bin/v-list-sys-interfaces similarity index 100% rename from bin/v_list_sys_interfaces rename to bin/v-list-sys-interfaces diff --git a/bin/v_list_sys_ip b/bin/v-list-sys-ip similarity index 100% rename from bin/v_list_sys_ip rename to bin/v-list-sys-ip diff --git a/bin/v_list_sys_ips b/bin/v-list-sys-ips similarity index 100% rename from bin/v_list_sys_ips rename to bin/v-list-sys-ips diff --git a/bin/v_list_sys_rrd b/bin/v-list-sys-rrd similarity index 100% rename from bin/v_list_sys_rrd rename to bin/v-list-sys-rrd diff --git a/bin/v_list_sys_shells b/bin/v-list-sys-shells similarity index 100% rename from bin/v_list_sys_shells rename to bin/v-list-sys-shells diff --git a/bin/v_list_sys_users b/bin/v-list-sys-users similarity index 100% rename from bin/v_list_sys_users rename to bin/v-list-sys-users diff --git a/bin/v_list_user b/bin/v-list-user similarity index 100% rename from bin/v_list_user rename to bin/v-list-user diff --git a/bin/v_list_user_backups b/bin/v-list-user-backups similarity index 100% rename from bin/v_list_user_backups rename to bin/v-list-user-backups diff --git a/bin/v_list_user_ips b/bin/v-list-user-ips similarity index 100% rename from bin/v_list_user_ips rename to bin/v-list-user-ips diff --git a/bin/v_list_user_log b/bin/v-list-user-log similarity index 100% rename from bin/v_list_user_log rename to bin/v-list-user-log diff --git a/bin/v_list_user_ns b/bin/v-list-user-ns similarity index 100% rename from bin/v_list_user_ns rename to bin/v-list-user-ns diff --git a/bin/v_list_user_package b/bin/v-list-user-package similarity index 100% rename from bin/v_list_user_package rename to bin/v-list-user-package diff --git a/bin/v_list_user_packages b/bin/v-list-user-packages similarity index 100% rename from bin/v_list_user_packages rename to bin/v-list-user-packages diff --git a/bin/v_list_user_stats b/bin/v-list-user-stats similarity index 100% rename from bin/v_list_user_stats rename to bin/v-list-user-stats diff --git a/bin/v_list_users b/bin/v-list-users similarity index 100% rename from bin/v_list_users rename to bin/v-list-users diff --git a/bin/v_list_web_domain b/bin/v-list-web-domain similarity index 100% rename from bin/v_list_web_domain rename to bin/v-list-web-domain diff --git a/bin/v_list_web_domain_ssl b/bin/v-list-web-domain-ssl similarity index 100% rename from bin/v_list_web_domain_ssl rename to bin/v-list-web-domain-ssl diff --git a/bin/v_list_web_domains b/bin/v-list-web-domains similarity index 100% rename from bin/v_list_web_domains rename to bin/v-list-web-domains diff --git a/bin/v_list_web_domains_alias b/bin/v-list-web-domains-alias similarity index 96% rename from bin/v_list_web_domains_alias rename to bin/v-list-web-domains-alias index 36e9cc8c..81a88666 100755 --- a/bin/v_list_web_domains_alias +++ b/bin/v-list-web-domains-alias @@ -4,7 +4,7 @@ # # The function for obtaining the list of aliases of all user's domains. This # call was arranged for filling in the lack of information by applying -# v_list_web_domains call in the shell format. +# v-list-web-domains call in the shell format. #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_elog b/bin/v-list-web-domains-elog similarity index 96% rename from bin/v_list_web_domains_elog rename to bin/v-list-web-domains-elog index 0d6ca6a9..95f75051 100755 --- a/bin/v_list_web_domains_elog +++ b/bin/v-list-web-domains-elog @@ -4,7 +4,7 @@ # # The function for obtaining the list of domains with parameter ErrorLog # displayed. This call was arranged for filling in the lack of information by -# applying v_list_web_domains call in the shell format. +# applying v-list-web-domains call in the shell format. #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_nginx b/bin/v-list-web-domains-nginx similarity index 96% rename from bin/v_list_web_domains_nginx rename to bin/v-list-web-domains-nginx index 2f894151..5bcb3082 100755 --- a/bin/v_list_web_domains_nginx +++ b/bin/v-list-web-domains-nginx @@ -4,7 +4,7 @@ # # The function for obtaining the list of domains with nginx parameter # displayed. This call was arranged for filling in the lack of information by -# applying v_list_web_domains call in the shell format. +# applying v-list-web-domains call in the shell format. #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_ssl b/bin/v-list-web-domains-ssl similarity index 96% rename from bin/v_list_web_domains_ssl rename to bin/v-list-web-domains-ssl index 4a34de7c..35c74200 100755 --- a/bin/v_list_web_domains_ssl +++ b/bin/v-list-web-domains-ssl @@ -4,7 +4,7 @@ # # The function for obtaining the list of domains with SSL parameter displayed. # This call was arranged for filling in the lack of information by applying -# v_list_web_domains call in the shell format. +# v-list-web-domains call in the shell format. #----------------------------------------------------------# diff --git a/bin/v_list_web_domains_stats b/bin/v-list-web-domains-stats similarity index 95% rename from bin/v_list_web_domains_stats rename to bin/v-list-web-domains-stats index 5519f2df..b0b890ca 100755 --- a/bin/v_list_web_domains_stats +++ b/bin/v-list-web-domains-stats @@ -4,7 +4,7 @@ # # The function for obtaining the list of domains with statistics parameter # displayed, including authentication settings. This call was arranged for -# filling in the lack of information by applying v_list_web_domains call in +# filling in the lack of information by applying v-list-web-domains call in # the shell format. diff --git a/bin/v_list_web_stats b/bin/v-list-web-stats similarity index 100% rename from bin/v_list_web_stats rename to bin/v-list-web-stats diff --git a/bin/v_list_web_templates b/bin/v-list-web-templates similarity index 100% rename from bin/v_list_web_templates rename to bin/v-list-web-templates diff --git a/bin/v_list_web_templates_nginx b/bin/v-list-web-templates-nginx similarity index 100% rename from bin/v_list_web_templates_nginx rename to bin/v-list-web-templates-nginx diff --git a/bin/v_rebuild_cron_jobs b/bin/v-rebuild-cron-jobs similarity index 97% rename from bin/v_rebuild_cron_jobs rename to bin/v-rebuild-cron-jobs index bcc6f123..84f5fa6b 100755 --- a/bin/v_rebuild_cron_jobs +++ b/bin/v-rebuild-cron-jobs @@ -42,7 +42,7 @@ sync_cron_jobs # Restart crond if [ "$restart" != 'no' ]; then - $BIN/v_restart_cron "$EVENT" + $BIN/v-restart-cron "$EVENT" fi # Logging diff --git a/bin/v_rebuild_databases b/bin/v-rebuild-databases similarity index 100% rename from bin/v_rebuild_databases rename to bin/v-rebuild-databases diff --git a/bin/v_rebuild_dns_domains b/bin/v-rebuild-dns-domains similarity index 99% rename from bin/v_rebuild_dns_domains rename to bin/v-rebuild-dns-domains index fd631b5d..1f489216 100755 --- a/bin/v_rebuild_dns_domains +++ b/bin/v-rebuild-dns-domains @@ -119,7 +119,7 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns" # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_rebuild_mail_domains b/bin/v-rebuild-mail-domains similarity index 95% rename from bin/v_rebuild_mail_domains rename to bin/v-rebuild-mail-domains index dfe3d75e..fddd91aa 100755 --- a/bin/v_rebuild_mail_domains +++ b/bin/v-rebuild-mail-domains @@ -91,10 +91,10 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do chmod 660 $HOMEDIR/$user/conf/mail/$domain/dkim.pem # Deleting old dkim records - records=$($BIN/v_list_dns_domain_records $user $domain plain) + records=$($BIN/v-list-dns-domain-records $user $domain plain) dkim_records=$(echo "$records" |grep -w '_domainkey'|cut -f 1 -d ' ') for id in $dkim_records; do - $BIN/v_delete_dns_domain_record $user $domain $id + $BIN/v-delete-dns-domain-record $user $domain $id done # Adding dkim dns records @@ -103,11 +103,11 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do p=$(cat $pub|grep -v ' KEY---'|tr -d '\n') record='_domainkey' policy="\"t=y; o=~;\"" - $BIN/v_add_dns_domain_record $user $domain $record TXT "$policy" + $BIN/v-add-dns-domain-record $user $domain $record TXT "$policy" record='mail._domainkey' slct="\"k=rsa\; p=$p\"" - $BIN/v_add_dns_domain_record $user $domain $record TXT "$slct" + $BIN/v-add-dns-domain-record $user $domain $record TXT "$slct" fi fi diff --git a/bin/v_rebuild_user b/bin/v-rebuild-user similarity index 90% rename from bin/v_rebuild_user rename to bin/v-rebuild-user index 837ba0ea..88b44180 100755 --- a/bin/v_rebuild_user +++ b/bin/v-rebuild-user @@ -70,13 +70,13 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then chmod 751 $HOMEDIR/$user/web chmod 777 $HOMEDIR/$user/tmp chown $user:$user $HOMEDIR/$user/web - $BIN/v_rebuild_web_domains $user $restart + $BIN/v-rebuild-web-domains $user $restart fi if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then mkdir -p $HOMEDIR/$user/conf/dns chmod 751 $HOMEDIR/$user/conf/dns - $BIN/v_rebuild_dns_domains $user $restart + $BIN/v-rebuild-dns-domains $user $restart fi if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then @@ -84,16 +84,16 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then mkdir -p $HOMEDIR/$user/mail chmod 751 $HOMEDIR/$user/mail chmod 751 $HOMEDIR/$user/conf/mail - $BIN/v_rebuild_mail_domains $user + $BIN/v-rebuild-mail-domains $user fi if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then - $BIN/v_rebuild_databases $user + $BIN/v-rebuild-databases $user fi if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then - $BIN/v_rebuild_cron_jobs $user $restart + $BIN/v-rebuild-cron-jobs $user $restart fi @@ -111,7 +111,7 @@ touch $USER_DATA/stats.log chmod 660 $USER_DATA/stats.log sed -i "/ $user$/d" $VESTA/data/queue/disk.pipe -echo "v_update_user_disk $user" >> $VESTA/data/queue/disk.pipe +echo "v-update-user-disk $user" >> $VESTA/data/queue/disk.pipe if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then mkdir -p $USER_DATA/ssl @@ -119,10 +119,10 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then touch $USER_DATA/web.conf chmod 660 $USER_DATA/web.conf if [ "$(grep -w $user $VESTA/data/queue/traffic.pipe)" ]; then - echo "$BIN/v_update_web_domains_traff $user" \ + echo "$BIN/v-update-web-domains-traff $user" \ >> $VESTA/data/queue/traffic.pipe fi - echo "v_update_web_domains_disk $user" >> $VESTA/data/queue/disk.pipe + echo "v-update-web-domains-disk $user" >> $VESTA/data/queue/disk.pipe fi if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then @@ -137,7 +137,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then chmod 770 $USER_DATA/mail touch $USER_DATA/mail.conf chmod 660 $USER_DATA/mail.conf - echo "v_update_mail_domains_disk $user" >> $VESTA/data/queue/disk.pipe + echo "v-update-mail-domains-disk $user" >> $VESTA/data/queue/disk.pipe fi if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then diff --git a/bin/v_rebuild_web_domains b/bin/v-rebuild-web-domains similarity index 99% rename from bin/v_rebuild_web_domains rename to bin/v-rebuild-web-domains index 2c517d4a..356a30e0 100755 --- a/bin/v_rebuild_web_domains +++ b/bin/v-rebuild-web-domains @@ -136,7 +136,7 @@ for domain in $(shell_list) ; do -e "s/%alias_idn%/${aliases_idn//,/ }/g" \ > $HOMEDIR/$user/conf/web/$STATS.$domain.conf - webstats="$BIN/v_update_web_domain_stat $user $domain" + webstats="$BIN/v-update-web-domain-stat $user $domain" check_webstats=$(grep "$webstats" $VESTA/data/queue/webstats.pipe) if [ -z "$check_webstats" ]; then echo "$webstats" >> $VESTA/data/queue/webstats.pipe @@ -297,7 +297,7 @@ update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases" # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_restart_cron b/bin/v-restart-cron similarity index 100% rename from bin/v_restart_cron rename to bin/v-restart-cron diff --git a/bin/v_restart_dns b/bin/v-restart-dns similarity index 100% rename from bin/v_restart_dns rename to bin/v-restart-dns diff --git a/bin/v_restart_mail b/bin/v-restart-mail similarity index 100% rename from bin/v_restart_mail rename to bin/v-restart-mail diff --git a/bin/v_restart_web b/bin/v-restart-web similarity index 100% rename from bin/v_restart_web rename to bin/v-restart-web diff --git a/bin/v_restore_user b/bin/v-restore-user similarity index 100% rename from bin/v_restore_user rename to bin/v-restore-user diff --git a/bin/v_search_object b/bin/v-search-object similarity index 100% rename from bin/v_search_object rename to bin/v-search-object diff --git a/bin/v_search_user_object b/bin/v-search-user-object similarity index 100% rename from bin/v_search_user_object rename to bin/v-search-user-object diff --git a/bin/v_suspend_cron_job b/bin/v-suspend-cron-job similarity index 97% rename from bin/v_suspend_cron_job rename to bin/v-suspend-cron-job index ca56a3bf..43d118c8 100755 --- a/bin/v_suspend_cron_job +++ b/bin/v-suspend-cron-job @@ -48,7 +48,7 @@ sync_cron_jobs # Restart crond if [ "$restart" != 'no' ]; then - $BIN/v_restart_cron "$EVENT" + $BIN/v-restart-cron "$EVENT" fi # Logging diff --git a/bin/v_suspend_cron_jobs b/bin/v-suspend-cron-jobs similarity index 94% rename from bin/v_suspend_cron_jobs rename to bin/v-suspend-cron-jobs index 60fa6742..6d450555 100755 --- a/bin/v_suspend_cron_jobs +++ b/bin/v-suspend-cron-jobs @@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user" # Suspendn all jobs for job in $(search_objects 'cron' 'SUSPENDED' 'no' 'JOB'); do - $BIN/v_suspend_cron_job $user $job 'no' + $BIN/v-suspend-cron-job $user $job 'no' done @@ -43,7 +43,7 @@ done # Restart crond if [ "$restart" != 'no' ]; then - $BIN/v_restart_cron "$EVENT" + $BIN/v-restart-cron "$EVENT" fi # Logging diff --git a/bin/v_suspend_database b/bin/v-suspend-database similarity index 100% rename from bin/v_suspend_database rename to bin/v-suspend-database diff --git a/bin/v_suspend_database_server b/bin/v-suspend-database-server similarity index 100% rename from bin/v_suspend_database_server rename to bin/v-suspend-database-server diff --git a/bin/v_suspend_databases b/bin/v-suspend-databases similarity index 96% rename from bin/v_suspend_databases rename to bin/v-suspend-databases index 44582c5e..8ff792e9 100755 --- a/bin/v_suspend_databases +++ b/bin/v-suspend-databases @@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user" # Starting suspend loop for database in $(search_objects 'db' 'SUSPENDED' "no" 'DB'); do - $BIN/v_suspend_database "$user" "$database" + $BIN/v-suspend-database "$user" "$database" done diff --git a/bin/v_suspend_dns_domain b/bin/v-suspend-dns-domain similarity index 98% rename from bin/v_suspend_dns_domain rename to bin/v-suspend-dns-domain index eb154e8a..7ce528d8 100755 --- a/bin/v_suspend_dns_domain +++ b/bin/v-suspend-dns-domain @@ -51,7 +51,7 @@ increase_user_value "$user" '$SUSPENDED_DNS' # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_suspend_dns_domain_record b/bin/v-suspend-dns-domain-record similarity index 98% rename from bin/v_suspend_dns_domain_record rename to bin/v-suspend-dns-domain-record index 58f1028f..d7f1b517 100755 --- a/bin/v_suspend_dns_domain_record +++ b/bin/v-suspend-dns-domain-record @@ -62,7 +62,7 @@ update_domain_zone # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_suspend_dns_domains b/bin/v-suspend-dns-domains similarity index 93% rename from bin/v_suspend_dns_domains rename to bin/v-suspend-dns-domains index 4a32bdde..7bb2e8c1 100755 --- a/bin/v_suspend_dns_domains +++ b/bin/v-suspend-dns-domains @@ -34,7 +34,7 @@ is_object_valid 'user' 'USER' "$user" # Starting suspend loop for domain in $(search_objects 'dns' 'SUSPENDED' "no" 'DOMAIN'); do - $BIN/v_suspend_dns_domain "$user" "$domain" 'no' + $BIN/v-suspend-dns-domain "$user" "$domain" 'no' done @@ -44,7 +44,7 @@ done # Restart dns server if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_suspend_mail_account b/bin/v-suspend-mail-account similarity index 100% rename from bin/v_suspend_mail_account rename to bin/v-suspend-mail-account diff --git a/bin/v_suspend_mail_accounts b/bin/v-suspend-mail-accounts similarity index 96% rename from bin/v_suspend_mail_accounts rename to bin/v-suspend-mail-accounts index 66db6e95..789c3492 100755 --- a/bin/v_suspend_mail_accounts +++ b/bin/v-suspend-mail-accounts @@ -39,7 +39,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain" # Starting suspend loop for account in $(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT'); do - $BIN/v_suspend_mail_account "$user" "$domain" "$account" + $BIN/v-suspend-mail-account "$user" "$domain" "$account" done diff --git a/bin/v_suspend_mail_domain b/bin/v-suspend-mail-domain similarity index 100% rename from bin/v_suspend_mail_domain rename to bin/v-suspend-mail-domain diff --git a/bin/v_suspend_mail_domains b/bin/v-suspend-mail-domains similarity index 96% rename from bin/v_suspend_mail_domains rename to bin/v-suspend-mail-domains index 1caaaa77..99ee8e46 100755 --- a/bin/v_suspend_mail_domains +++ b/bin/v-suspend-mail-domains @@ -34,7 +34,7 @@ is_object_valid 'user' 'USER' "$user" # Starting suspend loop for domain in $(search_objects 'mail' 'SUSPENDED' "no" 'DOMAIN'); do - $BIN/v_suspend_mail_domain "$user" "$domain" + $BIN/v-suspend-mail-domain "$user" "$domain" done diff --git a/bin/v_suspend_user b/bin/v-suspend-user similarity index 86% rename from bin/v_suspend_user rename to bin/v-suspend-user index 1a20c9a7..f159b783 100755 --- a/bin/v_suspend_user +++ b/bin/v-suspend-user @@ -40,27 +40,27 @@ fi # Suspending web domains if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then - $BIN/v_suspend_web_domains $user $restart + $BIN/v-suspend-web-domains $user $restart fi # Suspending dns domains if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then - $BIN/v_suspend_dns_domains $user $restart + $BIN/v-suspend-dns-domains $user $restart fi # Suspending mail domains if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then - $BIN/v_suspend_mail_domains $user + $BIN/v-suspend-mail-domains $user fi # Suspending datbabases if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then - $BIN/v_suspend_databases $user + $BIN/v-suspend-databases $user fi # Suspending cron jobs if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then - $BIN/v_suspend_cron_jobs $user $restart + $BIN/v-suspend-cron-jobs $user $restart fi @@ -70,9 +70,9 @@ fi # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" - $BIN/v_restart_dns "$EVENT" - $BIN/v_restart_cron "$EVENT" + $BIN/v-restart-web "$EVENT" + $BIN/v-restart-dns "$EVENT" + $BIN/v-restart-cron "$EVENT" fi # Changing suspend value diff --git a/bin/v_suspend_web_domain b/bin/v-suspend-web-domain similarity index 98% rename from bin/v_suspend_web_domain rename to bin/v-suspend-web-domain index 7953e2c9..349be3e0 100755 --- a/bin/v_suspend_web_domain +++ b/bin/v-suspend-web-domain @@ -87,7 +87,7 @@ increase_user_value "$user" '$SUSPENDED_WEB' # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_suspend_web_domains b/bin/v-suspend-web-domains similarity index 93% rename from bin/v_suspend_web_domains rename to bin/v-suspend-web-domains index 1f8bdcfa..90a85f8e 100755 --- a/bin/v_suspend_web_domains +++ b/bin/v-suspend-web-domains @@ -35,7 +35,7 @@ is_object_valid 'user' 'USER' "$user" # Starting suspend loop for domain in $(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'); do - $BIN/v_suspend_web_domain "$user" "$domain" 'no' + $BIN/v-suspend-web-domain "$user" "$domain" 'no' done #----------------------------------------------------------# @@ -44,7 +44,7 @@ done # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_unsuspend_cron_job b/bin/v-unsuspend-cron-job similarity index 97% rename from bin/v_unsuspend_cron_job rename to bin/v-unsuspend-cron-job index 0ca9ab9e..64e6d62b 100755 --- a/bin/v_unsuspend_cron_job +++ b/bin/v-unsuspend-cron-job @@ -48,7 +48,7 @@ sync_cron_jobs # Restart crond if [ "$restart" != 'no' ]; then - $BIN/v_restart_cron "$EVENT" + $BIN/v-restart-cron "$EVENT" fi # Logging diff --git a/bin/v_unsuspend_cron_jobs b/bin/v-unsuspend-cron-jobs similarity index 94% rename from bin/v_unsuspend_cron_jobs rename to bin/v-unsuspend-cron-jobs index 1c954a20..b05d0095 100755 --- a/bin/v_unsuspend_cron_jobs +++ b/bin/v-unsuspend-cron-jobs @@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user" # Unsuspendning jobs for job in $(search_objects 'cron' 'SUSPENDED' 'yes' 'JOB'); do - $BIN/v_unsuspend_cron_job $user $job 'no' + $BIN/v-unsuspend-cron-job $user $job 'no' done @@ -43,7 +43,7 @@ done # Restart crond if [ "$restart" != 'no' ]; then - $BIN/v_restart_cron "$EVENT" + $BIN/v-restart-cron "$EVENT" fi # Logging diff --git a/bin/v_unsuspend_database b/bin/v-unsuspend-database similarity index 100% rename from bin/v_unsuspend_database rename to bin/v-unsuspend-database diff --git a/bin/v_unsuspend_database_server b/bin/v-unsuspend-database-server similarity index 100% rename from bin/v_unsuspend_database_server rename to bin/v-unsuspend-database-server diff --git a/bin/v_unsuspend_databases b/bin/v-unsuspend-databases similarity index 96% rename from bin/v_unsuspend_databases rename to bin/v-unsuspend-databases index 8483110e..5d48a209 100755 --- a/bin/v_unsuspend_databases +++ b/bin/v-unsuspend-databases @@ -34,7 +34,7 @@ is_object_valid 'user' 'USER' "$user" # Starting unsuspend loop for database in $(search_objects 'db' 'SUSPENDED' "yes" 'DB'); do - $BIN/v_unsuspend_database "$user" "$database" + $BIN/v-unsuspend-database "$user" "$database" done diff --git a/bin/v_unsuspend_dns_domain b/bin/v-unsuspend-dns-domain similarity index 98% rename from bin/v_unsuspend_dns_domain rename to bin/v-unsuspend-dns-domain index 6ba6cf05..9cfdf212 100755 --- a/bin/v_unsuspend_dns_domain +++ b/bin/v-unsuspend-dns-domain @@ -53,7 +53,7 @@ sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/dns/$domain.conf # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_unsuspend_dns_domain_record b/bin/v-unsuspend-dns-domain-record similarity index 98% rename from bin/v_unsuspend_dns_domain_record rename to bin/v-unsuspend-dns-domain-record index 19cf9ffb..a95a75d9 100755 --- a/bin/v_unsuspend_dns_domain_record +++ b/bin/v-unsuspend-dns-domain-record @@ -61,7 +61,7 @@ update_domain_zone # Restart named if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_unsuspend_dns_domains b/bin/v-unsuspend-dns-domains similarity index 93% rename from bin/v_unsuspend_dns_domains rename to bin/v-unsuspend-dns-domains index 3928ff36..468b41a0 100755 --- a/bin/v_unsuspend_dns_domains +++ b/bin/v-unsuspend-dns-domains @@ -34,7 +34,7 @@ is_object_valid 'user' 'USER' "$user" # Starting unsuspend loop for domain in $(search_objects 'dns' 'SUSPENDED' "yes" 'DOMAIN'); do - $BIN/v_unsuspend_dns_domain "$user" "$domain" 'no' + $BIN/v-unsuspend-dns-domain "$user" "$domain" 'no' done @@ -44,7 +44,7 @@ done # Restart dns server if [ "$restart" != 'no' ]; then - $BIN/v_restart_dns "$EVENT" + $BIN/v-restart-dns "$EVENT" fi # Logging diff --git a/bin/v_unsuspend_mail_account b/bin/v-unsuspend-mail-account similarity index 100% rename from bin/v_unsuspend_mail_account rename to bin/v-unsuspend-mail-account diff --git a/bin/v_unsuspend_mail_accounts b/bin/v-unsuspend-mail-accounts similarity index 96% rename from bin/v_unsuspend_mail_accounts rename to bin/v-unsuspend-mail-accounts index 6866755c..e71f5790 100755 --- a/bin/v_unsuspend_mail_accounts +++ b/bin/v-unsuspend-mail-accounts @@ -39,7 +39,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain" # Starting unsuspend loop for account in $(search_objects "mail/$domain" 'SUSPENDED' 'yes' 'ACCOUNT'); do - $BIN/v_unsuspend_mail_account "$user" "$domain" "$account" + $BIN/v-unsuspend-mail-account "$user" "$domain" "$account" done diff --git a/bin/v_unsuspend_mail_domain b/bin/v-unsuspend-mail-domain similarity index 100% rename from bin/v_unsuspend_mail_domain rename to bin/v-unsuspend-mail-domain diff --git a/bin/v_unsuspend_mail_domains b/bin/v-unsuspend-mail-domains similarity index 96% rename from bin/v_unsuspend_mail_domains rename to bin/v-unsuspend-mail-domains index d03c8743..a1c37bc6 100755 --- a/bin/v_unsuspend_mail_domains +++ b/bin/v-unsuspend-mail-domains @@ -34,7 +34,7 @@ is_object_valid 'user' 'USER' "$user" # Starting unsuspend loop for domain in $(search_objects 'mail' 'SUSPENDED' "yes" 'DOMAIN'); do - $BIN/v_unsuspend_mail_domain "$user" "$domain" + $BIN/v-unsuspend-mail-domain "$user" "$domain" done diff --git a/bin/v_unsuspend_user b/bin/v-unsuspend-user similarity index 85% rename from bin/v_unsuspend_user rename to bin/v-unsuspend-user index c3e73a23..10ecbc23 100755 --- a/bin/v_unsuspend_user +++ b/bin/v-unsuspend-user @@ -39,27 +39,27 @@ fi # Unsuspending web domains if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then - $BIN/v_unsuspend_web_domains $user $restart + $BIN/v-unsuspend-web-domains $user $restart fi # Unsuspending dns domains if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then - $BIN/v_unsuspend_dns_domains $user $restart + $BIN/v-unsuspend-dns-domains $user $restart fi # Unsuspending mail domains if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then - $BIN/v_unsuspend_mail_domains $user + $BIN/v-unsuspend-mail-domains $user fi # Unsuspending datbabases if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then - $BIN/v_unsuspend_databases $user + $BIN/v-unsuspend-databases $user fi # Unsuspending cron jobs if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then - $BIN/v_unsuspend_cron_jobs $user $restart + $BIN/v-unsuspend-cron-jobs $user $restart fi @@ -72,9 +72,9 @@ update_user_value "$user" '$SUSPENDED' 'no' decrease_user_value 'admin' '$SUSPENDED_USERS' if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" - $BIN/v_restart_dns "$EVENT" - $BIN/v_restart_cron "$EVENT" + $BIN/v-restart-web "$EVENT" + $BIN/v-restart-dns "$EVENT" + $BIN/v-restart-cron "$EVENT" fi # Logging diff --git a/bin/v_unsuspend_web_domain b/bin/v-unsuspend-web-domain similarity index 98% rename from bin/v_unsuspend_web_domain rename to bin/v-unsuspend-web-domain index 4f2a3882..85d1dbcd 100755 --- a/bin/v_unsuspend_web_domain +++ b/bin/v-unsuspend-web-domain @@ -84,7 +84,7 @@ decrease_user_value "$user" '$SUSPENDED_WEB' # Restart web erver if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_unsuspend_web_domains b/bin/v-unsuspend-web-domains similarity index 93% rename from bin/v_unsuspend_web_domains rename to bin/v-unsuspend-web-domains index 891c27fc..474766fa 100755 --- a/bin/v_unsuspend_web_domains +++ b/bin/v-unsuspend-web-domains @@ -35,7 +35,7 @@ is_object_valid 'user' 'USER' "$user" # Starting unsuspend loop for domain in $(search_objects 'web' 'SUSPENDED' "yes" 'DOMAIN'); do - $BIN/v_unsuspend_web_domain "$user" "$domain" 'no' + $BIN/v-unsuspend-web-domain "$user" "$domain" 'no' done @@ -45,7 +45,7 @@ done # Restart web server if [ "$restart" != 'no' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_update_database_disk b/bin/v-update-database-disk similarity index 100% rename from bin/v_update_database_disk rename to bin/v-update-database-disk diff --git a/bin/v_update_databases_disk b/bin/v-update-databases-disk similarity index 95% rename from bin/v_update_databases_disk rename to bin/v-update-databases-disk index c152688a..1031a1b0 100755 --- a/bin/v_update_databases_disk +++ b/bin/v-update-databases-disk @@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user" # Starting update loop for database in $(search_objects 'db' 'SUSPENDED' "no" 'DB'); do - $BIN/v_update_database_disk "$user" "$database" + $BIN/v-update-database-disk "$user" "$database" done diff --git a/bin/v_update_mail_domain_disk b/bin/v-update-mail-domain-disk similarity index 100% rename from bin/v_update_mail_domain_disk rename to bin/v-update-mail-domain-disk diff --git a/bin/v_update_mail_domains_disk b/bin/v-update-mail-domains-disk similarity index 100% rename from bin/v_update_mail_domains_disk rename to bin/v-update-mail-domains-disk diff --git a/bin/v_update_sys_ip b/bin/v-update-sys-ip similarity index 98% rename from bin/v_update_sys_ip rename to bin/v-update-sys-ip index 07cca179..446fcaeb 100755 --- a/bin/v_update_sys_ip +++ b/bin/v-update-sys-ip @@ -84,7 +84,7 @@ increase_user_value "$user" '$IP_OWNED' # Restart web server if [ "$web_restart" = 'yes' ]; then - $BIN/v_restart_web "$EVENT" + $BIN/v-restart-web "$EVENT" fi # Logging diff --git a/bin/v_update_sys_queue b/bin/v-update-sys-queue similarity index 100% rename from bin/v_update_sys_queue rename to bin/v-update-sys-queue diff --git a/bin/v_update_sys_rrd b/bin/v-update-sys-rrd similarity index 87% rename from bin/v_update_sys_rrd rename to bin/v-update-sys-rrd index 5f3a4491..e264d4fc 100755 --- a/bin/v_update_sys_rrd +++ b/bin/v-update-sys-rrd @@ -3,7 +3,7 @@ # options: none # # The script is wrapper for all rrd functions. It updates all -# v_update_sys_rrd_* at once. +# v-update-sys-rrd_* at once. #----------------------------------------------------------# @@ -96,23 +96,23 @@ fi # Updateing system stats for period in $periods; do - $BIN/v_update_sys_rrd_la $period - $BIN/v_update_sys_rrd_net $period - $BIN/v_update_sys_rrd_mem $period - $BIN/v_update_sys_rrd_ssh $period + $BIN/v-update-sys-rrd-la $period + $BIN/v-update-sys-rrd-net $period + $BIN/v-update-sys-rrd-mem $period + $BIN/v-update-sys-rrd-ssh $period # Updating web stats if [ "$WEB_SYSTEM" = 'apache' ]; then - $BIN/v_update_sys_rrd_httpd $period + $BIN/v-update-sys-rrd-httpd $period fi if [ "$PROXY_SYSTEM" = 'nginx' ]; then - $BIN/v_update_sys_rrd_nginx $period + $BIN/v-update-sys-rrd-nginx $period fi # Updating ftp stats if [ ! -z "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" != 'no' ]; then - $BIN/v_update_sys_rrd_ftp $period + $BIN/v-update-sys-rrd-ftp $period fi # Updating db stats @@ -120,8 +120,8 @@ for period in $periods; do for type in ${DB_SYSTEM//,/ }; do # Switching on db type case $type in - mysql) $BIN/v_update_sys_rrd_mysql $period ;; - pgsql) $BIN/v_update_sys_rrd_pgsql $period ;; + mysql) $BIN/v-update-sys-rrd-mysql $period ;; + pgsql) $BIN/v-update-sys-rrd-pgsql $period ;; esac done fi diff --git a/bin/v_update_sys_rrd_ftp b/bin/v-update-sys-rrd-ftp similarity index 100% rename from bin/v_update_sys_rrd_ftp rename to bin/v-update-sys-rrd-ftp diff --git a/bin/v_update_sys_rrd_httpd b/bin/v-update-sys-rrd-httpd similarity index 100% rename from bin/v_update_sys_rrd_httpd rename to bin/v-update-sys-rrd-httpd diff --git a/bin/v_update_sys_rrd_la b/bin/v-update-sys-rrd-la similarity index 100% rename from bin/v_update_sys_rrd_la rename to bin/v-update-sys-rrd-la diff --git a/bin/v_update_sys_rrd_mem b/bin/v-update-sys-rrd-mem similarity index 100% rename from bin/v_update_sys_rrd_mem rename to bin/v-update-sys-rrd-mem diff --git a/bin/v_update_sys_rrd_mysql b/bin/v-update-sys-rrd-mysql similarity index 100% rename from bin/v_update_sys_rrd_mysql rename to bin/v-update-sys-rrd-mysql diff --git a/bin/v_update_sys_rrd_net b/bin/v-update-sys-rrd-net similarity index 100% rename from bin/v_update_sys_rrd_net rename to bin/v-update-sys-rrd-net diff --git a/bin/v_update_sys_rrd_nginx b/bin/v-update-sys-rrd-nginx similarity index 100% rename from bin/v_update_sys_rrd_nginx rename to bin/v-update-sys-rrd-nginx diff --git a/bin/v_update_sys_rrd_pgsql b/bin/v-update-sys-rrd-pgsql similarity index 100% rename from bin/v_update_sys_rrd_pgsql rename to bin/v-update-sys-rrd-pgsql diff --git a/bin/v_update_sys_rrd_ssh b/bin/v-update-sys-rrd-ssh similarity index 100% rename from bin/v_update_sys_rrd_ssh rename to bin/v-update-sys-rrd-ssh diff --git a/bin/v_update_sys_vesta b/bin/v-update-sys-vesta similarity index 100% rename from bin/v_update_sys_vesta rename to bin/v-update-sys-vesta diff --git a/bin/v_update_user_backups b/bin/v-update-user-backups similarity index 100% rename from bin/v_update_user_backups rename to bin/v-update-user-backups diff --git a/bin/v_update_user_counters b/bin/v-update-user-counters similarity index 100% rename from bin/v_update_user_counters rename to bin/v-update-user-counters diff --git a/bin/v_update_user_disk b/bin/v-update-user-disk similarity index 100% rename from bin/v_update_user_disk rename to bin/v-update-user-disk diff --git a/bin/v_update_user_package b/bin/v-update-user-package similarity index 95% rename from bin/v_update_user_package rename to bin/v-update-user-package index b7773d17..933a333a 100755 --- a/bin/v_update_user_package +++ b/bin/v-update-user-package @@ -33,7 +33,7 @@ is_package_valid for user in $(ls $VESTA/data/users); do check_package=$(grep "PACKAGE='$package'" $USER_DATA/$user/user.conf) if [ ! -z "$check_package" ]; then - $BIN/v_change_user_package $user $package 'yes' + $BIN/v-change-user-package $user $package 'yes' fi done diff --git a/bin/v_update_user_stats b/bin/v-update-user-stats similarity index 100% rename from bin/v_update_user_stats rename to bin/v-update-user-stats diff --git a/bin/v_update_web_domain_disk b/bin/v-update-web-domain-disk similarity index 100% rename from bin/v_update_web_domain_disk rename to bin/v-update-web-domain-disk diff --git a/bin/v_update_web_domain_stat b/bin/v-update-web-domain-stat similarity index 100% rename from bin/v_update_web_domain_stat rename to bin/v-update-web-domain-stat diff --git a/bin/v_update_web_domain_traff b/bin/v-update-web-domain-traff similarity index 100% rename from bin/v_update_web_domain_traff rename to bin/v-update-web-domain-traff diff --git a/bin/v_update_web_domains_disk b/bin/v-update-web-domains-disk similarity index 100% rename from bin/v_update_web_domains_disk rename to bin/v-update-web-domains-disk diff --git a/bin/v_update_web_domains_stat b/bin/v-update-web-domains-stat similarity index 96% rename from bin/v_update_web_domains_stat rename to bin/v-update-web-domains-stat index b0eba1e6..61c7615c 100755 --- a/bin/v_update_web_domains_stat +++ b/bin/v-update-web-domains-stat @@ -37,7 +37,7 @@ is_object_unsuspended 'user' 'USER' "$user" for domain in $(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'); do get_domain_values 'web' if [ ! -z "$STATS" ] && [ "$STATS" != 'no' ]; then - $BIN/v_update_web_domain_stat "$user" "$domain" + $BIN/v-update-web-domain-stat "$user" "$domain" fi done diff --git a/bin/v_update_web_domains_traff b/bin/v-update-web-domains-traff similarity index 100% rename from bin/v_update_web_domains_traff rename to bin/v-update-web-domains-traff diff --git a/web/add/cron/index.php b/web/add/cron/index.php index d0a1a1e3..8dea0444 100644 --- a/web/add/cron/index.php +++ b/web/add/cron/index.php @@ -43,7 +43,7 @@ top_panel($user,$TAB); $_SESSION['error_msg'] = "Error: field ".$error_msg." can not be blank."; } else { // Add Cron Job - exec (VESTA_CMD."v_add_cron_job ".$user." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var); + exec (VESTA_CMD."v-add-cron-job ".$user." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var); $v_type = $_POST['v_type']; $v_charset = $_POST['v_charset']; if ($return_var != 0) { @@ -64,7 +64,7 @@ top_panel($user,$TAB); } } } - exec (VESTA_CMD."v_list_database_types 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-database-types 'json'", $output, $return_var); $db_types = json_decode(implode('', $output), true); unset($output); diff --git a/web/add/db/index.php b/web/add/db/index.php index e02509c3..0b9be716 100644 --- a/web/add/db/index.php +++ b/web/add/db/index.php @@ -43,7 +43,7 @@ top_panel($user,$TAB); // Add Database $v_type = escapeshellarg($_POST['v_type']); $v_charset = escapeshellarg($_POST['v_charset']); - exec (VESTA_CMD."v_add_database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." 'default' ".$v_charset, $output, $return_var); + exec (VESTA_CMD."v-add-database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." 'default' ".$v_charset, $output, $return_var); $v_type = $_POST['v_type']; $v_charset = $_POST['v_charset']; if ($return_var != 0) { @@ -63,7 +63,7 @@ top_panel($user,$TAB); } } } - exec (VESTA_CMD."v_list_database_types 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-database-types 'json'", $output, $return_var); $db_types = json_decode(implode('', $output), true); unset($output); diff --git a/web/add/dns/index.php b/web/add/dns/index.php index 94d79daf..3abfa6ff 100644 --- a/web/add/dns/index.php +++ b/web/add/dns/index.php @@ -46,7 +46,7 @@ top_panel($user,$TAB); } else { // Add DNS - exec (VESTA_CMD."v_add_dns_domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$ns4, $output, $return_var); + exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$ns4, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -57,7 +57,7 @@ top_panel($user,$TAB); // Change Expiriation date if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) { $v_exp = escapeshellarg($_POST['v_exp']); - exec (VESTA_CMD."v_change_dns_domain_exp ".$user." ".$v_domain." ".$v_exp, $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -69,7 +69,7 @@ top_panel($user,$TAB); // Change TTL if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400')) { $v_ttl = escapeshellarg($_POST['v_ttl']); - exec (VESTA_CMD."v_change_dns_domain_ttl ".$user." ".$v_domain." ".$v_ttl, $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -113,7 +113,7 @@ top_panel($user,$TAB); $_SESSION['error_msg'] = "Error: field ".$error_msg." can not be blank."; } else { // Add DNS Record - exec (VESTA_CMD."v_add_dns_domain_record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority, $output, $return_var); + exec (VESTA_CMD."v-add-dns-domain-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority, $output, $return_var); $v_type = $_POST['v_type']; if ($return_var != 0) { $error = implode('
', $output); @@ -133,16 +133,16 @@ top_panel($user,$TAB); if ((empty($_GET['domain'])) && (empty($_POST['domain']))) { - exec (VESTA_CMD."v_get_user_value ".$user." 'TEMPLATE'", $output, $return_var); + exec (VESTA_CMD."v-get-user-value ".$user." 'TEMPLATE'", $output, $return_var); $template = $output[0] ; unset($output); - exec (VESTA_CMD."v_list_dns_templates json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var); $templates = json_decode(implode('', $output), true); unset($output); if ((empty($v_ns1)) && (empty($v_ns2))) { - exec (VESTA_CMD."v_list_user_ns ".$user." json", $output, $return_var); + exec (VESTA_CMD."v-list-user-ns ".$user." json", $output, $return_var); $nameservers = json_decode(implode('', $output), true); $v_ns1 = $nameservers[0]; $v_ns2 = $nameservers[1]; diff --git a/web/add/ip/index.php b/web/add/ip/index.php index f1938886..898cdc58 100644 --- a/web/add/ip/index.php +++ b/web/add/ip/index.php @@ -52,7 +52,7 @@ if ($_SESSION['user'] == 'admin') { // Add IP $v_interface = escapeshellarg($_POST['v_interface']); $v_owner = $_POST['v_owner']; - exec (VESTA_CMD."v_add_sys_ip ".$v_ip." ".$v_netmask." ".$v_interface." ".$v_owner." '".$ip_status."' ".$v_name, $output, $return_var); + exec (VESTA_CMD."v-add-sys-ip ".$v_ip." ".$v_netmask." ".$v_interface." ".$v_owner." '".$ip_status."' ".$v_name, $output, $return_var); $v_owner = $_POST['v_owner']; $v_interface = $_POST['v_interface']; if ($return_var != 0) { @@ -70,11 +70,11 @@ if ($_SESSION['user'] == 'admin') { } } } - exec (VESTA_CMD."v_list_sys_interfaces 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-sys-interfaces 'json'", $output, $return_var); $interfaces = json_decode(implode('', $output), true); unset($output); - exec (VESTA_CMD."v_list_sys_users 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var); $users = json_decode(implode('', $output), true); unset($output); diff --git a/web/add/mail/index.php b/web/add/mail/index.php index 8f5b2ff8..871e4a7c 100644 --- a/web/add/mail/index.php +++ b/web/add/mail/index.php @@ -52,7 +52,7 @@ top_panel($user,$TAB); } else { // Add mail domain - exec (VESTA_CMD."v_add_mail_domain ".$user." ".$v_domain." ".$v_antispam." ".$v_antivirus." ".$v_dkim, $output, $return_var); + exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain." ".$v_antispam." ".$v_antivirus." ".$v_dkim, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -98,7 +98,7 @@ top_panel($user,$TAB); $_SESSION['error_msg'] = "Error: field ".$error_msg." can not be blank."; } else { // Add Mail Account - exec (VESTA_CMD."v_add_mail_account ".$user." ".$v_domain." ".$v_account." ".$v_password." ".$v_quota, $output, $return_var); + exec (VESTA_CMD."v-add-mail-account ".$user." ".$v_domain." ".$v_account." ".$v_password." ".$v_quota, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -115,7 +115,7 @@ top_panel($user,$TAB); foreach ($aliases as $alias) { $alias = escapeshellarg($alias); if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v_add_mail_account_alias ".$user." ".$v_domain." ".$v_account." ".$alias, $output, $return_var); + exec (VESTA_CMD."v-add-mail-account-alias ".$user." ".$v_domain." ".$v_account." ".$alias, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -136,7 +136,7 @@ top_panel($user,$TAB); foreach ($fwd as $forward) { $forward = escapeshellarg($forward); if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v_add_mail_account_forward ".$user." ".$v_domain." ".$v_account." ".$forward, $output, $return_var); + exec (VESTA_CMD."v-add-mail-account-forward ".$user." ".$v_domain." ".$v_account." ".$forward, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/add/package/index.php b/web/add/package/index.php index 2e21f4a0..7c9aa020 100644 --- a/web/add/package/index.php +++ b/web/add/package/index.php @@ -104,7 +104,7 @@ if ($_SESSION['user'] == 'admin') { // Add new package if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v_add_user_package ".$tmpdir." ".$v_package, $output, $return_var); + exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -127,12 +127,12 @@ if ($_SESSION['user'] == 'admin') { } - exec (VESTA_CMD."v_list_web_templates json", $output, $return_var); + exec (VESTA_CMD."v-list-web-templates json", $output, $return_var); check_error($return_var); $templates = json_decode(implode('', $output), true); unset($output); - exec (VESTA_CMD."v_list_sys_shells json", $output, $return_var); + exec (VESTA_CMD."v-list-sys-shells json", $output, $return_var); check_error($return_var); $shells = json_decode(implode('', $output), true); unset($output); diff --git a/web/add/user/index.php b/web/add/user/index.php index 22d67397..19a37ae3 100644 --- a/web/add/user/index.php +++ b/web/add/user/index.php @@ -54,7 +54,7 @@ if ($_SESSION['user'] == 'admin') { } if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v_add_user ".$v_username." ".$v_password." ".$v_email." ".$v_package." ".$v_fname." ".$v_lname, $output, $return_var); + exec (VESTA_CMD."v-add-user ".$v_username." ".$v_password." ".$v_email." ".$v_package." ".$v_fname." ".$v_lname, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -89,7 +89,7 @@ if ($_SESSION['user'] == 'admin') { } } - exec (VESTA_CMD."v_list_user_packages json", $output, $return_var); + exec (VESTA_CMD."v-list-user-packages json", $output, $return_var); check_error($return_var); $data = json_decode(implode('', $output), true); unset($output); diff --git a/web/add/web/index.php b/web/add/web/index.php index 3fb774e7..f205838a 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -84,7 +84,7 @@ top_panel($user,$TAB); if (empty($_SESSION['error_msg'])) { // Add WEB - exec (VESTA_CMD."v_add_web_domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -94,7 +94,7 @@ top_panel($user,$TAB); // Add DNS if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_add_dns_domain ".$user." ".$v_domain." ".$v_ip, $output, $return_var); + exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -105,7 +105,7 @@ top_panel($user,$TAB); // Add Mail if (($_POST['v_mail'] == 'on') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_add_mail_domain ".$user." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -127,7 +127,7 @@ top_panel($user,$TAB); } else { $alias = escapeshellarg($alias); if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v_add_web_domain_alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -136,7 +136,7 @@ top_panel($user,$TAB); } unset($output); if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_add_dns_on_web_alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-dns-on-web-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -151,7 +151,7 @@ top_panel($user,$TAB); $alias = preg_replace("/^www./i", "", $_POST['v_domain']); $alias = 'www.'.$alias; $alias = escapeshellarg($alias); - exec (VESTA_CMD."v_delete_web_domain_alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -164,7 +164,7 @@ top_panel($user,$TAB); if (($_POST['v_nginx'] == 'on') && (empty($_SESSION['error_msg']))) { $ext = str_replace(' ', '', $v_nginx_ext); $ext = escapeshellarg($ext); - exec (VESTA_CMD."v_add_web_domain_nginx ".$user." ".$v_domain." 'default' ".$ext." 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-nginx ".$user." ".$v_domain." 'default' ".$ext." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -200,7 +200,7 @@ top_panel($user,$TAB); } $v_ssl_home = escapeshellarg($_POST['v_ssl_home']); - exec (VESTA_CMD."v_add_web_domain_ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -212,7 +212,7 @@ top_panel($user,$TAB); // Add WebStats if ((!empty($_POST['v_stats'])) && ($_POST['v_stats'] != 'none' ) && (empty($_SESSION['error_msg']))) { $v_stats = escapeshellarg($_POST['v_stats']); - exec (VESTA_CMD."v_add_web_domain_stats ".$user." ".$v_domain." ".$v_stats, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-stats ".$user." ".$v_domain." ".$v_stats, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -223,7 +223,7 @@ top_panel($user,$TAB); if ((!empty($_POST['v_stats_user'])) && (empty($_SESSION['error_msg']))) { $v_stats_user = escapeshellarg($_POST['v_stats_user']); $v_stats_password = escapeshellarg($_POST['v_stats_password']); - exec (VESTA_CMD."v_add_web_domain_stats_user ".$user." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-stats-user ".$user." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -240,7 +240,7 @@ top_panel($user,$TAB); if ((!empty($_POST['v_ftp'])) && (empty($_SESSION['error_msg']))) { $v_ftp_user = escapeshellarg($_POST['v_ftp_user']); $v_ftp_password = escapeshellarg($_POST['v_ftp_password']); - exec (VESTA_CMD."v_add_web_domain_ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -268,7 +268,7 @@ top_panel($user,$TAB); } if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_restart_dns", $output, $return_var); + exec (VESTA_CMD."v-restart-dns", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -278,7 +278,7 @@ top_panel($user,$TAB); } if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v_restart_web", $output, $return_var); + exec (VESTA_CMD."v-restart-web", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -296,19 +296,19 @@ top_panel($user,$TAB); } } - exec (VESTA_CMD."v_list_user_ips ".$user." json", $output, $return_var); + exec (VESTA_CMD."v-list-user-ips ".$user." json", $output, $return_var); $ips = json_decode(implode('', $output), true); unset($output); - exec (VESTA_CMD."v_get_user_value ".$user." 'TEMPLATE'", $output, $return_var); + exec (VESTA_CMD."v-get-user-value ".$user." 'TEMPLATE'", $output, $return_var); $template = $output[0] ; unset($output); - exec (VESTA_CMD."v_list_web_templates json", $output, $return_var); + exec (VESTA_CMD."v-list-web-templates json", $output, $return_var); $templates = json_decode(implode('', $output), true); unset($output); - exec (VESTA_CMD."v_list_web_stats json", $output, $return_var); + exec (VESTA_CMD."v-list-web-stats json", $output, $return_var); $stats = json_decode(implode('', $output), true); unset($output); diff --git a/web/bulk/backup/index.php b/web/bulk/backup/index.php index 77554d04..c30e11cd 100644 --- a/web/bulk/backup/index.php +++ b/web/bulk/backup/index.php @@ -10,7 +10,7 @@ $backup = $_POST['backup']; $action = $_POST['action']; switch ($action) { - case 'delete': $cmd='v_delete_user_backup'; + case 'delete': $cmd='v-delete-user-backup'; break; default: header("Location: /list/backup/"); exit; } diff --git a/web/bulk/cron/index.php b/web/bulk/cron/index.php index 375af362..3798b06c 100644 --- a/web/bulk/cron/index.php +++ b/web/bulk/cron/index.php @@ -11,17 +11,17 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { switch ($action) { - case 'delete': $cmd='v_delete_cron_job'; + case 'delete': $cmd='v-delete-cron-job'; break; - case 'suspend': $cmd='v_suspend_cron_job'; + case 'suspend': $cmd='v-suspend-cron-job'; break; - case 'unsuspend': $cmd='v_unsuspend_cron_job'; + case 'unsuspend': $cmd='v-unsuspend-cron-job'; break; default: header("Location: /list/cron/"); exit; } } else { switch ($action) { - case 'delete': $cmd='v_delete_cron_job'; + case 'delete': $cmd='v-delete-cron-job'; break; default: header("Location: /list/cron/"); exit; } @@ -34,7 +34,7 @@ foreach ($job as $value) { } if (!empty($restart)) { - exec (VESTA_CMD."v_restart_cron", $output, $return_var); + exec (VESTA_CMD."v-restart-cron", $output, $return_var); } header("Location: /list/cron/"); diff --git a/web/bulk/db/index.php b/web/bulk/db/index.php index 57d0def5..fa655a28 100644 --- a/web/bulk/db/index.php +++ b/web/bulk/db/index.php @@ -11,17 +11,17 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { switch ($action) { - case 'delete': $cmd='v_delete_database'; + case 'delete': $cmd='v-delete-database'; break; - case 'suspend': $cmd='v_suspend_database'; + case 'suspend': $cmd='v-suspend-database'; break; - case 'unsuspend': $cmd='v_unsuspend_database'; + case 'unsuspend': $cmd='v-unsuspend-database'; break; default: header("Location: /list/db/"); exit; } } else { switch ($action) { - case 'delete': $cmd='v_delete_database'; + case 'delete': $cmd='v-delete-database'; break; default: header("Location: /list/db/"); exit; } diff --git a/web/bulk/dns/index.php b/web/bulk/dns/index.php index 0d8d0cb5..286580f1 100644 --- a/web/bulk/dns/index.php +++ b/web/bulk/dns/index.php @@ -13,21 +13,21 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { if (empty($record)) { switch ($action) { - case 'delete': $cmd='v_delete_dns_domain'; + case 'delete': $cmd='v-delete-dns-domain'; break; - case 'suspend': $cmd='v_suspend_dns_domain'; + case 'suspend': $cmd='v-suspend-dns-domain'; break; - case 'unsuspend': $cmd='v_unsuspend_dns_domain'; + case 'unsuspend': $cmd='v-unsuspend-dns-domain'; break; default: header("Location: /list/dns/"); exit; } } else { switch ($action) { - case 'delete': $cmd='v_delete_dns_domain_record'; + case 'delete': $cmd='v-delete-dns-domain-record'; break; - case 'suspend': $cmd='v_suspend_dns_domain_record'; + case 'suspend': $cmd='v-suspend-dns-domain-record'; break; - case 'unsuspend': $cmd='v_unsuspend_dns_domain_record'; + case 'unsuspend': $cmd='v-unsuspend-dns-domain-record'; break; default: header("Location: /list/dns/?domain=".$domain); exit; } @@ -35,13 +35,13 @@ if ($_SESSION['user'] == 'admin') { } else { if (empty($record)) { switch ($action) { - case 'delete': $cmd='v_delete_dns_domain'; + case 'delete': $cmd='v-delete-dns-domain'; break; default: header("Location: /list/dns/"); exit; } } else { switch ($action) { - case 'delete': $cmd='v_delete_dns_domain_record'; + case 'delete': $cmd='v-delete-dns-domain-record'; break; default: header("Location: /list/dns/?domain=".$domain); exit; } @@ -67,7 +67,7 @@ if (empty($record)) { } if (!empty($restart)) { - exec (VESTA_CMD."v_restart_dns", $output, $return_var); + exec (VESTA_CMD."v-restart-dns", $output, $return_var); } if (empty($record)) { diff --git a/web/bulk/ip/index.php b/web/bulk/ip/index.php index 499f70e2..8f579247 100644 --- a/web/bulk/ip/index.php +++ b/web/bulk/ip/index.php @@ -11,7 +11,7 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { switch ($action) { - case 'delete': $cmd='v_delete_sys_ip'; + case 'delete': $cmd='v-delete-sys-ip'; break; default: header("Location: /list/ip/"); exit; } diff --git a/web/bulk/mail/index.php b/web/bulk/mail/index.php index 46d3ab4b..fb422d5c 100644 --- a/web/bulk/mail/index.php +++ b/web/bulk/mail/index.php @@ -13,21 +13,21 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { if (empty($account)) { switch ($action) { - case 'delete': $cmd='v_delete_mail_domain'; + case 'delete': $cmd='v-delete-mail-domain'; break; - case 'suspend': $cmd='v_suspend_mail_domain'; + case 'suspend': $cmd='v-suspend-mail-domain'; break; - case 'unsuspend': $cmd='v_unsuspend_mail_domain'; + case 'unsuspend': $cmd='v-unsuspend-mail-domain'; break; default: header("Location: /list/mail/"); exit; } } else { switch ($action) { - case 'delete': $cmd='v_delete_mail_account'; + case 'delete': $cmd='v-delete-mail-account'; break; - case 'suspend': $cmd='v_suspend_mail_account'; + case 'suspend': $cmd='v-suspend-mail-account'; break; - case 'unsuspend': $cmd='v_unsuspend_mail_account'; + case 'unsuspend': $cmd='v-unsuspend-mail-account'; break; default: header("Location: /list/mail/?domain=".$domain); exit; } @@ -35,13 +35,13 @@ if ($_SESSION['user'] == 'admin') { } else { if (empty($account)) { switch ($action) { - case 'delete': $cmd='v_delete_mail_domain'; + case 'delete': $cmd='v-delete-mail-domain'; break; default: header("Location: /list/mail/"); exit; } } else { switch ($action) { - case 'delete': $cmd='v_delete_mail_account'; + case 'delete': $cmd='v-delete-mail-account'; break; default: header("Location: /list/mail/?domain=".$domain); exit; } diff --git a/web/bulk/package/index.php b/web/bulk/package/index.php index e661b146..cc3dade9 100644 --- a/web/bulk/package/index.php +++ b/web/bulk/package/index.php @@ -11,7 +11,7 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { switch ($action) { - case 'delete': $cmd='v_delete_user_package'; + case 'delete': $cmd='v-delete-user-package'; break; default: header("Location: /list/package/"); exit; } diff --git a/web/bulk/user/index.php b/web/bulk/user/index.php index 7e217f44..6da7c191 100644 --- a/web/bulk/user/index.php +++ b/web/bulk/user/index.php @@ -11,31 +11,31 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { switch ($action) { - case 'delete': $cmd='v_delete_user'; $restart = 'no'; + case 'delete': $cmd='v-delete-user'; $restart = 'no'; break; - case 'suspend': $cmd='v_suspend_user'; $restart = 'no'; + case 'suspend': $cmd='v-suspend-user'; $restart = 'no'; break; - case 'unsuspend': $cmd='v_unsuspend_user'; $restart = 'no'; + case 'unsuspend': $cmd='v-unsuspend-user'; $restart = 'no'; break; - case 'update counters': $cmd='v_update_user_counters'; + case 'update counters': $cmd='v-update-user-counters'; break; - case 'rebuild': $cmd='v_rebuild_user'; $restart = 'no'; + case 'rebuild': $cmd='v-rebuild-user'; $restart = 'no'; break; - case 'rebuild web': $cmd='v_rebuild_web_domains'; $restart = 'no'; + case 'rebuild web': $cmd='v-rebuild-web-domains'; $restart = 'no'; break; - case 'rebuild dns': $cmd='v_rebuild_dns_domains'; $restart = 'no'; + case 'rebuild dns': $cmd='v-rebuild-dns-domains'; $restart = 'no'; break; - case 'rebuild mail': $cmd='v_rebuild_mail_domains'; + case 'rebuild mail': $cmd='v-rebuild-mail-domains'; break; - case 'rebuild db': $cmd='v_rebuild_databases'; + case 'rebuild db': $cmd='v-rebuild-databases'; break; - case 'rebuild cron': $cmd='v_rebuild_cron_jobs'; + case 'rebuild cron': $cmd='v-rebuild-cron-jobs'; break; default: header("Location: /list/user/"); exit; } } else { switch ($action) { - case 'update counters': $cmd='v_update_user_counters'; + case 'update counters': $cmd='v-update-user-counters'; break; default: header("Location: /list/user/"); exit; } @@ -48,9 +48,9 @@ foreach ($user as $value) { } if ((!empty($restart)) && (!empty($changes))) { - exec (VESTA_CMD."v_restart_web", $output, $return_var); - exec (VESTA_CMD."v_restart_dns", $output, $return_var); - exec (VESTA_CMD."v_restart_cron", $output, $return_var); + exec (VESTA_CMD."v-restart-web", $output, $return_var); + exec (VESTA_CMD."v-restart-dns", $output, $return_var); + exec (VESTA_CMD."v-restart-cron", $output, $return_var); } header("Location: /list/user/"); diff --git a/web/bulk/web/index.php b/web/bulk/web/index.php index 92189789..7e09550e 100644 --- a/web/bulk/web/index.php +++ b/web/bulk/web/index.php @@ -11,25 +11,25 @@ $action = $_POST['action']; if ($_SESSION['user'] == 'admin') { switch ($action) { - case 'delete': $cmd='v_delete_web_domain'; - $cmd_dns='v_delete_dns_domain'; - $cmd_mail='v_delete_mail_domain'; + case 'delete': $cmd='v-delete-web-domain'; + $cmd_dns='v-delete-dns-domain'; + $cmd_mail='v-delete-mail-domain'; break; - case 'suspend': $cmd='v_suspend_web_domain'; - $cmd_dns='v_suspend_dns_domain'; - $cmd_mail='v_suspend_mail_domain'; + case 'suspend': $cmd='v-suspend-web-domain'; + $cmd_dns='v-suspend-dns-domain'; + $cmd_mail='v-suspend-mail-domain'; break; - case 'unsuspend': $cmd='v_unsuspend_web_domain'; - $cmd_dns='v_unsuspend_dns_domain'; - $cmd_mail='v_unsuspend_mail_domain'; + case 'unsuspend': $cmd='v-unsuspend-web-domain'; + $cmd_dns='v-unsuspend-dns-domain'; + $cmd_mail='v-unsuspend-mail-domain'; break; default: header("Location: /list/web/"); exit; } } else { switch ($action) { - case 'delete': $cmd='v_delete_web_domain'; - $cmd_dns='v_delete_dns_domain'; - $cmd_mail='v_delete_mail_domain'; + case 'delete': $cmd='v-delete-web-domain'; + $cmd_dns='v-delete-dns-domain'; + $cmd_mail='v-delete-mail-domain'; break; default: header("Location: /list/web/"); exit; } @@ -43,7 +43,7 @@ foreach ($domain as $value) { // DNS if ($return_var == 0) { - exec (VESTA_CMD."v_list_dns_domain ".$user." ".$value." json", $output, $lreturn_var); + exec (VESTA_CMD."v-list-dns-domain ".$user." ".$value." json", $output, $lreturn_var); if ($lreturn_var == 0 ) { exec (VESTA_CMD.$cmd_dns." ".$user." ".$value." no", $output, $return_var); $restart_dns = 'yes'; @@ -52,7 +52,7 @@ foreach ($domain as $value) { // Mail if ($return_var == 0) { - exec (VESTA_CMD."v_list_mail_domain ".$user." ".$value." json", $output, $lreturn_var); + exec (VESTA_CMD."v-list-mail-domain ".$user." ".$value." json", $output, $lreturn_var); if ($lreturn_var == 0 ) { exec (VESTA_CMD.$cmd_mail." ".$user." ".$value." no", $output, $return_var); } @@ -60,11 +60,11 @@ foreach ($domain as $value) { } if (!empty($restart_web)) { - exec (VESTA_CMD."v_restart_web", $output, $return_var); + exec (VESTA_CMD."v-restart-web", $output, $return_var); } if (!empty($restart_dns)) { - exec (VESTA_CMD."v_restart_dns", $output, $return_var); + exec (VESTA_CMD."v-restart-dns", $output, $return_var); } header("Location: /list/web/"); diff --git a/web/delete/backup/index.php b/web/delete/backup/index.php index b082d17b..af7ee41a 100644 --- a/web/delete/backup/index.php +++ b/web/delete/backup/index.php @@ -13,7 +13,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (!empty($_GET['backup'])) { $v_username = escapeshellarg($user); $v_backup = escapeshellarg($_GET['backup']); - exec (VESTA_CMD."v_delete_user_backup ".$v_username." ".$v_backup, $output, $return_var); + exec (VESTA_CMD."v-delete-user-backup ".$v_username." ".$v_backup, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/delete/cron/index.php b/web/delete/cron/index.php index 57ddd921..d5568fe4 100644 --- a/web/delete/cron/index.php +++ b/web/delete/cron/index.php @@ -13,7 +13,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (!empty($_GET['job'])) { $v_username = escapeshellarg($user); $v_job = escapeshellarg($_GET['job']); - exec (VESTA_CMD."v_delete_cron_job ".$v_username." ".$v_job, $output, $return_var); + exec (VESTA_CMD."v-delete-cron-job ".$v_username." ".$v_job, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/delete/db/index.php b/web/delete/db/index.php index 1ee1aaba..44f6a513 100644 --- a/web/delete/db/index.php +++ b/web/delete/db/index.php @@ -13,7 +13,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (!empty($_GET['database'])) { $v_username = escapeshellarg($user); $v_database = escapeshellarg($_GET['database']); - exec (VESTA_CMD."v_delete_database ".$v_username." ".$v_database, $output, $return_var); + exec (VESTA_CMD."v-delete-database ".$v_username." ".$v_database, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/delete/dns/index.php b/web/delete/dns/index.php index 27717b34..417bb367 100644 --- a/web/delete/dns/index.php +++ b/web/delete/dns/index.php @@ -14,7 +14,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_delete_dns_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -36,7 +36,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); $v_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v_delete_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var); + exec (VESTA_CMD."v-delete-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/delete/ip/index.php b/web/delete/ip/index.php index aa4c8560..44419f91 100644 --- a/web/delete/ip/index.php +++ b/web/delete/ip/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['ip'])) { $v_ip = escapeshellarg($_GET['ip']); - exec (VESTA_CMD."v_delete_sys_ip ".$v_ip, $output, $return_var); + exec (VESTA_CMD."v-delete-sys-ip ".$v_ip, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/delete/mail/index.php b/web/delete/mail/index.php index 5969cf2e..4879b1e9 100644 --- a/web/delete/mail/index.php +++ b/web/delete/mail/index.php @@ -14,7 +14,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_delete_mail_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -35,7 +35,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); $v_account = escapeshellarg($_GET['account']); - exec (VESTA_CMD."v_delete_mail_account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); + exec (VESTA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/delete/package/index.php b/web/delete/package/index.php index f284ce27..d7dc6069 100644 --- a/web/delete/package/index.php +++ b/web/delete/package/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['package'])) { $v_package = escapeshellarg($_GET['package']); - exec (VESTA_CMD."v_delete_user_package ".$v_package, $output, $return_var); + exec (VESTA_CMD."v-delete-user-package ".$v_package, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/delete/user/index.php b/web/delete/user/index.php index ffac38a2..ca08147b 100644 --- a/web/delete/user/index.php +++ b/web/delete/user/index.php @@ -8,7 +8,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['user'])) { $v_username = escapeshellarg($_GET['user']); - exec (VESTA_CMD."v_delete_user ".$v_username, $output, $return_var); + exec (VESTA_CMD."v-delete-user ".$v_username, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/delete/web/index.php b/web/delete/web/index.php index 10c3516d..c088f041 100644 --- a/web/delete/web/index.php +++ b/web/delete/web/index.php @@ -13,7 +13,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if (!empty($_GET['domain'])) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_delete_web_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -23,9 +23,9 @@ if (!empty($_GET['domain'])) { // DNS if ($return_var == 0) { - exec (VESTA_CMD."v_list_dns_domain ".$v_username." ".$v_domain." json", $output, $lreturn_var); + exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $lreturn_var); if ($lreturn_var == 0 ) { - exec (VESTA_CMD."v_delete_dns_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -37,9 +37,9 @@ if (!empty($_GET['domain'])) { // Mail if ($return_var == 0) { - exec (VESTA_CMD."v_list_mail_domain ".$v_username." ".$v_domain." json", $output, $lreturn_var); + exec (VESTA_CMD."v-list-mail-domain ".$v_username." ".$v_domain." json", $output, $lreturn_var); if ($lreturn_var == 0 ) { - exec (VESTA_CMD."v_delete_mail_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php index d2e848fd..b061071a 100644 --- a/web/edit/cron/index.php +++ b/web/edit/cron/index.php @@ -25,7 +25,7 @@ top_panel($user,$TAB); } $v_job = escapeshellarg($_GET['job']); - exec (VESTA_CMD."v_list_cron_job ".$user." ".$v_job." 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -61,7 +61,7 @@ top_panel($user,$TAB); $v_month = escapeshellarg($_POST['v_month']); $v_wday = escapeshellarg($_POST['v_wday']); $v_cmd = escapeshellarg($_POST['v_cmd']); - exec (VESTA_CMD."v_change_cron_job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var); + exec (VESTA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/edit/db/index.php b/web/edit/db/index.php index a0691958..f63411e2 100644 --- a/web/edit/db/index.php +++ b/web/edit/db/index.php @@ -25,7 +25,7 @@ top_panel($user,$TAB); } $v_database = escapeshellarg($_GET['database']); - exec (VESTA_CMD."v_list_database ".$user." ".$v_database." 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -55,7 +55,7 @@ top_panel($user,$TAB); // Change password if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) { $v_password = escapeshellarg($_POST['v_password']); - exec (VESTA_CMD."v_change_database_password ".$v_username." ".$v_database." ".$v_password, $output, $return_var); + exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/edit/dns/index.php b/web/edit/dns/index.php index d2e8446f..043bf5c6 100644 --- a/web/edit/dns/index.php +++ b/web/edit/dns/index.php @@ -27,7 +27,7 @@ top_panel($user,$TAB); // Check domain if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_list_dns_domain ".$user." ".$v_domain." json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domain ".$user." ".$v_domain." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -52,7 +52,7 @@ top_panel($user,$TAB); $v_status = 'active'; } - exec (VESTA_CMD."v_list_dns_templates json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var); $templates = json_decode(implode('', $output), true); unset($output); } @@ -64,7 +64,7 @@ top_panel($user,$TAB); // IP if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) { $v_ip = escapeshellarg($_POST['v_ip']); - exec (VESTA_CMD."v_change_dns_domain_ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -77,7 +77,7 @@ top_panel($user,$TAB); // Template if (( $_SESSION['user'] == 'admin') && ($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) { $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v_change_dns_domain_tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -90,7 +90,7 @@ top_panel($user,$TAB); // SOA if (($v_soa != $_POST['v_soa']) && (empty($_SESSION['error_msg']))) { $v_soa = escapeshellarg($_POST['v_soa']); - exec (VESTA_CMD."v_change_dns_domain_soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -103,7 +103,7 @@ top_panel($user,$TAB); // EXP if (($v_exp != $_POST['v_exp']) && (empty($_SESSION['error_msg']))) { $v_exp = escapeshellarg($_POST['v_exp']); - exec (VESTA_CMD."v_change_dns_domain_exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -116,7 +116,7 @@ top_panel($user,$TAB); // TTL if (($v_ttl != $_POST['v_ttl']) && (empty($_SESSION['error_msg']))) { $v_ttl = escapeshellarg($_POST['v_ttl']); - exec (VESTA_CMD."v_change_dns_domain_ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -128,7 +128,7 @@ top_panel($user,$TAB); // Restart dns if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_restart_dns", $output, $return_var); + exec (VESTA_CMD."v-restart-dns", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -151,7 +151,7 @@ top_panel($user,$TAB); } else { $v_domain = escapeshellarg($_GET['domain']); $v_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v_list_dns_domain_records ".$user." ".$v_domain." 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domain-records ".$user." ".$v_domain." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -184,7 +184,7 @@ top_panel($user,$TAB); if (($v_val != $_POST['v_val']) || ($v_priority != $_POST['v_priority']) && (empty($_SESSION['error_msg']))) { $v_val = escapeshellarg($_POST['v_val']); $v_priority = escapeshellarg($_POST['v_priority']); - exec (VESTA_CMD."v_change_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_val." ".$v_priority, $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_val." ".$v_priority, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php index feb9d981..0d701a87 100644 --- a/web/edit/ip/index.php +++ b/web/edit/ip/index.php @@ -23,7 +23,7 @@ if ($_SESSION['user'] == 'admin') { } $v_ip = escapeshellarg($_GET['ip']); - exec (VESTA_CMD."v_list_sys_ip ".$v_ip." 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-sys-ip ".$v_ip." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -48,7 +48,7 @@ if ($_SESSION['user'] == 'admin') { $v_status = 'active'; } - exec (VESTA_CMD."v_list_sys_users 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var); $users = json_decode(implode('', $output), true); unset($output); @@ -59,7 +59,7 @@ if ($_SESSION['user'] == 'admin') { // Change Status if (($v_ipstatus == 'shared') && (empty($_POST['v_shared'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_change_sys_ip_status ".$v_ip." 'dedicated'", $output, $return_var); + exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'dedicated'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -69,7 +69,7 @@ if ($_SESSION['user'] == 'admin') { $v_dedicated = 'yes'; } if (($v_ipstatus == 'dedicated') && (!empty($_POST['v_shared'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_change_sys_ip_status ".$v_ip." 'shared'", $output, $return_var); + exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'shared'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -82,7 +82,7 @@ if ($_SESSION['user'] == 'admin') { // Change owner if (($v_owner != $_POST['v_owner']) && (empty($_SESSION['error_msg']))) { $v_owner = escapeshellarg($_POST['v_owner']); - exec (VESTA_CMD."v_change_sys_ip_owner ".$v_ip." ".$v_owner, $output, $return_var); + exec (VESTA_CMD."v-change-sys-ip-owner ".$v_ip." ".$v_owner, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -95,7 +95,7 @@ if ($_SESSION['user'] == 'admin') { // Change Name if (($v_name != $_POST['v_name']) && (empty($_SESSION['error_msg']))) { $v_name = escapeshellarg($_POST['v_name']); - exec (VESTA_CMD."v_change_sys_ip_name ".$v_ip." ".$v_name, $output, $return_var); + exec (VESTA_CMD."v-change-sys-ip-name ".$v_ip." ".$v_name, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php index c0cdbedc..ca3c152b 100644 --- a/web/edit/mail/index.php +++ b/web/edit/mail/index.php @@ -27,7 +27,7 @@ top_panel($user,$TAB); // Check domain if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_list_mail_domain ".$user." ".$v_domain." json", $output, $return_var); + exec (VESTA_CMD."v-list-mail-domain ".$user." ".$v_domain." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -57,7 +57,7 @@ top_panel($user,$TAB); // Antispam if (($v_antispam == 'yes') && (empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_mail_domain_antispam ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -67,7 +67,7 @@ top_panel($user,$TAB); unset($output); } if (($v_antispam == 'no') && (!empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_add_mail_domain_antispam ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-add-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -79,7 +79,7 @@ top_panel($user,$TAB); // Antivirus if (($v_antivirus == 'yes') && (empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_mail_domain_antivirus ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -89,7 +89,7 @@ top_panel($user,$TAB); unset($output); } if (($v_antivirus == 'no') && (!empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_add_mail_domain_antivirus ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-add-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -105,7 +105,7 @@ top_panel($user,$TAB); // DKIM if (($v_dkim == 'yes') && (empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_mail_domain_dkim ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -115,7 +115,7 @@ top_panel($user,$TAB); unset($output); } if (($v_dkim == 'no') && (!empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_add_mail_domain_dkim ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-add-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -127,7 +127,7 @@ top_panel($user,$TAB); // Catchall if ((!empty($v_catchall)) && (empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_mail_domain_catchall ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-mail-domain-catchall ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -140,7 +140,7 @@ top_panel($user,$TAB); if ((!empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) { if ($v_catchall != $_POST['v_catchall']) { $v_catchall = escapeshellarg($_POST['v_catchall']); - exec (VESTA_CMD."v_change_mail_domain_catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var); + exec (VESTA_CMD."v-change-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -152,7 +152,7 @@ top_panel($user,$TAB); if ((empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) { $v_catchall = escapeshellarg($_POST['v_catchall']); - exec (VESTA_CMD."v_add_mail_domain_catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var); + exec (VESTA_CMD."v-add-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -173,7 +173,7 @@ top_panel($user,$TAB); $v_username = $user; $v_domain = escapeshellarg($_GET['domain']); $v_account = escapeshellarg($_GET['account']); - exec (VESTA_CMD."v_list_mail_account ".$user." ".$v_domain." ".$v_account." 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-mail-account ".$user." ".$v_domain." ".$v_account." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -192,7 +192,7 @@ top_panel($user,$TAB); $v_quota = $data[$v_account]['QUOTA']; $v_autoreply = $data[$v_account]['AUTOREPLY']; if ( $v_autoreply == 'yes' ) { - exec (VESTA_CMD."v_list_mail_account_autoreply ".$user." '".$v_domain."' '".$v_account."' json", $output, $return_var); + exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." '".$v_domain."' '".$v_account."' json", $output, $return_var); $autoreply_str = json_decode(implode('', $output), true); unset($output); $v_autoreply_message = $autoreply_str[$v_account]['MSG']; @@ -215,7 +215,7 @@ top_panel($user,$TAB); // Password if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) { $v_password = escapeshellarg($_POST['v_password']); - exec (VESTA_CMD."v_change_mail_account_password ".$v_username." ".$v_domain." ".$v_account." ".$v_password, $output, $return_var); + exec (VESTA_CMD."v-change-mail-account-password ".$v_username." ".$v_domain." ".$v_account." ".$v_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -232,7 +232,7 @@ top_panel($user,$TAB); } else { $v_quota = escapeshellarg($_POST['v_quota']); } - exec (VESTA_CMD."v_change_mail_account_quota ".$v_username." ".$v_domain." ".$v_account." ".$v_quota, $output, $return_var); + exec (VESTA_CMD."v-change-mail-account-quota ".$v_username." ".$v_domain." ".$v_account." ".$v_quota, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -253,7 +253,7 @@ top_panel($user,$TAB); $result = array_diff($valiases, $aliases); foreach ($result as $alias) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { - exec (VESTA_CMD."v_delete_mail_account_alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var); + exec (VESTA_CMD."v-delete-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -265,7 +265,7 @@ top_panel($user,$TAB); $result = array_diff($aliases, $valiases); foreach ($result as $alias) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { - exec (VESTA_CMD."v_add_mail_account_alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var); + exec (VESTA_CMD."v-add-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -287,7 +287,7 @@ top_panel($user,$TAB); $result = array_diff($vfwd, $fwd); foreach ($result as $forward) { if ((empty($_SESSION['error_msg'])) && (!empty($forward))) { - exec (VESTA_CMD."v_delete_mail_account_forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var); + exec (VESTA_CMD."v-delete-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -299,7 +299,7 @@ top_panel($user,$TAB); $result = array_diff($fwd, $vfwd); foreach ($result as $forward) { if ((empty($_SESSION['error_msg'])) && (!empty($forward))) { - exec (VESTA_CMD."v_add_mail_account_forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var); + exec (VESTA_CMD."v-add-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -312,7 +312,7 @@ top_panel($user,$TAB); // Autoreply if (($v_autoreply == 'yes') && (empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_mail_account_autoreply ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); + exec (VESTA_CMD."v-delete-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -326,7 +326,7 @@ top_panel($user,$TAB); if ( $v_autoreply_message != str_replace("\r\n", "\n", $_POST['v_autoreply_message'])) { $v_autoreply_message = str_replace("\r\n", "\n", $_POST['v_autoreply_message']); $v_autoreply_message = escapeshellarg($v_autoreply_message); - exec (VESTA_CMD."v_add_mail_account_autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var); + exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -342,7 +342,7 @@ top_panel($user,$TAB); if (empty($_SESSION['error_msg'])) { $v_autoreply_message = str_replace("\r\n", "\n", $_POST['v_autoreply_message']); $v_autoreply_message = escapeshellarg($v_autoreply_message); - exec (VESTA_CMD."v_add_mail_account_autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var); + exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/edit/package/index.php b/web/edit/package/index.php index e2714066..21e47b7d 100644 --- a/web/edit/package/index.php +++ b/web/edit/package/index.php @@ -23,7 +23,7 @@ if ($_SESSION['user'] == 'admin') { } $v_package = escapeshellarg($_GET['package']); - exec (VESTA_CMD."v_list_user_package ".$v_package." 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-user-package ".$v_package." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -57,12 +57,12 @@ if ($_SESSION['user'] == 'admin') { $v_status = 'active'; - exec (VESTA_CMD."v_list_web_templates json", $output, $return_var); + exec (VESTA_CMD."v-list-web-templates json", $output, $return_var); check_error($return_var); $templates = json_decode(implode('', $output), true); unset($output); - exec (VESTA_CMD."v_list_sys_shells json", $output, $return_var); + exec (VESTA_CMD."v-list-sys-shells json", $output, $return_var); check_error($return_var); $shells = json_decode(implode('', $output), true); unset($output); @@ -153,7 +153,7 @@ if ($_SESSION['user'] == 'admin') { // Rewrite package if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v_add_user_package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var); + exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -167,7 +167,7 @@ if ($_SESSION['user'] == 'admin') { unset($output); // Propogate new package - exec (VESTA_CMD."v_update_user_package ".$v_package." 'json'", $output, $return_var); + exec (VESTA_CMD."v-update-user-package ".$v_package." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/edit/user/index.php b/web/edit/user/index.php index 4742cb81..947e5197 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -24,7 +24,7 @@ if ($_SESSION['user'] == 'admin') { // Check user $v_username = escapeshellarg($_GET['user']); - exec (VESTA_CMD."v_list_user ".$v_username." json", $output, $return_var); + exec (VESTA_CMD."v-list-user ".$v_username." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -55,15 +55,15 @@ if ($_SESSION['user'] == 'admin') { $v_time = $data[$v_username]['TIME']; $v_date = $data[$v_username]['DATE']; - exec (VESTA_CMD."v_list_user_packages json", $output, $return_var); + exec (VESTA_CMD."v-list-user-packages json", $output, $return_var); $packages = json_decode(implode('', $output), true); unset($output); - exec (VESTA_CMD."v_list_web_templates json", $output, $return_var); + exec (VESTA_CMD."v-list-web-templates json", $output, $return_var); $templates = json_decode(implode('', $output), true); unset($output); - exec (VESTA_CMD."v_list_sys_shells json", $output, $return_var); + exec (VESTA_CMD."v-list-sys-shells json", $output, $return_var); $shells = json_decode(implode('', $output), true); unset($output); } @@ -75,7 +75,7 @@ if ($_SESSION['user'] == 'admin') { // Change password if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) { $v_password = escapeshellarg($_POST['v_password']); - exec (VESTA_CMD."v_change_user_password ".$v_username." ".$v_password, $output, $return_var); + exec (VESTA_CMD."v-change-user-password ".$v_username." ".$v_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -88,7 +88,7 @@ if ($_SESSION['user'] == 'admin') { // Change package if (($v_package != $_POST['v_package']) && (empty($_SESSION['error_msg']))) { $v_package = escapeshellarg($_POST['v_package']); - exec (VESTA_CMD."v_change_user_package ".$v_username." ".$v_package, $output, $return_var); + exec (VESTA_CMD."v-change-user-package ".$v_username." ".$v_package, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -100,7 +100,7 @@ if ($_SESSION['user'] == 'admin') { // Change template if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) { $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v_change_user_template ".$v_username." ".$v_template, $output, $return_var); + exec (VESTA_CMD."v-change-user-template ".$v_username." ".$v_template, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -112,7 +112,7 @@ if ($_SESSION['user'] == 'admin') { // Change shell if (($v_shell != $_POST['v_shell']) && (empty($_SESSION['error_msg']))) { $v_shell = escapeshellarg($_POST['v_shell']); - exec (VESTA_CMD."v_change_user_shell ".$v_username." ".$v_shell, $output, $return_var); + exec (VESTA_CMD."v-change-user-shell ".$v_username." ".$v_shell, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -128,7 +128,7 @@ if ($_SESSION['user'] == 'admin') { $_SESSION['error_msg'] = 'Please enter valid email address.'; } else { $v_email = escapeshellarg($_POST['v_email']); - exec (VESTA_CMD."v_change_user_contact ".$v_username." ".$v_email, $output, $return_var); + exec (VESTA_CMD."v-change-user-contact ".$v_username." ".$v_email, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -142,7 +142,7 @@ if ($_SESSION['user'] == 'admin') { if (($v_fname != $_POST['v_fname']) || ($v_lname != $_POST['v_lname']) && (empty($_SESSION['error_msg']))) { $v_fname = escapeshellarg($_POST['v_fname']); $v_lname = escapeshellarg($_POST['v_lname']); - exec (VESTA_CMD."v_change_user_name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var); + exec (VESTA_CMD."v-change-user-name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -157,7 +157,7 @@ if ($_SESSION['user'] == 'admin') { $v_ns2 = escapeshellarg($_POST['v_ns2']); $v_ns3 = escapeshellarg($_POST['v_ns3']); $v_ns4 = escapeshellarg($_POST['v_ns4']); - $ns_cmd = VESTA_CMD."v_change_user_ns ".$v_username." ".$v_ns1." ".$v_ns2; + $ns_cmd = VESTA_CMD."v-change-user-ns ".$v_username." ".$v_ns1." ".$v_ns2; if (!empty($_POST['v_ns3'])) $ns_cmd = $ns_cmd." ".$v_ns3; if (!empty($_POST['v_ns4'])) $ns_cmd = $ns_cmd." ".$v_ns4; exec ($ns_cmd, $output, $return_var); @@ -185,7 +185,7 @@ if ($_SESSION['user'] == 'admin') { // Check user $v_username = escapeshellarg($_GET['user']); - exec (VESTA_CMD."v_list_user ".$v_username." json", $output, $return_var); + exec (VESTA_CMD."v-list-user ".$v_username." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -222,7 +222,7 @@ if ($_SESSION['user'] == 'admin') { // Change password if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) { $v_password = escapeshellarg($_POST['v_password']); - exec (VESTA_CMD."v_change_user_password ".$v_username." ".$v_password, $output, $return_var); + exec (VESTA_CMD."v-change-user-password ".$v_username." ".$v_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -235,7 +235,7 @@ if ($_SESSION['user'] == 'admin') { // Change contact email if (($v_email != $_POST['v_email']) && (empty($_SESSION['error_msg']))) { $v_email = escapeshellarg($_POST['v_email']); - exec (VESTA_CMD."v_change_user_contact ".$v_username." ".$v_email, $output, $return_var); + exec (VESTA_CMD."v-change-user-contact ".$v_username." ".$v_email, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -250,7 +250,7 @@ if ($_SESSION['user'] == 'admin') { $v_ns2 = escapeshellarg($_POST['v_ns2']); $v_ns3 = escapeshellarg($_POST['v_ns3']); $v_ns4 = escapeshellarg($_POST['v_ns4']); - $ns_cmd = VESTA_CMD."v_change_user_ns ".$v_username." ".$v_ns1." ".$v_ns2; + $ns_cmd = VESTA_CMD."v-change-user-ns ".$v_username." ".$v_ns1." ".$v_ns2; if (!empty($_POST['v_ns3'])) $ns_cmd = $ns_cmd." ".$v_ns3; if (!empty($_POST['v_ns4'])) $ns_cmd = $ns_cmd." ".$v_ns4; exec ($ns_cmd, $output, $return_var); diff --git a/web/edit/web/index.php b/web/edit/web/index.php index 2d069e8b..32a62630 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -29,7 +29,7 @@ top_panel($user,$TAB); // Check domain $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_list_web_domain ".$user." ".$v_domain." json", $output, $return_var); + exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -48,7 +48,7 @@ top_panel($user,$TAB); $v_elog = $data[$v_domain]['ELOG']; $v_ssl = $data[$v_domain]['SSL']; if ( $v_ssl == 'yes' ) { - exec (VESTA_CMD."v_list_web_domain_ssl ".$user." '".$v_domain."' json", $output, $return_var); + exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var); $ssl_str = json_decode(implode('', $output), true); unset($output); $v_ssl_crt = $ssl_str[$v_domain]['CRT']; @@ -72,15 +72,15 @@ top_panel($user,$TAB); $v_time = $data[$v_domain]['TIME']; $v_date = $data[$v_domain]['DATE']; - exec (VESTA_CMD."v_list_user_ips ".$user." json", $output, $return_var); + exec (VESTA_CMD."v-list-user-ips ".$user." json", $output, $return_var); $ips = json_decode(implode('', $output), true); unset($output); - exec (VESTA_CMD."v_list_web_templates json", $output, $return_var); + exec (VESTA_CMD."v-list-web-templates json", $output, $return_var); $templates = json_decode(implode('', $output), true); unset($output); - exec (VESTA_CMD."v_list_web_stats json", $output, $return_var); + exec (VESTA_CMD."v-list-web-stats json", $output, $return_var); $stats = json_decode(implode('', $output), true); unset($output); } @@ -92,7 +92,7 @@ top_panel($user,$TAB); // IP if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) { $v_ip = escapeshellarg($_POST['v_ip']); - exec (VESTA_CMD."v_change_web_domain_ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -100,9 +100,9 @@ top_panel($user,$TAB); } $restart_web = 'yes'; unset($output); - exec (VESTA_CMD."v_list_dns_domain ".$v_username." ".$v_domain." json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $return_var); if ((empty($_SESSION['error_msg'])) && ($return_var == 0 )) { - exec (VESTA_CMD."v_change_dns_domain_ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -112,9 +112,9 @@ top_panel($user,$TAB); } unset($output); foreach($valiases as $v_alias ){ - exec (VESTA_CMD."v_list_dns_domain ".$v_username." '".$v_alias."' json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domain ".$v_username." '".$v_alias."' json", $output, $return_var); if ((empty($_SESSION['error_msg'])) && ($return_var == 0 )) { - exec (VESTA_CMD."v_change_dns_domain_ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -129,7 +129,7 @@ top_panel($user,$TAB); // Template if (( $_SESSION['user'] == 'admin') && ($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) { $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v_change_web_domain_tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -152,7 +152,7 @@ top_panel($user,$TAB); if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { $restart_web = 'yes'; $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v_delete_web_domain_alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -161,7 +161,7 @@ top_panel($user,$TAB); unset($output); if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v_delete_dns_on_web_alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); + exec (VESTA_CMD."v-delete-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -178,7 +178,7 @@ top_panel($user,$TAB); if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { $restart_web = 'yes'; $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v_add_web_domain_alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -186,7 +186,7 @@ top_panel($user,$TAB); } unset($output); if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v_add_dns_on_web_alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -201,7 +201,7 @@ top_panel($user,$TAB); // Nginx if ((!empty($v_nginx)) && (empty($_POST['v_nginx'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_web_domain_nginx ".$v_username." ".$v_domain." 'no'", $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-nginx ".$v_username." ".$v_domain." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -219,7 +219,7 @@ top_panel($user,$TAB); $ext = str_replace(' ', ", ", $ext); if ( $v_nginx_ext != $ext ) { $ext = str_replace(', ', ",", $ext); - exec (VESTA_CMD."v_change_web_domain_nginx_tpl ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-nginx-tpl ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -240,7 +240,7 @@ top_panel($user,$TAB); $ext = str_replace(' ', ",", $ext); $v_nginx_ext = str_replace(',', ', ', $ext); } - exec (VESTA_CMD."v_add_web_domain_nginx ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-nginx ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -253,7 +253,7 @@ top_panel($user,$TAB); // SSL if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_web_domain_ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -289,7 +289,7 @@ top_panel($user,$TAB); fclose($fp); } - exec (VESTA_CMD."v_change_web_domain_sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -305,7 +305,7 @@ top_panel($user,$TAB); if (( $v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) { if ( $v_ssl_home != $_POST['v_ssl_home'] ) { $v_ssl_home = escapeshellarg($_POST['v_ssl_home']); - exec (VESTA_CMD."v_change_web_domain_sslhome ".$user." ".$v_domain." ".$v_ssl_home." 'no'", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-sslhome ".$user." ".$v_domain." ".$v_ssl_home." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -353,7 +353,7 @@ top_panel($user,$TAB); fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_ca'])); fclose($fp); } - exec (VESTA_CMD."v_add_web_domain_ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -371,7 +371,7 @@ top_panel($user,$TAB); // Web Stats if ((!empty($v_stats)) && ($_POST['v_stats'] == 'none') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_web_domain_stats ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-stats ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -382,7 +382,7 @@ top_panel($user,$TAB); } if ((!empty($v_stats)) && ($_POST['v_stats'] != $v_stats) && (empty($_SESSION['error_msg']))) { $v_stats = escapeshellarg($_POST['v_stats']); - exec (VESTA_CMD."v_change_web_domain_stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -392,7 +392,7 @@ top_panel($user,$TAB); } if ((empty($v_stats)) && ($_POST['v_stats'] != 'none') && (empty($_SESSION['error_msg']))) { $v_stats = escapeshellarg($_POST['v_stats']); - exec (VESTA_CMD."v_add_web_domain_stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -403,7 +403,7 @@ top_panel($user,$TAB); // Web Stats Auth if ((!empty($v_stats_user)) && (empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_web_domain_stats_user ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-stats-user ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -428,7 +428,7 @@ top_panel($user,$TAB); } else { $v_stats_user = escapeshellarg($_POST['v_stats_user']); $v_stats_password = escapeshellarg($_POST['v_stats_password']); - exec (VESTA_CMD."v_add_web_domain_stats_user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -454,7 +454,7 @@ top_panel($user,$TAB); if (($v_stats_user != $_POST['v_stats_user']) || ($_POST['v_stats_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) { $v_stats_user = escapeshellarg($_POST['v_stats_user']); $v_stats_password = escapeshellarg($_POST['v_stats_password']); - exec (VESTA_CMD."v_add_web_domain_stats_user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -467,7 +467,7 @@ top_panel($user,$TAB); // FTP Account if ((!empty($v_ftp_user)) && (empty($_POST['v_ftp'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_delete_web_domain_ftp ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -495,7 +495,7 @@ top_panel($user,$TAB); $v_ftp_user = preg_replace("/^".$user."_/", "", $_POST['v_ftp_user']); $v_ftp_user = escapeshellarg($v_ftp_user); $v_ftp_password = escapeshellarg($_POST['v_ftp_password']); - exec (VESTA_CMD."v_add_web_domain_ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -524,7 +524,7 @@ top_panel($user,$TAB); if (empty($_SESSION['error_msg'])) { $v_ftp_user = escapeshellarg($_POST['v_ftp_user']); $v_ftp_password = escapeshellarg($_POST['v_ftp_password']); - exec (VESTA_CMD."v_add_web_domain_ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -553,7 +553,7 @@ top_panel($user,$TAB); // Restart web if (!empty($restart_web) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_restart_web", $output, $return_var); + exec (VESTA_CMD."v-restart-web", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -563,7 +563,7 @@ top_panel($user,$TAB); // Restart dns if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v_restart_dns", $output, $return_var); + exec (VESTA_CMD."v-restart-dns", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/error/index.html b/web/error/index.html new file mode 100644 index 00000000..0b316dac --- /dev/null +++ b/web/error/index.html @@ -0,0 +1,26 @@ + + + 505 — internal error + + + + + + +

An internal error occurred

+ +
+ Try start again from home page or go back to previous page. +
+ + diff --git a/web/error/vesta.jpg b/web/error/vesta.jpg new file mode 100644 index 00000000..f1a32c93 Binary files /dev/null and b/web/error/vesta.jpg differ diff --git a/web/inc/main.php b/web/inc/main.php index d8706d94..be27f456 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -26,7 +26,7 @@ function check_error($return_var){ function top_panel($user, $TAB) { global $panel; - $command = VESTA_CMD."v_list_user '".$user."' 'json'"; + $command = VESTA_CMD."v-list-user '".$user."' 'json'"; exec ($command, $output, $return_var); if ( $return_var > 0 ) { header("Location: /error/"); diff --git a/web/list/backup/index.php b/web/list/backup/index.php index 09c25235..31ee4b81 100644 --- a/web/list/backup/index.php +++ b/web/list/backup/index.php @@ -13,7 +13,7 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v_list_user_backups $user json", $output, $return_var); +exec (VESTA_CMD."v-list-user-backups $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/cron/index.php b/web/list/cron/index.php index 3a8fccc3..852e3fdd 100644 --- a/web/list/cron/index.php +++ b/web/list/cron/index.php @@ -14,13 +14,13 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v_list_cron_jobs $user json", $output, $return_var); + exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_cron.html'); } else { - exec (VESTA_CMD."v_list_cron_jobs $user json", $output, $return_var); + exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/db/index.php b/web/list/db/index.php index 34e19b24..7179d48d 100644 --- a/web/list/db/index.php +++ b/web/list/db/index.php @@ -14,13 +14,13 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v_list_databases $user json", $output, $return_var); + exec (VESTA_CMD."v-list-databases $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_db.html'); } else { - exec (VESTA_CMD."v_list_databases $user json", $output, $return_var); + exec (VESTA_CMD."v-list-databases $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/dns/index.php b/web/list/dns/index.php index 4128e1f6..2918fbbb 100644 --- a/web/list/dns/index.php +++ b/web/list/dns/index.php @@ -15,13 +15,13 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { if (empty($_GET['domain'])){ - exec (VESTA_CMD."v_list_dns_domains $user json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns.html'); } else { - exec (VESTA_CMD."v_list_dns_domain_records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domain-records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); @@ -29,13 +29,13 @@ if ($_SESSION['user'] == 'admin') { } } else { if (empty($_GET['domain'])){ - exec (VESTA_CMD."v_list_dns_domains $user json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_dns.html'); } else { - exec (VESTA_CMD."v_list_dns_domain_records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domain-records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/ip/index.php b/web/list/ip/index.php index ed969221..d15790fd 100644 --- a/web/list/ip/index.php +++ b/web/list/ip/index.php @@ -14,7 +14,7 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v_list_sys_ips json", $output, $return_var); + exec (VESTA_CMD."v-list-sys-ips json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/mail/index.php b/web/list/mail/index.php index a6a1f1d3..987a0098 100644 --- a/web/list/mail/index.php +++ b/web/list/mail/index.php @@ -16,13 +16,13 @@ top_panel($user,$TAB); if ($_SESSION['user'] == 'admin') { if (empty($_GET['domain'])){ - exec (VESTA_CMD."v_list_mail_domains $user json", $output, $return_var); + exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail.html'); } else { - exec (VESTA_CMD."v_list_mail_accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); @@ -30,14 +30,14 @@ if ($_SESSION['user'] == 'admin') { } } else { if (empty($_GET['domain'])){ - exec (VESTA_CMD."v_list_mail_domains $user json", $output, $return_var); + exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_mail.html'); } else { - exec (VESTA_CMD."v_list_mail_accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); + exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/package/index.php b/web/list/package/index.php index ea938cc5..1008a202 100644 --- a/web/list/package/index.php +++ b/web/list/package/index.php @@ -14,7 +14,7 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v_list_user_packages json", $output, $return_var); + exec (VESTA_CMD."v-list-user-packages json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/rrd/index.php b/web/list/rrd/index.php index d91e5a1d..5c04caa5 100644 --- a/web/list/rrd/index.php +++ b/web/list/rrd/index.php @@ -14,7 +14,7 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v_list_sys_rrd json", $output, $return_var); + exec (VESTA_CMD."v-list-sys-rrd json", $output, $return_var); $data = json_decode(implode('', $output), true); unset($output); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_rrd.html'); diff --git a/web/list/stats/index.php b/web/list/stats/index.php index b9f5074d..a8a93633 100644 --- a/web/list/stats/index.php +++ b/web/list/stats/index.php @@ -13,7 +13,7 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); top_panel($user,$TAB); // Data -exec (VESTA_CMD."v_list_user_stats $user json", $output, $return_var); +exec (VESTA_CMD."v-list-user-stats $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); unset($output); diff --git a/web/list/user/index.php b/web/list/user/index.php index ca840561..35d15c48 100644 --- a/web/list/user/index.php +++ b/web/list/user/index.php @@ -15,15 +15,15 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - $cmd = "v_list_user '".$user."' json"; - if ($user == 'admin') $cmd = "v_list_users json"; + $cmd = "v-list-user '".$user."' json"; + if ($user == 'admin') $cmd = "v-list-users json"; exec (VESTA_CMD.$cmd, $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); display_error_block; include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_user.html'); } else { - exec (VESTA_CMD."v_list_user ".$user." json", $output, $return_var); + exec (VESTA_CMD."v-list-user ".$user." json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); display_error_block; diff --git a/web/list/web/index.php b/web/list/web/index.php index 876680f5..a99f9cdd 100644 --- a/web/list/web/index.php +++ b/web/list/web/index.php @@ -14,12 +14,12 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var); + exec (VESTA_CMD."v-list-web-domains $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_web.html'); } else { - exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var); + exec (VESTA_CMD."v-list-web-domains $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_web.html'); diff --git a/web/login/index.php b/web/login/index.php index c40f3c6d..d456da8a 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -23,7 +23,7 @@ if (isset($_SESSION['user'])) { $cmd="/usr/bin/sudo /usr/local/vesta/bin/"; $v_user = escapeshellarg($_POST['user']); $v_password = escapeshellarg($_POST['password']); - $command="$cmd"."v_check_user_password ".$v_user." ".$v_password." '".$_SERVER["REMOTE_ADDR"]."'"; + $command="$cmd"."v-check-user-password ".$v_user." ".$v_password." '".$_SERVER["REMOTE_ADDR"]."'"; exec ($command, $output, $return_var); if ( $return_var > 0 ) { $ERROR = "ERROR: Invalid username or password"; diff --git a/web/reset/index.php b/web/reset/index.php index cb974b97..02430f52 100644 --- a/web/reset/index.php +++ b/web/reset/index.php @@ -22,7 +22,7 @@ function send_email($to,$subject,$mailtext,$from) { if ((!empty($_POST['user'])) && (empty($_POST['code']))) { $v_user = escapeshellarg($_POST['user']); $user = $_POST['user']; - $cmd="/usr/bin/sudo /usr/local/vesta/bin/v_list_user"; + $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-list-user"; exec ($cmd." ".$v_user." json", $output, $return_var); if ( $return_var == 0 ) { $data = json_decode(implode('', $output), true); @@ -59,13 +59,13 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass $v_user = escapeshellarg($_POST['user']); $user = $_POST['user']; $v_password = escapeshellarg($_POST['password']); - $cmd="/usr/bin/sudo /usr/local/vesta/bin/v_list_user"; + $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-list-user"; exec ($cmd." ".$v_user." json", $output, $return_var); if ( $return_var == 0 ) { $data = json_decode(implode('', $output), true); $rkey = $data[$user]['RKEY']; if ($rkey == $_POST['code']) { - $cmd="/usr/bin/sudo /usr/local/vesta/bin/v_change_user_password"; + $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-change-user-password"; exec ($cmd." ".$v_user." ".$v_password, $output, $return_var); if ( $return_var > 0 ) { $ERROR = "ERROR: Internal error"; diff --git a/web/search/index.php b/web/search/index.php index 76b827fa..11474706 100644 --- a/web/search/index.php +++ b/web/search/index.php @@ -27,11 +27,11 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { $q = escapeshellarg($q); - exec (VESTA_CMD."v_search_object ".$q." json", $output, $return_var); + exec (VESTA_CMD."v-search-object ".$q." json", $output, $return_var); $data = json_decode(implode('', $output), true); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_search.html'); } else { - exec (VESTA_CMD."v_search_user_object ".$user." ".$q." json", $output, $return_var); + exec (VESTA_CMD."v-search-user-object ".$user." ".$q." json", $output, $return_var); $data = json_decode(implode('', $output), true); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_search.html'); } diff --git a/web/suspend/cron/index.php b/web/suspend/cron/index.php index 36cb9cd9..13824ea7 100644 --- a/web/suspend/cron/index.php +++ b/web/suspend/cron/index.php @@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') { if (!empty($_GET['job'])) { $v_username = escapeshellarg($user); $v_job = escapeshellarg($_GET['job']); - exec (VESTA_CMD."v_suspend_cron_job ".$v_username." ".$v_job, $output, $return_var); + exec (VESTA_CMD."v-suspend-cron-job ".$v_username." ".$v_job, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/suspend/db/index.php b/web/suspend/db/index.php index 93387879..9e22dcee 100644 --- a/web/suspend/db/index.php +++ b/web/suspend/db/index.php @@ -13,7 +13,7 @@ if ($_SESSION['user'] == 'admin') { if (!empty($_GET['database'])) { $v_username = escapeshellarg($user); $v_database = escapeshellarg($_GET['database']); - exec (VESTA_CMD."v_suspend_database ".$v_username." ".$v_database, $output, $return_var); + exec (VESTA_CMD."v-suspend-database ".$v_username." ".$v_database, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/suspend/dns/index.php b/web/suspend/dns/index.php index 74f1347e..38586bc8 100644 --- a/web/suspend/dns/index.php +++ b/web/suspend/dns/index.php @@ -14,7 +14,7 @@ if ($_SESSION['user'] == 'admin') { if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_suspend_dns_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-suspend-dns-domain ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -35,7 +35,7 @@ if ($_SESSION['user'] == 'admin') { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); $v_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v_suspend_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var); + exec (VESTA_CMD."v-suspend-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/suspend/mail/index.php b/web/suspend/mail/index.php index eeaba79d..cda23e81 100644 --- a/web/suspend/mail/index.php +++ b/web/suspend/mail/index.php @@ -14,7 +14,7 @@ if ($_SESSION['user'] == 'admin') { if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_suspend_mail_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-suspend-mail-domain ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -35,7 +35,7 @@ if ($_SESSION['user'] == 'admin') { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); $v_account = escapeshellarg($_GET['account']); - exec (VESTA_CMD."v_suspend_mail_account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); + exec (VESTA_CMD."v-suspend-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/suspend/user/index.php b/web/suspend/user/index.php index cc13ef0a..20d1debb 100644 --- a/web/suspend/user/index.php +++ b/web/suspend/user/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['user'])) { $v_username = escapeshellarg($_GET['user']); - exec (VESTA_CMD."v_suspend_user ".$v_username, $output, $return_var); + exec (VESTA_CMD."v-suspend-user ".$v_username, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/suspend/web/index.php b/web/suspend/web/index.php index 23c70269..fef9158e 100644 --- a/web/suspend/web/index.php +++ b/web/suspend/web/index.php @@ -13,7 +13,7 @@ if ($_SESSION['user'] == 'admin') { if (!empty($_GET['domain'])) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_suspend_web_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-suspend-web-domain ".$v_username." ".$v_domain, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html index 74885b84..bd0ba47c 100644 --- a/web/templates/admin/add_user.html +++ b/web/templates/admin/add_user.html @@ -27,7 +27,7 @@ -
+ diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 6c81fc82..0c0affad 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -296,7 +296,7 @@ - +
Web Statistics Username diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index 15e3c9b5..9f1f4414 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -44,7 +44,7 @@ var rnum = Math.floor(Math.random() * chars.length); randomstring += chars.substring(rnum,rnum+1); } - document.v_add_user.v_password.value = randomstring; + document.v-add-user.v_password.value = randomstring; } diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index 8ee2bef5..5551f801 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -260,7 +260,7 @@
- +
Web Statistics Username diff --git a/web/templates/user/add_web.html b/web/templates/user/add_web.html index d2e00285..a387b915 100644 --- a/web/templates/user/add_web.html +++ b/web/templates/user/add_web.html @@ -286,7 +286,7 @@
- +
Web Statistics Username diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index 8ea69321..a1b96ef8 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -239,7 +239,7 @@
- +
Web Statistics Username diff --git a/web/unsuspend/cron/index.php b/web/unsuspend/cron/index.php index 4a6ea8b9..500517b6 100644 --- a/web/unsuspend/cron/index.php +++ b/web/unsuspend/cron/index.php @@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') { if (!empty($_GET['job'])) { $v_username = escapeshellarg($user); $v_job = escapeshellarg($_GET['job']); - exec (VESTA_CMD."v_unsuspend_cron_job ".$v_username." ".$v_job, $output, $return_var); + exec (VESTA_CMD."v-unsuspend-cron-job ".$v_username." ".$v_job, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/unsuspend/db/index.php b/web/unsuspend/db/index.php index 49ba84be..e5c89204 100644 --- a/web/unsuspend/db/index.php +++ b/web/unsuspend/db/index.php @@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') { if (!empty($_GET['database'])) { $v_username = escapeshellarg($user); $v_database = escapeshellarg($_GET['database']); - exec (VESTA_CMD."v_unsuspend_database ".$v_username." ".$v_database, $output, $return_var); + exec (VESTA_CMD."v-unsuspend-database ".$v_username." ".$v_database, $output, $return_var); unset($output); } } diff --git a/web/unsuspend/dns/index.php b/web/unsuspend/dns/index.php index 6311503e..2b87b6bd 100644 --- a/web/unsuspend/dns/index.php +++ b/web/unsuspend/dns/index.php @@ -13,7 +13,7 @@ if ($_SESSION['user'] == 'admin') { if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_unsuspend_dns_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-unsuspend-dns-domain ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -35,7 +35,7 @@ if ($_SESSION['user'] == 'admin') { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); $v_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v_unsuspend_dns_domain_record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var); + exec (VESTA_CMD."v-unsuspend-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/unsuspend/mail/index.php b/web/unsuspend/mail/index.php index a6d50d46..5c95351e 100644 --- a/web/unsuspend/mail/index.php +++ b/web/unsuspend/mail/index.php @@ -13,7 +13,7 @@ if ($_SESSION['user'] == 'admin') { if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_unsuspend_mail_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-unsuspend-mail-domain ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; @@ -34,7 +34,7 @@ if ($_SESSION['user'] == 'admin') { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); $v_account = escapeshellarg($_GET['account']); - exec (VESTA_CMD."v_unsuspend_mail_account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); + exec (VESTA_CMD."v-unsuspend-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = 'Error: vesta did not return any output.'; diff --git a/web/unsuspend/user/index.php b/web/unsuspend/user/index.php index 2ff2a752..8a07505a 100644 --- a/web/unsuspend/user/index.php +++ b/web/unsuspend/user/index.php @@ -9,7 +9,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ($_SESSION['user'] == 'admin') { if (!empty($_GET['user'])) { $v_username = escapeshellarg($_GET['user']); - exec (VESTA_CMD."v_unsuspend_user ".$v_username, $output, $return_var); + exec (VESTA_CMD."v-unsuspend-user ".$v_username, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output); diff --git a/web/unsuspend/web/index.php b/web/unsuspend/web/index.php index e107c1fa..04ff36ca 100644 --- a/web/unsuspend/web/index.php +++ b/web/unsuspend/web/index.php @@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') { if (!empty($_GET['domain'])) { $v_username = escapeshellarg($user); $v_domain = escapeshellarg($_GET['domain']); - exec (VESTA_CMD."v_unsuspend_web_domain ".$v_username." ".$v_domain, $output, $return_var); + exec (VESTA_CMD."v-unsuspend-web-domain ".$v_username." ".$v_domain, $output, $return_var); } if ($return_var != 0) { $error = implode('
', $output);