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

Fix "PreservingIniWriter not found" 

The class was renamed a few commits ago to "IniWriter"
This commit is contained in:
Johannes Meyer 2014-11-04 14:35:57 +01:00
parent 170ded6510
commit 5a169ee656
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/forms/Config/General/ApplicationConfigForm.php
View File

@ -9,7 +9,7 @@ use Icinga\Web\Form;
use Icinga\Util\Translator; use Icinga\Util\Translator;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Web\Form\Element\Number; use Icinga\Web\Form\Element\Number;
use Icinga\Config\PreservingIniWriter; use Icinga\File\Ini\IniWriter;
/** /**
* Form class to modify the general application configuration * Form class to modify the general application configuration
@ -76,7 +76,7 @@ class ApplicationConfigForm extends Form
'description' => t( 'description' => t(
'This is the global default file mode for new configuration files created by Icinga Web 2.' 'This is the global default file mode for new configuration files created by Icinga Web 2.'
), ),
'value' => decoct(PreservingIniWriter::$fileMode) 'value' => decoct(IniWriter::$fileMode)
) )
) )
); );

6
library/Icinga/Application/ApplicationBootstrap.php
View File

@ -14,8 +14,8 @@ use Icinga\Exception\NotReadableError;
use Icinga\Application\Logger; use Icinga\Application\Logger;
use Icinga\Util\DateTimeFactory; use Icinga\Util\DateTimeFactory;
use Icinga\Util\Translator; use Icinga\Util\Translator;
use Icinga\File\Ini\IniWriter;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
use Icinga\Config\PreservingIniWriter;
/** /**
* This class bootstraps a thin Icinga application layer * This class bootstraps a thin Icinga application layer
@ -373,9 +373,9 @@ abstract class ApplicationBootstrap
} }
if ($this->config->global !== null) { if ($this->config->global !== null) {
PreservingIniWriter::$fileMode = octdec($this->config->global->get('filemode', '0664')); IniWriter::$fileMode = octdec($this->config->global->get('filemode', '0664'));
} else { } else {
PreservingIniWriter::$fileMode = 0664; IniWriter::$fileMode = 0664;
} }
return $this; return $this;

6
library/Icinga/Installation/AuthenticationStep.php
View File

@ -8,8 +8,8 @@ use Exception;
use Zend_Config; use Zend_Config;
use Icinga\Web\Setup\Step; use Icinga\Web\Setup\Step;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\File\Ini\IniWriter;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Config\PreservingIniWriter;
use Icinga\Authentication\Backend\DbUserBackend; use Icinga\Authentication\Backend\DbUserBackend;
class AuthenticationStep extends Step class AuthenticationStep extends Step
@ -50,7 +50,7 @@ class AuthenticationStep extends Step
} }
try { try {
$writer = new PreservingIniWriter(array( $writer = new IniWriter(array(
'config' => new Zend_Config($config), 'config' => new Zend_Config($config),
'filename' => Config::resolvePath('authentication.ini'), 'filename' => Config::resolvePath('authentication.ini'),
'filemode' => octdec($this->data['fileMode']) 'filemode' => octdec($this->data['fileMode'])
@ -74,7 +74,7 @@ class AuthenticationStep extends Step
); );
try { try {
$writer = new PreservingIniWriter(array( $writer = new IniWriter(array(
'config' => new Zend_Config($config), 'config' => new Zend_Config($config),
'filename' => Config::resolvePath('permissions.ini'), 'filename' => Config::resolvePath('permissions.ini'),
'filemode' => octdec($this->data['fileMode']) 'filemode' => octdec($this->data['fileMode'])

4
library/Icinga/Installation/GeneralConfigStep.php
View File

@ -9,7 +9,7 @@ use Zend_Config;
use Icinga\Logger\Logger; use Icinga\Logger\Logger;
use Icinga\Web\Setup\Step; use Icinga\Web\Setup\Step;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Config\PreservingIniWriter; use Icinga\File\Ini\IniWriter;
class GeneralConfigStep extends Step class GeneralConfigStep extends Step
{ {
@ -36,7 +36,7 @@ class GeneralConfigStep extends Step
} }
try { try {
$writer = new PreservingIniWriter(array( $writer = new IniWriter(array(
'config' => new Zend_Config($config), 'config' => new Zend_Config($config),
'filename' => Config::resolvePath('config.ini'), 'filename' => Config::resolvePath('config.ini'),
'filemode' => octdec($this->data['fileMode']) 'filemode' => octdec($this->data['fileMode'])

4
library/Icinga/Installation/ResourceStep.php
View File

@ -8,7 +8,7 @@ use Exception;
use Zend_Config; use Zend_Config;
use Icinga\Web\Setup\Step; use Icinga\Web\Setup\Step;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Config\PreservingIniWriter; use Icinga\File\Ini\IniWriter;
class ResourceStep extends Step class ResourceStep extends Step
{ {
@ -39,7 +39,7 @@ class ResourceStep extends Step
} }
try { try {
$writer = new PreservingIniWriter(array( $writer = new IniWriter(array(
'config' => new Zend_Config($resourceConfig), 'config' => new Zend_Config($resourceConfig),
'filename' => Config::resolvePath('resources.ini'), 'filename' => Config::resolvePath('resources.ini'),
'filemode' => octdec($this->data['fileMode']) 'filemode' => octdec($this->data['fileMode'])

6
modules/monitoring/library/Monitoring/Installation/BackendStep.php
View File

@ -8,7 +8,7 @@ use Exception;
use Zend_Config; use Zend_Config;
use Icinga\Web\Setup\Step; use Icinga\Web\Setup\Step;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Config\PreservingIniWriter; use Icinga\File\Ini\IniWriter;
class BackendStep extends Step class BackendStep extends Step
{ {
@ -39,7 +39,7 @@ class BackendStep extends Step
); );
try { try {
$writer = new PreservingIniWriter(array( $writer = new IniWriter(array(
'config' => new Zend_Config($config), 'config' => new Zend_Config($config),
'filename' => Config::resolvePath('modules/monitoring/backends.ini'), 'filename' => Config::resolvePath('modules/monitoring/backends.ini'),
'filemode' => octdec($this->data['fileMode']) 'filemode' => octdec($this->data['fileMode'])
@ -64,7 +64,7 @@ class BackendStep extends Step
$config = Config::app('resources', true); $config = Config::app('resources', true);
$config->merge(new Zend_Config(array($resourceName => $resourceConfig))); $config->merge(new Zend_Config(array($resourceName => $resourceConfig)));
$writer = new PreservingIniWriter(array( $writer = new IniWriter(array(
'config' => $config, 'config' => $config,
'filename' => Config::resolvePath('resources.ini'), 'filename' => Config::resolvePath('resources.ini'),
'filemode' => octdec($this->data['fileMode']) 'filemode' => octdec($this->data['fileMode'])

4
modules/monitoring/library/Monitoring/Installation/InstanceStep.php
View File

@ -8,7 +8,7 @@ use Exception;
use Zend_Config; use Zend_Config;
use Icinga\Web\Setup\Step; use Icinga\Web\Setup\Step;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Config\PreservingIniWriter; use Icinga\File\Ini\IniWriter;
class InstanceStep extends Step class InstanceStep extends Step
{ {
@ -28,7 +28,7 @@ class InstanceStep extends Step
unset($instanceConfig['name']); unset($instanceConfig['name']);
try { try {
$writer = new PreservingIniWriter(array( $writer = new IniWriter(array(
'config' => new Zend_Config(array($instanceName => $instanceConfig)), 'config' => new Zend_Config(array($instanceName => $instanceConfig)),
'filename' => Config::resolvePath('modules/monitoring/instances.ini'), 'filename' => Config::resolvePath('modules/monitoring/instances.ini'),
'filemode' => octdec($this->data['fileMode']) 'filemode' => octdec($this->data['fileMode'])

4
modules/monitoring/library/Monitoring/Installation/SecurityStep.php
View File

@ -8,7 +8,7 @@ use Exception;
use Zend_Config; use Zend_Config;
use Icinga\Web\Setup\Step; use Icinga\Web\Setup\Step;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Config\PreservingIniWriter; use Icinga\File\Ini\IniWriter;
class SecurityStep extends Step class SecurityStep extends Step
{ {
@ -27,7 +27,7 @@ class SecurityStep extends Step
$config['security'] = $this->data['securityConfig']; $config['security'] = $this->data['securityConfig'];
try { try {
$writer = new PreservingIniWriter(array( $writer = new IniWriter(array(
'config' => new Zend_Config($config), 'config' => new Zend_Config($config),
'filename' => Config::resolvePath('modules/monitoring/config.ini'), 'filename' => Config::resolvePath('modules/monitoring/config.ini'),
'filemode' => octdec($this->data['fileMode']) 'filemode' => octdec($this->data['fileMode'])