tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 00:34:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Rename all command transport related classes

Browse Source 
refs #9651
This commit is contained in:
Johannes Meyer 2015-08-26 15:52:36 +02:00
parent ec8567cbbf
commit 8c887ee450
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/monitoring/application/controllers/ConfigController.php
View File

@ -7,8 +7,8 @@ use Icinga\Forms\ConfirmRemovalForm;
use Icinga\Web\Controller;
use Icinga\Web\Notification;
use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm;
use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm;
use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm;
use Icinga\Module\Monitoring\Forms\Config\TransportConfigForm;
/**
* Configuration controller for editing monitoring resources
@ -151,7 +151,7 @@ class Monitoring_ConfigController extends Controller
{
$transportName = $this->params->getRequired('transport');
$transportForm = new InstanceConfigForm();
$transportForm = new TransportConfigForm();
$transportForm->setIniConfig($this->Config('commandtransports'));
$form = new ConfirmRemovalForm();
$form->setRedirectUrl('monitoring/config');
@ -191,11 +191,11 @@ class Monitoring_ConfigController extends Controller
{
$transportName = $this->params->getRequired('transport');
$form = new InstanceConfigForm();
$form = new TransportConfigForm();
$form->setRedirectUrl('monitoring/config');
$form->setTitle(sprintf($this->translate('Edit Command Transport %s'), $transportName));
$form->setIniConfig($this->Config('commandtransports'));
$form->setOnSuccess(function (InstanceConfigForm $form) use ($transportName) {
$form->setOnSuccess(function (TransportConfigForm $form) use ($transportName) {
try {
$form->edit($transportName, array_map(
function ($v) {
@ -232,11 +232,11 @@ class Monitoring_ConfigController extends Controller
*/
public function createtransportAction()
{
$form = new InstanceConfigForm();
$form = new TransportConfigForm();
$form->setRedirectUrl('monitoring/config');
$form->setTitle($this->translate('Create New Command Transport'));
$form->setIniConfig($this->Config('commandtransports'));
$form->setOnSuccess(function (InstanceConfigForm $form) {
$form->setOnSuccess(function (TransportConfigForm $form) {
try {
$form->add(array_filter($form->getValues()));
} catch (Exception $e) {

4
modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php → modules/monitoring/application/forms/Config/Transport/LocalTransportForm.php
View File

@ -1,11 +1,11 @@
<?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Module\Monitoring\Forms\Config\Instance;
namespace Icinga\Module\Monitoring\Forms\Config\Transport;
use Icinga\Web\Form;
class LocalInstanceForm extends Form
class LocalTransportForm extends Form
{
/**
* (non-PHPDoc)

4
modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php → modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php
View File

@ -1,13 +1,13 @@
<?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Module\Monitoring\Forms\Config\Instance;
namespace Icinga\Module\Monitoring\Forms\Config\Transport;
use Icinga\Data\ResourceFactory;
use Icinga\Exception\ConfigurationError;
use Icinga\Web\Form;
class RemoteInstanceForm extends Form
class RemoteTransportForm extends Form
{
/**
* The available resources split by type

10
modules/monitoring/application/forms/Config/InstanceConfigForm.php → modules/monitoring/application/forms/Config/TransportConfigForm.php
View File

@ -9,13 +9,13 @@ use Icinga\Exception\NotFoundError;
use Icinga\Forms\ConfigForm;
use Icinga\Module\Monitoring\Command\Transport\LocalCommandFile;
use Icinga\Module\Monitoring\Command\Transport\RemoteCommandFile;
use Icinga\Module\Monitoring\Forms\Config\Instance\LocalInstanceForm;
use Icinga\Module\Monitoring\Forms\Config\Instance\RemoteInstanceForm;
use Icinga\Module\Monitoring\Forms\Config\Transport\LocalTransportForm;
use Icinga\Module\Monitoring\Forms\Config\Transport\RemoteTransportForm;
/**
* Form for managing command transports
*/
class InstanceConfigForm extends ConfigForm
class TransportConfigForm extends ConfigForm
{
/**
* The transport to load when displaying the form for the first time
@ -46,9 +46,9 @@ class InstanceConfigForm extends ConfigForm
{
switch (strtolower($type)) {
case LocalCommandFile::TRANSPORT:
return new LocalInstanceForm();
return new LocalTransportForm();
case RemoteCommandFile::TRANSPORT;
return new RemoteInstanceForm();
return new RemoteTransportForm();
default:
throw new InvalidArgumentException(
sprintf($this->translate('Invalid command transport type "%s" given'), $type)

6
modules/monitoring/application/forms/Setup/InstancePage.php → modules/monitoring/application/forms/Setup/TransportPage.php
View File

@ -4,9 +4,9 @@
namespace Icinga\Module\Monitoring\Forms\Setup;
use Icinga\Web\Form;
use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm;
use Icinga\Module\Monitoring\Forms\Config\TransportConfigForm;
class InstancePage extends Form
class TransportPage extends Form
{
public function init()
{
@ -19,7 +19,7 @@ class InstancePage extends Form
public function createElements(array $formData)
{
$transportConfigForm = new InstanceConfigForm();
$transportConfigForm = new TransportConfigForm();
$this->addSubForm($transportConfigForm, 'transport_form');
$transportConfigForm->create($formData);
$transportConfigForm->getElement('name')->setValue('icinga2');

6
modules/monitoring/library/Monitoring/MonitoringWizard.php
View File

@ -12,8 +12,8 @@ use Icinga\Module\Setup\RequirementSet;
use Icinga\Module\Setup\Forms\SummaryPage;
use Icinga\Module\Monitoring\Forms\Setup\WelcomePage;
use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
use Icinga\Module\Monitoring\Forms\Setup\InstancePage;
use Icinga\Module\Monitoring\Forms\Setup\SecurityPage;
use Icinga\Module\Monitoring\Forms\Setup\TransportPage;
use Icinga\Module\Monitoring\Forms\Setup\IdoResourcePage;
use Icinga\Module\Monitoring\Forms\Setup\LivestatusResourcePage;
use Icinga\Module\Setup\Requirement\ClassRequirement;
@ -33,7 +33,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
$this->addPage(new BackendPage());
$this->addPage(new IdoResourcePage());
$this->addPage(new LivestatusResourcePage());
$this->addPage(new InstancePage());
$this->addPage(new TransportPage());
$this->addPage(new SecurityPage());
$this->addPage(new SummaryPage(array('name' => 'setup_monitoring_summary')));
}
@ -150,7 +150,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
);
$setup->addStep(
new InstanceStep(array(
new TransportStep(array(
'transportConfig' => $pageData['setup_command_transport']
))
);

2
modules/monitoring/library/Monitoring/InstanceStep.php → modules/monitoring/library/Monitoring/TransportStep.php
View File

@ -8,7 +8,7 @@ use Icinga\Module\Setup\Step;
use Icinga\Application\Config;
use Icinga\Exception\IcingaException;
class InstanceStep extends Step
class TransportStep extends Step
{
protected $data;