X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fbackups.php;h=18ca997279f7f38ab3b7f7f07c983bfa3d3cafbd;hb=7e8c90ee7e898a9181f62f387ccb92158f47f59c;hp=cfc54c7f27efdb3f5fad216413a35d9b169f18a3;hpb=8864b1ec0fd3321e510511ef22614bc36845540e;p=fa-stable.git
diff --git a/admin/backups.php b/admin/backups.php
index cfc54c7f..18ca9972 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -16,6 +16,24 @@ 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 .= "";
- $selector = "";
+ $selector = "";
$Ajax->addUpdate('cmd_backups', "_cmd_backups_sel", $selector);
$selector = "".$selector."\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.")." "