diff options
| author | Simon Rettberg | 2023-03-08 15:38:45 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2023-03-08 15:38:45 +0100 |
| commit | e2d8c43c734adeb7c5a8ca5d90529874fcda15e0 (patch) | |
| tree | 08429349f0f09ef75262df512cc57a3c63cc33c6 /modules-available/backup/page.inc.php | |
| parent | [backup] Check supplied backup file before trying to apply (diff) | |
| download | slx-admin-e2d8c43c734adeb7c5a8ca5d90529874fcda15e0.tar.gz slx-admin-e2d8c43c734adeb7c5a8ca5d90529874fcda15e0.tar.xz slx-admin-e2d8c43c734adeb7c5a8ca5d90529874fcda15e0.zip | |
[backup] Add option to store in /root, not just VMstore
Diffstat (limited to 'modules-available/backup/page.inc.php')
| -rw-r--r-- | modules-available/backup/page.inc.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/modules-available/backup/page.inc.php b/modules-available/backup/page.inc.php index 67be584f..9a2d08be 100644 --- a/modules-available/backup/page.inc.php +++ b/modules-available/backup/page.inc.php @@ -48,8 +48,8 @@ class Page_Backup extends Page 'id_color' => $bgcolor, 'id_prefix' => $title, 'last_backup' => $lastBackup, - 'autoBackupEnabled_checked' => Property::get(BackupRestore::PROP_AUTO_BACKUP_MODE, BackupRestore::BACKUP_MODE_OFF) - != BackupRestore::BACKUP_MODE_OFF ? 'checked' : '', + 'backup_' . Property::get(BackupRestore::PROP_AUTO_BACKUP_MODE, BackupRestore::BACKUP_MODE_OFF) + . '_checked' => 'checked', 'autoBackupPw' => Property::get(BackupRestore::PROP_AUTO_BACKUP_PASS, ''), ]; Permission::addGlobalTags($params['perms'], NULL, ['create', 'restore', 'config']); @@ -135,6 +135,7 @@ class Page_Backup extends Page $task = Taskmanager::waitComplete($task, 5000); @unlink($tempfile . '2'); if (Taskmanager::isFailed($task)) { + @unlink($tempfile); Util::redirect('?do=backup&errtaskid=' . $task['id']); } // Got uploaded file, now shut down all the daemons etc. @@ -191,8 +192,12 @@ class Page_Backup extends Page if (empty($password)) { $password = null; } - $mode = Request::post('auto-backup-enabled', 0, 'int') - ? BackupRestore::BACKUP_MODE_VMSTORE : BackupRestore::BACKUP_MODE_OFF; + $mode = Request::post('auto-backup-mode', false, 'string'); + if ($mode !== BackupRestore::BACKUP_MODE_OFF && $mode !== BackupRestore::BACKUP_MODE_ROOTHOME + && $mode !== BackupRestore::BACKUP_MODE_VMSTORE) { + Message::addError('invalid-auto-backup-mode', $mode); + Util::redirect('?do=backup'); + } Property::set(BackupRestore::PROP_AUTO_BACKUP_MODE, $mode); Property::set(BackupRestore::PROP_AUTO_BACKUP_PASS, $password); Util::redirect('?do=backup'); |