Sfoglia il codice sorgente

liberal coding convetion

Serghey Rodin 14 anni fa
parent
commit
2000d8f73b
100 ha cambiato i file con 306 aggiunte e 307 eliminazioni
  1. 5 5
      bin/v_add_db_base
  2. 9 9
      bin/v_add_db_host
  3. 7 7
      bin/v_add_dns_domain
  4. 3 3
      bin/v_add_dns_domain_record
  5. 3 3
      bin/v_add_ssl_certificate
  6. 9 9
      bin/v_add_sys_cron
  7. 4 4
      bin/v_add_sys_ip
  8. 5 5
      bin/v_add_sys_user
  9. 2 2
      bin/v_add_sys_user_reports
  10. 3 3
      bin/v_add_web_domain
  11. 2 2
      bin/v_add_web_domain_alias
  12. 2 2
      bin/v_add_web_domain_cgi
  13. 2 2
      bin/v_add_web_domain_elog
  14. 4 4
      bin/v_add_web_domain_nginx
  15. 4 4
      bin/v_add_web_domain_ssl
  16. 3 3
      bin/v_add_web_domain_stat
  17. 4 4
      bin/v_add_web_domain_stat_auth
  18. 3 3
      bin/v_backup_sys_user
  19. 1 1
      bin/v_backup_sys_users
  20. 4 4
      bin/v_change_db_password
  21. 3 3
      bin/v_change_dns_domain_exp
  22. 3 3
      bin/v_change_dns_domain_ip
  23. 3 3
      bin/v_change_dns_domain_record
  24. 3 3
      bin/v_change_dns_domain_soa
  25. 3 3
      bin/v_change_dns_domain_tpl
  26. 3 3
      bin/v_change_dns_domain_ttl
  27. 9 9
      bin/v_change_sys_cron_job
  28. 3 3
      bin/v_change_sys_ip_name
  29. 3 3
      bin/v_change_sys_ip_owner
  30. 3 3
      bin/v_change_sys_ip_status
  31. 3 3
      bin/v_change_sys_user_contact
  32. 4 4
      bin/v_change_sys_user_name
  33. 10 10
      bin/v_change_sys_user_ns
  34. 3 3
      bin/v_change_sys_user_package
  35. 3 3
      bin/v_change_sys_user_password
  36. 3 3
      bin/v_change_sys_user_shell
  37. 3 3
      bin/v_change_web_domain_ip
  38. 3 3
      bin/v_change_web_domain_sslcert
  39. 3 3
      bin/v_change_web_domain_sslhome
  40. 3 3
      bin/v_change_web_domain_tpl
  41. 3 3
      bin/v_del_db_base
  42. 2 2
      bin/v_del_db_dbases
  43. 3 3
      bin/v_del_db_host
  44. 2 2
      bin/v_del_dns_domain
  45. 3 3
      bin/v_del_dns_domain_record
  46. 2 2
      bin/v_del_dns_domains
  47. 3 3
      bin/v_del_ssl_certificate
  48. 3 3
      bin/v_del_sys_cron
  49. 2 2
      bin/v_del_sys_ip
  50. 2 2
      bin/v_del_sys_user
  51. 2 2
      bin/v_del_sys_user_reports
  52. 2 2
      bin/v_del_web_domain
  53. 2 2
      bin/v_del_web_domain_alias
  54. 2 2
      bin/v_del_web_domain_cgi
  55. 2 2
      bin/v_del_web_domain_elog
  56. 2 2
      bin/v_del_web_domain_nginx
  57. 2 2
      bin/v_del_web_domain_ssl
  58. 2 2
      bin/v_del_web_domain_stat
  59. 3 3
      bin/v_del_web_domain_stat_auth
  60. 2 2
      bin/v_del_web_domains
  61. 2 2
      bin/v_get_dns_domain_value
  62. 2 2
      bin/v_get_sys_user_value
  63. 2 2
      bin/v_get_web_domain_value
  64. 2 2
      bin/v_rebuild_dns_domains
  65. 2 2
      bin/v_rebuild_sys_cron
  66. 3 4
      bin/v_rebuild_web_domains
  67. 3 3
      bin/v_suspend_db_base
  68. 2 2
      bin/v_suspend_db_bases
  69. 2 2
      bin/v_suspend_dns_domain
  70. 2 2
      bin/v_suspend_dns_domains
  71. 3 3
      bin/v_suspend_sys_cron_job
  72. 2 2
      bin/v_suspend_sys_cron_jobs
  73. 2 2
      bin/v_suspend_web_domain
  74. 2 2
      bin/v_suspend_web_domains
  75. 3 3
      bin/v_unsuspend_db_base
  76. 2 2
      bin/v_unsuspend_db_bases
  77. 2 2
      bin/v_unsuspend_dns_domain
  78. 2 2
      bin/v_unsuspend_dns_domains
  79. 3 3
      bin/v_unsuspend_sys_cron_job
  80. 2 2
      bin/v_unsuspend_sys_cron_jobs
  81. 2 2
      bin/v_unsuspend_web_domain
  82. 2 2
      bin/v_unsuspend_web_domains
  83. 3 3
      bin/v_upd_db_base_disk
  84. 2 2
      bin/v_upd_db_bases_disk
  85. 5 5
      bin/v_upd_sys_ip
  86. 2 2
      bin/v_upd_sys_queue
  87. 1 1
      bin/v_upd_sys_rrd
  88. 4 4
      bin/v_upd_sys_rrd_ftp
  89. 4 4
      bin/v_upd_sys_rrd_httpd
  90. 4 4
      bin/v_upd_sys_rrd_la
  91. 4 4
      bin/v_upd_sys_rrd_mem
  92. 5 5
      bin/v_upd_sys_rrd_mysql
  93. 4 4
      bin/v_upd_sys_rrd_net
  94. 4 4
      bin/v_upd_sys_rrd_nginx
  95. 4 4
      bin/v_upd_sys_rrd_pgsql
  96. 4 4
      bin/v_upd_sys_rrd_ssh
  97. 2 2
      bin/v_upd_sys_user_bill
  98. 2 2
      bin/v_upd_sys_user_disk
  99. 2 2
      bin/v_upd_sys_vesta
  100. 2 2
      bin/v_upd_web_domain_disk

