refactoring: log_event(), is_format_valid()

This commit is contained in:
Serghey Rodin 2016-06-09 16:31:56 +03:00
commit e05dca61a6
211 changed files with 756 additions and 1091 deletions

View file

@ -26,12 +26,12 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
check_args '3' "$#" 'USER SYSTEM OBJECT'
validate_format 'user' 'system'
is_format_valid 'user' 'system'
case $system in
MAIL_ACC) validate_format 'email' ;;
CRON) validate_format 'id' ;;
DNS_REC) validate_format 'id' ;;
*) validate_format 'object'
MAIL_ACC) is_format_valid 'email' ;;
CRON) is_format_valid 'id' ;;
DNS_REC) is_format_valid 'id' ;;
*) is_format_valid 'object'
esac
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -120,6 +120,6 @@ chmod 640 $USER_DATA/favourites.conf
# Logging
log_history "added starred $object in $system listing"
log_event "$OK" "$EVENT"
log_event "$OK" "$ARGUMENTS"
exit