From 62b0c1f507f67bf908d465c66590a73f23f550e3 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Thu, 17 Dec 2020 12:55:25 -0700
Subject: [PATCH] manual database backups scheduled once per server
---
interface/lib/classes/plugin_backuplist.inc.php | 2 +-
interface/web/sites/templates/web_backup_list.htm | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/plugin_backuplist.inc.php b/interface/lib/classes/plugin_backuplist.inc.php
index 81fe1daae7..4774eb6c49 100644
--- a/interface/lib/classes/plugin_backuplist.inc.php
+++ b/interface/lib/classes/plugin_backuplist.inc.php
@@ -58,7 +58,7 @@ class plugin_backuplist extends plugin_base {
if ($tmp['number'] == 0) {
if($action_type === 'backup_database') {
// get all server ids of databases for this domain
- $sql = 'SELECT `server_id` FROM `web_database` WHERE `parent_domain_id` = ?';
+ $sql = 'SELECT distinct(`server_id`) FROM `web_database` WHERE `parent_domain_id` = ?';
$result = $app->db->query($sql, $domain_id);
while(($cur = $result->get())) {
$server_id = $cur['server_id'];
diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm
index 47c08d4413..f2baa48f91 100644
--- a/interface/web/sites/templates/web_backup_list.htm
+++ b/interface/web/sites/templates/web_backup_list.htm
@@ -1,6 +1,6 @@
<h3><tmpl_var name="manual_backup_title_txt"></h3>
-<button class="btn btn-default formbutton-default" type="button" onclick="ISPConfig.confirm_action('sites/web_vhost_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&make_backup=database&','{tmpl_var name='make_backup_confirm_txt'}');">{tmpl_var name="make_backup_database_txt"}</button>
-<button class="btn btn-default formbutton-default" type="button" onclick="ISPConfig.confirm_action('sites/web_vhost_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&make_backup=web&','{tmpl_var name='make_backup_confirm_txt'}');">{tmpl_var name="make_backup_web_txt"}</button>
+<button class="btn btn-default formbutton-default" type="button" onclick="ISPConfig.confirm_action('sites/web_vhost_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&make_backup=database','{tmpl_var name='make_backup_confirm_txt'}');">{tmpl_var name="make_backup_database_txt"}</button>
+<button class="btn btn-default formbutton-default" type="button" onclick="ISPConfig.confirm_action('sites/web_vhost_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&make_backup=web','{tmpl_var name='make_backup_confirm_txt'}');">{tmpl_var name="make_backup_web_txt"}</button>
<tmpl_if name="msg">
<br><br>
--
GitLab