From 9c2f3fae86ed048fb53ae5f796d1528a58d8bb73 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 12 May 2023 11:16:26 +0200
Subject: [backup] Don't error out if backup file is not readable by www-data

---
 modules-available/backup/hooks/cron.inc.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'modules-available/backup')

diff --git a/modules-available/backup/hooks/cron.inc.php b/modules-available/backup/hooks/cron.inc.php
index c4f976c4..3117ad36 100644
--- a/modules-available/backup/hooks/cron.inc.php
+++ b/modules-available/backup/hooks/cron.inc.php
@@ -1,7 +1,8 @@
 <?php
 
 (function () {
-	if (date('w') !== '0' || (int)date('i') >= 5)
+	// Sunday midnight, between 0-4 minutes of hour
+	if (date('Hw') !== '000' || (int)date('i') >= 5)
 		return;
 	$mode = Property::get(BackupRestore::PROP_AUTO_BACKUP_MODE, BackupRestore::BACKUP_MODE_OFF);
 	if ($mode === BackupRestore::BACKUP_MODE_OFF)
@@ -31,13 +32,13 @@
 		return;
 	}
 	$task = Taskmanager::waitComplete($task, 60000);
-	if (!Taskmanager::isFinished($task) || !isset($task['data']['backupFile'])) {
+	if (!Taskmanager::isFinished($task) || Taskmanager::isFailed($task) || !isset($task['data']['backupFile'])) {
 		EventLog::failure("Creating backup failed", print_r($task, true));
 		return;
 	}
-	if (!is_readable($task['data']['backupFile'])) {
-		EventLog::failure("Backup file '{$task['data']['backupFile']}' is not readable");
+	if (!file_exists($task['data']['backupFile'])) {
+		EventLog::failure("Backup file '{$task['data']['backupFile']}' not found after successful backup run");
 		return;
 	}
-	Property::set('backup.last-time', time());
+	Property::set(BackupRestore::PROP_LAST_BACKUP, time());
 })();
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522