X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fbackups.php;h=4bf99a4207a82c558ee02fb332ece51e98b67b00;hb=204e03f5e1658c9c7ba2b13580ecb3290b624ba7;hp=728d3f29dde29877efd2528e5cb453a122fcd0f2;hpb=fc72e71a81a7d2c9d68eabbb1200d4c0cbf17f6e;p=fa-stable.git

diff --git a/admin/backups.php b/admin/backups.php
index 728d3f29..4bf99a42 100644
--- 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,24 +17,27 @@ 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('backups')) {
+		display_error(_('Select backup file first.'));
+	} else {
+		$filename = BACKUP_PATH . get_post('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'));
+	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 +54,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 +70,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 +82,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 +100,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>";
 }
 
@@ -110,6 +108,7 @@ function download_file($filename)
 {
     if (empty($filename) || !file_exists($filename))
     {
+		display_error(_('Select backup file first.'));
         return false;
     }
     $saveasname = basename($filename);
@@ -126,19 +125,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 +153,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 +176,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();