- fixed missing web protection removal on backup restore

Marius Cramer · Marius Cramer · commit d219d4828659 · 2015-06-15T18:56:51.000+02:00
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
@@ -128,6 +128,7 @@ public function backup_action($action_name, $data) {
 
 				//* 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');
@@ -148,6 +149,7 @@ public function backup_action($action_name, $data) {
 							$app->log('Restored Web backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
 						}
 					}
+					$app->system->web_folder_protection($web['document_root'], true);
 				}
 			} else {
 				$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ public function backup_action($action_name, $data) {`
`128`	`128`
`129`	`129`	`//* Restore a web backup`
`130`	`130`	`if($action_name == 'backup_restore' && $backup['backup_type'] == 'web') {`
	`131`	`+ $app->system->web_folder_protection($web['document_root'], false);`
`131`	`132`	`if($backup['backup_mode'] == 'userzip') {`
`132`	`133`	`if(file_exists($backup_dir.'/'.$backup['filename']) && $web['document_root'] != '' && $web['document_root'] != '/' && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {`
`133`	`134`	`if(file_exists($web['document_root'].'/backup/'.$backup['filename'])) rename($web['document_root'].'/backup/'.$backup['filename'], $web['document_root'].'/backup/'.$backup['filename'].'.bak');`
`@@ -148,6 +149,7 @@ public function backup_action($action_name, $data) {`
`148`	`149`	`$app->log('Restored Web backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);`
`149`	`150`	`}`
`150`	`151`	`}`
	`152`	`+ $app->system->web_folder_protection($web['document_root'], true);`
`151`	`153`	`}`
`152`	`154`	`} else {`
`153`	`155`	`$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);`