Fixed: FS#3287 - Fix issue with empty .zip files in .zip mode of the backup function.

Author: Marius Cramer

server/lib/classes/cron.d/500-backup.inc.php

@@ -98,13 +98,13 @@ public function onRunJob() {
 							//* Create a .zip backup as web user and include also files owned by apache / nginx user
 							$web_backup_file = 'web'.$web_id.'_'.date('Y-m-d_H-i').'.zip';
 							exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -group '.escapeshellarg($web_group).' -print 2> /dev/null | zip -b /tmp --exclude=backup\* --symlinks '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' -@', $tmp_output, $retval);
-							if($retval == 0) 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\* --update --symlinks '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' -@', $tmp_output, $retval);
+							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\* --update --symlinks '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' -@', $tmp_output, $retval);
 						} else {
 							//* Create a tar.gz backup as root user
 							$web_backup_file = 'web'.$web_id.'_'.date('Y-m-d_H-i').'.tar.gz';
 							exec('tar pczf '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' --exclude=backup\* --directory '.escapeshellarg($web_path).' .', $tmp_output, $retval);
 						}
-						if($retval == 0){
+						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
 							chown($web_backup_dir.'/'.$web_backup_file, 'root');
 							chgrp($web_backup_dir.'/'.$web_backup_file, 'root');
 							chmod($web_backup_dir.'/'.$web_backup_file, 0750);