From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 1 Dec 2017 19:53:46 +0000 (+0100)
Subject: Backups/Restore: fixed compressed backup view, fixed obsolete ajax indicator during... 
X-Git-Tag: v2.4.4~49
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=a5edfc9244a2b1f478269a1b276cbf2236ec6cc3

Backups/Restore: fixed compressed backup view, fixed obsolete ajax indicator during download.
---

diff --git a/admin/backups.php b/admin/backups.php
index e4364def..102deb55 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -24,14 +24,21 @@ if (get_post('view')) {
 		if (in_ajax()) 
 			$Ajax->popup( $filename );
 		else {
-		    header('Content-type: text/plain');
-    		header('Content-Length: '.filesize($filename));
+			header('Content-type: text/plain');
+			header('Content-Length: '.filesize($filename));
 			header("Content-Disposition: inline; filename=".basename($filename));
-    		readfile($filename);
+			if (substr($filename, -3, 3) == '.gz')
+				header("Content-Encoding: gzip");
+
+			if (substr($filename, -4, 4) == '.zip')
+				echo db_unzip('', $filename);
+			else
+				readfile($filename);
 			exit();
 		}
 	}
 };
+
 if (get_post('download')) {
 	if (get_post('backups')) {
 		download_file($SysPrefs->backup_dir().clean_file_name(get_post('backups')));
@@ -180,7 +187,7 @@ if (get_post('upload'))
 
 }
 //-------------------------------------------------------------------------------
-start_form(true, true);
+start_form(false, true);
 start_outer_table(TABLESTYLE2);
 table_section(1);
 table_section_title(_("Create backup"));
@@ -196,7 +203,7 @@ table_section_title(_("Backup scripts maintenance"));
 	echo "<td style='padding-left:20px' valign='top'>";
 	start_table();
 	submit_row('view',_("View Backup"), false, '', '', false);
-	submit_row('download',_("Download Backup"), false, '', '', false);
+	submit_row('download',_("Download Backup"), false, '', '', 'download');
 	submit_row('restore',_("Restore Backup"), false, '','', 'process');
 	submit_js_confirm('restore',_("You are about to restore database from backup file.\nDo you want to continue?"));
 
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 054af15e..d2854d86 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -159,6 +159,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
 					if ($icon===false) $icon=ICON_ESCAPE; break;
 
 				case 'nonajax':
+				case 'download':
 					$atype = false;
 			}
 		}
diff --git a/js/inserts.js b/js/inserts.js
index ccc8024c..17b71143 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -314,7 +314,8 @@ var inserts = {
 		e.onclick = function(){
 			if (validate(e)) {
 				setTimeout(function() {	var asp = e.getAttribute('aspect');
-					set_mark((asp && ((asp.indexOf('process') !== -1) || (asp.indexOf('nonajax') !== -1))) ? 'progressbar.gif' : 'ajax-loader.gif');
+					if (asp && asp.indexOf('download') === -1)
+						set_mark((asp && ((asp.indexOf('process') !== -1) || (asp.indexOf('nonajax') !== -1))) ? 'progressbar.gif' : 'ajax-loader.gif');
 				}, 100);
 				return true;
 			}