Merge remote-tracking branch 'origin/master' into 0.10.0

2018-10-11 14:57:53 +02:00
parent b6e4dbd70a aa6f3d33eb
commit 95b305b865
5 changed files with 14 additions and 2 deletions
--- a/lib/classes/api/commands/class.CustomerBackups.php
+++ b/lib/classes/api/commands/class.CustomerBackups.php
@@ -73,6 +73,11 @@ class CustomerBackups extends ApiCommand implements ResourceEntity
 		$userpath = $path;
 		$path = makeCorrectDir($customer['documentroot'] . '/' . $path);

+		// path cannot be the customers docroot
+		if ($path == makeCorrectDir($customer['documentroot'])) {
+			standar_error('backupfoldercannotbedocroot', '', true);
+		}
+
 		if ($backup_dbs != '1') {
 			$backup_dbs = '0';
 		}