+ 5 - 5
bin/v_add_db_base

@@ -6,13 +6,13 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 database="$user"_"$2"
 database="$user"_"$2"
 db_user="$user"_"$3"
 db_user="$user"_"$3"
-db_password="$4"
-type="$5"
+db_password=$4
+type=$5
 host=$6
 host=$6
-encoding="${7-UTF8}"
+encoding=${7-UTF8}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -89,4 +89,4 @@ V_EVENT="$dt $V_SCRIPT $user $database $db_user ***** $type $host"
 log_history "$V_EVENT" "v_del_db_base $user $database"
 log_history "$V_EVENT" "v_del_db_base $user $database"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 9 - 9
bin/v_add_db_host

@@ -6,14 +6,14 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-type="$1"
-host="$2"
-port="$3"
-db_user="$4"
-db_password="$5"
-max_usr="${6-300}"
-max_db="${7-300}"
-template="${8-template1}"
+type=$1
+host=$2
+port=$3
+db_user=$4
+db_password=$5
+max_usr=${6-300}
+max_db=${7-300}
+template=${8-template1}
 
 
 
 
 # Importing variables
 # Importing variables
@@ -81,4 +81,4 @@ V_EVENT=$(echo $V_EVENT | sed -e "s/$db_password/xxxxxx/g")
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 7 - 7
bin/v_add_dns_domain

@@ -6,15 +6,15 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-ip="$3"
-template="${4-default}"
+ip=$3
+template=${4-default}
 next_year=$(date +%m-%d-%y -d "+ 1 year")
 next_year=$(date +%m-%d-%y -d "+ 1 year")
-exp="${5-$next_year}"
-soa="$6"
-ttl="${7-14400}"
+exp=${5-$next_year}
+soa=$6
+ttl=${7-14400}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -117,4 +117,4 @@ restart_schedule 'dns'
 log_history "$V_EVENT" "v_del_dns_domain $user $domain"
 log_history "$V_EVENT" "v_del_dns_domain $user $domain"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_add_dns_domain_record

