Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.6.0 1948 fix backup #1952

Merged
merged 7 commits into from
Feb 22, 2017
Merged

2.6.0 1948 fix backup #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a704560
Cleanup Backup Utility
crossan007 Feb 20, 2017
0ec4409
Cleanup restores
crossan007 Feb 20, 2017
a814d39
Merge branch 'master' into 2.6.0-1948-fix-backup
crossan007 Feb 20, 2017
86bedc4
fix sql.gz
crossan007 Feb 20, 2017
b9d65b1
ignore all temp attach files
crossan007 Feb 20, 2017
adb4e9f
Apply fixes from StyleCI
DawoudIO Feb 20, 2017
04f7e8f
Merge pull request #1954 from ChurchCRM/analysis-XVoNbw
crossan007 Feb 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ src/ChurchCRM/model/ChurchCRM/Base
src/ChurchCRM/model/ChurchCRM/Map
src/signatures.json
src/integrityCheck.json
src/tmp_attach
10 changes: 6 additions & 4 deletions src/ChurchCRM/FileSystemUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@
{
class FileSystemUtils
{
public static function recursiveRemoveDirectory($directory)
public static function recursiveRemoveDirectory($directory, $retainParentFolderAndFiles=false)
{
//sourced from http://stackoverflow.com/questions/11267086/php-unlink-all-files-within-a-directory-and-then-deleting-that-directory
foreach (glob("{$directory}/*") as $file) {
if (is_dir($file)) {
self::recursiveRemoveDirectory($file);
} else {
self::recursiveRemoveDirectory($file, false);
} elseif (!$retainParentFolderAndFiles) {
unlink($file);
}
}
rmdir($directory);
if (!$retainParentFolderAndFiles) {
rmdir($directory);
}
}

public static function recursiveCopyDirectory($src, $dst)
Expand Down
45 changes: 20 additions & 25 deletions src/ChurchCRM/Service/SystemService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,43 +50,43 @@ public function restoreDatabaseFromBackup($file)
$restoreResult->type = pathinfo($file['name'], PATHINFO_EXTENSION);
$restoreResult->type2 = pathinfo(mb_substr($file['name'], 0, strlen($file['name']) - 3), PATHINFO_EXTENSION);
$restoreResult->root = SystemURLs::getDocumentRoot();
$restoreResult->backupRoot = SystemURLs::getDocumentRoot() . '/tmp_attach/';
$restoreResult->imagesRoot = 'Images';
$restoreResult->headers = [];
$restoreResult->uploadedFileDestination = SystemURLs::getDocumentRoot() . '/tmp_attach/' . $file['name'];
$restoreResult->backupRoot = SystemURLs::getDocumentRoot() . '/tmp_attach/';
$restoreResult->backupDir = $restoreResult->backupRoot . '/ChurchCRMRestores/';
$restoreResult->uploadedFileDestination = $restoreResult->backupDir . '/' . $file['name'];
// Delete any old backup files
FileSystemUtils::recursiveRemoveDirectory($restoreResult->backupRoot);
mkdir($restoreResult->backupRoot);
FileSystemUtils::recursiveRemoveDirectory($restoreResult->backupRoot,true);
mkdir($restoreResult->backupDir);
move_uploaded_file($file['tmp_name'], $restoreResult->uploadedFileDestination);
if ($restoreResult->type == 'gz') {
if ($restoreResult->type2 == 'tar') {
$phar = new PharData($restoreResult->uploadedFileDestination);
$phar->extractTo($restoreResult->backupRoot);
$restoreResult->SQLfile = "$restoreResult->backupRoot/ChurchCRM-Database.sql";
$phar->extractTo($restoreResult->backupDir);
$restoreResult->SQLfile = "$restoreResult->backupDir/ChurchCRM-Database.sql";
if (file_exists($restoreResult->SQLfile))
{
SQLUtils::sqlImport($restoreResult->SQLfile, $connection);
FileSystemUtils::recursiveRemoveDirectory(SystemURLs::getDocumentRoot() . '/Images');
FileSystemUtils::recursiveCopyDirectory($restoreResult->backupRoot . '/Images/', SystemURLs::getDocumentRoot() . '/Images');
FileSystemUtils::recursiveCopyDirectory($restoreResult->backupDir . '/Images/', SystemURLs::getImagesRoot());
}
else
{
FileSystemUtils::recursiveRemoveDirectory($restoreResult->backupRoot);
FileSystemUtils::recursiveRemoveDirectory($restoreResult->backupDir,true);
throw new Exception(gettext("Backup archive does not contain a database").": " . $file['name']);
}

} elseif ($restoreResult->type2 == 'sql') {
$restoreResult->SQLfile = SystemURLs::getDocumentRoot() . '/tmp_attach/' . str_replace('.gz', '', $file['name']);
$restoreResult->SQLfile = $restoreResult->backupDir . str_replace('.gz', '', $file['name']);
file_put_contents($restoreResult->SQLfile, gzopen($restoreResult->uploadedFileDestination, r));
SQLUtils::sqlImport($restoreResult->SQLfile, $connection);
}
} elseif ($restoreResult->type == 'sql') {
SQLUtils::sqlImport($restoreResult->uploadedFileDestination, $connection);
} else {
FileSystemUtils::recursiveRemoveDirectory($restoreResult->backupRoot);
FileSystemUtils::recursiveRemoveDirectory($restoreResult->backupDir,true);
throw new Exception(gettext("Unknown File Type").": " . $restoreResult->type . " ".gettext("from file").": " . $file['name']);
}
FileSystemUtils::recursiveRemoveDirectory($restoreResult->backupRoot);
FileSystemUtils::recursiveRemoveDirectory($restoreResult->backupRoot,true);
$restoreResult->UpgradeStatus = $this->upgradeDatabaseVersion();
SQLUtils::sqlImport(SystemURLs::getDocumentRoot() . '/mysql/upgrade/rebuild_nav_menus.sql', $connection);
//When restoring a database, do NOT let the database continue to create remote backups.
Expand All @@ -103,19 +103,14 @@ public function getDatabaseBackup($params)
requireUserGroupMembership('bAdmin');
global $sSERVERNAME, $sDATABASE, $sUSER, $sPASSWORD;
$backup = new \stdClass();
$backup->root = SystemURLs::getDocumentRoot();
$backup->backupRoot = "$backup->root/tmp_attach/ChurchCRMBackups";
$backup->imagesRoot = "$backup->root/Images";
$backup->backupRoot = SystemURLs::getDocumentRoot() . "/tmp_attach";
$backup->backupDir = $backup->backupRoot."/ChurchCRMBackups";
FileSystemUtils::recursiveRemoveDirectory($backup->backupRoot,true);
mkdir($backup->backupDir,077,true);
$backup->headers = [];
// Delete any old backup files
FileSystemUtils::recursiveRemoveDirectory($backup->backupRoot);
mkdir($backup->backupRoot);

$backup->params = $params;
$bNoErrors = true;

$backup->saveTo = "$backup->backupRoot/ChurchCRM-" . date(SystemConfig::getValue("sDateFilenameFormat"));
$backup->SQLFile = "$backup->backupRoot/ChurchCRM-Database.sql";
$backup->saveTo = "$backup->backupDir/ChurchCRM-" . date(SystemConfig::getValue("sDateFilenameFormat"));
$backup->SQLFile = "$backup->backupDir/ChurchCRM-Database.sql";

try {
$dump = new Mysqldump('mysql:host=' . $sSERVERNAME . ';dbname=' . $sDATABASE, $sUSER, $sPASSWORD, ['add-drop-table' => true]);
Expand All @@ -140,7 +135,7 @@ public function getDatabaseBackup($params)
$phar = new \PharData($backup->saveTo);
$phar->startBuffering();
$phar->addFile($backup->SQLFile, 'ChurchCRM-Database.sql');
$imageFiles = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($backup->imagesRoot));
$imageFiles = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(SystemURLs::getImagesRoot()));
foreach ($imageFiles as $imageFile) {
if (!$imageFile->isDir()) {
$localName = str_replace(SystemURLs::getDocumentRoot() . '/', '', $imageFile->getRealPath());
Expand Down Expand Up @@ -260,7 +255,7 @@ public function download($filename)
}
}
fclose($fd);
FileSystemUtils::recursiveRemoveDirectory(SystemURLs::getDocumentRoot() . '/tmp_attach/ChurchCRMBackups');
FileSystemUtils::recursiveRemoveDirectory(SystemURLs::getDocumentRoot() . '/tmp_attach/',true);
}
}

Expand Down
1 change: 1 addition & 0 deletions src/tmp_attach/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Deny from all
Empty file removed src/tmp_attach/index.html
View file
Open in desktop
Empty file.