X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fbackups.php;h=e4364def3b5537bd5ed4d3862e84c31a62fc11e3;hb=9481e23e6d03f39f7d9e745f86bd1be5f703b96d;hp=2831c131747a115e4a6917a87f5a6481c3f98cf0;hpb=bd8f517d30d1edd3261e26e582ddd9e11c555616;p=fa-stable.git
diff --git a/admin/backups.php b/admin/backups.php
index 2831c131..e4364def 100644
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -16,19 +16,17 @@ 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");
-define("BACKUP_PATH", $SysPrefs->comp_path.'/'.user_company()."/backup/");
-
if (get_post('view')) {
if (!get_post('backups')) {
display_error(_('Select backup file first.'));
} else {
- $filename = BACKUP_PATH . clean_file_name(get_post('backups'));
+ $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");
+ header("Content-Disposition: inline; filename=".basename($filename));
readfile($filename);
exit();
}
@@ -36,7 +34,7 @@ if (get_post('view')) {
};
if (get_post('download')) {
if (get_post('backups')) {
- download_file(BACKUP_PATH . clean_file_name(get_post('backups')));
+ download_file($SysPrefs->backup_dir().clean_file_name(get_post('backups')));
exit;
} else
display_error(_("Select backup file first."));
@@ -48,10 +46,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;
}
@@ -59,24 +59,26 @@ function check_paths()
function generate_backup($conn, $ext='no', $comm='')
{
- $filename = db_backup($conn, $ext, $comm, BACKUP_PATH);
+ 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('backups');
- $dh = opendir(BACKUP_PATH);
+ $dh = opendir($SysPrefs->backup_dir());
while (($file = readdir($dh)) !== false)
$ar_files[] = $file;
closedir($dh);
@@ -127,18 +129,19 @@ function download_file($filename)
$conn = $db_connections[user_company()];
$backup_name = clean_file_name(get_post('backups'));
-$backup_path = BACKUP_PATH . $backup_name;
+$backup_path = $SysPrefs->backup_dir() . $backup_name;
if (get_post('creat')) {
generate_backup($conn, get_post('comp'), get_post('comments'));
$Ajax->activate('backups');
+ $SysPrefs->refresh(); // re-read system setup
};
if (get_post('restore')) {
if ($backup_name) {
- if (db_import($backup_path, $conn))
+ if (db_import($backup_path, $conn, true, false, check_value('protected')))
display_notification(_("Restore backup completed."));
- refresh_sys_prefs(); // re-read system setup
+ $SysPrefs->refresh(); // re-read system setup
} else
display_error(_("Select backup file first."));
}
@@ -164,8 +167,10 @@ if (get_post('upload'))
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, BACKUP_PATH . $fname);
+ rename($tmpname, $SysPrefs->backup_dir() . $fname);
display_notification(_("File uploaded to backup directory"));
$Ajax->activate('backups');
} else
@@ -202,7 +207,12 @@ table_section_title(_("Backup scripts maintenance"));
echo "";
end_row();
start_row();
-echo "