Added missing company settings to upgrade script, fixed company settings refreshing...

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

diff --git a/admin/backups.php b/admin/backups.php
index 8d7bfbc01f8fb739c244bba81b5f0dfde5824867..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 {
@@ -34,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."));
@@ -46,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;
        }
@@ -57,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);
@@ -70,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);
@@ -123,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'));
@@ -137,7 +140,7 @@ if (get_post('restore')) {
        if ($backup_name) {
                if (db_import($backup_path, $conn))
                        display_notification(_("Restore backup completed."));
-               refresh_sys_prefs(); // re-read system setup
+               $SysPrefs->refesh(); // re-read system setup
        } else
                display_error(_("Select backup file first."));
 }
@@ -164,8 +167,8 @@ if (get_post('upload'))
                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");
+                       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."));
@@ -209,4 +212,3 @@ end_outer_table();
 end_form();
 
 end_page();
-?>