diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml
index 6ad1bcb4c..f82354557 100644
--- a/application/views/scripts/config/resource/create.phtml
+++ b/application/views/scripts/config/resource/create.phtml
@@ -3,14 +3,12 @@
Create New Resource
-errorMessage): ?>
-
- Create a new resource to describes a data sourc
+ Resources are entities that provide data to Icingaweb.
form ?>
\ 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 9956c3cdf..079c9464d 100644
--- a/application/views/scripts/config/resource/modify.phtml
+++ b/application/views/scripts/config/resource/modify.phtml
@@ -3,13 +3,16 @@
Edit Resource "escape($this->name); ?>"
-errorMessage || $this->form->getErrorMessages()): ?>
+messageBox)): ?>
+ messageBox->render() ?>
+
+
+form->getErrorMessages()): ?>
- escape($this->errorMessage); ?>
form->getErrorMessages() as $error): ?>
- escape($error); ?>
+ escape($error); ?>
-
+
form ?>
\ 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 0502cc709..3b5ffbfc1 100644
--- a/application/views/scripts/config/resource/remove.phtml
+++ b/application/views/scripts/config/resource/remove.phtml
@@ -2,4 +2,9 @@
Remove Resource "escape($this->name); ?>"
-form ?>
\ No newline at end of file
+
+messageBox)): ?>
+ messageBox->render() ?>
+
+
+form ?>
diff --git a/application/views/scripts/config/show-configuration.phtml b/application/views/scripts/config/show-configuration.phtml
index 79d8edf59..2bf97cbfb 100644
--- a/application/views/scripts/config/show-configuration.phtml
+++ b/application/views/scripts/config/show-configuration.phtml
@@ -1,4 +1,6 @@
tabs->render($this); ?>
+
+
WARNING ICONSaving "escape($this->file); ?>.ini" Failed
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index f9c73e026..c51ab59da 100755
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,26 +1,9 @@
+tabs->render($this); ?>
+
An error occurred
-
- message ?>
-
- exception)): ?>
-
-
Exception information:
-
-
- Message:
- exception->getMessage(); ?>
-
-
-
Stack trace:
-
- exception->getTraceAsString(); ?>
-
-
-
Request Parameters:
-
getParams(), true); ?>
-
-
-
+ messageBox)) : ?>
+ messageBox->render() ?>
+
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index a5d5da7d2..756316af8 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -232,12 +232,7 @@ class Web extends ApplicationBootstrap
*/
private function setupUser()
{
- $authenticationManager = AuthenticationManager::getInstance(
- null,
- array(
- 'writeSession' => true
- )
- );
+ $authenticationManager = AuthenticationManager::getInstance();
if ($authenticationManager->isAuthenticated() === true) {
$user = $authenticationManager->getUser();
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index b089ea015..83c9393e3 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -121,16 +121,10 @@ class Manager
}
if (!isset($options['sessionClass'])) {
- $this->session = new PhpSession($config->session);
+ $this->session = new PhpSession();
} else {
$this->session = $options['sessionClass'];
}
-
- if (isset($options['writeSession']) && $options['writeSession'] === true) {
- $this->session->read(true);
- } else {
- $this->session->read();
- }
}
/**
@@ -404,9 +398,9 @@ class Manager
}
/**
- * Returns the current user or null if no user is authenticated
+ * Returns the current user or null if no user is authenticated
*
- * @return User
+ * @return User
**/
public function getUser()
{
diff --git a/library/Icinga/Authentication/PhpSession.php b/library/Icinga/Authentication/PhpSession.php
index 14fe12525..fea5b3663 100644
--- a/library/Icinga/Authentication/PhpSession.php
+++ b/library/Icinga/Authentication/PhpSession.php
@@ -51,21 +51,7 @@ class PhpSession extends Session
*
* @var string
*/
- const SESSION_NAME = 'Icinga2Web';
-
- /**
- * Flag if session is open
- *
- * @var bool
- */
- private $isOpen = false;
-
- /**
- * Flag if session is flushed
- *
- * @var bool
- */
- private $isFlushed = false;
+ private $sessionName = 'Icingaweb2';
/**
* Configuration for cookie options
@@ -96,8 +82,12 @@ class PhpSession extends Session
} else {
$options = PhpSession::$defaultCookieOptions;
}
+ if (array_key_exists('test_session_name', $options)) {
+ $this->sessionName = $options['test_session_name'];
+ unset($options['test_session_name']);
+ }
foreach ($options as $sessionVar => $value) {
- if (ini_set("session.".$sessionVar, $value) === false) {
+ if (ini_set("session." . $sessionVar, $value) === false) {
Logger::warn(
'Could not set php.ini setting %s = %s. This might affect your sessions behaviour.',
$sessionVar,
@@ -108,129 +98,38 @@ class PhpSession extends Session
if (!is_writable(session_save_path())) {
throw new ConfigurationError('Can\'t save session');
}
+ $this->read();
}
/**
- * Return true when the session has not yet been closed
- *
- * @return bool
+ * Open a PHP session
*/
- private function sessionCanBeChanged()
+ private function open()
{
- if ($this->isFlushed) {
- Logger::error('Tried to work on a closed session, session changes will be ignored');
- return false;
- }
- return true;
- }
-
- /**
- * Return true when the session has not yet been opened
- *
- * @return bool
- */
- private function sessionCanBeOpened()
- {
- if ($this->isOpen) {
- Logger::warn('Tried to open a session more than once');
- return false;
- }
- return $this->sessionCanBeChanged();
- }
-
- /**
- * Open a PHP session when possible
- *
- * @return bool True on success
- */
- public function open()
- {
- if (!$this->sessionCanBeOpened()) {
- return false;
- }
-
- session_name(self::SESSION_NAME);
+ session_name($this->sessionName);
session_start();
- $this->isOpen = true;
+ }
+
+ /**
+ * Read all values written to the underling session and make them accessible.
+ */
+ public function read()
+ {
+ $this->open();
$this->setAll($_SESSION);
- return true;
- }
-
- /**
- * Ensure that the session is open modifiable
- *
- * @return bool True on success
- */
- private function ensureOpen()
- {
- // try to open first
- if (!$this->isOpen) {
- if (!$this->open()) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Read all values written to the underling session and
- * makes them accessible. if keepOpen is not set, the session
- * is immediately closed again
- *
- * @param bool $keepOpen Set to true when modifying the session
- *
- * @return bool True on success
- */
- public function read($keepOpen = false)
- {
- if (!$this->ensureOpen()) {
- return false;
- }
- if ($keepOpen) {
- return true;
- }
- $this->close();
- return true;
+ session_write_close();
}
/**
* Write all values of this session object to the underlying session implementation
- *
- * If keepOpen is not set, the session is closed
- *
- * @param bool $keepOpen Set to true when modifying the session further
- *
- * @return bool True on success
*/
- public function write($keepOpen = false)
+ public function write()
{
- if (!$this->ensureOpen()) {
- return false;
- }
+ $this->open();
foreach ($this->getAll() as $key => $value) {
$_SESSION[$key] = $value;
}
- if ($keepOpen) {
- return null;
- }
- $this->close();
-
- return null;
- }
-
- /**
- * Close and writes the session
- *
- * Only call this if you want the session to be closed without any changes.
- *
- * @see PHPSession::write
- */
- public function close()
- {
- if (!$this->isFlushed) {
- session_write_close();
- }
- $this->isFlushed = true;
+ session_write_close();
}
/**
@@ -238,12 +137,12 @@ class PhpSession extends Session
*/
public function purge()
{
- if ($this->ensureOpen()) {
- $_SESSION = array();
- session_destroy();
- $this->clearCookies();
- $this->close();
- }
+ $this->open();
+ $_SESSION = array();
+ $this->setAll(array(), true);
+ session_destroy();
+ $this->clearCookies();
+ session_write_close();
}
/**
diff --git a/library/Icinga/Authentication/Session.php b/library/Icinga/Authentication/Session.php
index 0cdd5b3bd..8959549a6 100644
--- a/library/Icinga/Authentication/Session.php
+++ b/library/Icinga/Authentication/Session.php
@@ -41,29 +41,15 @@ abstract class Session
*/
private $sessionValues = array();
- /**
- * Open a session or creates a new one if not exists
- */
- abstract public function open();
-
/**
* Read all values from the underlying session implementation
- *
- * @param bool $keepOpen True to keep the session open
*/
- abstract public function read($keepOpen = false);
+ abstract public function read();
/**
* Persists changes to the underlying session implementation
- *
- * @param bool $keepOpen True to keep the session open
*/
- abstract public function write($keepOpen = false);
-
- /**
- * Close session
- */
- abstract public function close();
+ abstract public function write();
/**
* Purge session
@@ -78,10 +64,13 @@ abstract class Session
* @see self::persist
* @param string $key Name of value
* @param mixed $value Value
+ *
+ * @returns PhpSession this
*/
public function set($key, $value)
{
$this->sessionValues[$key] = $value;
+ return $this;
}
/**
diff --git a/library/Icinga/User.php b/library/Icinga/User.php
index 9003e9f64..4a35ac721 100644
--- a/library/Icinga/User.php
+++ b/library/Icinga/User.php
@@ -31,14 +31,16 @@ namespace Icinga;
use \DateTimeZone;
use \InvalidArgumentException;
-use Icinga\User\Preferences;
+use \Icinga\User\Preferences;
+use \Icinga\User\Message;
+use \Icinga\Authentication\PhpSession;
+
/**
* This class represents an authorized user
*
* You can retrieve authorization information (@TODO: Not implemented yet) or
* to retrieve user information
- *
*/
class User
{
@@ -105,6 +107,13 @@ class User
*/
private $preferences;
+ /**
+ * Queued notifications for this user.
+ *
+ * @var array()
+ */
+ private $messages;
+
/**
* Creates a user object given the provided information
*
@@ -334,4 +343,36 @@ 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;
+ }
}
diff --git a/library/Icinga/User/Message.php b/library/Icinga/User/Message.php
new file mode 100644
index 000000000..d10bb09f5
--- /dev/null
+++ b/library/Icinga/User/Message.php
@@ -0,0 +1,57 @@
+message = $message;
+ $this->level = $level;
+ }
+
+ /**
+ * @return string
+ */
+ public function getMessage()
+ {
+ return $this->message;
+ }
+
+ /**
+ * @return The
+ */
+ public function getLevel()
+ {
+ return $this->level;
+ }
+}
\ No newline at end of file
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index b7e2ee826..b153e7411 100755
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -58,17 +58,6 @@ class ActionController extends Zend_Controller_Action
*/
protected $requiresAuthentication = true;
- /**
- * Set true when this controller modifies the session
- *
- * otherwise the session will be written back to disk and closed before the controller
- * action is executed, leading to every modification in the session to be lost after
- * the response is submitted
- *
- * @var bool
- */
- protected $modifiesSession = false;
-
/**
* The constructor starts benchmarking, loads the configuration and sets
* other useful controller properties
@@ -114,10 +103,7 @@ class ActionController extends Zend_Controller_Action
return false;
}
- return !AuthManager::getInstance(
- null,
- array('writeSession' => $this->modifiesSession)
- )->isAuthenticated();
+ return !AuthManager::getInstance()->isAuthenticated();
}
/**
diff --git a/library/Icinga/Web/Controller/BaseConfigController.php b/library/Icinga/Web/Controller/BaseConfigController.php
index 86e108cbc..5ca93e9aa 100644
--- a/library/Icinga/Web/Controller/BaseConfigController.php
+++ b/library/Icinga/Web/Controller/BaseConfigController.php
@@ -30,6 +30,9 @@
namespace Icinga\Web\Controller;
use \Icinga\Application\Icinga;
+use \Icinga\Authentication\Manager as AuthenticationManager;
+use \Zend_Log;
+use \Icinga\User\Message;
/**
* Base class for Configuration Controllers
@@ -38,14 +41,36 @@ use \Icinga\Application\Icinga;
* added to the application's configuration dialog. If you create a subclass of
* BasePreferenceController and overwrite @see init(), make sure you call
* parent::init(), otherwise you won't have the $tabs property in your view.
- *
*/
class BaseConfigController extends ActionController
{
/**
- * @var Zend_Controller_Action_Helper_FlashMessenger
+ * Send a message with the logging level Zend_Log::INFO to the current user and
+ * commit the changes to the underlying session.
+ *
+ * @param $msg The message content
*/
- protected $flashManager;
+ protected function addSuccessMessage($msg)
+ {
+ AuthenticationManager::getInstance()->getUser()->addMessage(
+ new Message($msg, Zend_Log::INFO)
+ );
+ AuthenticationManager::getInstance()->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)
+ );
+ AuthenticationManager::getInstance()->getSession()->write();
+ }
/*
* Return an array of tabs provided by this configuration controller.
@@ -68,6 +93,5 @@ class BaseConfigController extends ActionController
{
parent::init();
$this->view->tabs = ControllerTabCollector::collectControllerTabs('ConfigController');
- $this->view->flashMessages = $this->_request->getParam('flash_message');
}
}
diff --git a/library/Icinga/Web/Widget/AlertMessageBox.php b/library/Icinga/Web/Widget/AlertMessageBox.php
new file mode 100644
index 000000000..9bf90facf
--- /dev/null
+++ b/library/Icinga/Web/Widget/AlertMessageBox.php
@@ -0,0 +1,128 @@
+user->getMessages();
+ $this->user->clearMessages();
+ AuthenticationManager::getInstance()->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' => 'icinga-icon-success'
+ ),
+ Zend_Log::NOTICE => array(
+ 'state' => 'alert-info',
+ 'icon' => 'icinga-icon-info'
+ ),
+ Zend_Log::WARN => array(
+ 'state' => 'alert-warning',
+ 'icon' => 'icinga-icon-warning'
+ ),
+ Zend_Log::ERR => array(
+ 'state' => 'alert-danger',
+ 'icon' => 'icinga-icon-danger'
+ )
+ );
+
+ /**
+ * 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 .= '
' .
+ '' .
+ '' . htmlspecialchars($message->getMessage()) . '' .
+ '
';
+ }
+ return $html;
+ }
+}
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 755a06173..c75a54829 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -34,6 +34,7 @@ use \Icinga\Application\Config as IcingaConfig;
use \Icinga\Config\PreservingIniWriter;
use \Icinga\Web\Controller\BaseConfigController;
use \Icinga\Web\Widget\Tab;
+use \Icinga\Web\Widget\AlertMessageBox;
use \Icinga\Web\Url;
use Icinga\Module\Monitoring\Form\Config\ConfirmRemovalForm;
@@ -69,6 +70,7 @@ class Monitoring_ConfigController extends BaseConfigController {
*/
public function indexAction()
{
+ $this->view->messageBox = new AlertMessageBox(true);
$this->view->backends = IcingaConfig::module('monitoring', 'backends')->toArray();
$this->view->instances = IcingaConfig::module('monitoring', 'instances')->toArray();
$this->render('index');
@@ -89,11 +91,11 @@ class Monitoring_ConfigController extends BaseConfigController {
$backendForm->setBackendConfiguration(IcingaConfig::module('monitoring', 'backends')->get($backend));
if ($backendForm->isSubmittedAndValid()) {
-
$newConfig = $backendForm->getConfig();
$config = IcingaConfig::module('monitoring', 'backends');
$config->$backend = $newConfig;
if ($this->writeConfiguration($config, 'backends')) {
+ $this->addSuccessMessage('Backend ' . $backend . ' Modified.');
$this->redirectNow('monitoring/config');
} else {
$this->render('show-configuration');
@@ -116,8 +118,8 @@ class Monitoring_ConfigController extends BaseConfigController {
$configArray[$form->getBackendName()] = $form->getConfig();
if ($this->writeConfiguration(new Zend_Config($configArray), 'backends')) {
- $this->view->successMessage = 'Backend Creation Succeeded';
- $this->indexAction();
+ $this->addSuccessMessage('Backend Creation Succeeded');
+ $this->redirectNow('monitoring/config');
} else {
$this->render('show-configuration');
}
@@ -146,8 +148,8 @@ class Monitoring_ConfigController extends BaseConfigController {
unset($configArray[$backend]);
if ($this->writeConfiguration(new Zend_Config($configArray), 'backends')) {
- $this->view->successMessage = 'Backend "' . $backend . '" Removed';
- $this->indexAction();
+ $this->addSuccessMessage('Backend "' . $backend . '" Removed');
+ $this->redirectNow('monitoring/config');
} else {
$this->render('show-configuration');
}
@@ -178,8 +180,8 @@ class Monitoring_ConfigController extends BaseConfigController {
unset($configArray[$instance]);
if ($this->writeConfiguration(new Zend_Config($configArray), 'instances')) {
- $this->view->successMessage = 'Instance "' . $instance . '" Removed';
- $this->indexAction();
+ $this->addSuccessMessage('Instance "' . $instance . '" Removed');
+ $this->redirectNow('monitoring/config');
} else {
$this->render('show-configuration');
}
@@ -207,8 +209,8 @@ class Monitoring_ConfigController extends BaseConfigController {
$instanceConfig = IcingaConfig::module('monitoring', 'instances')->toArray();
$instanceConfig[$instance] = $form->getConfig();
if ($this->writeConfiguration(new Zend_Config($instanceConfig), 'instances')) {
- $this->view->successMessage = 'Instance Modified';
- $this->indexAction();
+ $this->addSuccessMessage('Instance Modified');
+ $this->redirectNow('monitoring/config');
} else {
$this->render('show-configuration');
return;
@@ -228,8 +230,8 @@ class Monitoring_ConfigController extends BaseConfigController {
$instanceConfig = IcingaConfig::module('monitoring', 'instances')->toArray();
$instanceConfig[$form->getInstanceName()] = $form->getConfig()->toArray();
if ($this->writeConfiguration(new Zend_Config($instanceConfig), 'instances')) {
- $this->view->successMessage = 'Instance Creation Succeeded';
- $this->indexAction();
+ $this->addSuccessMessage('Instance Creation Succeeded');
+ $this->redirectNow('monitoring/config');
} else {
$this->render('show-configuration');
}
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 569500a82..39febc428 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -56,7 +56,6 @@ class Monitoring_ShowController extends MonitoringController
*/
public function init()
{
-
if ($this->getRequest()->getActionName() === 'host') {
$this->view->object = new Host($this->getRequest());
} elseif ($this->getRequest()->getActionName() === 'service'
diff --git a/modules/monitoring/application/views/scripts/config/editbackend.phtml b/modules/monitoring/application/views/scripts/config/editbackend.phtml
index 4344f9dbe..7ecf69bf0 100644
--- a/modules/monitoring/application/views/scripts/config/editbackend.phtml
+++ b/modules/monitoring/application/views/scripts/config/editbackend.phtml
@@ -1,8 +1,8 @@
-tabs->render($this); ?>
+
name): ?>
-
{{EDIT_ICON}} Edit Backend "escape($this->name) ?>"
+
Edit Backend "escape($this->name) ?>"
-
{{CREATE_ICON}} Create New Backend
+
Create New Backend
error): ?>
diff --git a/modules/monitoring/application/views/scripts/config/editinstance.phtml b/modules/monitoring/application/views/scripts/config/editinstance.phtml
index 5b6907c64..1a2f5fe97 100644
--- a/modules/monitoring/application/views/scripts/config/editinstance.phtml
+++ b/modules/monitoring/application/views/scripts/config/editinstance.phtml
@@ -1,9 +1,8 @@
-tabs->render($this); ?>
name)): ?>
-
{{EDIT_ICON}} Edit Instance Configuration for "escape($this->name) ?>"
+
} Edit Instance Configuration for "escape($this->name) ?>"
-
{{CREATE_ICON}} Configure New Icinga Instance
+
Configure New Icinga Instance
error): ?>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index a12501f9f..f9e1f0ea8 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -3,16 +3,13 @@
Monitoring Backends
-successMessage): ?>
-
- {{OK_ICON}}
- escape($this->successMessage); ?>
-
-
+messageBox)): ?>
+ messageBox->render() ?>
+
@@ -24,8 +21,8 @@
escape($backendName); ?>
(Type: escape($config['type'] === 'ido' ? 'IDO' : ucfirst($config['type'])); ?>)