Improved error checking during company update/creation.

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

diff --git a/admin/backups.php b/admin/backups.php
index 728d3f29dde29877efd2528e5cb453a122fcd0f2..a70a2846e55c96a7a8fcae67221f648d0da7b5fa 100644 (file)
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 15;
+$page_security = 'SA_BACKUP';
 
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
@@ -17,7 +17,7 @@ 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');
+       $filename = BACKUP_PATH . get_post('backups');
        if (in_ajax()) 
                $Ajax->popup( $filename );
        else {
@@ -30,11 +30,11 @@ if (get_post('view')) {
 };
 
 if (get_post('download')) {
-       download_file(BACKUP_PATH . get_post('cmb_backups'));
+       download_file(BACKUP_PATH . get_post('backups'));
        exit;
 }
 
-page(_("Backup and Restore Database"), false, false, '', '');
+page(_($help_context = "Backup and Restore Database"), false, false, '', '');
 
 check_paths();
 
@@ -51,12 +51,7 @@ function check_paths()
 
 function generate_backup($conn, $ext='no', $comm='')
 {
-       if ($conn['tbpref'] != "")
-               $filename = $conn['dbname'] . "_" . $conn['tbpref'] . date("Ymd_Hi") . ".sql";
-       else
-               $filename = $conn['dbname'] . "_" . date("Ymd_Hi") . ".sql";
-
-       $filename = db_export($conn, $filename, $ext, $comm);
+       $filename = db_backup($conn, $ext, $comm);
        if ($filename)
                display_notification(_("Backup successfully generated."). ' '
                        . _("Filename") . ": " . $filename);
@@ -72,7 +67,7 @@ function get_backup_file_combo()
        global $path_to_root, $Ajax;
        
        $ar_files = array();
-    default_focus('cmb_backups');
+    default_focus('backups');
     $dh = opendir(BACKUP_PATH);
        while (($file = readdir($dh)) !== false)
                $ar_files[] = $file;
@@ -84,10 +79,10 @@ 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;min-width:230px'>$opt_files</select>";
+       $selector = "<select name='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";
+       $Ajax->addUpdate('backups', "_backups_sel", $selector);
+       $selector = "<span id='_backups_sel'>".$selector."</span>\n";
 
        return $selector;
 }
@@ -102,7 +97,7 @@ function compress_list_row($label, $name, $value=null)
        $ar_comps['gzip'] = "gzip";
 
        echo "<tr><td>$label</td><td>";
-       array_selector('comp', $value, $ar_comps);
+       echo array_selector('comp', $value, $ar_comps);
        echo "</td></tr>";
 }
 
@@ -126,19 +121,19 @@ $conn = $db_connections[$db_name];
 
 if (get_post('creat')) {
        generate_backup($conn, get_post('comp'), get_post('comments'));
-       $Ajax->activate('cmd_backups');
+       $Ajax->activate('backups');
 };
 
 if (get_post('restore')) {
-       if (db_import(BACKUP_PATH . get_post('cmb_backups'), $conn))
+       if (db_import(BACKUP_PATH . get_post('backups'), $conn))
                display_notification(_("Restore backup completed."));
 }
 
-if (get_post('delete')) {
-       if (unlink(BACKUP_PATH . get_post('cmb_backups'))) {
+if (get_post('deldump')) {
+       if (unlink(BACKUP_PATH . get_post('backups'))) {
                display_notification(_("File successfully deleted.")." "
-                               . _("Filename") . ": " . get_post('cmb_backups'));
-               $Ajax->activate('cmd_backups');
+                               . _("Filename") . ": " . get_post('backups'));
+               $Ajax->activate('backups');
        }
        else
                display_error(_("Can't delete backup file."));
@@ -154,7 +149,7 @@ if (get_post('upload'))
        elseif (is_uploaded_file($tmpname)) {
                rename($tmpname, BACKUP_PATH . $fname);
                display_notification( "File uploaded to backup directory");
-               $Ajax->activate('cmd_backups');
+               $Ajax->activate('backups');
        } else
                display_error(_("File was not uploaded into the system."));
 }
@@ -177,13 +172,11 @@ table_section_title(_("Backup scripts maintenance"));
        submit_row('view',_("View Backup"), false, '', '', true);
        submit_row('download',_("Download Backup"), false, '', '', false);
        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?"));
 
-       $js = "if(confirm(\""
-               .sprintf(_('You are about to remove %s backup file.<br> Do you want to continue ?'),
-                       get_post('cmb_backups'))
-               ."\")) { JsHttpRequest.request(\"delete\"); }";
-
-       submit_row('delete', _("Delete Backup"), false, '','', 'dialog');
+       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 "</td>";
        end_row();