X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fbackups.php;h=01ef0732acc41e8be64c2903e651c0a87a4eeec9;hb=3977695ae8f6c065a6eaa12d18812623e0e17181;hp=3f45f522872a00c5ff51528cb05881cb376513b4;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git
diff --git a/admin/backups.php b/admin/backups.php
index 3f45f522..01ef0732 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -17,21 +17,34 @@ 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 = $SysPrefs->backup_dir() . 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; filename=".basename($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')) {
- download_file(BACKUP_PATH . get_post('cmb_backups'));
- exit;
+ if (get_post('backups')) {
+ download_file($SysPrefs->backup_dir().clean_file_name(get_post('backups')));
+ exit;
+ } else
+ display_error(_("Select backup file first."));
}
page(_($help_context = "Backup and Restore Database"), false, false, '', '');
@@ -40,10 +53,12 @@ check_paths();
function check_paths()
{
- if (!file_exists(BACKUP_PATH)) {
+ global $SysPrefs;
+
+ if (!file_exists($SysPrefs->backup_dir())) {
display_error (_("Backup paths have not been set correctly.")
._("Please contact System Administrator.")."
"
- . _("cannot find backup directory") . " - " . BACKUP_PATH . "
");
+ . _("cannot find backup directory") . " - " . $SysPrefs->backup_dir() . "
");
end_page();
exit;
}
@@ -51,24 +66,26 @@ function check_paths()
function generate_backup($conn, $ext='no', $comm='')
{
- $filename = db_backup($conn, $ext, $comm);
+ global $SysPrefs;
+
+ $filename = db_backup($conn, $ext, $comm, $SysPrefs->backup_dir());
if ($filename)
display_notification(_("Backup successfully generated."). ' '
. _("Filename") . ": " . $filename);
else
display_error(_("Database backup failed."));
-
+
return $filename;
}
function get_backup_file_combo()
{
- global $path_to_root, $Ajax;
+ global $path_to_root, $Ajax, $SysPrefs;
$ar_files = array();
- default_focus('cmb_backups');
- $dh = opendir(BACKUP_PATH);
+ default_focus('backups');
+ $dh = opendir($SysPrefs->backup_dir());
while (($file = readdir($dh)) !== false)
$ar_files[] = $file;
closedir($dh);
@@ -79,10 +96,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 +113,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 +122,7 @@ function download_file($filename)
{
if (empty($filename) || !file_exists($filename))
{
+ display_error(_('Select backup file first.'));
return false;
}
$saveasname = basename($filename);
@@ -116,46 +134,61 @@ function download_file($filename)
return true;
}
-$db_name = $_SESSION["wa_current_user"]->company;
-$conn = $db_connections[$db_name];
+$conn = $db_connections[user_company()];
+$backup_name = clean_file_name(get_post('backups'));
+$backup_path = $SysPrefs->backup_dir() . $backup_name;
if (get_post('creat')) {
generate_backup($conn, get_post('comp'), get_post('comments'));
- $Ajax->activate('cmd_backups');
+ $Ajax->activate('backups');
+ $SysPrefs->refresh(); // re-read system setup
};
if (get_post('restore')) {
- if (db_import(BACKUP_PATH . get_post('cmb_backups'), $conn))
- display_notification(_("Restore backup completed."));
+ if ($backup_name) {
+ if (db_import($backup_path, $conn, true, false, check_value('protect')))
+ display_notification(_("Restore backup completed."));
+ $SysPrefs->refresh(); // re-read system setup
+ } else
+ display_error(_("Select backup file first."));
}
-if (get_post('delete')) {
- if (unlink(BACKUP_PATH . get_post('cmb_backups'))) {
- display_notification(_("File successfully deleted.")." "
- . _("Filename") . ": " . get_post('cmb_backups'));
- $Ajax->activate('cmd_backups');
- }
- else
- display_error(_("Can't delete backup file."));
-};
+if (get_post('deldump')) {
+ if ($backup_name) {
+ if (unlink($backup_path)) {
+ display_notification(_("File successfully deleted.")." "
+ . _("Filename") . ": " . $backup_name);
+ $Ajax->activate('backups');
+ }
+ else
+ display_error(_("Can't delete backup file."));
+ } else
+ display_error(_("Select backup file first."));
+}
if (get_post('upload'))
{
$tmpname = $_FILES['uploadfile']['tmp_name'];
- $fname = $_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');
+ $fname = trim(basename($_FILES['uploadfile']['name']));
+
+ if ($fname) {
+ if (!preg_match("/\.sql(\.zip|\.gz)?$/", $fname))
+ display_error(_("You can only upload *.sql backup files"));
+ elseif ($fname != clean_file_name($fname))
+ display_error(_("Filename contains forbidden chars. Please rename file and try again."));
+ elseif (is_uploaded_file($tmpname)) {
+ rename($tmpname, $SysPrefs->backup_dir() . $fname);
+ display_notification(_("File uploaded to backup directory"));
+ $Ajax->activate('backups');
+ } else
+ display_error(_("File was not uploaded into the system."));
} else
- display_error(_("File was not uploaded into the system."));
+ display_error(_("Select backup file first."));
+
}
//-------------------------------------------------------------------------------
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);
@@ -166,26 +199,31 @@ table_section(2);
table_section_title(_("Backup scripts maintenance"));
start_row();
- echo "".get_backup_file_combo()." | ";
- echo "";
+ echo " | ".get_backup_file_combo()." | ";
+ echo "";
start_table();
- submit_row('view',_("View Backup"), false, '', '', true);
- submit_row('download',_("Download Backup"), false, '', '', false);
+ submit_row('view',_("View 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?"));
- 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();
start_row();
-echo " | ";
- submit_cells('upload',_("Upload file"),'', '', true);
+ echo ""
+ . radio(_('Update security settings'), 'protect', 0) . ' '
+ . radio(_('Protect security settings'), 'protect', 1, true) . " | ";
+end_row();
+start_row();
+ echo " | ";
+ submit_cells('upload',_("Upload file"),"style='padding-left:20px'", '', true);
end_row();
end_outer_table();
end_form();
end_page();
-?>