Fixed db_import to allow select/delete queries in upgrade files.

[fa-stable.git] / admin / backups.php

diff --git a/admin/backups.php b/admin/backups.php
index 2193486ba9210d22bf8f5dc0add07e2e5874fa1b..0c039dea42205b6a2f482b2d226b09a90f96c8c9 100644 (file)
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -20,7 +20,7 @@ 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 {
@@ -33,8 +33,11 @@ if (get_post('view')) {
        }
 };
 if (get_post('download')) {
-       download_file(BACKUP_PATH . clean_file_name(get_post('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, '', '');
@@ -43,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.")."<br>" 
-                       . _("cannot find backup directory") . " - " . BACKUP_PATH . "<br>");
+                       . _("cannot find backup directory") . " - " . $SysPrefs->backup_dir() . "<br>");
                end_page();
                exit;
        }
@@ -54,7 +59,9 @@ 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);
@@ -67,11 +74,11 @@ function generate_backup($conn, $ext='no', $comm='')
 
 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);
@@ -120,10 +127,9 @@ 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 = BACKUP_PATH . $backup_name;
+$backup_path = $SysPrefs->backup_dir() . $backup_name;
 
 if (get_post('creat')) {
        generate_backup($conn, get_post('comp'), get_post('comments'));
@@ -131,19 +137,25 @@ if (get_post('creat')) {
 };
 
 if (get_post('restore')) {
-       if (db_import($backup_path, $conn))
-               display_notification(_("Restore backup completed."));
-       refresh_sys_prefs(); // re-read system setup
+       if ($backup_name) {
+               if (db_import($backup_path, $conn))
+                       display_notification(_("Restore backup completed."));
+               $SysPrefs->refesh(); // re-read system setup
+       } else
+               display_error(_("Select backup file first."));
 }
 
 if (get_post('deldump')) {
-       if (unlink($backup_path)) {
-               display_notification(_("File successfully deleted.")." "
-                               . _("Filename") . ": " . $backup_name);
-               $Ajax->activate('backups');
-       }
-       else
-               display_error(_("Can't delete backup file."));
+       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'))
@@ -151,14 +163,18 @@ if (get_post('upload'))
        $tmpname = $_FILES['uploadfile']['tmp_name'];
        $fname = trim(basename($_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('backups');
+       if ($fname) {
+               if (!preg_match("/\.sql(\.zip|\.gz)?$/", $fname))
+                       display_error(_("You can only upload *.sql backup files"));
+               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);
@@ -173,8 +189,8 @@ table_section(2);
 table_section_title(_("Backup scripts maintenance"));
 
        start_row();
-       echo "<td style='padding-left:20px'align='left'>".get_backup_file_combo()."</td>";
-       echo "<td valign='top'>";
+       echo "<td style='padding-left:20px' align='left'>".get_backup_file_combo()."</td>";
+       echo "<td style='padding-left:20px' valign='top'>";
        start_table();
        submit_row('view',_("View Backup"), false, '', '', false);
        submit_row('download',_("Download Backup"), false, '', '', false);
@@ -189,11 +205,10 @@ table_section_title(_("Backup scripts maintenance"));
        end_row();
 start_row();
 echo "<td style='padding-left:20px' align='left'><input name='uploadfile' type='file'></td>";
-       submit_cells('upload',_("Upload file"),'', '', true);
+       submit_cells('upload',_("Upload file"),"style='padding-left:20px'", '', true);
 end_row();
 end_outer_table();
 
 end_form();
 
 end_page();
-?>