mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-02-06 07:04:57 +00:00
use backup dir for backup archives and sql dumps
This commit is contained in:
parent
88a607ccd3
commit
ce420a78eb
|
@ -31,8 +31,12 @@ if (!$user->isAdmin()) {
|
|||
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
|
||||
}
|
||||
|
||||
if (!$settings->_backupDir) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("no_backup_dir"));
|
||||
}
|
||||
|
||||
$v = new SeedDMS_Version;
|
||||
$dump_name = $settings->_contentDir.date('Y-m-d\TH-i-s')."_".$v->_number.".sql";
|
||||
$dump_name = addDirSep($settings->_backupDir).date('Y-m-d\TH-i-s')."_".$v->_number.".sql";
|
||||
if(!$dms->createDump($dump_name))
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
|
||||
|
||||
|
|
|
@ -167,10 +167,14 @@ if (!is_object($folder)) {
|
|||
UI::exitError(getMLText("admin_tools"),getMLText("invalid_folder_id"));
|
||||
}
|
||||
|
||||
if (!$settings->_backupDir) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("no_backup_dir"));
|
||||
}
|
||||
|
||||
$human_readable = (isset($_GET["human_readable"]) && $_GET["human_readable"]==1 ? true : false);
|
||||
|
||||
if ($human_readable)$ark_name = $settings->_contentDir.time()."_".$folderid."_HR.tar";
|
||||
else $ark_name = $settings->_contentDir.time()."_".$folderid.".tar";
|
||||
if ($human_readable)$ark_name = addDirSep($settings->_backupDir).time()."_".$folderid."_HR.tar";
|
||||
else $ark_name = addDirSep($settings->_backupDir).time()."_".$folderid.".tar";
|
||||
|
||||
$ark = fopen($ark_name,"w");
|
||||
|
||||
|
|
|
@ -126,19 +126,20 @@ elseif (isset($_GET["arkname"])) { /* {{{ */
|
|||
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
|
||||
}
|
||||
|
||||
if (!file_exists($settings->_contentDir.$filename) ) {
|
||||
$backupdir = addDirSep($settings->_backupDir);
|
||||
if (!file_exists($backupdir.$filename) ) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
|
||||
}
|
||||
|
||||
header('Content-Description: File Transfer');
|
||||
header("Content-Type: application/zip");
|
||||
header("Content-Transfer-Encoding: binary");
|
||||
header("Content-Length: " . filesize($settings->_contentDir . $filename ));
|
||||
header("Content-Length: " . filesize($backupdir . $filename ));
|
||||
$efilename = rawurlencode($filename);
|
||||
header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
|
||||
header("Cache-Control: must-revalidate");
|
||||
|
||||
sendFile($settings->_contentDir .$filename );
|
||||
sendFile($backupdir .$filename );
|
||||
|
||||
} /* }}} */
|
||||
elseif (isset($_GET["logname"])) { /* {{{ */
|
||||
|
@ -206,18 +207,23 @@ elseif (isset($_GET["dumpname"])) { /* {{{ */
|
|||
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
|
||||
}
|
||||
|
||||
if (!file_exists($settings->_contentDir.$filename) ) {
|
||||
$backupdir = addDirSep($settings->_backupDir);
|
||||
if (!$backupdir) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("no_backup_dir"));
|
||||
}
|
||||
|
||||
if (!file_exists($backupdir.$filename) ) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
|
||||
}
|
||||
|
||||
header("Content-Type: application/zip");
|
||||
header("Content-Transfer-Encoding: binary");
|
||||
header("Content-Length: " . filesize($settings->_contentDir . $filename ));
|
||||
header("Content-Length: " . filesize($backupdir . $filename ));
|
||||
$efilename = rawurlencode($filename);
|
||||
header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
|
||||
header("Cache-Control: must-revalidate");
|
||||
|
||||
sendFile($settings->_contentDir .$filename );
|
||||
sendFile($backupdir .$filename );
|
||||
} elseif (isset($_GET["reviewlogid"])) {
|
||||
if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
|
||||
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
|
||||
|
|
|
@ -35,11 +35,11 @@ if(!checkFormKey('removearchive')) {
|
|||
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
|
||||
}
|
||||
|
||||
if (!isset($_POST["arkname"]) || !file_exists($settings->_contentDir.$_POST["arkname"]) ) {
|
||||
if (!isset($_POST["arkname"]) || !file_exists(addDirSep($settings->_backupDir).$_POST["arkname"]) ) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
|
||||
}
|
||||
|
||||
if (!SeedDMS_Core_File::removeFile($settings->_contentDir.$_POST["arkname"])) {
|
||||
if (!SeedDMS_Core_File::removeFile(addDirSep($settings->_backupDir).$_POST["arkname"])) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
|
||||
}
|
||||
|
||||
|
|
|
@ -35,11 +35,11 @@ if(!checkFormKey('removedump')) {
|
|||
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
|
||||
}
|
||||
|
||||
if (!isset($_POST["dumpname"]) || !file_exists($settings->_contentDir.$_POST["dumpname"]) ) {
|
||||
if (!isset($_POST["dumpname"]) || !file_exists(addDirSep($settings->_backupDir).$_POST["dumpname"]) ) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
|
||||
}
|
||||
|
||||
if (!SeedDMS_Core_File::removeFile($settings->_contentDir.$_POST["dumpname"])) {
|
||||
if (!SeedDMS_Core_File::removeFile($settings->_backupDir.$_POST["dumpname"])) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
|
||||
}
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
/
|
||||
|
||||
if(!isset($settings))
|
||||
require_once("../inc/inc.Settings.php");
|
||||
require_once("inc/inc.LogInit.php");
|
||||
|
@ -33,7 +33,7 @@ if (!$user->isAdmin()) {
|
|||
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
|
||||
}
|
||||
|
||||
if (!isset($_GET["arkname"]) || !file_exists($settings->_contentDir.$_GET["arkname"]) ) {
|
||||
if (!isset($_GET["arkname"]) || !file_exists(addDirSep($settings->_backupDir).$_GET["arkname"]) ) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
|
||||
}
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ if (!$user->isAdmin()) {
|
|||
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
|
||||
}
|
||||
|
||||
if (!isset($_GET["dumpname"]) || !file_exists($settings->_contentDir.$_GET["dumpname"]) ) {
|
||||
if (!isset($_GET["dumpname"]) || !file_exists(addDirSep($settings->_backupDir).$_GET["dumpname"]) ) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user