tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/setup-config-directory-config-should-use-mkdir-p-instead-of-mkdir-10126' 

fixes #10126
This commit is contained in:
Eric Lippmann 2015-12-21 11:13:13 +01:00
parent dad9538496 a14481a96b
commit ed5c2c4190
2 changed files with 1 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/setup/application/clicommands/ConfigCommand.php
View File

@ -54,7 +54,7 @@ class ConfigCommand extends Command
));
}
if (! file_exists($configDir) && ! @mkdir($configDir)) {
if (! file_exists($configDir) && ! @mkdir($configDir, 0755, true)) {
$e = error_get_last();
$this->fail(sprintf(
$this->translate('Can\'t create configuration directory %s: %s'),

70
modules/setup/library/Setup/Utils/MakeDirStep.php
View File

@ -1,70 +0,0 @@
<?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Module\Setup\Utils;
use Icinga\Module\Setup\Step;
class MakeDirStep extends Step
{
protected $paths;
protected $dirmode;
protected $errors;
/**
* @param array $paths
* @param int $dirmode
*/
public function __construct($paths, $dirmode)
{
$this->paths = $paths;
$this->dirmode = $dirmode;
$this->errors = array();
}
public function apply()
{
$success = true;
foreach ($this->paths as $path) {
if (false === file_exists($path)) {
if (false === @mkdir($path)) {
$this->errors[$path] = error_get_last();
$success = false;
} else {
$this->errors[$path] = null;
chmod($path, $this->dirmode);
}
}
}
return $success;
}
public function getSummary()
{
// This step is usually being used for directories which are required for the configuration but
// are not defined in any way by the user. So there is no need to show a summary for this step.
}
public function getReport()
{
$okMessage = mt('setup', 'Directory "%s" in "%s" has been successfully created.');
$failMessage = mt('setup', 'Unable to create directory "%s" in "%s". An error occured:');
$report = array();
foreach ($this->paths as $path) {
if (array_key_exists($path, $this->errors)) {
if (is_array($this->errors[$path])) {
$report[] = sprintf($failMessage, basename($path), dirname($path));
$report[] = sprintf(mt('setup', 'ERROR: %s'), $this->errors[$path]['message']);
} else {
$report[] = sprintf($okMessage, basename($path), dirname($path));
}
}
}
return $report;
}
}