X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fbackups.php;h=24ec77b68a33d268368acdf744af544c41869340;hb=66a62190f99d83f958bb98195b5756b8b307e378;hp=efa78619d75a2fae547ad16be348bbf8b19a114e;hpb=a71350aae19e5abbfdac6b0552664897f98c5557;p=fa-stable.git
diff --git a/admin/backups.php b/admin/backups.php
index efa78619..24ec77b6 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -17,20 +17,23 @@ 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 . clean_file_name(get_post('backups'));
+ if (in_ajax())
+ $Ajax->popup( $filename );
+ else {
+ header('Content-type: text/plain');
+ header('Content-Length: '.filesize($filename));
+ header("Content-Disposition: inline");
+ readfile($filename);
+ exit();
+ }
}
};
-
if (get_post('download')) {
- download_file(BACKUP_PATH . get_post('cmb_backups'));
+ download_file(BACKUP_PATH . clean_file_name(get_post('backups')));
exit;
}
@@ -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,7 +99,7 @@ function compress_list_row($label, $name, $value=null)
if (function_exists("gzopen"))
$ar_comps['gzip'] = "gzip";
- echo "
$label | ";
+ 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);
@@ -118,44 +122,46 @@ function download_file($filename)
$db_name = $_SESSION["wa_current_user"]->company;
$conn = $db_connections[$db_name];
+$backup_name = clean_file_name(get_post('backups'));
+$backup_path = BACKUP_PATH . $backup_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, $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)) {
display_notification(_("File successfully deleted.")." "
- . _("Filename") . ": " . get_post('cmb_backups'));
- $Ajax->activate('cmd_backups');
+ . _("Filename") . ": " . $backup_name);
+ $Ajax->activate('backups');
}
else
display_error(_("Can't delete backup file."));
-};
+}
if (get_post('upload'))
{
$tmpname = $_FILES['uploadfile']['tmp_name'];
- $fname = $_FILES['uploadfile']['name'];
+ $fname = clean_file_name($FILES['uploadfile']['name']);
if (!preg_match("/.sql(.zip|.gz)?$/", $fname))
display_error(_("You can only upload *.sql backup files"));
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);
@@ -169,13 +175,14 @@ table_section_title(_("Backup scripts maintenance"));
echo "".get_backup_file_combo()." | ";
echo "";
start_table();
- submit_row('view',_("View Backup"), false, '', '', true);
+ submit_row('view',_("View Backup"), false, '', '', false);
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?"));
- 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 ?")));
+ 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();