@@ -6,13 +6,13 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 record=$(idn -t --quiet -u "$3" )
 record=$(idn -t --quiet -u "$3" )
 rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]')
 rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]')
 dvalue=$(idn -t --quiet -u "$5" )
 dvalue=$(idn -t --quiet -u "$5" )
-id="$6"
+id=$6
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -87,4 +87,4 @@ restart_schedule 'dns'
 log_history "$V_EVENT" "v_del_dns_domain_record $user $domain $id"
 log_history "$V_EVENT" "v_del_dns_domain_record $user $domain $id"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_add_ssl_certificate

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-cert="$2"
+user=$1
+cert=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -54,4 +54,4 @@ mv $V_TMP/$cert.key $V_USERS/$user/cert/
 log_history "$V_EVENT" "v_del_ssl_certificate $user $cert"
 log_history "$V_EVENT" "v_del_ssl_certificate $user $cert"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 9 - 9
bin/v_add_sys_cron

@@ -6,14 +6,14 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-min="$2"
-hour="$3"
-day="$4"
-month="$5"
-wday="$6"
-command="$7"
-job="$8"
+user=$1
+min=$2
+hour=$3
+day=$4
+month=$5
+wday=$6
+command=$7
+job=$8
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -79,4 +79,4 @@ restart_schedule 'cron'
 log_history "$V_EVENT" "v_del_sys_cron $user $job"
 log_history "$V_EVENT" "v_del_sys_cron $user $job"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_add_sys_ip

@@ -6,12 +6,12 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-ip="$1"
-mask="$2"
+ip=$1
+mask=$2
 interface="${3-eth0}"
 interface="${3-eth0}"
 user="${4-vesta}"
 user="${4-vesta}"
 ip_status="${5-shared}"
 ip_status="${5-shared}"
-ip_name="$6"
+ip_name=$6
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -91,4 +91,4 @@ fi
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 5 - 5
bin/v_add_sys_user

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-password="$2"
-email="$3"
-package="${4-default}"
+user=$1
+password=$2
+email=$3
+package=${4-default}
 fname=$5
 fname=$5
 lname=$6
 lname=$6
 
 
@@ -154,4 +154,4 @@ V_EVENT="$dt $V_SCRIPT $user ***** $email $package $fname $lname"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_add_sys_user_reports

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -56,4 +56,4 @@ restart_schedule 'cron'
 log_history "$V_EVENT" "v_del_sys_user_reports $user"
 log_history "$V_EVENT" "v_del_sys_user_reports $user"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_add_web_domain

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-ip="$3"
+ip=$3
 template=${4-default}
 template=${4-default}
 
 
 # Importing variables
 # Importing variables
@@ -204,4 +204,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_del_web_domain $user $domain"
 log_history "$V_EVENT" "v_del_web_domain $user $domain"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 2 - 2
bin/v_add_web_domain_alias

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 dom_alias=$(idn -t --quiet -u "$3" )
 dom_alias=$(idn -t --quiet -u "$3" )
@@ -108,4 +108,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_del_web_domain_alias $user $domain $dom_alias"
 log_history "$V_EVENT" "v_del_web_domain_alias $user $domain $dom_alias"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_add_web_domain_cgi

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -96,4 +96,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_del_web_domain_cgi $user $domain"
 log_history "$V_EVENT" "v_del_web_domain_cgi $user $domain"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_add_web_domain_elog

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -95,4 +95,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_del_web_domain_elog $user $domain"
 log_history "$V_EVENT" "v_del_web_domain_elog $user $domain"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_add_web_domain_nginx

@@ -6,13 +6,13 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-template="${3-default}"
+template=${3-default}
 default_extentions="jpg,jpeg,gif,png,ico,css,zip,tgz,gz,rar,bz2,doc,xls,exe,\
 default_extentions="jpg,jpeg,gif,png,ico,css,zip,tgz,gz,rar,bz2,doc,xls,exe,\
 pdf,ppt,txt,tar,wav,bmp,rtf,js,mp3,avi,mpeg,html,htm"
 pdf,ppt,txt,tar,wav,bmp,rtf,js,mp3,avi,mpeg,html,htm"
