X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fbackups.php;h=d501999deab6af47a55f16293febb763e43d99b0;hb=3ff9ed87cb909f19c8fe3e7dfda5df79d0c01a6c;hp=cfc54c7f27efdb3f5fad216413a35d9b169f18a3;hpb=8864b1ec0fd3321e510511ef22614bc36845540e;p=fa-stable.git

diff --git a/admin/backups.php b/admin/backups.php
index cfc54c7f..d501999d 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -9,13 +9,31 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 15;
+$page_security = 'SA_BACKUP';
 
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/admin/db/maintenance_db.inc");
 
+if (get_post('view')) {
+	$filename = BACKUP_PATH . get_post('cmb_backups');
+	if (in_ajax()) 
+		$Ajax->popup( $filename );
+	else {
+	    header('Content-type: application/octet-stream');
+    	header('Content-Length: '.filesize($filename));
+		header("Content-Disposition: inline; filename=$filename");
+    	readfile($filename);
+		exit();
+	}
+};
+
+if (get_post('download')) {
+	download_file(BACKUP_PATH . get_post('cmb_backups'));
+	exit;
+}
+
 page(_("Backup and Restore Database"), false, false, '', '');
 
 check_paths();
@@ -33,12 +51,7 @@ function check_paths()
 
 function generate_backup($conn, $ext='no', $comm='')
 {
-	if ($conn['tbpref'] != "")
-		$filename = $conn['dbname'] . "_" . $conn['tbpref'] . date("Ymd_Hi") . ".sql";
-	else
-		$filename = $conn['dbname'] . "_" . date("Ymd_Hi") . ".sql";
-
-	$filename = db_export($conn, $filename, $ext, $comm);
+	$filename = db_backup($conn, $ext, $comm);
 	if ($filename)
 		display_notification(_("Backup successfully generated."). ' '
 			. _("Filename") . ": " . $filename);
@@ -66,7 +79,7 @@ function get_backup_file_combo()
 		if (preg_match("/.sql(.zip|.gz)?$/", $file))
     		$opt_files .= "<option value='$file'>$file</option>";
 
-	$selector = "<select name='cmb_backups' size=2 style='height:160px;width:230px'>$opt_files</select>";
+	$selector = "<select name='cmb_backups' size=2 style='height:160px;min-width:230px'>$opt_files</select>";
 
 	$Ajax->addUpdate('cmd_backups', "_cmd_backups_sel", $selector);
 	$selector = "<span id='_cmd_backups_sel'>".$selector."</span>\n";
@@ -116,24 +129,6 @@ if (get_post('restore')) {
 		display_notification(_("Restore backup completed."));
 }
 
-if (get_post('view')) {
-	$filename = BACKUP_PATH . get_post('cmb_backups');
-	if (in_ajax()) 
-		$Ajax->popup( $filename );
-	else {
-	    header('Content-type: application/octet-stream');
-    	header('Content-Length: '.filesize($filename));
-		header("Content-Disposition: inline; filename=$filename");
-    	readfile($filename);
-		exit();
-	}
-};
-
-if (get_post('download')) {
-	download_file(BACKUP_PATH . get_post('cmb_backups'));
-	exit;
-}
-
 if (get_post('delete')) {
 	if (unlink(BACKUP_PATH . get_post('cmb_backups'))) {
 		display_notification(_("File successfully deleted.")." "
@@ -177,13 +172,10 @@ table_section_title(_("Backup scripts maintenance"));
 	submit_row('view',_("View Backup"), false, '', '', true);
 	submit_row('download',_("Download Backup"), false, '', '', false);
 	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?"));
 
-	$js = "if(confirm(\""
-		.sprintf(_('You are about to remove %s backup file.<br> Do you want to continue ?'),
-			get_post('cmb_backups'))
-		."\")) { JsHttpRequest.request(\"delete\"); }";
-
-	submit_row('delete', _("Delete Backup"), false, '','', 'dialog');
+	submit_row('delete', _("Delete Backup"), false, '','', true);
+	submit_js_confirm('delete', sprintf(_("You are about to remove selected backup file.\nDo you want to continue ?")));
 	end_table();
 	echo "</td>";
 	end_row();