maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Michael Kaufmann
2018-10-11 14:57:53 +02:00
parent b6e4dbd70a aa6f3d33eb
commit 95b305b865
5 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/classes/api/commands/class.CustomerBackups.php
View File

@@ -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';
}

4
lib/formfields/customer/extras/formfield.backup.php
View File

@@ -24,8 +24,8 @@ return array(
'image' => 'icons/backup_big.png',
'fields' => array(
'path' => array(
'label' => $lng['panel']['path'],
'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'label' => $lng['panel']['backuppath']['title'],
'desc' => $lng['panel']['backuppath']['description'].'<br>'.(Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']