-
-
- icon('create.png'); ?> translate('Create a new resource'); ?>
+
+ icon('create.png'); ?> translate('Create A New Resource'); ?>
@@ -17,12 +16,12 @@
resources as $name => $resource): ?>
|
-
- icon('edit.png') ?> escape($name); ?>
+
+ icon('edit.png'); ?> escape($name); ?>
|
-
+
icon('remove.png'); ?>
|
diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml
index 74639f056..5a07d832e 100644
--- a/application/views/scripts/config/resource/create.phtml
+++ b/application/views/scripts/config/resource/create.phtml
@@ -1,4 +1,3 @@
-
-translate('Create a new resource'); ?>
-translate('Resources are entities that provide data to Icingaweb.'); ?>
+translate('Create A New Resource'); ?>
+translate('Resources are entities that provide data to Icinga Web 2.'); ?>
\ No newline at end of file
diff --git a/application/views/scripts/config/resource/modify.phtml b/application/views/scripts/config/resource/modify.phtml
index 7f549d537..5fa2536bd 100644
--- a/application/views/scripts/config/resource/modify.phtml
+++ b/application/views/scripts/config/resource/modify.phtml
@@ -1,3 +1,2 @@
translate('Edit Existing Resource'); ?>
-
\ No newline at end of file
diff --git a/application/views/scripts/config/resource/remove.phtml b/application/views/scripts/config/resource/remove.phtml
index fba6b081b..a43bcd74c 100644
--- a/application/views/scripts/config/resource/remove.phtml
+++ b/application/views/scripts/config/resource/remove.phtml
@@ -1,3 +1,2 @@
translate('Remove Existing Resource'); ?>
-
\ No newline at end of file
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index e3a71f829..2a900651b 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -11,7 +11,4 @@
escape($stackTrace) ?>
-messageBox)) : ?>
- messageBox->render(); ?>
-
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 13f62881a..6d34e10ab 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -7,7 +7,6 @@ namespace Icinga;
use DateTimeZone;
use InvalidArgumentException;
use Icinga\User\Preferences;
-use Icinga\User\Message;
/**
* This class represents an authorized user
@@ -98,13 +97,6 @@ class User
*/
protected $preferences;
- /**
- * Queued notifications for this user.
- *
- * @var array()
- */
- protected $messages;
-
/**
* Creates a user object given the provided information
*
@@ -382,38 +374,6 @@ class User
return new DateTimeZone($tz);
}
- /**
- * Add a message that can be accessed from future requests, to this user.
- *
- * This function does NOT automatically write to the session, messages will not be persisted until you do.
- *
- * @param Message $msg The message
- */
- public function addMessage(Message $msg)
- {
- $this->messages[] = $msg;
- }
-
- /**
- * Get all currently pending messages
- *
- * @return array The messages
- */
- public function getMessages()
- {
- return isset($this->messages) ? $this->messages : array();
- }
-
- /**
- * Remove all messages from this user
- *
- * This function does NOT automatically write the session, messages will not be persisted until you do.
- */
- public function clearMessages()
- {
- $this->messages = null;
- }
-
/**
* Set additional remote user information
*
diff --git a/library/Icinga/User/Message.php b/library/Icinga/User/Message.php
deleted file mode 100644
index 83d780563..000000000
--- a/library/Icinga/User/Message.php
+++ /dev/null
@@ -1,59 +0,0 @@
-message = $message;
- $this->level = $level;
- }
-
- /**
- * @return string
- */
- public function getMessage()
- {
- return $this->message;
- }
-
- /**
- * @return The
- */
- public function getLevel()
- {
- return $this->level;
- }
-}
diff --git a/library/Icinga/Web/Controller/BaseConfigController.php b/library/Icinga/Web/Controller/BaseConfigController.php
deleted file mode 100644
index b4c90f3e2..000000000
--- a/library/Icinga/Web/Controller/BaseConfigController.php
+++ /dev/null
@@ -1,75 +0,0 @@
-getUser()->addMessage(
- new Message($msg, Zend_Log::INFO)
- );
- Session::getSession()->write();
- }
-
- /**
- * Send a message with the logging level Zend_Log::ERR to the current user and
- * commit the changes to the underlying session.
- *
- * @param $msg The message content
- */
- protected function addErrorMessage($msg)
- {
- AuthenticationManager::getInstance()->getUser()->addMessage(
- new Message($msg, Zend_Log::ERR)
- );
- Session::getSession()->write();
- }
-
- /**
- * Send a message with the logging level Zend_Log::WARN to the current user and
- * commit the changes to the underlying session.
- *
- * @param $msg The message content
- */
- protected function addWarningMessage($msg)
- {
- AuthenticationManager::getInstance()->getUser()->addMessage(
- new Message($msg, Zend_Log::WARN)
- );
- Session::getSession()->write();
- }
-
- /*
- * Return an array of tabs provided by this configuration controller.
- *
- * Those tabs will automatically be added to the application's configuration dialog
- *
- * @return array
- */
- public static function createProvidedTabs()
- {
- return array();
- }
-}
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 78755f00b..2c0fb2a89 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -8,9 +8,7 @@ use LogicException;
use Zend_Form;
use Zend_View_Interface;
use Icinga\Application\Icinga;
-use Icinga\Web\Form\Decorator\HelpText;
use Icinga\Web\Form\Decorator\NoScriptApply;
-use Icinga\Web\Form\Decorator\ElementWrapper;
use Icinga\Web\Form\Element\CsrfCounterMeasure;
/**
@@ -99,6 +97,7 @@ class Form extends Zend_Form
if ($this->onSuccess !== null && false === is_callable($this->onSuccess)) {
throw new LogicException('The option `onSuccess\' is not callable');
}
+
if (! isset($options['elementDecorators'])) {
$options['elementDecorators'] = array(
'ViewHelper',
@@ -108,6 +107,7 @@ class Form extends Zend_Form
array('HtmlTag', array('tag' => 'div'))
);
}
+
parent::__construct($options);
}
@@ -321,7 +321,7 @@ class Form extends Zend_Form
*
* @param Request $request The current request
*/
- public function onShow(Request $request)
+ public function onRequest(Request $request)
{
}
@@ -372,6 +372,7 @@ class Form extends Zend_Form
if (is_array($options) && ! isset($options['disableLoadDefaultDecorators'])) {
$options['disableLoadDefaultDecorators'] = true;
}
+
$el = parent::createElement($type, $name, $options);
if ($el && $el->getAttrib('autosubmit')) {
$el->addDecorator(new NoScriptApply()); // Non-JS environments
@@ -386,6 +387,7 @@ class Form extends Zend_Form
$el->setAttrib('class', $class); // JS environments
unset($el->autosubmit);
}
+
return $el;
}
@@ -439,7 +441,7 @@ class Form extends Zend_Form
* Process the given request using this form
*
* Redirects to the url set with setRedirectUrl() upon success. See onSuccess()
- * and onShow() wherewith you can customize the processing logic.
+ * and onRequest() wherewith you can customize the processing logic.
*
* @param Request $request The request to be processed
*
@@ -465,7 +467,7 @@ class Form extends Zend_Form
$this->isValidPartial($formData);
}
} else {
- $this->onShow($request);
+ $this->onRequest($request);
}
return $request;
@@ -555,6 +557,7 @@ class Form extends Zend_Form
if ($this->loadDefaultDecoratorsIsDisabled()) {
return $this;
}
+
$decorators = $this->getDecorators();
if (empty($decorators)) {
if ($this->viewScript) {
@@ -563,11 +566,13 @@ class Form extends Zend_Form
'form' => $this
));
} else {
- $this
+ $this->addDecorator('FormErrors', array('onlyCustomFormErrors' => true))
->addDecorator('FormElements')
+ //->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
->addDecorator('Form');
}
}
+
return $this;
}
diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php
index d87a6d09f..3bfbc6406 100644
--- a/library/Icinga/Web/Form/Element/Number.php
+++ b/library/Icinga/Web/Form/Element/Number.php
@@ -4,38 +4,37 @@
namespace Icinga\Web\Form\Element;
-use Zend_Form_Element_Xhtml;
+use Zend_Form_Element;
/**
- * Number form element
+ * A number input control
*/
-class Number extends Zend_Form_Element_Xhtml
+class Number extends Zend_Form_Element
{
/**
- * Default form view helper to use for rendering
+ * Disable default decorators
+ *
+ * \Icinga\Web\Form sets default decorators for elements.
+ *
+ * @var bool
+ *
+ * @see \Icinga\Web\Form::__construct() For default element decorators.
+ */
+ protected $_disableLoadDefaultDecorators = true;
+
+ /**
+ * Form view helper to use for rendering
*
* @var string
*/
- public $helper = "formNumber";
+ public $helper = 'formNumber';
/**
- * Check whether $value is of type integer
- *
- * @param string $value The value to check
- * @param mixed $context Context to use
- *
- * @return bool
+ * (non-PHPDoc)
+ * @see \Zend_Form_Element::init() For the method documentation.
*/
- public function isValid($value, $context = null)
+ public function init()
{
- if (parent::isValid($value, $context)) {
- if (is_numeric($value)) {
- return true;
- }
-
- $this->addError(t('Please enter a number.'));
- }
-
- return false;
+ $this->addValidator('Int');
}
}
diff --git a/library/Icinga/Web/Form/Validator/ReadablePathValidator.php b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
new file mode 100644
index 000000000..4060f6ecd
--- /dev/null
+++ b/library/Icinga/Web/Form/Validator/ReadablePathValidator.php
@@ -0,0 +1,58 @@
+_messageTemplates = array(
+ 'NOT_READABLE' => t('Path is not readable'),
+ 'DOES_NOT_EXIST' => t('Path does not exist')
+ );
+ }
+
+ /**
+ * Check whether the given value is a readable filepath
+ *
+ * @param string $value The value submitted in the form
+ * @param mixed $context The context of the form
+ *
+ * @return bool Whether the value was successfully validated
+ */
+ public function isValid($value, $context = null)
+ {
+ if (false === file_exists($value)) {
+ $this->_error('DOES_NOT_EXIST');
+ return false;
+ }
+
+ if (false === is_readable($value)) {
+ $this->_error('NOT_READABLE');
+ }
+
+ return true;
+ }
+}
diff --git a/library/Icinga/Web/Widget/AlertMessageBox.php b/library/Icinga/Web/Widget/AlertMessageBox.php
deleted file mode 100644
index 13cf91068..000000000
--- a/library/Icinga/Web/Widget/AlertMessageBox.php
+++ /dev/null
@@ -1,133 +0,0 @@
-user->getMessages();
- $this->user->clearMessages();
- Session::getSession()->write();
- return $messages;
- }
-
- /**
- * The displayed alert messages
- *
- * @var array
- */
- private $messages = array();
-
- /**
- * The user to fetch the messages from
- *
- * @var User
- */
- private $user;
-
- /**
- * The available states.
- *
- * @var array
- */
- private $states = array(
- Zend_Log::INFO => array(
- 'state' => 'alert-success',
- 'icon' => 'success.png'
- ),
- Zend_Log::NOTICE => array(
- 'state' => 'alert-info',
- 'icon' => 'info.png'
- ),
- Zend_Log::WARN => array(
- 'state' => 'alert-warning',
- 'icon' => 'warning.png'
- ),
- Zend_Log::ERR => array(
- 'state' => 'alert-danger',
- 'icon' => 'error.png'
- )
- );
-
- /**
- * Create a new AlertBox
- *
- * @param boolean showUserMessages If the current user messages should be displayed
- * in this AlertMessageBox. Defaults to false
- */
- public function __construct($showUserMessages = false)
- {
- if ($showUserMessages) {
- $this->user = AuthenticationManager::getInstance()->getUser();
- }
- }
-
- /**
- * Add a new error
- *
- * @param $error
- */
- public function addError($error)
- {
- $this->messages[] = new Message($error, Zend_Log::ERR);
- }
-
- /**
- * Add the error messages of the given Zend_Form
- */
- public function addForm(Zend_Form $form)
- {
- foreach ($form->getErrorMessages() as $error) {
- $this->addError($error);
- }
- }
-
- /**
- * Output the HTML of the AlertBox
- *
- * @return string
- */
- public function render(Zend_View_Abstract $view = null)
- {
- $html = '';
- if (isset($this->user)) {
- $this->messages = array_merge($this->messages, $this->getAndClearMessages());
- }
- foreach ($this->messages as $message) {
- $level = $message->getLevel();
- if (!array_key_exists($level, $this->states)) {
- continue;
- }
- $alert = $this->states[$level];
- $html .= '' .
- $this->view()->icon($alert['icon']) .
- '' . htmlspecialchars($message->getMessage()) . '' .
- '
';
- }
- return $html;
- }
-}