-extentions="${4-$default_extentions}"
+extentions=${4-$default_extentions}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -130,4 +130,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_del_web_domain_nginx $user $domain"
 log_history "$V_EVENT" "v_del_web_domain_nginx $user $domain"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_add_web_domain_ssl

@@ -6,11 +6,11 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-cert="$3"
-tpl_option="${4-single}"
+cert=$3
+tpl_option=${4-single}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -128,4 +128,4 @@ update_web_domain_value '$SSL_CERT' "$cert"
 log_history "$V_EVENT" "v_del_web_domain_ssl $user $domain"
 log_history "$V_EVENT" "v_del_web_domain_ssl $user $domain"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_add_web_domain_stat

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-type="$3"
+type=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -85,4 +85,4 @@ update_web_domain_value '$STATS' "$type"
 log_history "$V_EVENT" "v_del_web_domain_stat $user $domain"
 log_history "$V_EVENT" "v_del_web_domain_stat $user $domain"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 4 - 4
bin/v_add_web_domain_stat_auth

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
-auth_user="$3"
-auth_pass="$4"
+auth_user=$3
+auth_pass=$4
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -96,4 +96,4 @@ V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $user $domain $auth_user *****"
 log_history "$V_EVENT" "v_del_web_domain_stat_auth $user $domain $auth_user"
 log_history "$V_EVENT" "v_del_web_domain_stat_auth $user $domain $auth_user"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 3 - 3
bin/v_backup_sys_user

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-output="$2"
+user=$1
+output=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -538,4 +538,4 @@ fi
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 1 - 1
bin/v_backup_sys_users

@@ -33,4 +33,4 @@ done
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_change_db_password

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-database="$2"
-db_password="$3"
+user=$1
+database=$2
+db_password=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -68,4 +68,4 @@ V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $user $database *****"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_dns_domain_exp

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-exp="$3"
+exp=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -62,4 +62,4 @@ update_dns_domain_value '$EXP' "$exp"
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_exp"
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_exp"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_dns_domain_ip

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-ip="$3"
+ip=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -70,4 +70,4 @@ restart_schedule 'dns'
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ip"
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ip"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_dns_domain_record

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-id="$3"
+id=$3
 record=$(idn -t --quiet -u "$4" )
 record=$(idn -t --quiet -u "$4" )
 rtype=$(echo "$5"| tr '[:lower:]' '[:upper:]')
 rtype=$(echo "$5"| tr '[:lower:]' '[:upper:]')
 value=$(idn -t --quiet -u "$6" )
 value=$(idn -t --quiet -u "$6" )
@@ -84,4 +84,4 @@ restart_schedule 'dns'
 log_history "$V_EVENT"
 log_history "$V_EVENT"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_dns_domain_soa

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-soa="$3"
+soa=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -67,4 +67,4 @@ restart_schedule 'dns'
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_soa"
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_soa"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_dns_domain_tpl

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-template="$3"
+template=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -81,4 +81,4 @@ restart_schedule 'dns'
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_tpl"
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_tpl"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_dns_domain_ttl

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-ttl="$3"
+ttl=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -68,4 +68,4 @@ restart_schedule 'dns'
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ttl"
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ttl"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 9 - 9
bin/v_change_sys_cron_job

@@ -6,14 +6,14 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-job="$2"
-min="$3"
-hour="$4"
-day="$5"
-month="$6"
-wday="$7"
-command="$8"
+user=$1
+job=$2
+min=$3
+hour=$4
+day=$5
+month=$6
+wday=$7
+command=$8
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -79,4 +79,4 @@ restart_schedule 'cron'
 log_history "$V_EVENT"
 log_history "$V_EVENT"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 3 - 3
