Merged changes from main branch up to 2.1.3.

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

diff --git a/admin/backups.php b/admin/backups.php
index dd8c6639d49138c8238d440183497d879c1c4cea..18ca997279f7f38ab3b7f7f07c983bfa3d3cafbd 100644 (file)
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -16,6 +16,24 @@ 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");
 
+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('download')) {
+       download_file(BACKUP_PATH . get_post('cmb_backups'));
+       exit;
+}
+
 page(_("Backup and Restore Database"), false, false, '', '');
 
 check_paths();
@@ -61,7 +79,7 @@ function get_backup_file_combo()
                if (preg_match("/.sql(.zip|.gz)?$/", $file))
                $opt_files .= "<option value='$file'>$file</option>";
 
-       $selector = "<select name='cmb_backups' size=2 style='height:160px;width:230px'>$opt_files</select>";
+       $selector = "<select name='cmb_backups' size=2 style='height:160px;min-width:230px'>$opt_files</select>";
 
        $Ajax->addUpdate('cmd_backups', "_cmd_backups_sel", $selector);
        $selector = "<span id='_cmd_backups_sel'>".$selector."</span>\n";
@@ -111,24 +129,6 @@ if (get_post('restore')) {
                display_notification(_("Restore backup completed."));
 }
 
-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('download')) {
-       download_file(BACKUP_PATH . get_post('cmb_backups'));
-       exit;
-}
-
 if (get_post('delete')) {
        if (unlink(BACKUP_PATH . get_post('cmb_backups'))) {
                display_notification(_("File successfully deleted.")." "