diff --git a/interface/lib/classes/remote.d/sites.inc.php b/interface/lib/classes/remote.d/sites.inc.php index 10fc028e645f80b96e2b8461f95894b1b23d9d36..ee665ec72abbeca4c0fd9899c3386724ba7a80dd 100644 --- a/interface/lib/classes/remote.d/sites.inc.php +++ b/interface/lib/classes/remote.d/sites.inc.php @@ -167,9 +167,8 @@ class remoting_sites extends remoting { $retval = $this->updateQueryExecute($sql, $primary_id, $params); // set correct values for backup_interval and backup_copies - if(isset($params['backup_interval']) || isset($params['backup_copies']) || isset($params['backup_format_web']) || isset($params['backup_format_db'])){ + if(isset($params['backup_copies']) || isset($params['backup_format_web']) || isset($params['backup_format_db'])){ $sql_set = array(); - if(isset($params['backup_interval'])) $sql_set[] = "backup_interval = '".$app->db->quote($params['backup_interval'])."'"; if(isset($params['backup_copies'])) $sql_set[] = "backup_copies = ".$app->functions->intval($params['backup_copies']); if(isset($params['backup_format_web'])) $sql_set[] = "backup_format_web = ".$app->functions->intval($params['backup_format_web']); if(isset($params['backup_format_db'])) $sql_set[] = "backup_format_db = ".$app->functions->intval($params['backup_format_db']); diff --git a/interface/lib/classes/sites_database_plugin.inc.php b/interface/lib/classes/sites_database_plugin.inc.php index 68421d6083ddd0eafaf56c539bcb040d4917fe2c..bc345f62add1695e61df39bbf753312644101ac4 100644 --- a/interface/lib/classes/sites_database_plugin.inc.php +++ b/interface/lib/classes/sites_database_plugin.inc.php @@ -44,8 +44,7 @@ class sites_database_plugin { //* The Database user shall be owned by the same group then the website $sys_groupid = $app->functions->intval($web['sys_groupid']); - $backup_interval = $web['backup_interval']; - $backup_format_web = $web['backup_format_web']; + $backup_interval = $app->db->quote($form_page->dataRecord["backup_interval"]); $backup_format_db = $web['backup_format_db']; $backup_copies = $app->functions->intval($web['backup_copies']); diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php index 2d4785df99d116b20359fdf44b4ccd6eb3c39fdd..81a4f79bf2917f1fb010c86653f627c5a95353f2 100644 --- a/interface/web/sites/form/database.tform.php +++ b/interface/web/sites/form/database.tform.php @@ -95,6 +95,17 @@ $form["tabs"]['database'] = array ( 'mysql' => 'MySQL' ) ), + 'backup_interval' => [ + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'default' => 'none', + 'value' => [ + 'none' => 'no_backup_txt', + 'daily' => 'daily_backup_txt', + 'weekly' => 'weekly_backup_txt', + 'monthly' => 'monthly_backup_txt', + ] + ], 'database_name' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', diff --git a/interface/web/sites/lib/lang/ar_database.lng b/interface/web/sites/lib/lang/ar_database.lng index f081f1dce8802b654dee732b91d31f32a860f249..42b930d97f20ced89582ab3a14ab9d7734a106a7 100644 --- a/interface/web/sites/lib/lang/ar_database.lng +++ b/interface/web/sites/lib/lang/ar_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/bg_database.lng b/interface/web/sites/lib/lang/bg_database.lng index 675bbdd8c9aa01a3e339bc75da61208ddb0549e5..d7f74ce1783dcec138cbc396cf525dc6b592616c 100644 --- a/interface/web/sites/lib/lang/bg_database.lng +++ b/interface/web/sites/lib/lang/bg_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng index 7e872a31bb771778d9373f6d85364ac17baa05c1..1b0ec53b15196024622d273141a0ea1953c55cfc 100644 --- a/interface/web/sites/lib/lang/br_database.lng +++ b/interface/web/sites/lib/lang/br_database.lng @@ -47,3 +47,9 @@ $wb['limit_database_quota_txt'] = 'Cota do Banco de Dados'; $wb['limit_database_quota_error_notint'] = 'A cota do Banco de Dados deve ser um número.'; $wb['limit_database_quota_free_txt'] = 'Cota do Banco de Dados disponÃvel'; $wb['limit_database_quota_not_0_txt'] = 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'Sem backup'; +$wb['daily_backup_txt'] = 'Diário'; +$wb['weekly_backup_txt'] = 'Semanal'; +$wb['monthly_backup_txt'] = 'Mensal'; +$wb['backup_interval_txt'] = 'Intervalo entre backups'; +?> diff --git a/interface/web/sites/lib/lang/ca_database.lng b/interface/web/sites/lib/lang/ca_database.lng index 5a49db5f7500e33d5c11e22c73993a610b93e057..fc486cad96100cf94aa89fffce563ec97e831cc6 100644 --- a/interface/web/sites/lib/lang/ca_database.lng +++ b/interface/web/sites/lib/lang/ca_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/cn_database.lng b/interface/web/sites/lib/lang/cn_database.lng index d1c9180fbbe33b8b76a38177b2c9690f393c1109..f8bd9d214a07c58c9323339940f508261391c963 100644 --- a/interface/web/sites/lib/lang/cn_database.lng +++ b/interface/web/sites/lib/lang/cn_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'æ•°æ®åº“é…é¢'; $wb['limit_database_quota_error_notint'] = 'æ•°æ®åº“é…é¢å¿…须是数å—。'; $wb['limit_database_quota_free_txt'] = '最大å¯ç”¨çš„æ•°æ®åº“é…é¢ '; $wb['limit_database_quota_not_0_txt'] = 'æ•°æ®åº“é…é¢ä¸èƒ½ä¸º0。'; +$wb['no_backup_txt'] = 'ä¸å¤‡ä»½'; +$wb['daily_backup_txt'] = 'æ¯æ—¥'; +$wb['weekly_backup_txt'] = 'æ¯å‘¨'; +$wb['monthly_backup_txt'] = 'æ¯æœˆ'; +$wb['backup_interval_txt'] = '备份间隔'; ?> diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng index 419fe424884d398e514df43edf62a5d2a18236df..0ed55c2c767ccb14f0145d5e8652ee981ffa2850 100644 --- a/interface/web/sites/lib/lang/cz_database.lng +++ b/interface/web/sites/lib/lang/cz_database.lng @@ -47,3 +47,9 @@ $wb['limit_database_quota_txt'] = 'Kvóta databáze'; $wb['limit_database_quota_error_notint'] = 'Limit databázové kvóty musà být ÄÃslo.'; $wb['limit_database_quota_free_txt'] = 'Max. dostupná DB kvóta je '; $wb['limit_database_quota_not_0_txt'] = 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'Žádná záloha'; +$wb['daily_backup_txt'] = 'DennÃ'; +$wb['weekly_backup_txt'] = 'TýdennÃ'; +$wb['monthly_backup_txt'] = 'MÄ›sÃÄnÃ'; +$wb['backup_interval_txt'] = 'Interval zálohovánÃ'; +?> diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng index 9f7a102ca3113af670c18d287d8da92b29d60096..6ea231d38ebb3d3c2e67a112afbcf7370499f19a 100644 --- a/interface/web/sites/lib/lang/de_database.lng +++ b/interface/web/sites/lib/lang/de_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'inaktiv'; +$wb['daily_backup_txt'] = 'täglich'; +$wb['weekly_backup_txt'] = 'wöchentlich'; +$wb['monthly_backup_txt'] = 'monatlich'; +$wb['backup_interval_txt'] = 'Backup-Interval'; ?> diff --git a/interface/web/sites/lib/lang/dk_database.lng b/interface/web/sites/lib/lang/dk_database.lng index 70ac3b45dd540be592c49c0b9f8499f3f3293b5e..8f02873a9c7b60887fb2185433d7509711793f3f 100644 --- a/interface/web/sites/lib/lang/dk_database.lng +++ b/interface/web/sites/lib/lang/dk_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng index d3c1555a7c6ce30dd81c51cc04f589fe3963ff71..8b3d40391cda8f2853c99b1187248d290239473c 100644 --- a/interface/web/sites/lib/lang/el_database.lng +++ b/interface/web/sites/lib/lang/el_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/en_database.lng b/interface/web/sites/lib/lang/en_database.lng index 4c3e65387398062c9ec75433cd52302c20b402b2..7317424bbd65e4fcd957f9252affbf7488b5a9c7 100644 --- a/interface/web/sites/lib/lang/en_database.lng +++ b/interface/web/sites/lib/lang/en_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt']='Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/es_database.lng b/interface/web/sites/lib/lang/es_database.lng index 512d297da0fc47b887629a3d4442711227703ae5..c8722d93b2d6adbf02ca9ddd05d8c126eb894f29 100644 --- a/interface/web/sites/lib/lang/es_database.lng +++ b/interface/web/sites/lib/lang/es_database.lng @@ -47,4 +47,9 @@ $wb['select_site_txt'] = '- Seleccionar sitio -'; $wb['server_id_txt'] = 'Servidor'; $wb['type_txt'] = 'Tipo'; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'Sin copia de seguridad'; +$wb['daily_backup_txt'] = 'Diariamente'; +$wb['weekly_backup_txt'] = 'Semanalmente'; +$wb['monthly_backup_txt'] = 'Mensualmente'; +$wb['backup_interval_txt'] = 'Intervalo de copias de seguridad'; ?> diff --git a/interface/web/sites/lib/lang/fi_database.lng b/interface/web/sites/lib/lang/fi_database.lng index 397cdbf03144fca54003da1aaf292baeda666963..e6218fab1d4ecd2afbaf523b2161fb8052044206 100644 --- a/interface/web/sites/lib/lang/fi_database.lng +++ b/interface/web/sites/lib/lang/fi_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/fr_database.lng b/interface/web/sites/lib/lang/fr_database.lng index 77e1d561cb1f3df02d7b30f4565b1f86e9b81726..eaba5523956bb1f7bdea0082dac24a95a00a8e2a 100644 --- a/interface/web/sites/lib/lang/fr_database.lng +++ b/interface/web/sites/lib/lang/fr_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'Pas de backup'; +$wb['daily_backup_txt'] = 'Journalier'; +$wb['weekly_backup_txt'] = 'Hebdomadaire'; +$wb['monthly_backup_txt'] = 'Mensuel'; +$wb['backup_interval_txt'] = 'Intervalle des Backups'; ?> diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng index f1c7d0db2e14301107af5f8c302b16615b0cba48..75909d9eb90b210cbd5fa202e51c00dc66181770 100644 --- a/interface/web/sites/lib/lang/hr_database.lng +++ b/interface/web/sites/lib/lang/hr_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/hu_database.lng b/interface/web/sites/lib/lang/hu_database.lng index cb27357b9736f6ffc9dc027d0cd9ecb61148b655..5a04240e3385ec2505e55b6d59d3fe72bde8c0b1 100644 --- a/interface/web/sites/lib/lang/hu_database.lng +++ b/interface/web/sites/lib/lang/hu_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/id_database.lng b/interface/web/sites/lib/lang/id_database.lng index 90d38332179d6b6d3079dea3b232871f40cdd6f6..4c377c92a6e23718ae75db6731800543743724fd 100644 --- a/interface/web/sites/lib/lang/id_database.lng +++ b/interface/web/sites/lib/lang/id_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/it_database.lng b/interface/web/sites/lib/lang/it_database.lng index ba9be340915fc9313dc302ce08c5bd1f7df14fb4..015fe89399dd940afaa43ec0ed4fc67fa1543463 100644 --- a/interface/web/sites/lib/lang/it_database.lng +++ b/interface/web/sites/lib/lang/it_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'La quota del database deve essere un numero positivo.'; $wb['limit_database_quota_free_txt'] = 'Quota DB disponibile '; $wb['limit_database_quota_not_0_txt'] = 'La quota Database non può essere 0'; +$wb['no_backup_txt'] = 'Nessun backup'; +$wb['daily_backup_txt'] = 'Giornaliero'; +$wb['weekly_backup_txt'] = 'Settimanale'; +$wb['monthly_backup_txt'] = 'Mensile'; +$wb['backup_interval_txt'] = 'Intervallo di Backup'; ?> diff --git a/interface/web/sites/lib/lang/ja_database.lng b/interface/web/sites/lib/lang/ja_database.lng index f081f1dce8802b654dee732b91d31f32a860f249..42b930d97f20ced89582ab3a14ab9d7734a106a7 100644 --- a/interface/web/sites/lib/lang/ja_database.lng +++ b/interface/web/sites/lib/lang/ja_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng index d9bbfb0693f46f5abf9ac680f37febffb629d3c9..4746db1735f4e787fae2b38f4430dda37bf724e7 100644 --- a/interface/web/sites/lib/lang/nl_database.lng +++ b/interface/web/sites/lib/lang/nl_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng index 57294f0a4050ab754379c710b092268458944350..c7cce7903f9b2e3add615d1973eda6f24627c885 100644 --- a/interface/web/sites/lib/lang/pl_database.lng +++ b/interface/web/sites/lib/lang/pl_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/pt_database.lng b/interface/web/sites/lib/lang/pt_database.lng index 9da316d039ca4c8f6a4d827afb0e936f3ecf9d5d..2431db782e9fecfcbf08eb021691a9fad928eec3 100644 --- a/interface/web/sites/lib/lang/pt_database.lng +++ b/interface/web/sites/lib/lang/pt_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/ro_database.lng b/interface/web/sites/lib/lang/ro_database.lng index 73f2b3eb6347a99d22f0c0f2c3642a39924e428c..f1dfb7dd50d903c80aa2a27dd768e2fe873aaf49 100644 --- a/interface/web/sites/lib/lang/ro_database.lng +++ b/interface/web/sites/lib/lang/ro_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/ru_database.lng b/interface/web/sites/lib/lang/ru_database.lng index 478be40597d40c8de3b48c2bb9e1d7d41176894b..04015d4faceb9975104928a9b66416a09e7dafb8 100644 --- a/interface/web/sites/lib/lang/ru_database.lng +++ b/interface/web/sites/lib/lang/ru_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Квота базы данных'; $wb['limit_database_quota_error_notint'] = 'Лимит квоты базы данных должен быть чиÑлом.'; $wb['limit_database_quota_free_txt'] = 'МакÑ. доÑÑ‚ÑƒÐ¿Ð½Ð°Ñ ÐºÐ²Ð¾Ñ‚Ð° базы данных.'; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'Ðе резервировать'; +$wb['daily_backup_txt'] = 'Ежедневно'; +$wb['weekly_backup_txt'] = 'Еженедельно'; +$wb['monthly_backup_txt'] = 'ЕжемеÑÑчно'; +$wb['backup_interval_txt'] = 'Интервал резервного копированиÑ'; ?> diff --git a/interface/web/sites/lib/lang/se_database.lng b/interface/web/sites/lib/lang/se_database.lng index bf3f3fabfe8b1dbf698a0bc8fc84382a1e9847a2..67e03afa2467672fe25d410429532f3d9ebd1d12 100644 --- a/interface/web/sites/lib/lang/se_database.lng +++ b/interface/web/sites/lib/lang/se_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/sk_database.lng b/interface/web/sites/lib/lang/sk_database.lng index 7b8b53f2abd134510526f6e3e19288724046fffb..e90413cdcba23ef40bbdd54cdb75033e3b0fb9e7 100644 --- a/interface/web/sites/lib/lang/sk_database.lng +++ b/interface/web/sites/lib/lang/sk_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'No backup'; +$wb['daily_backup_txt'] = 'Daily'; +$wb['weekly_backup_txt'] = 'Weekly'; +$wb['monthly_backup_txt'] = 'Monthly'; +$wb['backup_interval_txt'] = 'Backup interval'; ?> diff --git a/interface/web/sites/lib/lang/tr_database.lng b/interface/web/sites/lib/lang/tr_database.lng index 9f8d200e436770f599663ba2db3b1215af3fa9d0..1c8fb06bc68489dfa4ac48bbac3379f04ebcbf28 100644 --- a/interface/web/sites/lib/lang/tr_database.lng +++ b/interface/web/sites/lib/lang/tr_database.lng @@ -47,4 +47,9 @@ $wb['limit_database_quota_txt'] = 'Veritabanı Kotası'; $wb['limit_database_quota_error_notint'] = 'Veritabanı kotası bir sayı olmalıdır'; $wb['limit_database_quota_free_txt'] = 'Kullanılabilecek en fazla veritabanı kotası'; $wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; +$wb['no_backup_txt'] = 'Yedek yok'; +$wb['daily_backup_txt'] = 'Günlük'; +$wb['weekly_backup_txt'] = 'Haftalık'; +$wb['monthly_backup_txt'] = 'Aylık'; +$wb['backup_interval_txt'] = 'Yedekleme Sıklığı'; ?> diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm index b4ed450f308f78c20b1f4051c73cfd5b6cd617ae..e6aa508e5fbd2dd36b51dbac3baf55d85d6c3869 100644 --- a/interface/web/sites/templates/database_edit.htm +++ b/interface/web/sites/templates/database_edit.htm @@ -44,6 +44,14 @@ <div class="col-sm-9"><select name="type" id="type" class="form-control"> {tmpl_var name='type'} </select></div> + </div> + <div class="form-group"> + <label for="backup_interval" class="col-sm-3 control-label">{tmpl_var name='backup_interval_txt'}</label> + <div class="col-sm-9"> + <select name="backup_interval" id="backup_interval" class="form-control"> + {tmpl_var name='backup_interval'} + </select> + </div> </div> <div class="form-group"> <label for="database_name" class="col-sm-3 control-label">{tmpl_var name='database_name_txt'}</label> diff --git a/server/lib/classes/backup.inc.php b/server/lib/classes/backup.inc.php index 52c080200910720e118d9010080e2dcbc2a5e202..b755a0f23b6cde1861174704918d2b5fb5fe13ac 100644 --- a/server/lib/classes/backup.inc.php +++ b/server/lib/classes/backup.inc.php @@ -1997,7 +1997,7 @@ class backup if ($success) { $backup_username = ($global_config['backups_include_into_web_quota'] == 'y') ? $web_user : 'root'; $backup_group = ($global_config['backups_include_into_web_quota'] == 'y') ? $web_group : 'root'; - + //Insert web backup record in database $archive_size = self::getReposArchiveSize($backup_mode, $backup_repos_path, $web_backup_archive, $repos_password); $password = $repos_password ? '*secret*' : ''; @@ -2286,7 +2286,7 @@ class backup } } - $sql = "SELECT DISTINCT d.*, db.server_id as `server_id` FROM web_database as db INNER JOIN web_domain as d ON (d.domain_id = db.parent_domain_id) WHERE db.server_id = ? AND db.active = 'y' AND d.backup_interval != 'none' AND d.backup_interval != ''"; + $sql = "SELECT DISTINCT d.domain_id, db.backup_interval, db.server_id, db.parent_domain_id FROM web_database as db INNER JOIN web_domain as d ON (d.domain_id = db.parent_domain_id) WHERE db.server_id = ? AND db.active = 'y' AND db.backup_interval != 'none' AND db.backup_interval != ''"; $databases = $app->dbmaster->queryAllRecords($sql, $server_id); foreach ($databases as $database) {