@@ -1157,12 +1157,12 @@ function send_notification_email($template, $placeholders, $recipients) {
11571157 if ($ backup_mode == 'userzip ' ) {
11581158 //* Create a .zip backup as web user and include also files owned by apache / nginx user
11591159 $ web_backup_file = 'web ' .$ web_id .'_ ' .date ('Y-m-d_H-i ' ).'.zip ' ;
1160- exec ('cd ' .escapeshellarg ($ web_path ).' && sudo -u ' .escapeshellarg ($ web_user ).' find . -group ' .escapeshellarg ($ web_group ).' -print 2> /dev/null | zip -b /tmp --exclude=backup\* ' .$ backup_excludes .' --symlinks ' .escapeshellarg ($ web_backup_dir .'/ ' .$ web_backup_file ).' -@ ' , $ tmp_output , $ retval );
1161- if ($ retval == 0 || $ retval == 12 ) exec ('cd ' .escapeshellarg ($ web_path ).' && sudo -u ' .escapeshellarg ($ web_user ).' find . -user ' .escapeshellarg ($ http_server_user ).' -print 2> /dev/null | zip -b /tmp --exclude=backup\* ' .$ backup_excludes .' --update --symlinks ' .escapeshellarg ($ web_backup_dir .'/ ' .$ web_backup_file ).' -@ ' , $ tmp_output , $ retval );
1160+ exec ('cd ' .escapeshellarg ($ web_path ).' && sudo -u ' .escapeshellarg ($ web_user ).' find . -group ' .escapeshellarg ($ web_group ).' -print 2> /dev/null | zip -b /tmp --exclude=./ backup\* ' .$ backup_excludes .' --symlinks ' .escapeshellarg ($ web_backup_dir .'/ ' .$ web_backup_file ).' -@ ' , $ tmp_output , $ retval );
1161+ if ($ retval == 0 || $ retval == 12 ) exec ('cd ' .escapeshellarg ($ web_path ).' && sudo -u ' .escapeshellarg ($ web_user ).' find . -user ' .escapeshellarg ($ http_server_user ).' -print 2> /dev/null | zip -b /tmp --exclude=./ backup\* ' .$ backup_excludes .' --update --symlinks ' .escapeshellarg ($ web_backup_dir .'/ ' .$ web_backup_file ).' -@ ' , $ tmp_output , $ retval );
11621162 } else {
11631163 //* Create a tar.gz backup as root user
11641164 $ web_backup_file = 'web ' .$ web_id .'_ ' .date ('Y-m-d_H-i ' ).'.tar.gz ' ;
1165- exec ('tar pczf ' .escapeshellarg ($ web_backup_dir .'/ ' .$ web_backup_file ).' --exclude=backup\* ' .$ backup_excludes .' --directory ' .escapeshellarg ($ web_path ).' . ' , $ tmp_output , $ retval );
1165+ exec ('tar pczf ' .escapeshellarg ($ web_backup_dir .'/ ' .$ web_backup_file ).' --exclude=./ backup\* ' .$ backup_excludes .' --directory ' .escapeshellarg ($ web_path ).' . ' , $ tmp_output , $ retval );
11661166 }
11671167 if ($ retval == 0 || ($ backup_mode != 'userzip ' && $ retval == 1 ) || ($ backup_mode == 'userzip ' && $ retval == 12 )) { // tar can return 1, zip can return 12(due to harmless warings) and still create valid backups
11681168 if (is_file ($ web_backup_dir .'/ ' .$ web_backup_file )){
0 commit comments