bin/v_change_sys_ip_name

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-ip="$1"
-ip_name="$2"
+ip=$1
+ip_name=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -44,4 +44,4 @@ update_sys_ip_value '$NAME' "$ip_name"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_sys_ip_owner

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-ip="$2"
+user=$1
+ip=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -61,4 +61,4 @@ fi
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_sys_ip_status

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-ip="$1"
-ip_status="$2"
+ip=$1
+ip_status=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -64,4 +64,4 @@ update_sys_ip_value '$STATUS' "$ip_status"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_sys_user_contact

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-email="$2"
+user=$1
+email=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -54,4 +54,4 @@ sed -i "$str s/$old_email/$email/g" /etc/passwd
 log_history "$V_EVENT" "$V_SCRIPT $user $old_email"
 log_history "$V_EVENT" "$V_SCRIPT $user $old_email"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_change_sys_user_name

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-fname="$2"
-lname="$3"
+user=$1
+fname=$2
+lname=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -53,4 +53,4 @@ update_user_value "$user" '$LNAME' "$lname"
 log_history "$V_EVENT" "$V_SCRIPT $user $old_fname $old_lname"
 log_history "$V_EVENT" "$V_SCRIPT $user $old_fname $old_lname"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 10 - 10
bin/v_change_sys_user_ns

@@ -6,15 +6,15 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-ns1="$2"
-ns2="$3"
-ns3="$4"
-ns4="$5"
-ns5="$6"
-ns6="$7"
-ns7="$8"
-ns8="$9"
+user=$1
+ns1=$2
+ns2=$3
+ns3=$4
+ns4=$5
+ns5=$6
+ns6=$7
+ns7=$8
+ns8=$9
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -84,4 +84,4 @@ update_user_value "$user" '$NS' "$ns"
 log_history "$V_EVENT" "$V_SCRIPT $user ${old_ns//,/ }"
 log_history "$V_EVENT" "$V_SCRIPT $user ${old_ns//,/ }"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 3 - 3
bin/v_change_sys_user_package

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-package="$2"
+user=$1
+package=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -55,4 +55,4 @@ change_user_package
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_sys_user_password

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-password="$2"
+user=$1
+password=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -49,4 +49,4 @@ V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $user *****"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_sys_user_shell

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-shell="$2"
+user=$1
+shell=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -52,4 +52,4 @@ shell_path=$(get_shell_path)
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_web_domain_ip

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-ip="$3"
+ip=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -94,4 +94,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ip"
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ip"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_web_domain_sslcert

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-certificate="$3"
+certificate=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -106,4 +106,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ssl_cert"
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $old_ssl_cert"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_web_domain_sslhome

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-tpl_option="$3"
+tpl_option=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -107,4 +107,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $ssl_home"
 log_history "$V_EVENT" "$V_SCRIPT $user $domain $ssl_home"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_change_web_domain_tpl

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-template="$3"
+template=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -157,4 +157,4 @@ restart_schedule 'web'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_del_db_base

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-database="$2"
+user=$1
+database=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -73,4 +73,4 @@ del_db_vesta
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_db_dbases

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -65,4 +65,4 @@ done
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_del_db_host

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-type="$1"
-host="$2"
+type=$1
+host=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -53,4 +53,4 @@ del_dbhost_vesta
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_dns_domain

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 named_conf=/etc/named.conf
 named_conf=/etc/named.conf
 
 
@@ -75,4 +75,4 @@ restart_schedule 'dns'
 log_history "$V_EVENT" "v_add_dns_domain $user $domain $old_ip $tpl_name"
 log_history "$V_EVENT" "v_add_dns_domain $user $domain $old_ip $tpl_name"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_del_dns_domain_record

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
-id="$3"
+id=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -71,4 +71,4 @@ restart_schedule 'dns'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 2 - 2
bin/v_del_dns_domains

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -65,4 +65,4 @@ done
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_del_ssl_certificate

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-cert="$2"
+user=$1
+cert=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -54,4 +54,4 @@ rm -f $V_USERS/$user/cert/$cert.*
 log_history "$V_EVENT"
 log_history "$V_EVENT"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 3 - 3
