tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-04-08 17:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't suppress an E_WARNING in CLI commands

Browse Source 
We should probably set an error handler to catch such things in the CLI..
This commit is contained in:
Johannes Meyer 2014-10-21 16:36:14 +02:00
parent 049e42ba9a
commit d201cff087
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/clicommands/SetupCommand.php
View File

@ -26,7 +26,7 @@ class SetupCommand extends Command
*/
public function showTokenAction()
{
$token = @file_get_contents($this->app->getConfigDir() . '/setup.token');
$token = file_get_contents($this->app->getConfigDir() . '/setup.token');
if (! $token) {
$this->fail(
$this->translate('Nothing to show. Please create a new setup token using the generateToken action.')
@ -55,12 +55,12 @@ class SetupCommand extends Command
$token = bin2hex(openssl_random_pseudo_bytes(8));
$filepath = $this->app->getConfigDir() . '/setup.token';
if (false === @file_put_contents($filepath, $token)) {
if (false === file_put_contents($filepath, $token)) {
$this->fail(sprintf($this->translate('Cannot write setup token "%s" to disk.'), $filepath));
}
if (false === @chmod($filepath, 0640)) {
$this->fail(sprintf($this->translate('Cannot change access mode of "%s" to %o.'), $filepath, 0640));
if (false === chmod($filepath, 0660)) {
$this->fail(sprintf($this->translate('Cannot change access mode of "%s" to %o.'), $filepath, 0660));
}
printf($this->translate("The newly generated setup token is: %s\n"), $token);