X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fbackups.php;h=4011a2a5423eafddedb376cd8eab233d14ecd99e;hb=19c4a341d22f27dcc7fa9f56e0979d8ebec47b54;hp=450f1df57113694391926257f0d22d1a678c56dd;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git
diff --git a/admin/backups.php b/admin/backups.php
index 450f1df5..4011a2a5 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -17,24 +17,27 @@ 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('backups')) {
+ display_error(_('Select backup file first.'));
+ } else {
+ $filename = BACKUP_PATH . get_post('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'));
+ download_file(BACKUP_PATH . get_post('backups'));
exit;
}
-page(_("Backup and Restore Database"), false, false, '', '');
+page(_($help_context = "Backup and Restore Database"), false, false, '', '');
check_paths();
@@ -67,7 +70,7 @@ function get_backup_file_combo()
global $path_to_root, $Ajax;
$ar_files = array();
- default_focus('cmb_backups');
+ default_focus('backups');
$dh = opendir(BACKUP_PATH);
while (($file = readdir($dh)) !== false)
$ar_files[] = $file;
@@ -79,10 +82,10 @@ 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";
+ $Ajax->addUpdate('backups', "_backups_sel", $selector);
+ $selector = "".$selector."\n";
return $selector;
}
@@ -96,8 +99,8 @@ function compress_list_row($label, $name, $value=null)
if (function_exists("gzopen"))
$ar_comps['gzip'] = "gzip";
- echo "
$label | ";
- array_selector('comp', $value, $ar_comps);
+ echo " |
$label | ";
+ echo array_selector('comp', $value, $ar_comps);
echo " |
";
}
@@ -105,6 +108,7 @@ function download_file($filename)
{
if (empty($filename) || !file_exists($filename))
{
+ display_error(_('Select backup file first.'));
return false;
}
$saveasname = basename($filename);
@@ -121,19 +125,19 @@ $conn = $db_connections[$db_name];
if (get_post('creat')) {
generate_backup($conn, get_post('comp'), get_post('comments'));
- $Ajax->activate('cmd_backups');
+ $Ajax->activate('backups');
};
if (get_post('restore')) {
- if (db_import(BACKUP_PATH . get_post('cmb_backups'), $conn))
+ if (db_import(BACKUP_PATH . get_post('backups'), $conn))
display_notification(_("Restore backup completed."));
}
-if (get_post('delete')) {
- if (unlink(BACKUP_PATH . get_post('cmb_backups'))) {
+if (get_post('deldump')) {
+ if (unlink(BACKUP_PATH . get_post('backups'))) {
display_notification(_("File successfully deleted.")." "
- . _("Filename") . ": " . get_post('cmb_backups'));
- $Ajax->activate('cmd_backups');
+ . _("Filename") . ": " . get_post('backups'));
+ $Ajax->activate('backups');
}
else
display_error(_("Can't delete backup file."));
@@ -149,13 +153,13 @@ if (get_post('upload'))
elseif (is_uploaded_file($tmpname)) {
rename($tmpname, BACKUP_PATH . $fname);
display_notification( "File uploaded to backup directory");
- $Ajax->activate('cmd_backups');
+ $Ajax->activate('backups');
} else
display_error(_("File was not uploaded into the system."));
}
//-------------------------------------------------------------------------------
start_form(true, true);
-start_outer_table($table_style2);
+start_outer_table(TABLESTYLE2);
table_section(1);
table_section_title(_("Create backup"));
textarea_row(_("Comments:"), 'comments', null, 30, 8);
@@ -172,13 +176,11 @@ 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.
Do you want to continue ?'),
- get_post('cmb_backups'))
- ."\")) { JsHttpRequest.request(\"delete\"); }";
-
- submit_row('delete', _("Delete Backup"), false, '','', 'dialog');
+ submit_row('deldump', _("Delete Backup"), false, '','', true);
+ // don't use 'delete' name or IE js errors appear
+ submit_js_confirm('deldump', sprintf(_("You are about to remove selected backup file.\nDo you want to continue ?")));
end_table();
echo "";
end_row();