bin/v_del_sys_cron

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-job="$2"
+user=$1
+job=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -59,4 +59,4 @@ restart_schedule 'cron'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 2 - 2
bin/v_del_sys_ip

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-ip="$1"
+ip=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -87,4 +87,4 @@ fi
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 2 - 2
bin/v_del_sys_user

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -127,4 +127,4 @@ rm -rf $V_USERS/$user
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_sys_user_reports

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -56,4 +56,4 @@ restart_schedule 'cron'
 log_history "$V_EVENT" "v_add_sys_user_reports $user"
 log_history "$V_EVENT" "v_add_sys_user_reports $user"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_web_domain

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -149,4 +149,4 @@ restart_schedule 'web'
 log_history "$V_EVENT"
 log_history "$V_EVENT"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_web_domain_alias

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain" )
 domain_idn=$(idn -t --quiet -a "$domain" )
 dom_alias=$(idn -t --quiet -u "$3" )
 dom_alias=$(idn -t --quiet -u "$3" )
@@ -103,4 +103,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_add_web_domain_alias $user $domain $dom_alias"
 log_history "$V_EVENT" "v_add_web_domain_alias $user $domain $dom_alias"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_web_domain_cgi

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -96,4 +96,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_add_web_domain_cgi $user $domain"
 log_history "$V_EVENT" "v_add_web_domain_cgi $user $domain"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_web_domain_elog

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -95,4 +95,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_add_web_domain_elog $user $domain"
 log_history "$V_EVENT" "v_add_web_domain_elog $user $domain"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_web_domain_nginx

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -102,4 +102,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_add_web_domain_nginx $user $domain $tpl_name $ext"
 log_history "$V_EVENT" "v_add_web_domain_nginx $user $domain $tpl_name $ext"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_web_domain_ssl

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -98,4 +98,4 @@ restart_schedule 'web'
 log_history "$V_EVENT" "v_add_web_domain_ssl $user $domain $cert $tpl_option"
 log_history "$V_EVENT" "v_add_web_domain_ssl $user $domain $cert $tpl_option"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_del_web_domain_stat

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 
 
 # Importing variables
 # Importing variables
@@ -81,4 +81,4 @@ update_web_domain_value '$STATS' ''
 log_history "$V_EVENT" "v_add_web_domain_stat $user $doman $type"
 log_history "$V_EVENT" "v_add_web_domain_stat $user $doman $type"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 3 - 3
bin/v_del_web_domain_stat_auth

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
-auth_user="$3"
+auth_user=$3
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -102,4 +102,4 @@ update_web_domain_value '$STATS_AUTH' "$new_val"
 log_history "$V_EVENT"
 log_history "$V_EVENT"
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 2 - 2
bin/v_del_web_domains

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -65,4 +65,4 @@ done
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_get_dns_domain_value

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
 key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
@@ -55,4 +55,4 @@ echo "$value"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit 

