Skip to content

Commit 55c0bac

Browse files
author
Till Brehm
committed
Merge branch 'fix-6692' into 'develop'
proposal Fix #6692 and #2962 add backup interval setting for databases Closes #2962 and #6692 See merge request ispconfig/ispconfig3!1886
2 parents e63889a + 6883d16 commit 55c0bac

31 files changed

+155
-6
lines changed

‎interface/lib/classes/remote.d/sites.inc.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,8 @@ public function sites_database_update($session_id, $client_id, $primary_id, $par
167167
$retval = $this->updateQueryExecute($sql, $primary_id, $params);
168168

169169
// set correct values for backup_interval and backup_copies
170-
if(isset($params['backup_interval']) || isset($params['backup_copies']) || isset($params['backup_format_web']) || isset($params['backup_format_db'])){
170+
if(isset($params['backup_copies']) || isset($params['backup_format_web']) || isset($params['backup_format_db'])){
171171
$sql_set = array();
172-
if(isset($params['backup_interval'])) $sql_set[] = "backup_interval = '".$app->db->quote($params['backup_interval'])."'";
173172
if(isset($params['backup_copies'])) $sql_set[] = "backup_copies = ".$app->functions->intval($params['backup_copies']);
174173
if(isset($params['backup_format_web'])) $sql_set[] = "backup_format_web = ".$app->functions->intval($params['backup_format_web']);
175174
if(isset($params['backup_format_db'])) $sql_set[] = "backup_format_db = ".$app->functions->intval($params['backup_format_db']);

‎interface/lib/classes/sites_database_plugin.inc.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ public function processDatabaseUpdate($form_page) {
4444

4545
//* The Database user shall be owned by the same group then the website
4646
$sys_groupid = $app->functions->intval($web['sys_groupid']);
47-
$backup_interval = $web['backup_interval'];
48-
$backup_format_web = $web['backup_format_web'];
47+
$backup_interval = $app->db->quote($form_page->dataRecord["backup_interval"]);
4948
$backup_format_db = $web['backup_format_db'];
5049
$backup_copies = $app->functions->intval($web['backup_copies']);
5150

‎interface/web/sites/form/database.tform.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,17 @@
9595
'mysql' => 'MySQL'
9696
)
9797
),
98+
'backup_interval' => [
99+
'datatype' => 'VARCHAR',
100+
'formtype' => 'SELECT',
101+
'default' => 'none',
102+
'value' => [
103+
'none' => 'no_backup_txt',
104+
'daily' => 'daily_backup_txt',
105+
'weekly' => 'weekly_backup_txt',
106+
'monthly' => 'monthly_backup_txt',
107+
]
108+
],
98109
'database_name' => array (
99110
'datatype' => 'VARCHAR',
100111
'formtype' => 'TEXT',

‎interface/web/sites/lib/lang/ar_database.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota';
4747
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
4848
$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
4949
$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0';
50+
$wb['no_backup_txt'] = 'No backup';
51+
$wb['daily_backup_txt'] = 'Daily';
52+
$wb['weekly_backup_txt'] = 'Weekly';
53+
$wb['monthly_backup_txt'] = 'Monthly';
54+
$wb['backup_interval_txt'] = 'Backup interval';
5055
?>

‎interface/web/sites/lib/lang/bg_database.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota';
4747
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
4848
$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
4949
$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0';
50+
$wb['no_backup_txt'] = 'No backup';
51+
$wb['daily_backup_txt'] = 'Daily';
52+
$wb['weekly_backup_txt'] = 'Weekly';
53+
$wb['monthly_backup_txt'] = 'Monthly';
54+
$wb['backup_interval_txt'] = 'Backup interval';
5055
?>

‎interface/web/sites/lib/lang/br_database.lng‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,9 @@ $wb['limit_database_quota_txt'] = 'Cota do Banco de Dados';
4747
$wb['limit_database_quota_error_notint'] = 'A cota do Banco de Dados deve ser um número.';
4848
$wb['limit_database_quota_free_txt'] = 'Cota do Banco de Dados disponível';
4949
$wb['limit_database_quota_not_0_txt'] = 'Database quota can not be 0';
50+
$wb['no_backup_txt'] = 'Sem backup';
51+
$wb['daily_backup_txt'] = 'Diário';
52+
$wb['weekly_backup_txt'] = 'Semanal';
53+
$wb['monthly_backup_txt'] = 'Mensal';
54+
$wb['backup_interval_txt'] = 'Intervalo entre backups';
55+
?>

‎interface/web/sites/lib/lang/ca_database.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota';
4747
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
4848
$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
4949
$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0';
50+
$wb['no_backup_txt'] = 'No backup';
51+
$wb['daily_backup_txt'] = 'Daily';
52+
$wb['weekly_backup_txt'] = 'Weekly';
53+
$wb['monthly_backup_txt'] = 'Monthly';
54+
$wb['backup_interval_txt'] = 'Backup interval';
5055
?>

‎interface/web/sites/lib/lang/cn_database.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = '数据库配额';
4747
$wb['limit_database_quota_error_notint'] = '数据库配额必须是数字。';
4848
$wb['limit_database_quota_free_txt'] = '最大可用的数据库配额 ';
4949
$wb['limit_database_quota_not_0_txt'] = '数据库配额不能为0。';
50+
$wb['no_backup_txt'] = '不备份';
51+
$wb['daily_backup_txt'] = '每日';
52+
$wb['weekly_backup_txt'] = '每周';
53+
$wb['monthly_backup_txt'] = '每月';
54+
$wb['backup_interval_txt'] = '备份间隔';
5055
?>

‎interface/web/sites/lib/lang/cz_database.lng‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,9 @@ $wb['limit_database_quota_txt'] = 'Kvóta databáze';
4747
$wb['limit_database_quota_error_notint'] = 'Limit databázové kvóty musí být číslo.';
4848
$wb['limit_database_quota_free_txt'] = 'Max. dostupná DB kvóta je ';
4949
$wb['limit_database_quota_not_0_txt'] = 'Database quota can not be 0';
50+
$wb['no_backup_txt'] = 'Žádná záloha';
51+
$wb['daily_backup_txt'] = 'Denní';
52+
$wb['weekly_backup_txt'] = 'Týdenní';
53+
$wb['monthly_backup_txt'] = 'Měsíční';
54+
$wb['backup_interval_txt'] = 'Interval zálohování';
55+
?>

‎interface/web/sites/lib/lang/de_database.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota';
4747
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
4848
$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
4949
$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0';
50+
$wb['no_backup_txt'] = 'inaktiv';
51+
$wb['daily_backup_txt'] = 'täglich';
52+
$wb['weekly_backup_txt'] = 'wöchentlich';
53+
$wb['monthly_backup_txt'] = 'monatlich';
54+
$wb['backup_interval_txt'] = 'Backup-Interval';
5055
?>

0 commit comments

Comments
 (0)