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

Adjust LoggingForm to suit the "final" form builder implementation 

refs #5525
This commit is contained in:
Johannes Meyer 2014-07-18 10:29:23 +02:00
parent 5da14d3fc5
commit 7157b11f97
2 changed files with 89 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
application/controllers/ConfigController.php
View File

@ -89,15 +89,22 @@ class ConfigController extends BaseConfigController
$this->view->tabs->activate('logging');
$form = new LoggingForm();
if ($form->isSubmittedAndValid($this->_request->getParams())) {
$appConfig = IcingaConfig::app();
$appConfig['logging'] = $form->getValues();
if (false === $this->writeConfigFile($appConfig, 'config')) {
return;
$request = $this->getRequest();
if ($request->isPost()) {
if ($form->isValid($request->getPost())) {
$appConfig = IcingaConfig::app();
$appConfig->logging = new Zend_Config($form->getValues());
if ($this->writeConfigFile($appConfig, 'config')) {
$this->addSuccessMessage($this->translate('Logging configuration has sucessfully been stored'));
$this->redirectNow('config/logging');
}
}
Notification::success('New configuration has sucessfully been stored');
$this->redirectNow('config/logging');
} else {
$loggingConfig = Icinga::app()->getConfig()->logging;
if ($loggingConfig === null) {
$loggingConfig = new Zend_Config(array());
}
$form->populate($loggingConfig->toArray());
}
$this->view->form = $form;

146
application/forms/Config/LoggingForm.php
View File

@ -4,7 +4,6 @@
namespace Icinga\Form\Config;
use Zend_Config;
use Icinga\Web\Form;
use Icinga\Application\Icinga;
use Icinga\Web\Form\Validator\WritablePathValidator;
@ -16,17 +15,18 @@ class LoggingForm extends Form
{
/**
* Initialize this logging configuration form
*
* Sets actually only the name.
*/
public function init()
{
$this->setName('form_config_logging');
$this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
}
/**
* @see Form::createElements()
*/
public function createElements()
public function createElements(array $formData)
{
$elements = array();
@ -37,7 +37,7 @@ class LoggingForm extends Form
'required' => true,
'label' => t('Logging Enabled'),
'helptext' => t('Check this to enable logging.'),
'value' => 0
'value' => isset($formData['enable']) ? $formData['enable'] : 0
)
);
$elements[] = $this->createElement(
@ -47,7 +47,7 @@ class LoggingForm extends Form
'required' => true,
'label' => t('Logging Level'),
'helptext' => t('The maximum loglevel to emit.'),
'value' => 0,
'value' => isset($formData['level']) ? $formData['level'] : 0,
'multiOptions' => array(
0 => t('Error'),
1 => t('Warning'),
@ -64,94 +64,96 @@ class LoggingForm extends Form
'class' => 'autosubmit',
'label' => t('Logging Type'),
'helptext' => t('The type of logging to utilize.'),
'value' => 'file',
'value' => isset($formData['type']) ? $formData['type'] : 'syslog',
'multiOptions' => array(
'file' => t('File'),
'syslog' => 'Syslog'
)
)
);
$elements[] = $this->createElement(
'text',
'application',
array(
'depends' => 'type',
'requires' => 'syslog',
'required' => true,
'label' => t('Application Prefix'),
'helptext' => t('The name of the application by which to prefix syslog messages.'),
'value' => 'icingaweb',
'validators' => array(
array(
'Regex',
false,
if (false === isset($formData['type']) || $formData['type'] === 'syslog') {
$elements[] = $this->createElement(
'text',
'application',
array(
'required' => true,
'label' => t('Application Prefix'),
'helptext' => t('The name of the application by which to prefix syslog messages.'),
'value' => isset($formData['application']) ? $formData['application'] : 'icingaweb',
'validators' => array(
array(
'pattern' => '/^[^\W]+$/',
'messages' => array(
'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
'Regex',
false,
array(
'pattern' => '/^[^\W]+$/',
'messages' => array(
'regexNotMatch' => 'The application prefix cannot contain any whitespaces.'
)
)
)
)
)
)
);
$elements[] = $this->createElement(
'select',
'facility',
array(
'depends' => 'type',
'requires' => 'syslog',
'required' => true,
'label' => t('Facility'),
'helptext' => t('The Syslog facility to utilize.'),
'value' => 'LOG_USER',
'multiOptions' => array(
'LOG_USER' => 'LOG_USER'
);
$elements[] = $this->createElement(
'select',
'facility',
array(
'required' => true,
'label' => t('Facility'),
'helptext' => t('The Syslog facility to utilize.'),
'value' => isset($formData['facility']) ? $formData['facility'] : 'LOG_USER',
'multiOptions' => array(
'LOG_USER' => 'LOG_USER'
)
)
)
);
$elements[] = $this->createElement(
'text',
'target',
array(
'depends' => 'type',
'requires' => 'file',
'required' => true,
'label' => t('Filepath'),
'helptext' => t('The logfile to write messages to.'),
'value' => $this->getDefaultLogDir(),
'validators' => array(new WritablePathValidator())
)
);
);
} elseif ($formData['type'] === 'file') {
$elements[] = $this->createElement(
'text',
'target',
array(
'required' => true,
'label' => t('Filepath'),
'helptext' => t('The logfile to write messages to.'),
'value' => isset($formData['target']) ? $formData['target'] : $this->getDefaultLogDir(),
'validators' => array(new WritablePathValidator())
)
);
}
return $elements;
}
/**
* Return the current logging configuration
* @see Form::addSubmitButton()
*/
public function addSubmitButton()
{
$this->addElement(
'submit',
'btn_submit',
array(
'label' => t('Save')
)
);
return $this;
}
/**
* Retrieve all form element values
*
* Returns all configuration relevant element values.
*
* @return array
*/
public function getConfiguration()
public function getValues()
{
$loggingConfig = Icinga::app()->getConfig()->logging;
if ($loggingConfig === null) {
$loggingConfig = new Zend_Config(array());
}
$config = array();
$config['enable'] = $loggingConfig->enable ? 1 : 0;
$config['level'] = $loggingConfig->level;
$config['type'] = $loggingConfig->type;
if ($loggingConfig->type === 'file') {
$config['target'] = $loggingConfig->target;
} elseif ($loggingConfig->type === 'syslog') {
$config['application'] = $loggingConfig->application;
$config['facility'] = $loggingConfig->facility;
}
return $config;
$values = parent::getValues();
unset($values['btn_submit']);
unset($values[$this->getTokenElementName()]);
return $values;
}
/**