Przeglądaj źródła

Merge branch 'fix-restore-notification-0706'

Kristan Kenney 5 lat temu
rodzic
commit
db62ce1424
2 zmienionych plików z 5 dodań i 1 usunięć
  1. 1 1
      bin/v-backup-user
  2. 4 0
      bin/v-restore-user

+ 1 - 1
bin/v-backup-user

@@ -948,7 +948,7 @@ if [ -e "$BACKUP/$user.log" ] && [ "$notify" = "yes" ]; then
     email=$(get_user_value '$CONTACT')
     cat $BACKUP/$user.log |$SENDMAIL -s "$subj" $email $notify
     rm $BACKUP/$user.log
-    $BIN/v-add-user-notification $user "$subj" "$email"
+    $BIN/v-add-user-notification "$user" "Backup created successfully" "<b>Archive:</b> $user.$backup_new_date.tar"
 fi
 
 # Logging

+ 4 - 0
bin/v-restore-user

@@ -815,6 +815,9 @@ chown -R $user:$user $HOMEDIR/$user/tmp
 subj="$user → restore has been completed"
 cat $tmpdir/restore.log |$SENDMAIL -s "$subj" $email $notify
 
+# Send notification to panel
+$HESTIA/bin/v-add-user-notification "$user" "Backup restored successfully" "<b>Archive:</b> $backup"
+
 # Deleting temporary data
 rm -rf $tmpdir
 
@@ -832,6 +835,7 @@ $BIN/v-update-user-counters admin
 $BIN/v-update-sys-ip-counters
 
 # Logging
+log_history "restored contents from backup archive $backup"
 log_event "$OK" "$ARGUMENTS"
 
 exit