From 0ef44223568b3ef512b504cc236378bc64fc38a8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 11 Dec 2019 18:00:38 +0100
Subject: [backup] Disable button during download; add IP to download file name

---
 modules-available/backup/page.inc.php         | 2 +-
 modules-available/backup/templates/_page.html | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules-available/backup/page.inc.php b/modules-available/backup/page.inc.php
index 985f39ee..1d69ddd3 100644
--- a/modules-available/backup/page.inc.php
+++ b/modules-available/backup/page.inc.php
@@ -63,7 +63,7 @@ class Page_Backup extends Page
 			Util::redirect('?do=Backup');
 		}
 		Header('Content-Type: application/octet-stream', true);
-		Header('Content-Disposition: attachment; filename=' . 'satellite-backup_v16_' . date('Y.m.d-H.i.s') . '.tgz');
+		Header('Content-Disposition: attachment; filename=' . 'satellite-backup_' . Property::getServerIp() . '_' . date('Y.m.d-H.i.s') . '.tgz');
 		Header('Content-Length: ' . @filesize($task['data']['backupFile']));
 		while (!feof($fh)) {
 			$data = fread($fh, 16000);
diff --git a/modules-available/backup/templates/_page.html b/modules-available/backup/templates/_page.html
index 4c6cade4..fa88b966 100644
--- a/modules-available/backup/templates/_page.html
+++ b/modules-available/backup/templates/_page.html
@@ -1,6 +1,6 @@
 <h1>{{lang_backupRestore}}</h1>
 
-<form action="?do=Backup" method="post">
+<form action="?do=Backup" method="post" onsubmit="$('#b-btn').prop('disabled', true).find('span').removeClass('glyphicon-save').addClass('glyphicon-refresh slx-rotation')">
 	<input type="hidden" name="token" value="{{token}}">
 	<input type="hidden" name="action" value="backup">
 	<div class="panel panel-default">
@@ -12,7 +12,9 @@
 				{{^last_backup}}{{lang_unknown}}{{/last_backup}}
 				{{last_backup}}
 			</p>
-			<button {{perms.create.disabled}} class="btn btn-primary pull-right" type="submit"><span class="glyphicon glyphicon-save"></span> {{lang_download}}</button>
+			<button id="b-btn" {{perms.create.disabled}} class="btn btn-primary pull-right" type="submit">
+				<span class="glyphicon glyphicon-save"></span> {{lang_download}}
+			</button>
 		</div>
 	</div>
 </form>
-- 
cgit v1.2.3-55-g7522