From a5714c39c76695af5b2220e93a4ac3121a9d83a1 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 17 Nov 2015 12:59:40 -0500
Subject: [PATCH] Merge branch 'stable-3.0.5'
---
server/plugins-available/backup_plugin.inc.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index 50fa81c..0da8e35 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -137,6 +137,7 @@
//* Restore a web backup
if($action_name == 'backup_restore' && $backup['backup_type'] == 'web') {
+ $app->system->web_folder_protection($web['document_root'], false);
if($backup['backup_mode'] == 'userzip') {
if(file_exists($backup_dir.'/'.$backup['filename']) && $web['document_root'] != '' && $web['document_root'] != '/' && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
if(file_exists($web['document_root'].'/backup/'.$backup['filename'])) rename($web['document_root'].'/backup/'.$backup['filename'], $web['document_root'].'/backup/'.$backup['filename'].'.bak');
@@ -157,6 +158,7 @@
$app->log('Restored Web backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
}
}
+ $app->system->web_folder_protection($web['document_root'], true);
}
if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
} else {
--
Gitblit v1.9.1