+ 2 - 2
bin/v_get_sys_user_value

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 key=$(echo "$2"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
 key=$(echo "$2"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
 
 
 # Importing variables
 # Importing variables
@@ -49,4 +49,4 @@ echo "$value"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 2 - 2
bin/v_get_web_domain_value

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
 key=$(echo "$3"| tr '[:lower:]' '[:upper:]'|sed -e "s/^/$/")
@@ -58,4 +58,4 @@ echo "$value"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit  $OK
+exit

+ 2 - 2
bin/v_rebuild_dns_domains

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -129,4 +129,4 @@ restart_schedule 'dns'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_rebuild_sys_cron

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -49,4 +49,4 @@ restart_schedule 'cron'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 4
bin/v_rebuild_web_domains

@@ -6,8 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -15,7 +14,7 @@ source $V_FUNC/shared_func.sh
 source $V_FUNC/domain_func.sh
 source $V_FUNC/domain_func.sh
 source $V_FUNC/ip_func.sh
 source $V_FUNC/ip_func.sh
 
 
-url="${2-$V_SUSPEND_URL}"
+url=${2-$V_SUSPEND_URL}
 
 
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 #                    Verifications                         #
 #                    Verifications                         #
@@ -274,4 +273,4 @@ restart_schedule 'web'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_suspend_db_base

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-database="$2"
+user=$1
+database=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -64,4 +64,4 @@ update_db_base_value '$SUSPEND' 'yes'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_suspend_db_bases

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -71,4 +71,4 @@ done
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_suspend_dns_domain

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -65,4 +65,4 @@ restart_schedule 'dns'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_suspend_dns_domains

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -70,4 +70,4 @@ restart_schedule 'dns'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_suspend_sys_cron_job

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-job="$2"
+user=$1
+job=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -56,4 +56,4 @@ restart_schedule 'cron'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_suspend_sys_cron_jobs

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -57,4 +57,4 @@ restart_schedule 'cron'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_suspend_web_domain

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -103,4 +103,4 @@ restart_schedule 'web'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_suspend_web_domains

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -121,4 +121,4 @@ restart_schedule 'web'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_unsuspend_db_base

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-database="$2"
+user=$1
+database=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -64,4 +64,4 @@ update_db_base_value '$SUSPEND' 'no'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_unsuspend_db_bases

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -71,4 +71,4 @@ done
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_unsuspend_dns_domain

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -63,4 +63,4 @@ restart_schedule 'dns'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_unsuspend_dns_domains

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -74,4 +74,4 @@ restart_schedule 'dns'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_unsuspend_sys_cron_job

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-job="$2"
+user=$1
+job=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -56,4 +56,4 @@ restart_schedule 'cron'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_unsuspend_sys_cron_jobs

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -57,4 +57,4 @@ restart_schedule 'cron'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_unsuspend_web_domain

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -115,4 +115,4 @@ restart_schedule 'web'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_unsuspend_web_domains

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -126,4 +126,4 @@ restart_schedule 'web'
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 3 - 3
bin/v_upd_db_base_disk

@@ -6,8 +6,8 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
-database="$2"
+user=$1
+database=$2
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -73,4 +73,4 @@ update_user_value "$user" '$U_DISK' "$disk_size"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_upd_db_bases_disk

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -77,4 +77,4 @@ update_user_value "$user" '$U_DISK' "$disk_size"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 5 - 5
bin/v_upd_sys_ip

@@ -6,10 +6,10 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-owner="$1"
-ip_status="$2"
-owner="${3-vesta}"
-ip_status="${4-shared}"
+owner=$1
+ip_status=$2
+owner=${3-vesta}
+ip_status=${4-shared}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf    # include for internal func
 source $VESTA/conf/vars.conf    # include for internal func
@@ -103,4 +103,4 @@ fi
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_upd_sys_queue

@@ -5,7 +5,7 @@
 #                    Variable&Function                     #
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 # Argument defenition
 # Argument defenition
-pipe="$1"
+pipe=$1
 
 
 # Importing system enviroment  as we run this script
 # Importing system enviroment  as we run this script
 #     mostly by cron wich not read it by itself
 #     mostly by cron wich not read it by itself
@@ -72,4 +72,4 @@ esac
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 1 - 1
bin/v_upd_sys_rrd

@@ -63,4 +63,4 @@ fi
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_upd_sys_rrd_ftp

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-rrd_start="${1--1d}"
-rrd_end="${2-now}"
-rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
+rrd_start=${1--1d}
+rrd_end=${2-now}
+rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -84,4 +84,4 @@ if [ "$result" -ne 0 ]; then
     exit $E_RRD_FAILED
     exit $E_RRD_FAILED
 fi
 fi
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_upd_sys_rrd_httpd

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-rrd_start="${1--1d}"
-rrd_end="${2-now}"
-rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
+rrd_start=${1--1d}
+rrd_end=${2-now}
+rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -92,4 +92,4 @@ if [ "$result" -ne 0 ]; then
     exit $E_RRD_FAILED
     exit $E_RRD_FAILED
 fi
 fi
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_upd_sys_rrd_la

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-rrd_start="${1--1d}"
-rrd_end="${2-now}"
-rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
+rrd_start=${1--1d}
+rrd_end=${2-now}
+rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -89,4 +89,4 @@ if [ "$result" -ne 0 ]; then
     exit $E_RRD_FAILED
     exit $E_RRD_FAILED
 fi
 fi
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_upd_sys_rrd_mem

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-rrd_start="${1--1d}"
-rrd_end="${2-now}"
-rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
+rrd_start=${1--1d}
+rrd_end=${2-now}
+rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -89,4 +89,4 @@ if [ "$result" -ne 0 ]; then
     exit $E_RRD_FAILED
     exit $E_RRD_FAILED
 fi
 fi
 
 
-exit $OK
+exit

+ 5 - 5
bin/v_upd_sys_rrd_mysql

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-rrd_start="${1--1d}"
-rrd_end="${2-now}"
-rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
+rrd_start=${1--1d}
+rrd_end=${2-now}
+rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -29,7 +29,7 @@ fi
 conf="$V_DB/mysql.conf"
 conf="$V_DB/mysql.conf"
 fields='$HOST'
 fields='$HOST'
 nohead=1
 nohead=1
-hosts=$(shel_list)
+hosts=$(shell_list)
 check_row=$(echo "$hosts" |wc -l)
 check_row=$(echo "$hosts" |wc -l)
 if [ 0 -eq "$check_row" ]; then
 if [ 0 -eq "$check_row" ]; then
     exit
     exit
@@ -129,4 +129,4 @@ done
 #                       Vesta                              #
 #                       Vesta                              #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_upd_sys_rrd_net

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-rrd_start="${1--1d}"
-rrd_end="${2-now}"
-rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
+rrd_start=${1--1d}
+rrd_end=${2-now}
+rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -102,4 +102,4 @@ done
 #                       Vesta                              #
 #                       Vesta                              #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_upd_sys_rrd_nginx

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-rrd_start="${1--1d}"
-rrd_end="${2-now}"
-rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
+rrd_start=${1--1d}
+rrd_end=${2-now}
+rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -81,4 +81,4 @@ if [ "$result" -ne 0 ]; then
     exit $E_RRD_FAILED
     exit $E_RRD_FAILED
 fi
 fi
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_upd_sys_rrd_pgsql

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-rrd_start="${1--1d}"
-rrd_end="${2-now}"
-rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
+rrd_start=${1--1d}
+rrd_end=${2-now}
+rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -135,4 +135,4 @@ done
 #                       Vesta                              #
 #                       Vesta                              #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
-exit $OK
+exit

+ 4 - 4
bin/v_upd_sys_rrd_ssh

@@ -6,9 +6,9 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-rrd_start="${1--1d}"
-rrd_end="${2-now}"
-rrd_grid="${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}"
+rrd_start=${1--1d}
+rrd_end=${2-now}
+rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M}
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -83,4 +83,4 @@ if [ "$result" -ne 0 ]; then
     exit $E_RRD_FAILED
     exit $E_RRD_FAILED
 fi
 fi
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_upd_sys_user_bill

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing system enviroment  as we run this script 
 # Importing system enviroment  as we run this script 
 #       mostly by cron wich not read it by itself
 #       mostly by cron wich not read it by itself
@@ -144,4 +144,4 @@ done
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_upd_sys_user_disk

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 
 
 # Importing variables
 # Importing variables
 source $VESTA/conf/vars.conf
 source $VESTA/conf/vars.conf
@@ -64,4 +64,4 @@ update_user_value "$user" '$U_DISK' "$disk_size"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_upd_sys_vesta

@@ -9,7 +9,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-version="$1"
+version=$1
 updates=''
 updates=''
 
 
 # Importing system enviroment
 # Importing system enviroment
@@ -109,4 +109,4 @@ fi
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

+ 2 - 2
bin/v_upd_web_domain_disk

@@ -6,7 +6,7 @@
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Argument defenition
 # Argument defenition
-user="$1"
+user=$1
 domain=$(idn -t --quiet -u "$2" )
 domain=$(idn -t --quiet -u "$2" )
 domain_idn=$(idn -t --quiet -a "$domain")
 domain_idn=$(idn -t --quiet -a "$domain")
 
 
@@ -66,4 +66,4 @@ update_user_value "$user" '$U_DISK' "$disk_size"
 # Logging
 # Logging
 log_event 'system' "$V_EVENT"
 log_event 'system' "$V_EVENT"
 
 
-exit $OK
+exit

Some files were not shown because too many files changed in this diff