redesigned return codes

This commit is contained in:
Serghey Rodin 2011-12-18 22:39:29 +02:00
commit 593819e10b
24 changed files with 335 additions and 440 deletions

View file

@ -12,9 +12,9 @@ is_cron_job_free() {
check_job=$(grep "JOB='$job'" $V_USERS/$user/cron.conf)
if [ ! -z "$check_job" ]; then
echo "Error: job exist"
log_event 'debug' "$E_JOB_EXIST $V_EVENT"
exit $E_JOB_EXIST
echo "Error: job id exist"
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -61,9 +61,9 @@ is_job_valid() {
result=$(grep "JOB='$job'" $V_USERS/$user/cron.conf)
if [ -z "$result" ]; then
echo "Error: job not exists"
log_event 'debug' "$E_JOB_NOTEXIST $V_EVENT"
exit $E_JOB_NOTEXIST
echo "Error: job id not exists"
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -80,8 +80,8 @@ is_job_suspended() {
# Checkng key
if [ ! -z "$str" ]; then
echo "Error: job suspended"
log_event 'debug' "$E_JOB_SUSPENDED $V_EVENT"
exit $E_JOB_SUSPENDED
log_event 'debug' "$E_SUSPENDED $V_EVENT"
exit $E_SUSPENDED
fi
}
@ -92,8 +92,8 @@ is_job_unsuspended() {
# Checkng key
if [ ! -z "$str" ]; then
echo "Error: job unsuspended"
log_event 'debug' "$E_JOB_UNSUSPENDED $V_EVENT"
exit $E_JOB_UNSUSPENDED
log_event 'debug' "$E_UNSUSPENDED $V_EVENT"
exit $E_UNSUSPENDED
fi
}

View file

@ -5,8 +5,8 @@ is_db_valid() {
# Checking result
if [ -z "$check_db" ]; then
echo "Error: db not added"
log_event 'debug' "$E_DB_NOTEXIST $V_EVENT"
exit $E_DB_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -17,8 +17,8 @@ is_db_new() {
# Checking result
if [ ! -z "$check_db" ]; then
echo "Error: db exist"
log_event 'debug' "$E_DB_EXIST $V_EVENT"
exit $E_DB_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -31,8 +31,8 @@ is_db_host_valid() {
# Checking result
if [ -z "$check_db" ]; then
echo "Error: host not added"
log_event 'debug' "$E_DBHOST_NOTEXIST $V_EVENT"
exit $E_DBHOST_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -231,16 +231,16 @@ create_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Adding database & checking result
@ -248,8 +248,8 @@ create_db_mysql() {
code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Adding user with password (% will give access to db from any ip)
@ -279,16 +279,16 @@ create_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Adding new role
@ -296,8 +296,8 @@ create_db_pgsql() {
code=$?
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Adding database & checking result
@ -320,8 +320,8 @@ is_db_host_new() {
check_host=$(grep "HOST='$host'" $V_DB/$type.conf)
if [ ! -z "$check_host" ]; then
echo "Error: db host exist"
log_event 'debug' "$E_DBHOST_EXIST $V_EVENT"
exit $E_DBHOST_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
fi
}
@ -332,8 +332,8 @@ is_mysql_host_alive() {
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
}
@ -344,8 +344,8 @@ is_pgsql_host_alive() {
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
}
@ -356,8 +356,8 @@ is_db_suspended() {
# Checking result
if [ ! -z "$check_db" ]; then
echo "Error: db suspended"
log_event 'debug' "$E_DB_SUSPENDED $V_EVENT"
exit $E_DB_SUSPENDED
log_event 'debug' "$E_SUSPENDED $V_EVENT"
exit $E_SUSPENDED
fi
}
@ -368,8 +368,8 @@ is_db_unsuspended() {
# Checking result
if [ -z "$check_db" ]; then
echo "Error: db unsuspended"
log_event 'debug' "$E_DB_UNSUSPENDED $V_EVENT"
exit $E_DB_UNSUSPENDED
log_event 'debug' "$E_UNSUSPENDED $V_EVENT"
exit $E_UNSUSPENDED
fi
}
@ -380,8 +380,8 @@ is_db_user_valid() {
# Checking result
if [ -z "$check_db" ]; then
echo "Error: dbuser not exist"
log_event 'debug' "$E_DBUSER_NOTEXIST $V_EVENT"
exit $E_DBUSER_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -396,16 +396,16 @@ change_db_mysql_password() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Changing user password
@ -430,16 +430,16 @@ change_db_pgsql_password() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
$sql "ALTER ROLE $db_user WITH LOGIN PASSWORD '$db_password'" >/dev/null
@ -474,24 +474,24 @@ del_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting database & checking result
$sql "DROP DATABASE $database" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting user
@ -523,16 +523,16 @@ del_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting database & checking result
@ -540,8 +540,8 @@ del_db_pgsql() {
$sql "DROP DATABASE $database" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting user
@ -562,8 +562,8 @@ del_db_vesta() {
string=$( grep -n "DB='$database'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
}
@ -580,16 +580,16 @@ dump_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Dumping database
@ -613,16 +613,16 @@ dump_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Dumping database
@ -649,8 +649,8 @@ is_db_host_free() {
# Checking U_DB_BASES
if [ 0 -ne "$U_DB_BASES" ]; then
echo "Error: host is used"
log_event 'debug' "$E_DBHOST_BUSY $V_EVENT"
exit $E_DBHOST_BUSY
log_event 'debug' "$E_INUSE $V_EVENT"
exit $E_INUSE
fi
}
@ -661,8 +661,8 @@ del_dbhost_vesta() {
string=$( grep -n "HOST='$host'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
}
@ -709,16 +709,16 @@ suspend_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Suspending user
@ -739,16 +739,16 @@ suspend_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Suspending user
@ -767,16 +767,16 @@ unsuspend_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Unsuspending user
@ -797,16 +797,16 @@ unsuspend_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Unsuspending user
@ -840,16 +840,16 @@ get_disk_db_mysql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Deleting database & checking result
@ -885,16 +885,16 @@ get_disk_db_pgsql() {
# Checking empty vars
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: config is broken"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking connection
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
if [ '0' -ne "$code" ]; then
echo "Error: Connect failed"
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
exit $E_DBHOST_UNAVAILABLE
log_event 'debug' "$E_DB $V_EVENT"
exit $E_DB
fi
# Raw query

View file

@ -19,10 +19,10 @@ is_domain_new() {
if [ ! -z "$check_domain" ] || [ ! -z "$check_alias" ]; then
if [ "$output_mode" != 'quiet' ]; then
echo "Error: domain exist"
log_event 'debug' "$E_DOM_EXIST $V_EVENT"
exit $E_DOM_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
return $E_DOM_EXIST
return $E_EXISTS
fi
}
@ -43,8 +43,8 @@ is_domain_owner() {
# Checking result
if [ -z "$check_domain" ] && [ -z "$check_alias" ]; then
echo "Error: domain not owned"
log_event 'debug' "$E_DOM_NOTOWNED $V_EVENT"
exit $E_DOM_NOTOWNED
log_event 'debug' "$E_FORBIDEN $V_EVENT"
exit $E_FORBIDEN
fi
}
@ -55,8 +55,8 @@ is_dns_domain_free() {
# Checking result
if [ ! -z "$check_domain" ]; then
echo "Error: domain exist"
log_event 'debug' "$E_DOM_EXIST $V_EVENT"
exit $E_DOM_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -75,8 +75,8 @@ is_web_domain_free() {
# Checking result
if [ ! -z "$check_domain" ] || [ ! -z "$check_alias" ]; then
echo "Error: domain exist"
log_event 'debug' "$E_DOM_EXIST $V_EVENT"
exit $E_DOM_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -87,8 +87,8 @@ is_dns_domain_valid() {
# Checking result
if [ -z "$check_domain" ]; then
echo "Error: domain not exist"
log_event 'debug' "$E_DOM_NOTEXIST $V_EVENT"
exit $E_DOM_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -99,8 +99,8 @@ is_web_domain_valid() {
# Checking result
if [ -z "$check_domain" ]; then
echo "Error: domain not exist"
log_event 'debug' "$E_DOM_NOTEXIST $V_EVENT"
exit $E_DOM_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -113,8 +113,8 @@ is_domain_suspended() {
# Checking result
if [ ! -z "$check_domain" ]; then
echo "Error: domain suspended"
log_event 'debug' "$E_DOM_SUSPENDED $V_EVENT"
exit $E_DOM_SUSPENDED
log_event 'debug' "$E_SUSPENDED $V_EVENT"
exit $E_SUSPENDED
fi
}
@ -127,8 +127,8 @@ is_domain_unsuspended() {
# Checking result
if [ ! -z "$check_domain" ]; then
echo "Error: domain unsuspended"
log_event 'debug' "$E_DOM_UNSUSPENDED $V_EVENT"
exit $E_DOM_UNSUSPENDED
log_event 'debug' "$E_UNSUSPENDED $V_EVENT"
exit $E_UNSUSPENDED
fi
}
@ -207,8 +207,8 @@ is_dns_record_free() {
if [ ! -z "$check_id" ]; then
echo "Error: ID exist"
log_event 'debug' "$E_ID_EXIST $V_EVENT"
exit $E_ID_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -254,8 +254,8 @@ get_web_config_brds() {
# Defining template borders
serv_line=$(grep -ni 'Name %domain_idn%' "$tpl_file" |cut -f 1 -d :)
if [ -z "$serv_line" ]; then
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
return $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
return $E_PARSING
fi
# Template lines
@ -444,8 +444,8 @@ is_web_domain_key_empty() {
# Checkng key
if [ ! -z "$value" ] && [ "$value" != 'no' ]; then
echo "Error: value is not empty = $value"
log_event 'debug' "$E_VALUE_EXIST $V_EVENT"
exit $E_VALUE_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -453,34 +453,34 @@ is_web_domain_cert_valid() {
# Checking file existance
if [ ! -e "$ssl_dir/$domain.crt" ] || [ ! -e "$ssl_dir/$domain.key" ]; then
echo "Error: certificate not exist"
log_event 'debug' "$E_CERT_NOTEXIST $V_EVENT"
exit $E_CERT_NOTEXIST
echo "Error: ssl certificate not exist"
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
# Checking certificate
crt=$(openssl verify $ssl_dir/$domain.crt 2>/dev/null |grep '/C=')
if [ -z "$crt" ]; then
echo "Error: certificate invalid"
log_event 'debug' "$E_CERT_INVALID $V_EVENT"
exit $E_CERT_INVALID
echo "Error: ssl certificate invalid"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking certificate key
openssl rsa -in "$ssl_dir/$domain.key" -check >/dev/null 2>/dev/null
if [ "$?" -ne 0 ]; then
echo "Error: key invalid"
log_event 'debug' "$E_KEY_INVALID $V_EVENT"
exit $E_KEY_INVALID
echo "Error: ssl key invalid"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking certificate authority
if [ -e "$ssl_dir/$domain.ca" ]; then
ca=$(openssl verify $ssl_dir/$domain.ca 2>/dev/null |grep '/C=')
if [ -z "$ca" ]; then
echo "Error: certificate invalid"
log_event 'debug' "$E_CERT_INVALID $V_EVENT"
exit $E_CERT_INVALID
echo "Error: ssl certificate invalid"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
fi
@ -493,9 +493,9 @@ is_web_domain_cert_valid() {
kill $pid > /dev/null 2>&1
result=$?
if [ "$result" -ne '0' ]; then
echo "Error: certificate key pair invalid"
log_event 'debug' "$E_CERTKEY_INVALID $V_EVENT"
exit $E_CERTKEY_INVALID
echo "Error: ssl certificate key pair invalid"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -506,8 +506,8 @@ is_dns_record_valid() {
if [ -z "$check_id" ]; then
echo "Error: ID not exist"
log_event 'debug' "$E_ID_NOTEXIST $V_EVENT"
exit $E_ID_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -528,8 +528,8 @@ is_web_domain_value_exist() {
# Checking result
if [ -z "$value" ] || [ "$value" = 'no' ]; then
echo "Error: ${key//$/} is empty"
log_event 'debug' "$E_VALUE_EMPTY $V_EVENT"
exit $E_VALUE_EMPTY
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -550,8 +550,8 @@ is_dns_domain_value_exist() {
# Checking result
if [ -z "$value" ] || [ "$value" = 'no' ]; then
echo "Error: ${key//$/} is empty"
log_event 'debug' "$E_VALUE_EMPTY $V_EVENT"
exit $E_VALUE_EXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_EXISTS
fi
}
@ -571,8 +571,8 @@ del_dns_domain() {
string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
rm -f $V_USERS/$user/dns/$domain
@ -585,8 +585,8 @@ del_web_domain() {
string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
}
@ -678,8 +678,8 @@ namehost_ip_disable() {
if [ -z "$tpl_ln" ] || [ -z "$ip_line" ] || [ -z "$conf_line" ]
then
echo "Error: nginx config paring error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
up_line=$((ip_line - 1))
@ -689,8 +689,8 @@ namehost_ip_disable() {
# Checking parsed lines
if [ -z "$first_line" ] || [ -z "$last_line" ]; then
echo "Error: nginx config paring error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$first_line,$last_line d" $nconf

View file

@ -6,8 +6,8 @@ is_sys_ip_free() {
ip_check=$(echo "$ip_list"|grep -w "$ip")
if [ -n "$ip_check" ] || [ -e "$V_IPS/$ip" ]; then
echo "Error: IP exist"
log_event 'debug' "$E_IP_EXIST $V_EVENT"
exit $E_IP_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -32,8 +32,8 @@ is_sys_ip_valid() {
# Checking ip existance
if [ ! -e "$V_IPS/$ip" ] || [ -z "$check_ifc" ]; then
echo "Error: IP not exist"
log_event 'debug' "$E_IP_NOTEXIST $V_EVENT"
exit $E_IP_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
}
@ -54,8 +54,8 @@ is_ip_key_empty() {
# Checkng key
if [ ! -z "$value" ] && [ "$value" != '0' ]; then
echo "Error: value is not empty = $value "
log_event 'debug' "$E_VALUE_EXIST $V_EVENT"
exit $E_VALUE_EXIST
log_event 'debug' "$E_EXISTS $V_EVENT"
exit $E_EXISTS
fi
}
@ -92,8 +92,8 @@ is_ip_avalable() {
# Checking ip existance
if [ ! -e "$V_IPS/$ip" ]; then
echo "Error: IP not exist"
log_event 'debug' "$E_IP_NOTEXIST $V_EVENT"
exit $E_IP_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
# Parsing ip data
@ -110,8 +110,8 @@ is_ip_avalable() {
if [ "$ip_owner" != "$user" ] && [ "$ip_shared" != 'yes' ]; then
echo "Error: ip not owned by user"
log_event 'debug' "$E_IP_NOTOWNED $V_EVENT"
exit $E_IP_NOTOWNED
log_event 'debug' "$E_FORBIDEN $V_EVENT"
exit $E_FORBIDEN
fi
}
@ -121,8 +121,8 @@ is_sys_ip_owner() {
ip_owner=$(grep 'OWNER=' $V_IPS/$ip|cut -f 2 -d \')
if [ "$ip_owner" != "$user" ]; then
echo "Error: IP not owned"
log_event 'debug' "$E_IP_NOTOWNED $V_EVENT"
exit $E_IP_NOTOWNED
log_event 'debug' "$E_FORBIDEN $V_EVENT"
exit $E_FORBIDEN
fi
}
@ -144,8 +144,8 @@ increase_ip_value() {
# Checking result
if [ -z "$current_web" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# +1 webdomain
@ -181,8 +181,8 @@ decrease_ip_value() {
# Checking result
if [ -z "$current_web" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# -1 webdomain
@ -230,16 +230,16 @@ get_current_interface() {
# Checking result
if [ -z "$i" ]; then
echo "Error: IP not exist"
log_event 'debug' "$E_IP_NOTEXIST $V_EVENT"
exit $E_IP_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
# Checking ip is alias
check_alias=$(echo $i| cut -s -f 2 -d :)
if [ -z "$check_alias" ]; then
echo "Error: IP is first on interface"
log_event 'debug' "$E_IP_FIRST $V_EVENT"
exit $E_IP_FIRST
echo "Error: Main IP on interface"
log_event 'debug' "$E_FORBIDEN $V_EVENT"
exit $E_FORBIDEN
fi
echo "$i"
}

View file

@ -35,8 +35,8 @@ check_args() {
if [ "$user_args" -lt "$sys_args" ]; then
echo "Error: bad args"
echo "Usage: $V_SCRIPT $usage"
log_event 'debug' "$E_BAD_ARGS $V_EVENT"
exit $E_BAD_ARGS
log_event 'debug' "$E_ARGS $V_EVENT"
exit $E_ARGS
fi
}
@ -51,9 +51,9 @@ format_validation() {
check_http=$( echo "$val" |grep "^https://" )
needed_chars=$(echo "$val" | cut -s -f 2 -d '.')
if [ -z "$check_http" ] || [ -z "$needed_chars" ]; then
echo "Error: shell not found"
log_event 'debug' "$E_SHELL_INVALID $V_EVENT"
exit $E_SHELL_INVALID
echo "Error: invalid url"
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -65,8 +65,8 @@ format_validation() {
check_shell=$(/usr/bin/chsh --list-shells | grep -w "$val" )
if [ -z "$check_shell" ]; then
echo "Error: shell not found"
log_event 'debug' "$E_SHELL_INVALID $V_EVENT"
exit $E_SHELL_INVALID
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -77,8 +77,8 @@ format_validation() {
# Checking password lenght
if [ "${#val}" -lt '6' ]; then
echo "Error: password is shorter than 6 chars"
log_event 'debug' "$E_PASSWORD_SHORT $V_EVENT"
exit $E_PASSWORD_SHORT
log_event 'debug' "$E_PASSWORD $V_EVENT"
exit $E_PASSWORD
fi
}
@ -92,23 +92,23 @@ format_validation() {
if [[ 0 -ne "$special_chars" ]]; then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking letters
letters=$(echo "$val" | grep -c "[a-Z]")
if [ 0 -ne "$letters" ]; then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking -zero
if [[ 0 -ne "$val" ]] && [[ 0 -gt "$val" ]]; then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -125,8 +125,8 @@ format_validation() {
if [ -z "$oc1" ] || [ -z "$oc2" ] || [ -z "$oc3" ] || [ -z "$oc4" ]
then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -139,8 +139,8 @@ format_validation() {
# Checking status
if [ -z "$check_status" ]; then
echo "Error: $var out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -157,8 +157,8 @@ format_validation() {
[ "${#check_dt}" -lt 2 ] &&\
[ "$val" != 'vesta@localhost' ]; then
echo "Error: email format is wrong"
log_event 'debug' "$E_EMAIL_INVALID $V_EVENT"
exit $E_EMAIL_INVALID
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -172,8 +172,8 @@ format_validation() {
if [ "$return_val" -ne 0 ]; then
echo "Error: intreface not exist"
log_event 'debug' "$E_INTERFACE_NOTEXIST"
exit $E_INTERFACE_NOTEXIST
log_event 'debug' "$E_NOTEXIST"
exit $E_NOTEXIST
fi
}
@ -188,8 +188,8 @@ format_validation() {
# Checking result
if [[ 0 -ne "$special_chars" ]]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -205,8 +205,8 @@ format_validation() {
# Checking result
if [[ 0 -ne "$special_chars" ]] || [ -z "$needed_chars" ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -221,8 +221,8 @@ format_validation() {
# Checking result
if [[ 0 -ne "$special_chars" ]] || [ 17 -le ${#val} ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -233,8 +233,8 @@ format_validation() {
# Checking result
if [ 17 -le ${#val} ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -260,8 +260,8 @@ format_validation() {
if [[ "$known" != 'yes' ]]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -272,8 +272,8 @@ format_validation() {
# Checking result
if [ 200 -le ${#val} ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -286,8 +286,8 @@ format_validation() {
check_rtype="$(echo "A AAAA NS CNAME" | grep -i -w "$rtype")"
if [ ! -z "$check_spaces" ] && [ ! -z "$check_rtype" ]; then
echo "Error: $var is out of range"
log_event 'debug' "$E_OUTOFRANGE $V_EVENT"
exit $E_OUTOFRANGE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
# Checking ip
@ -362,48 +362,48 @@ is_system_enabled() {
web_function() {
if [ -z "$WEB_SYSTEM" ] || [ "$WEB_SYSTEM" = "no" ]; then
echo "Error: web hosting support disabled"
log_event 'debug' "$E_WEB_DISABLED $V_EVENT"
exit $E_WEB_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
proxy_function() {
if [ "$PROXY_SYSTEM" != 'nginx' ]; then # only nginx
echo "Error: proxy hosting support disabled" # support for
log_event 'debug' "$E_PROXY_DISABLED $V_EVENT" # now
exit $E_PROXY_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT" # now
exit $E_DISABLED
fi
}
dns_function() {
if [ -z "$DNS_SYSTEM" ] || [ "$DNS_SYSTEM" = "no" ]; then
echo "Error: dns support disabled"
log_event 'debug' "$E_DNS_DISABLED $V_EVENT"
exit $E_DNS_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
cron_function() {
if [ -z "$CRON_SYSTEM" ] || [ "$CRON_SYSTEM" = "no" ]; then
echo "Error: crond support disabled"
log_event 'debug' "$E_CRON_DISABLED $V_EVENT"
exit $E_CRON_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
db_function() {
if [ -z "$DB_SYSTEM" ] || [ "$DB_SYSTEM" = "no" ]; then
echo "Error: db support disabled"
log_event 'debug' "$E_DB_DISABLED $V_EVENT"
exit $E_DB_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
backup_function() {
if [ -z "$BACKUP_SYSTEM" ] || [ "$BACKUP_SYSTEM" = "no" ]; then
echo "Error: backup support disabled"
log_event 'debug' "$E_BACKUP_DISABLED $V_EVENT"
exit $E_BACKUP_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}
@ -424,14 +424,14 @@ is_user_valid() {
check_user=$(grep -w "$search_user" /etc/passwd )
if [ -z "$check_user" ]; then
echo "Error: user not found"
log_event 'debug' "$E_USER_NOTEXIST $V_EVENT"
exit $E_USER_NOTEXIST
log_event 'debug' "$E_NOTEXIST $V_EVENT"
exit $E_NOTEXIST
fi
if [ ! -d "$V_USERS/$search_user" ]; then
echo "Error: unknown user"
log_event 'debug' "$E_USER_UNKNOWN $V_EVENT"
exit $E_USER_UNKNOWN
log_event 'debug' "$E_USER_NOTEXIST $V_EVENT"
exit $E_USER_NOTEXIST
fi
}
@ -440,8 +440,8 @@ is_user_suspended() {
check_suspend=$(grep "SUSPENDED='yes'" $V_USERS/$user/user.conf)
if [ ! -z "$check_suspend" ]; then
echo "Error: User is suspended"
log_event 'debug' "$E_USER_SUSPENDED $V_EVENT"
exit $E_USER_SUSPENDED
log_event 'debug' "$E_SUSPENDED $V_EVENT"
exit $E_SUSPENDED
fi
}
@ -457,8 +457,8 @@ is_package_full() {
val=$(grep '^WEB_DOMAINS=' $V_USERS/$user/user.conf|cut -f 2 -d \' )
if [ "$domain_number" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -472,8 +472,8 @@ is_package_full() {
val=$(grep 'WEB_ALIASES=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
if [ "$alias_nmb" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -482,8 +482,8 @@ is_package_full() {
val=$(grep '^WEB_SSL=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
if [ "$val" -eq '0' ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
# Checking domains
@ -491,8 +491,8 @@ is_package_full() {
# Comparing current val with conf
if [ "$domain_nmb" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -504,8 +504,8 @@ is_package_full() {
val=$(grep '^DNS_DOMAINS=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
if [ "$domain_number" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -517,8 +517,8 @@ is_package_full() {
val=$(grep '^DATABASES=' $V_USERS/$user/user.conf | cut -f 2 -d \' )
if [ "$db_number" -ge "$val" ]; then
echo "Error: Upgrade package"
log_event 'debug' "$E_PKG_UPGRADE $v_log"
exit $E_PKG_UPGRADE
log_event 'debug' "$E_LIMIT $v_log"
exit $E_LIMIT
fi
}
@ -536,8 +536,8 @@ is_package_full() {
mail_forwarder) mail_forwarder "$user" "$domain";;
*)
echo "Error: bad type"
log_event 'debug' "$E_BAD_TYPE $V_EVENT"
exit $E_BAD_TYPE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
;;
esac
}
@ -555,8 +555,8 @@ is_template_valid() {
if [ -z "$check_tpl" ] || [ ! -e $tpl ] || \
[ ! -e $descr ] || [ ! -e $ssl ]; then
echo "Error: template not found"
log_event 'debug' "$E_TPL_NOTEXIST"
exit $E_TPL_NOTEXIST
log_event 'debug' "$E_NOTEXIST"
exit $E_NOTEXIST
fi
}
@ -567,8 +567,8 @@ is_template_valid() {
if [ ! -e $tpl ] || [ ! -e $descr ] || [ ! -e $ssl ]; then
echo "Error: template not found"
log_event 'debug' "$E_TPL_NOTEXIST"
exit $E_TPL_NOTEXIST
log_event 'debug' "$E_NOTEXIST"
exit $E_NOTEXIST
fi
}
@ -578,8 +578,8 @@ is_template_valid() {
if [ ! -e $tpl ] || [ ! -e $descr ]; then
echo "Error: template not found"
log_event 'debug' "$E_TPL_NOTEXIST"
exit $E_TPL_NOTEXIST
log_event 'debug' "$E_NOTEXIST"
exit $E_NOTEXIST
fi
}
@ -630,8 +630,8 @@ restart_schedule() {
is_package_valid() {
if [ ! -e "$V_PKG/$package.pkg" ]; then
echo "Error: package is not exist"
log_event 'debug' "$E_PKG_NOTEXIST $v_log"
exit $E_PKG_NOTEXIST
log_event 'debug' "$E_NOTEXIST $v_log"
exit $E_NOTEXIST
fi
}
@ -680,8 +680,8 @@ increase_user_value() {
# Checking result
if [ -z "$current_value" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Plus one
@ -709,8 +709,8 @@ is_type_valid() {
# Checking result
if [ -z "$check_type" ]; then
echo "Error: unknown type"
log_event 'debug' "$E_BAD_TYPE $V_EVENT"
exit $E_BAD_TYPE
log_event 'debug' "$E_INVALID $V_EVENT"
exit $E_INVALID
fi
}
@ -728,8 +728,8 @@ decrease_user_value() {
# Checking result
if [ -z "$current_value" ]; then
echo "Error: Parsing error"
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
exit $E_PARSE_ERROR
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
# Checking zero val
@ -875,8 +875,8 @@ is_backup_enabled() {
BACKUPS=$(grep "BACKUPS='" $V_USERS/$user/user.conf |cut -f 2 -d \')
if [ -z "$BACKUPS" ] || [[ "$BACKUPS" -le '0' ]]; then
echo "Error: User backups are disabled"
log_event 'debug' "$E_BACKUP_DISABLED $V_EVENT"
exit $E_BACKUP_DISABLED
log_event 'debug' "$E_DISABLED $V_EVENT"
exit $E_DISABLED
fi
}