Skip to content

Commit

Permalink
[TASK] PSR-2 codestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
Markus Sommer committed Oct 10, 2015
1 parent 299d91c commit a7ef1e8
Show file tree
Hide file tree
Showing 14 changed files with 477 additions and 447 deletions.
100 changes: 52 additions & 48 deletions Classes/Command/BackupCommandController.php
View file
Expand Up @@ -36,59 +36,63 @@
*
* @author Markus Sommer
*/
class BackupCommandController extends CommandController {
class BackupCommandController extends CommandController
{

/**
* @var string
*/
protected $backupPath = '';
/**
* @var string
*/
protected $backupPath = '';

/**
* @var int
*/
protected $backupsToKeep = 3;
/**
* @var int
*/
protected $backupsToKeep = 3;

/**
* Backup all files and folders in the given folder
*
* @param string $folder Folder to backup
* @param int $backupsToKeep Backups to keep
* @return void
*/
public function filesBackupCommand($folder, $backupsToKeep = 3) {
$this->backupPath = PATH_site . 'backup/files/' . $folder . '/';
$this->backupsToKeep = $backupsToKeep;
/**
* Backup all files and folders in the given folder
*
* @param string $folder Folder to backup
* @param int $backupsToKeep Backups to keep
* @return void
*/
public function filesBackupCommand($folder, $backupsToKeep = 3)
{
$this->backupPath = PATH_site . 'backup/files/' . $folder . '/';
$this->backupsToKeep = $backupsToKeep;

self::backupFolder($folder);
BackupUtility::removeOldBackups($this->backupPath, $this->backupsToKeep);
}
self::backupFolder($folder);
BackupUtility::removeOldBackups($this->backupPath, $this->backupsToKeep);
}

/**
* @param int $backupsToKeep
* @return void
*/
public function dbBackupCommand($backupsToKeep = 3) {
$this->backupPath = PATH_site . 'backup/database/';
$this->backupsToKeep = $backupsToKeep;
/**
* @param int $backupsToKeep
* @return void
*/
public function dbBackupCommand($backupsToKeep = 3)
{
$this->backupPath = PATH_site . 'backup/database/';
$this->backupsToKeep = $backupsToKeep;

BackupUtility::backupTable($this->backupPath);
BackupUtility::removeOldBackups($this->backupPath, $this->backupsToKeep);
}
BackupUtility::backupTable($this->backupPath);
BackupUtility::removeOldBackups($this->backupPath, $this->backupsToKeep);
}

/**
* @param string $folder
*
* @return bool
*/
protected function backupFolder($folder) {
GeneralUtility::mkdir_deep($this->backupPath);
$compressedFileName = $folder . '_' . time() . '.tar';
$phar = new \PharData($this->backupPath . $compressedFileName);
if ($phar->buildFromDirectory(PATH_site . $folder, '/^(?!_temp_|_processed_|_recycler_).*/')) {
BackupUtility::generateBackupLog($folder, $compressedFileName . '.gz', $this->backupPath, $this->backupsToKeep);
BackupUtility::gzCompressFile($this->backupPath . $compressedFileName);
return TRUE;
}
return FALSE;
}
/**
* @param string $folder
*
* @return bool
*/
protected function backupFolder($folder)
{
GeneralUtility::mkdir_deep($this->backupPath);
$compressedFileName = $folder . '_' . time() . '.tar';
$phar = new \PharData($this->backupPath . $compressedFileName);
if ($phar->buildFromDirectory(PATH_site . $folder, '/^(?!_temp_|_processed_|_recycler_).*/')) {
BackupUtility::generateBackupLog($folder, $compressedFileName . '.gz', $this->backupPath, $this->backupsToKeep);
BackupUtility::gzCompressFile($this->backupPath . $compressedFileName);
return true;
}
return false;
}
}
143 changes: 74 additions & 69 deletions Classes/Controller/BackupController.php
View file
Expand Up @@ -35,77 +35,82 @@
*
* @author Markus Sommer
*/
class BackupController extends ActionController {
class BackupController extends ActionController
{

/**
* Action list
*
* @return void
*/
public function indexAction() {
$backupDirectories = GeneralUtility::get_dirs(PATH_site . 'backup/files/');
if (is_array($backupDirectories)) {
foreach ($backupDirectories as $backupDirectory) {
$fileBackups[$backupDirectory] =
self::getBackupsByFile('backup/files/' . $backupDirectory . '/backup.log');
}
}
if (!empty($fileBackups)) {
$this->view->assign('fileBackups', $fileBackups);
}
$databaseBackups = self::getBackupsByFile('backup/database/backup.log');
if (!empty($databaseBackups)) {
$this->view->assign('databaseBackups', $databaseBackups);
}
$this->view->assign('pathSite', PATH_site);
}
/**
* Action list
*
* @return void
*/
public function indexAction()
{
$backupDirectories = GeneralUtility::get_dirs(PATH_site . 'backup/files/');
if (is_array($backupDirectories)) {
foreach ($backupDirectories as $backupDirectory) {
$fileBackups[$backupDirectory] =
self::getBackupsByFile('backup/files/' . $backupDirectory . '/backup.log');
}
}
if (!empty($fileBackups)) {
$this->view->assign('fileBackups', $fileBackups);
}
$databaseBackups = self::getBackupsByFile('backup/database/backup.log');
if (!empty($databaseBackups)) {
$this->view->assign('databaseBackups', $databaseBackups);
}
$this->view->assign('pathSite', PATH_site);
}

/**
* Database Backup Action
*
* @return void
*/
public function dbBackupAction() {
$path = BackupUtility::backupTable(PATH_site . 'backup/database/');
// TODO: translate messages
$this->addFlashMessage('Datei geschieben ' . $path, 'Backup vollständig');
$this->forward('index');
}
/**
* Database Backup Action
*
* @return void
*/
public function dbBackupAction()
{
$path = BackupUtility::backupTable(PATH_site . 'backup/database/');
// TODO: translate messages
$this->addFlashMessage('Datei geschieben ' . $path, 'Backup vollständig');
$this->forward('index');
}

/**
* Remove empty values from array Recursively
*
* @param array $array The given array
* @return void
*/
static public function removeEmptyValuesRecursively(array &$array = array()) {
foreach ($array as $index => $value) {
if (empty($value)) {
unset($array[$index]);
} elseif (is_array($value)) {
self::removeEmptyValuesRecursively($value);
}
}
}
/**
* Remove empty values from array Recursively
*
* @param array $array The given array
* @return void
*/
static public function removeEmptyValuesRecursively(array &$array = array())
{
foreach ($array as $index => $value) {
if (empty($value)) {
unset($array[$index]);
} elseif (is_array($value)) {
self::removeEmptyValuesRecursively($value);
}
}
}

/**
* Get the files from Log
*
* @param string $logfile The log file
* @return array|string
*/
protected function getBackupsByFile($logfile) {
$backupFile = PATH_site . $logfile;
if (file_exists($backupFile)) {
$backupArray = array();
$backupsLog = explode(PHP_EOL, file_get_contents($backupFile));
foreach ($backupsLog as $backupsLogLine) {
$backupArray[] = unserialize($backupsLogLine);
}
self::removeEmptyValuesRecursively($backupArray);
return $backupArray;
}
// FIXME: return empty array instead
return '';
}
/**
* Get the files from Log
*
* @param string $logfile The log file
* @return array|string
*/
protected function getBackupsByFile($logfile)
{
$backupFile = PATH_site . $logfile;
if (file_exists($backupFile)) {
$backupArray = array();
$backupsLog = explode(PHP_EOL, file_get_contents($backupFile));
foreach ($backupsLog as $backupsLogLine) {
$backupArray[] = unserialize($backupsLogLine);
}
self::removeEmptyValuesRecursively($backupArray);
return $backupArray;
}
// FIXME: return empty array instead
return '';
}
}

0 comments on commit a7ef1e8

Please sign in to comment.