From 7fb910bf216eee45fa7bcada5ab580d39f00bcb8 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 26 May 2014 13:46:14 +0000 Subject: [PATCH 01/96] layout/menu: don't show uncollapsed loading menu We have a no-JS-friendly CSS showing the menu uncollapsed unless JS is fully loaded. Even if the page loads pretty fast this looks still ugly in JS-enabled browsers. This patch adds a JS-snippet removing the no-js class from the HTML element before the rendering engine reaches the body. You'll see no more flickering in your JS-enabled browser. fixes #6307 --- application/layouts/scripts/layout.phtml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index c527edbd5..5c91b4b48 100644 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -30,6 +30,12 @@ $isIframe = isset($_GET['_render']) && $_GET['_render'] === 'iframe'; + From 5b87d6238bfc129d63ebf06c3bfdf4f1e934d8ee Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 26 May 2014 14:11:43 +0000 Subject: [PATCH 02/96] Modules\Module: improve provided metadata refs #4095 --- application/clicommands/ModuleCommand.php | 2 +- library/Icinga/Application/Modules/Module.php | 61 ++++++++++++++----- 2 files changed, 48 insertions(+), 15 deletions(-) diff --git a/application/clicommands/ModuleCommand.php b/application/clicommands/ModuleCommand.php index 6a6f981ed..1fb0932fd 100644 --- a/application/clicommands/ModuleCommand.php +++ b/application/clicommands/ModuleCommand.php @@ -67,7 +67,7 @@ class ModuleCommand extends Command if ($this->isVerbose) { $dir = ' ' . $this->modules->getModuleDir($module); } else { - $dir = $mod->getShortDescription(); + $dir = $mod->getTitle(); } printf( "%-14s %-9s %-9s %s\n", diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php index c765ca380..027bfc48b 100644 --- a/library/Icinga/Application/Modules/Module.php +++ b/library/Icinga/Application/Modules/Module.php @@ -292,13 +292,23 @@ class Module } /** - * Get short description + * Get module description * * @return string */ - public function getShortDescription() + public function getDescription() { - return $this->metadata()->shortDescription; + return $this->metadata()->description; + } + + /** + * Get module title (short description) + * + * @return string + */ + public function getTitle() + { + return $this->metadata()->title; } /** @@ -308,7 +318,6 @@ class Module */ public function getDependencies() { - return $this->metadata()->depends; } @@ -321,11 +330,11 @@ class Module { if ($this->metadata === null) { $metadata = (object) array( - 'name' => $this->getName(), - 'version' => '0.0.0', - 'shortDescription' => '', - 'description' => '', - 'depends' => array(), + 'name' => $this->getName(), + 'version' => '0.0.0', + 'title' => null, + 'description' => '', + 'depends' => array(), ); if (file_exists($this->metadataFile)) { @@ -336,15 +345,21 @@ class Module while (false !== ($line = fgets($fh))) { $line = rtrim($line); - if ($key === 'description' && $line[0] === ' ') { - $metadata->{$key} .= "\n" . ltrim($line); - continue; + if ($key === 'description') { + if (empty($line)) { + $metadata->description .= "\n"; + continue; + } elseif ($line[0] === ' ') { + $metadata->description .= $line; + continue; + } } list($key, $val) = preg_split('/:\s+/', $line, 2); $key = lcfirst($key); switch ($key) { + case 'depends': if (strpos($val, ' ') === false) { $metadata->depends[$val] = true; @@ -361,9 +376,15 @@ class Module } } break; + case 'description': - $metadata->shortDescription = $val; - // YES, no break here + if ($metadata->title === null) { + $metadata->title = $val; + } else { + $metadata->description = $val; + } + break; + default: $metadata->{$key} = $val; @@ -371,6 +392,18 @@ class Module } } + if ($metadata->title === null) { + $metadata->title = $this->getName(); + } + + if ($metadata->description === '') { + // TODO: Check whether the translation module is able to + // extract this + $metadata->description = t( + 'This module has no description' + ); + } + $this->metadata = $metadata; } return $this->metadata; From 7c68d0a30fba92c44edff4604a60424df19edf94 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 26 May 2014 14:14:34 +0000 Subject: [PATCH 03/96] Modules\Module: clean up phpdoc blocks --- library/Icinga/Application/Modules/Module.php | 60 +++++++++++-------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php index 027bfc48b..5ee89e0d5 100644 --- a/library/Icinga/Application/Modules/Module.php +++ b/library/Icinga/Application/Modules/Module.php @@ -200,9 +200,9 @@ class Module /** * Test for an enabled module by name * - * @param string $name + * @param string $name * - * @return boolean + * @return boolean */ public static function exists($name) { @@ -212,12 +212,12 @@ class Module /** * Get module by name * - * @param string $name - * @param bool $autoload + * @param string $name + * @param bool $autoload * - * @return mixed + * @return mixed * - * @throws \Icinga\Exception\ProgrammingError When the module is not yet loaded + * @throws ProgrammingError When the module is not yet loaded */ public static function get($name, $autoload = false) { @@ -429,6 +429,11 @@ class Module return $this->basedir; } + /** + * Get the controller directory + * + * @return string + */ public function getControllerDir() { return $this->controllerdir; @@ -467,21 +472,20 @@ class Module /** * Getter for module config object * - * @param string $file + * @param string $file * - * @return Config + * @return Config */ public function getConfig($file = null) { - return $this->app - ->getConfig() - ->module($this->name, $file); + return $this->app->getConfig()->module($this->name, $file); } /** * Retrieve provided permissions * - * @param string $name Permission name + * @param string $name Permission name + * * @return array */ public function getProvidedPermissions() @@ -505,7 +509,8 @@ class Module /** * Whether the given permission name is supported * - * @param string $name Permission name + * @param string $name Permission name + * * @return bool */ public function providesPermission($name) @@ -517,7 +522,8 @@ class Module /** * Whether the given restriction name is supported * - * @param string $name Restriction name + * @param string $name Restriction name + * * @return bool */ public function providesRestriction($name) @@ -529,9 +535,10 @@ class Module /** * Provide a named permission * - * @param string $name Unique permission name - * @param string $name Permission description - * @return void + * @param string $name Unique permission name + * @param string $name Permission description + * + * @return void */ protected function providePermission($name, $description) { @@ -549,9 +556,10 @@ class Module /** * Provide a named restriction * - * @param string $name Unique restriction name - * @param string $name Restriction description - * @return void + * @param string $name Unique restriction name + * @param string $description Restriction description + * + * @return void */ protected function provideRestriction($name, $description) { @@ -671,9 +679,9 @@ class Module /** * Include a php script if it is readable * - * @param string $file File to include + * @param string $file File to include * - * @return self + * @return self */ protected function includeScript($file) { @@ -703,11 +711,11 @@ class Module /** * Register hook * - * @param string $name - * @param string $class - * @param string $key + * @param string $name + * @param string $class + * @param string $key * - * @return self + * @return self */ protected function registerHook($name, $class, $key = null) { From 8a770007fff60e074d4b1f031a73dd296ba755bd Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 26 May 2014 14:17:46 +0000 Subject: [PATCH 04/96] Modules\Module: provide a lighter header sample We should get rid of the current way of copying license snippets to every single file. This is a first example of how a lighter header could look like. I'd add a short slogan to the title and place a copy of the license to icinga.org, so our links could point there instead of gnu.org. refs #6309 --- library/Icinga/Application/Modules/Module.php | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php index 5ee89e0d5..e732ba412 100644 --- a/library/Icinga/Application/Modules/Module.php +++ b/library/Icinga/Application/Modules/Module.php @@ -1,32 +1,12 @@ - * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 - * @author Icinga Development Team - * - */ -// {{{ICINGA_LICENSE_HEADER}}} +/** + * Icingaweb 2 + * + * @link https://git.icinga.org/icingaweb2.git/ for the official source repository + * @copyright Copyright (c) 2013-2014 Icinga Development Team (https://www.icinga.org) + * @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2 + */ namespace Icinga\Application\Modules; use Exception; From ed0b731062c506289b1222c1e3c715d5c71a4e38 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 26 May 2014 14:32:59 +0000 Subject: [PATCH 05/96] config/module: remove unused show.phtml I see no reference to this file, byebye. --- .../views/scripts/config/module/show.phtml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 application/views/scripts/config/module/show.phtml diff --git a/application/views/scripts/config/module/show.phtml b/application/views/scripts/config/module/show.phtml deleted file mode 100644 index 51d6ecae3..000000000 --- a/application/views/scripts/config/module/show.phtml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - modules as $module): ?> - - - - - - - -
ModuleTypeActive
From af41ae875da54ea25db08712460569d4a8507094 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 26 May 2014 14:35:59 +0000 Subject: [PATCH 06/96] monitoring/module.info: provide sample metadata We are currently able to read module metadata, but our modules don't provide such. Here you go, feel free to extend it's description. --- modules/monitoring/module.info | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 modules/monitoring/module.info diff --git a/modules/monitoring/module.info b/modules/monitoring/module.info new file mode 100644 index 000000000..a807a5316 --- /dev/null +++ b/modules/monitoring/module.info @@ -0,0 +1,5 @@ +Module: monitoring +Version: 2.0.0~alpha4 +Description: Icinga monitoring module + This is the core module for most Icingaweb users. It provides an + abstraction layer for various Icinga data backends. From 4f1b7f16e4140989318421ccf081917d33666eec Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 26 May 2014 14:38:03 +0000 Subject: [PATCH 07/96] config/modules: prepare new view scripts The controller is still pointing to the former view script, it will soon be replaced by this ones. As soon as I created two forms handling enable/disable requests this will be completed. refs #4095 --- application/views/scripts/config/module.phtml | 56 +++++++++++++++++++ .../views/scripts/config/modules.phtml | 41 ++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 application/views/scripts/config/module.phtml create mode 100644 application/views/scripts/config/modules.phtml diff --git a/application/views/scripts/config/module.phtml b/application/views/scripts/config/module.phtml new file mode 100644 index 000000000..ceb14feb2 --- /dev/null +++ b/application/views/scripts/config/module.phtml @@ -0,0 +1,56 @@ +
+tabs ?> +
+
+ +translate('There is no such module installed.') ?> + +getDependencies(); +$restrictions = $module->getProvidedRestrictions(); +$permissions = $module->getProvidedPermissions(); + +?> +

escape($module->getTitle()) ?>

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
escape('Name') ?>escape($module->getName()) ?>
escape('Version') ?>escape($module->getVersion()) ?>
escape('Description') ?>escape($module->getDescription())) ?>
escape('Dependencies') ?>translate('This module has no dependencies'); + +else: foreach ($dependencies as $name => $versionString): ?> +escape($name) ?>: escape($versionString) ?>
+
escape('Permissions') ?> +escape($permission->name) ?>: escape($permission->description) ?>
+
escape('Restrictions') ?> +escape($restriction->name) ?>: escape($restriction->description) ?>
+
+ +
diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml new file mode 100644 index 000000000..b4210d4d4 --- /dev/null +++ b/application/views/scripts/config/modules.phtml @@ -0,0 +1,41 @@ +modules->limit(10); +$modules = $this->modules->paginate(); + +?> +
+tabs->render($this); ?> +
+ +
+

Installed Modules

+ +messageBox)): ?> + messageBox->render() ?> + + +paginationControl($modules, null, null, array( + 'preserve' => $this->preserve +)); +?> + + + + + + + + +
+ enabled): ?> + icon('success.png', 'Module is enabled') ?> + + icon('remove.png', 'Module is disabled') ?> + + escape($module->name); ?> + (enabled ? ($module->loaded ? 'enabled' : 'failed') : 'disabled' ?>) +
+
From 70ba36aad66bf44d8fbb4b9863c1e31dd5b5201a Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 26 May 2014 14:41:47 +0000 Subject: [PATCH 08/96] notifications: improve client- and serverside This is just a first step, trying to catch a few gotchas: * it doesn't send notifications to the browser when issueing a redirect as redirects can currently not be catched in jQuery response handlers * it tries to find a better notification handling place in the response handler (JS) - still imperfect * it explicitely stores sessions once modified by notifications. Still need to crosscheck whether this is really needed and how we can get rid of this. refs #6280 --- .../Web/Controller/ActionController.php | 5 ++- library/Icinga/Web/Notification.php | 2 ++ public/js/icinga/loader.js | 31 ++++++++++++++----- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 5893a3c3f..889be721c 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -81,6 +81,8 @@ class ActionController extends Zend_Controller_Action private $windowId; + protected $isRedirect = false; + // TODO: This would look better if we had a ModuleActionController public function Config($file = null) { @@ -371,6 +373,7 @@ class ActionController extends Zend_Controller_Action $url = Url::fromPath($url)->getRelativeUrl(); } $this->_helper->Redirector->gotoUrlAndExit(preg_replace('~&~', '&', $url)); + $this->isRedirect = true; } /** @@ -412,7 +415,7 @@ class ActionController extends Zend_Controller_Action } $notifications = Notification::getInstance(); - if ($isXhr && $notifications->hasMessages()) { + if ($isXhr && ! $this->isRedirect && $notifications->hasMessages()) { foreach ($notifications->getMessages() as $m) { header('X-Icinga-Notification: ' . $m->type . ' ' . $m->message); } diff --git a/library/Icinga/Web/Notification.php b/library/Icinga/Web/Notification.php index 6a29cfc3f..941654277 100644 --- a/library/Icinga/Web/Notification.php +++ b/library/Icinga/Web/Notification.php @@ -112,6 +112,7 @@ class Notification $msgs = $session->messages; $msgs[] = $mo; $session->messages = $msgs; + $session->write(); } public function hasMessages() @@ -125,6 +126,7 @@ class Notification $session = Session::getSession(); $msgs = $session->messages; $session->messages = array(); + $session->write(); return $msgs; } diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index ead489be7..d3343c75c 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -287,13 +287,6 @@ } var notifications = req.getResponseHeader('X-Icinga-Notification'); - if (notifications) { - var parts = notifications.split(' '); - this.createNotice( - parts.shift(), - parts.join(' ') - ); - } // var target = req.getResponseHeader('X-Icinga-Container'); @@ -310,6 +303,14 @@ newBody = true; } + if (! newBody && notifications) { + var parts = notifications.split(' '); + this.createNotice( + parts.shift(), + parts.join(' ') + ); + } + var moduleName = req.getResponseHeader('X-Icinga-Module'); classes = $.grep(req.$target.classes(), function (el) { if (el === 'icinga-module' || el.match(/^module\-/)) { @@ -424,6 +425,14 @@ */ if (rendered) { + + if (newBody && notifications) { + var parts = notifications.split(' '); + this.createNotice( + parts.shift(), + parts.join(' ') + ); + } return; } @@ -435,6 +444,14 @@ if (newBody) { this.icinga.ui.fixDebugVisibility().triggerWindowResize(); } + if (newBody && notifications) { + var parts = notifications.split(' '); + this.createNotice( + parts.shift(), + parts.join(' ') + ); + } + if (active) { var focusedUrl = this.icinga.ui.getFocusedContainerDataUrl(); From 40e45a2a39cdf767a96edf4d6472f99a8fe978f4 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 26 May 2014 14:57:18 +0000 Subject: [PATCH 09/96] monitoring/lists: Don't render unexistant controls Even PHP code in HTML comments will be executed. As the filter object sometimes failes, this can result in an invisible "breaking" exception. refs #6031 --- modules/monitoring/application/views/scripts/list/hosts.phtml | 2 +- .../monitoring/application/views/scripts/list/services.phtml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 29a5597a6..4b13acb4b 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -4,7 +4,7 @@ $helper = $this->getHelper('MonitoringState');
tabs ?>
-Sort by sortControl->render($this); ?> +Sort by sortControl->render($this); ?>
paginationControl($hosts, null, null, array('preserve' => $this->preserve)); ?> diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index 346555a07..c807e68c8 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -5,7 +5,6 @@ if (!$this->compact): ?>
tabs ?>
- Sort by sortControl ?>
From 886c8b12315b6060d51ba268383cbdde6eb867a7 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 27 May 2014 10:54:44 +0000 Subject: [PATCH 10/96] js/notifications: fixed target=ignore notification Ongoing error handling cleanup silently dropped notifications for requests with "invalid" target (e.g. commands not redirecting after submission - they should not exist, but they do). This is redundant code, but that's ok for now - response handling will be restructured. fixes #6327 refs #6280 --- public/js/icinga/loader.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index d3343c75c..d88e5adcc 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -288,11 +288,15 @@ var notifications = req.getResponseHeader('X-Icinga-Notification'); - // var target = req.getResponseHeader('X-Icinga-Container'); var newBody = false; if (target) { if (target === 'ignore') { + var parts = notifications.split(' '); + this.createNotice( + parts.shift(), + parts.join(' ') + ); return; } // If we change the target, oncomplete will fail to clean up From 360ac875503d83d696c0cc2263f6a6f49221881f Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 27 May 2014 21:41:46 +0000 Subject: [PATCH 11/96] Translation: add a module-aware translation helper With this fix $this->translate works in our view scripts refs #6338 --- library/Icinga/Web/Controller/ActionController.php | 3 +++ library/Icinga/Web/View.php | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 889be721c..e2c514f82 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -128,6 +128,9 @@ class ActionController extends Zend_Controller_Action $this->windowId = $this->_request->getHeader('X-Icinga-WindowId', null); } + $module = $request->getModuleName(); + $this->view->translationDomain = $module === 'default' ? 'icinga' : $module; + if ($this->requiresConfig() === false) { if ($this->requiresLogin() === false) { $this->view->tabs = new Tabs(); diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php index 67995f8c7..ce44ea73a 100644 --- a/library/Icinga/Web/View.php +++ b/library/Icinga/Web/View.php @@ -31,6 +31,7 @@ namespace Icinga\Web; use Icinga\Exception\ProgrammingError; +use Icinga\Util\Translator; use Zend_View_Abstract; use Closure; @@ -154,6 +155,11 @@ class View extends Zend_View_Abstract ); } + public function translate($text) + { + return Translator::translate($text, $this->translationDomain); + } + /** * Load helpers */ From b47cec3e028446e4def7844acbc14f7b76dd5e39 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 27 May 2014 21:44:02 +0000 Subject: [PATCH 12/96] Translation: use translation for monitoring/views Just a bunch of translation-helper calls refs #6339 --- .../views/scripts/list/eventhistory.phtml | 4 ++-- .../application/views/scripts/list/hosts.phtml | 8 ++++---- .../views/scripts/list/notifications.phtml | 2 +- .../views/scripts/list/servicematrix.phtml | 2 +- .../application/views/scripts/list/services.phtml | 6 +++--- .../scripts/show/components/acknowledgement.phtml | 8 ++++---- .../scripts/show/components/checkstatistics.phtml | 4 ++-- .../views/scripts/show/components/flags.phtml | 12 ++++++------ .../views/scripts/show/components/header.phtml | 10 +++++----- .../scripts/show/components/notifications.phtml | 4 ++-- .../application/views/scripts/show/history.phtml | 4 ++-- .../application/views/scripts/show/host.phtml | 2 +- .../application/views/scripts/show/service.phtml | 2 +- .../application/views/scripts/show/services.phtml | 2 +- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml index fb8e1b212..ba7034a1e 100644 --- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml +++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml @@ -1,14 +1,14 @@
tabs->render($this); ?>
-Sort by sortControl->render($this); ?> +translate('Sort by') ?> sortControl->render($this); ?>
paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
-No entries found +translate('No entries found') ?>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 4b13acb4b..bb169c892 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -4,7 +4,7 @@ $helper = $this->getHelper('MonitoringState');
tabs ?>
-Sort by sortControl->render($this); ?> +translate('Sort by') ?> sortControl->render($this); ?>
paginationControl($hosts, null, null, array('preserve' => $this->preserve)); ?> @@ -15,7 +15,7 @@ Sort by sortControl->render($this); ?> count() === 0) { - echo 'No host found
'; + echo $this->translate('No host found') . '
'; return; } ?> @@ -78,10 +78,10 @@ if ($hosts->count() === 0) { monitoringState($host, 'host')); ?>
- Since timeSince($host->host_last_state_change); ?> + translate('Since') ?> timeSince($host->host_last_state_change); ?> host_state > 0): ?>
- host_state_type === '1') ? 'Hard' : 'Soft'; ?> host_current_check_attempt; ?>/host_max_check_attempts; ?> + host_state_type === '1') ? $this->translate('Hard') : $this->translate('Soft') ?> host_current_check_attempt; ?>/host_max_check_attempts; ?>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml index 97b56a650..cd94600cc 100644 --- a/modules/monitoring/application/views/scripts/list/notifications.phtml +++ b/modules/monitoring/application/views/scripts/list/notifications.phtml @@ -1,7 +1,7 @@
tabs ?>
-Sort by sortControl->render($this) ?> +translate('Sort by') ?> sortControl->render($this) ?> selectionToolbar('single') ?>
diff --git a/modules/monitoring/application/views/scripts/list/servicematrix.phtml b/modules/monitoring/application/views/scripts/list/servicematrix.phtml index 224dd46c5..65dea6d4e 100644 --- a/modules/monitoring/application/views/scripts/list/servicematrix.phtml +++ b/modules/monitoring/application/views/scripts/list/servicematrix.phtml @@ -2,7 +2,7 @@
tabs; ?>
- Sort by sortControl ?> + translate('Sort by') ?> sortControl ?>
partial( 'pivottablePagination.phtml', diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index c807e68c8..d16690d52 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -5,7 +5,7 @@ if (!$this->compact): ?>
tabs ?>
-Sort by sortControl ?> +translate('Sort by') ?> sortControl ?>
paginationControl($services, null, null, array('preserve' => $this->preserve)) ?> @@ -39,9 +39,9 @@ foreach ($services as $service): ?> - monitoringState($service, 'service')); ?>
+ translate(strtoupper($helper->monitoringState($service, 'service'))) ?>
- compact): ?>Since timeSince($service->service_last_state_change); ?> + compact): ?>translate('Since') ?> timeSince($service->service_last_state_change); ?> service_state > 0 && (int) $service->service_state_type === 0): ?>
Soft service_attempt ?> diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml index a96e98fdc..38359bf34 100644 --- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml +++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml @@ -22,19 +22,19 @@ if ($object instanceof Host && $object->host_acknowledged || $object instanceof Service && $object->service_acknowledged): ?> Issue acknowledged labelSubmitForm( - 'Remove Acknowledgement', - 'Remove problem acknowledgement', + $this->translate('Remove Acknowledgement'), + $this->translate('Remove problem acknowledgement'), 'link-like', 'removeacknowledgement', $data ) ?> - Not acknowledged + translate('Not acknowledged') ?> icon('acknowledgement_petrol.png') ?> Acknowledge + ) ?>">icon('acknowledgement_petrol.png') ?> translate('Acknowledge') ?> diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml index 3d564e1e1..e5cf0e0a4 100644 --- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml +++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml @@ -5,8 +5,8 @@ $cf = $this->getHelper('CommandForm'); ?> translate('Last check') ?> img('img/icons/refresh_petrol.png') ?> labelSubmitForm( - 'Check now', - 'Reschedule next check immediately', + $this->translate('Check now'), + $this->translate('Reschedule next check immediately'), 'link-like', 'reschedulenextcheck', array( diff --git a/modules/monitoring/application/views/scripts/show/components/flags.phtml b/modules/monitoring/application/views/scripts/show/components/flags.phtml index 585520328..fb02b97a3 100644 --- a/modules/monitoring/application/views/scripts/show/components/flags.phtml +++ b/modules/monitoring/application/views/scripts/show/components/flags.phtml @@ -10,7 +10,7 @@ $data = array( ?> - Passive Checks + translate('Passive Checks') ?> toggleSubmitForm( '', $o->passive_checks_enabled, @@ -21,7 +21,7 @@ $data = array( ) ?> - Active Checks + translate('Active Checks') ?> toggleSubmitForm( '', $o->active_checks_enabled, @@ -32,7 +32,7 @@ $data = array( ) ?> - Notifications + translate('Notifications') ?> toggleSubmitForm( '', $o->notifications_enabled, @@ -43,7 +43,7 @@ $data = array( ) ?> - Event Handler + translate('Event Handler') ?> toggleSubmitForm( '', $o->event_handler_enabled, @@ -54,7 +54,7 @@ $data = array( ) ?> - Flap Detection + translate('Flap Detection') ?> toggleSubmitForm( '', $o->flap_detection_enabled, @@ -65,7 +65,7 @@ $data = array( ) ?> - Obsessing + translate('Obsessing') ?> toggleSubmitForm( '', $o->obsessing, diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml index 0cfdfb048..774c1edf0 100644 --- a/modules/monitoring/application/views/scripts/show/components/header.phtml +++ b/modules/monitoring/application/views/scripts/show/components/header.phtml @@ -5,8 +5,8 @@ - - +
> - util()->getHostStateName($object->host_state) ?>
- since timeSince($object->host_last_state_change) ?> + translate($this->util()->getHostStateName($object->host_state)) ?>
+ translate('Since') ?> timeSince($object->host_last_state_change) ?> 		escape($object->host_name) ?>host_address && $object->host_address !== $object->host_name): ?> @@ -17,10 +17,10 @@
- util()->getServiceStateName($object->service_state); ?>
- since timeSince($object->service_last_state_change) ?> + translate($this->util()->getServiceStateName($object->service_state)) ?>
+ translate('Since') ?> timeSince($object->service_last_state_change) ?> 		Service: escape($object->service_description) ?> + translate('Service') ?>: escape($object->service_description) ?> render('show/components/statusIcons.phtml') ?> diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml index 09c54539e..5c52e872a 100644 --- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml +++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml @@ -7,7 +7,7 @@ if (in_array((int) $object->state, array(0, 99))) { ?>
Notificationstranslate('Notifications') ?> current_notification_number > 0) { $this->translate('%s notications have been sent for this issue'), $object->current_notification_number ) . '
' . sprintf( - 'The last one occured %s ago', + $this->translate('The last one occured %s ago'), $this->timeSince($object->last_notification) ); } diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml index 32e3cbdfb..2b7aa63d9 100644 --- a/modules/monitoring/application/views/scripts/show/history.phtml +++ b/modules/monitoring/application/views/scripts/show/history.phtml @@ -33,12 +33,12 @@ $states = array( ?>
render('show/components/header.phtml') ?> -

This object's event history

+

translate("This object's event history") ?>

paginationControl($this->history, null, null, array('preserve' => $this->preserve)); ?>
history->count() === 0): ?> -No History Available For This Object +translate('No History Available For This Object' ?> diff --git a/modules/monitoring/application/views/scripts/show/host.phtml b/modules/monitoring/application/views/scripts/show/host.phtml index 189729192..e2f6ee1c4 100644 --- a/modules/monitoring/application/views/scripts/show/host.phtml +++ b/modules/monitoring/application/views/scripts/show/host.phtml @@ -1,6 +1,6 @@
render('show/components/header.phtml') ?> -

This host's current state

+

translate("This host's current state") ?>

render('show/components/output.phtml') ?> diff --git a/modules/monitoring/application/views/scripts/show/service.phtml b/modules/monitoring/application/views/scripts/show/service.phtml index 1c8f42c9f..19e5666e2 100644 --- a/modules/monitoring/application/views/scripts/show/service.phtml +++ b/modules/monitoring/application/views/scripts/show/service.phtml @@ -1,6 +1,6 @@
render('show/components/header.phtml') ?> -

This service's current state

+

translate("This service's current state") ?>

render('show/components/output.phtml') ?> diff --git a/modules/monitoring/application/views/scripts/show/services.phtml b/modules/monitoring/application/views/scripts/show/services.phtml index 06aee393f..bd734b97b 100644 --- a/modules/monitoring/application/views/scripts/show/services.phtml +++ b/modules/monitoring/application/views/scripts/show/services.phtml @@ -1,6 +1,6 @@
render('show/components/header.phtml') ?> -

All services configured on this host

+

translate('All services configured on this host') ?>

From cfa0251dbf75e28b1973d0336944084b1a8d15c4 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 27 May 2014 21:47:13 +0000 Subject: [PATCH 13/96] Translation: another bunch of translatable strings refs #6339 --- .../controllers/AuthenticationController.php | 2 +- application/controllers/SearchController.php | 32 +-- .../layouts/scripts/parts/navigation.phtml | 2 +- .../views/scripts/authentication/login.phtml | 2 +- .../controllers/CommandController.php | 190 +++++++++--------- 5 files changed, 117 insertions(+), 111 deletions(-) diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php index 1066a5802..a26034082 100644 --- a/application/controllers/AuthenticationController.php +++ b/application/controllers/AuthenticationController.php @@ -60,7 +60,7 @@ class AuthenticationController extends ActionController { $this->view->form = new LoginForm(); $this->view->form->setRequest($this->_request); - $this->view->title = 'Icinga Web Login'; + $this->view->title = $this->translate('Icingaweb Login'); try { $redirectUrl = Url::fromPath($this->_request->getParam('redirect', 'dashboard')); diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php index 5760803da..f648ce8a7 100644 --- a/application/controllers/SearchController.php +++ b/application/controllers/SearchController.php @@ -19,19 +19,25 @@ class SearchController extends ActionController $this->view->hint = $this->translate('Ready to search, waiting for your input'); return; } - $dashboard = Widget::create('dashboard')->createPane('Search'); - $pane = $dashboard->getPane('Search'); + $dashboard = Widget::create('dashboard')->createPane($this->translate('Search')); + $pane = $dashboard->getPane($this->translate('Search')); $suffix = strlen($search) ? ': ' . rtrim($search, '*') . '*' : ''; - $pane->addComponent('Hosts' . $suffix, Url::fromPath('monitoring/list/hosts', array( - 'host_name' => $search . '*', - 'sort' => 'host_severity', - 'limit' => 10, - ))); - $pane->addComponent('Services' . $suffix, Url::fromPath('monitoring/list/services', array( - 'service_description' => $search . '*', - 'sort' => 'service_severity', - 'limit' => 10, - ))); + $pane->addComponent( + $this->translate('Hosts') . $suffix, + Url::fromPath('monitoring/list/hosts', array( + 'host_name' => $search . '*', + 'sort' => 'host_severity', + 'limit' => 10, + ) + )); + $pane->addComponent( + $this->translate('Services') . $suffix, + Url::fromPath('monitoring/list/services', array( + 'service_description' => $search . '*', + 'sort' => 'service_severity', + 'limit' => 10, + ) + )); $pane->addComponent('Hostgroups' . $suffix, Url::fromPath('monitoring/list/hostgroups', array( 'hostgroup' => $search . '*', 'limit' => 10, @@ -40,7 +46,7 @@ class SearchController extends ActionController 'servicegroup' => $search . '*', 'limit' => 10, ))); - $dashboard->activate('Search'); + $dashboard->activate($this->translate('Search')); $this->view->dashboard = $dashboard; $this->view->tabs = $dashboard->getTabs(); } diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml index 391b4d1dd..0e47d5358 100644 --- a/application/layouts/scripts/parts/navigation.phtml +++ b/application/layouts/scripts/parts/navigation.phtml @@ -14,7 +14,7 @@ $menu = Menu::fromConfig(); ?>
-

Icinga Users Login

+

translate('Icingaweb Login') ?>

errorInfo)): ?> diff --git a/modules/monitoring/application/controllers/CommandController.php b/modules/monitoring/application/controllers/CommandController.php index f73cc9739..e871e9b64 100644 --- a/modules/monitoring/application/controllers/CommandController.php +++ b/modules/monitoring/application/controllers/CommandController.php @@ -302,19 +302,19 @@ class Monitoring_CommandController extends ActionController ); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable Active Checks')); + $form->setSubmitLabel($this->translate('Disable Active Checks')); if ($form->provideGlobalCommand()) { - $form->addNote(t('Disable active checks on a program-wide basis.')); + $form->addNote($this->translate('Disable active checks on a program-wide basis.')); } else { - $form->addNote(t('Disable active checks for this object.')); + $form->addNote($this->translate('Disable active checks for this object.')); } $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, active checks will be disabled'); + Notification::success($this->translate('Command has been sent, active checks will be disabled')); } } @@ -329,17 +329,17 @@ class Monitoring_CommandController extends ActionController $form->setGlobalCommands('START_EXECUTING_HOST_CHECKS', 'START_EXECUTING_SVC_CHECKS'); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable Active Checks')); + $form->setSubmitLabel($this->translate('Enable Active Checks')); if ($form->provideGlobalCommand()) { - $form->addNote(t('Enable active checks on a program-wide basis.')); + $form->addNote($this->translate('Enable active checks on a program-wide basis.')); } else { - $form->addNote(t('Enable active checks for this object.')); + $form->addNote($this->translate('Enable active checks for this object.')); } $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, active checks will be enabled'); + Notification::success($this->translate('Command has been sent, active checks will be enabled')); } } @@ -358,7 +358,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, check will be rescheduled'); + Notification::success($this->translate('Command has been sent, check will be rescheduled')); } } @@ -381,7 +381,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Passive check result has been submitted'); + Notification::success($this->translate('Passive check result has been submitted')); } } @@ -393,12 +393,12 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host', 'service', 'global')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Stop obsessing')); + $form->setSubmitLabel($this->translate('Stop obsessing')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Disable obsessing on a program-wide basis.')); + $form->addNote($this->translate('Disable obsessing on a program-wide basis.')); } else { - $form->addNote(t('Stop obsessing over this object.')); + $form->addNote($this->translate('Stop obsessing over this object.')); } $form->setCommand( @@ -415,7 +415,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, obsessing will be disabled'); + Notification::success($this->translate('Command has been sent, obsessing will be disabled')); } } @@ -427,12 +427,12 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host', 'service', 'global')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Start obsessing')); + $form->setSubmitLabel($this->translate('Start obsessing')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Enable obsessing on a program-wide basis.')); + $form->addNote($this->translate('Enable obsessing on a program-wide basis.')); } else { - $form->addNote(t('Start obsessing over this object.')); + $form->addNote($this->translate('Start obsessing over this object.')); } $form->setCommand( @@ -449,7 +449,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, obsessing will be enabled'); + Notification::success($this->translate('Command has been sent, obsessing will be enabled')); } } @@ -461,12 +461,12 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host', 'service', 'global')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Stop Accepting Passive Checks')); + $form->setSubmitLabel($this->translate('Stop Accepting Passive Checks')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Disable passive checks on a program-wide basis.')); + $form->addNote($this->translate('Disable passive checks on a program-wide basis.')); } else { - $form->addNote(t('Passive checks for this object will be omitted.')); + $form->addNote($this->translate('Passive checks for this object will be omitted.')); } $form->setCommand( @@ -483,7 +483,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, passive check results will be refused'); + Notification::success($this->translate('Command has been sent, passive check results will be refused')); } } @@ -495,12 +495,12 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host', 'service', 'global')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Start Accepting Passive Checks')); + $form->setSubmitLabel($this->translate('Start Accepting Passive Checks')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Enable passive checks on a program-wide basis.')); + $form->addNote($this->translate('Enable passive checks on a program-wide basis.')); } else { - $form->addNote(t('Passive checks for this object will be accepted.')); + $form->addNote($this->translate('Passive checks for this object will be accepted.')); } $form->setCommand( @@ -516,7 +516,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, passive check results will be accepted'); + Notification::success($this->translate('Command has been sent, passive check results will be accepted')); } } @@ -534,7 +534,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, notifications will be disabled'); + Notification::success($this->translate('Command has been sent, notifications will be disabled')); } } @@ -547,12 +547,12 @@ class Monitoring_CommandController extends ActionController $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable Notifications')); + $form->setSubmitLabel($this->translate('Disable Notifications')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Disable notifications on a program-wide basis.')); + $form->addNote($this->translate('Disable notifications on a program-wide basis.')); } else { - $form->addNote(t('Notifications for this object will be disabled.')); + $form->addNote($this->translate('Notifications for this object will be disabled.')); } $form->setCommand('DISABLE_HOST_NOTIFICATIONS', 'DISABLE_SVC_NOTIFICATIONS'); @@ -562,7 +562,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, notifications will be disabled'); + Notification::success($this->translate('Command has been sent, notifications will be disabled')); } } @@ -577,12 +577,12 @@ class Monitoring_CommandController extends ActionController $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable Notifications')); + $form->setSubmitLabel($this->translate('Enable Notifications')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Enable notifications on a program-wide basis.')); + $form->addNote($this->translate('Enable notifications on a program-wide basis.')); } else { - $form->addNote(t('Notifications for this object will be enabled.')); + $form->addNote($this->translate('Notifications for this object will be enabled.')); } $form->setCommand('ENABLE_HOST_NOTIFICATIONS', 'ENABLE_SVC_NOTIFICATIONS'); @@ -592,7 +592,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, notifications will be enabled'); + Notification::success($this->translate('Command has been sent, notifications will be enabled')); } } @@ -608,7 +608,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Custom notification has been sent'); + Notification::success($this->translate('Custom notification has been sent')); } } @@ -627,7 +627,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Downtime scheduling requested'); + Notification::success($this->translate('Downtime scheduling requested')); } } @@ -645,7 +645,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Downtime scheduling requested'); + Notification::success($this->translate('Downtime scheduling requested')); } } @@ -657,14 +657,14 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Remove Downtime(s)')); - $form->addNote(t('Remove downtime(s) from this host and its services.')); + $form->setSubmitLabel($this->translate('Remove Downtime(s)')); + $form->addNote($this->translate('Remove downtime(s) from this host and its services.')); $form->setCommand('DEL_DOWNTIME_BY_HOST_NAME', 'DEL_DOWNTIME_BY_HOST_NAME'); $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Downtime removal requested'); + Notification::success($this->translate('Downtime removal requested')); } } @@ -676,8 +676,8 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable Notifications')); - $form->addNote(t('Notifications for this host and its services will be disabled.')); + $form->setSubmitLabel($this->translate('Disable Notifications')); + $form->addNote($this->translate('Notifications for this host and its services will be disabled.')); $form->setCommand('DISABLE_ALL_NOTIFICATIONS_BEYOND_HOST'); $this->setForm($form); @@ -685,7 +685,7 @@ class Monitoring_CommandController extends ActionController $this->target->sendCommand($form->createCommand(), $this->view->objects); $form->setCommand('DISABLE_HOST_NOTIFICATIONS', 'DISABLE_SVC_NOTIFICATIONS'); $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, notifications will be disabled'); + Notification::success($this->translate('Command has been sent, notifications will be disabled')); } } @@ -697,8 +697,8 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable Notifications')); - $form->addNote(t('Notifications for this host and its services will be enabled.')); + $form->setSubmitLabel($this->translate('Enable Notifications')); + $form->addNote($this->translate('Notifications for this host and its services will be enabled.')); $form->setCommand('ENABLE_ALL_NOTIFICATIONS_BEYOND_HOST'); $this->setForm($form); @@ -706,7 +706,7 @@ class Monitoring_CommandController extends ActionController $this->target->sendCommand($form->createCommand(), $this->view->objects); $form->setCommand('ENABLE_HOST_NOTIFICATIONS', 'ENABLE_SVC_NOTIFICATIONS'); $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, notifications will be enabled'); + Notification::success($this->translate('Command has been sent, notifications will be enabled')); } } @@ -725,7 +725,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, checks will be rescheduled'); + Notification::success($this->translate('Command has been sent, checks will be rescheduled')); } } @@ -737,15 +737,15 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable Active Checks')); - $form->addNote(t('Disable active checks for this host and its services.')); + $form->setSubmitLabel($this->translate('Disable Active Checks')); + $form->addNote($this->translate('Disable active checks for this host and its services.')); $form->setCommand('DISABLE_HOST_CHECK'); $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { // @TODO(mh): Missing child command $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, active checks will be disabled'); + Notification::success($this->translate('Command has been sent, active checks will be disabled')); } } @@ -757,15 +757,15 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable Active Checks')); - $form->addNote(t('Enable active checks for this host and its services.')); + $form->setSubmitLabel($this->translate('Enable Active Checks')); + $form->addNote($this->translate('Enable active checks for this host and its services.')); $form->setCommand('ENABLE_HOST_CHECK'); $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { // @TODO(mh): Missing child command $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, active checks will be enabled'); + Notification::success($this->translate('Command has been sent, active checks will be enabled')); } } @@ -777,12 +777,12 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host', 'service', 'global')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable Event Handler')); + $form->setSubmitLabel($this->translate('Disable Event Handler')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Disable event handler for the whole system.')); + $form->addNote($this->translate('Disable event handler for the whole system.')); } else { - $form->addNote(t('Disable event handler for this object.')); + $form->addNote($this->translate('Disable event handler for this object.')); } $form->setCommand( @@ -796,7 +796,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, event handlers will be disabled'); + Notification::success($this->translate('Command has been sent, event handlers will be disabled')); } } @@ -809,12 +809,12 @@ class Monitoring_CommandController extends ActionController $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable Event Handler')); + $form->setSubmitLabel($this->translate('Enable Event Handler')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Enable event handlers on the whole system.')); + $form->addNote($this->translate('Enable event handlers on the whole system.')); } else { - $form->addNote(t('Enable event handler for this object.')); + $form->addNote($this->translate('Enable event handler for this object.')); } $form->setCommand( @@ -828,7 +828,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, event handlers will be enabled'); + Notification::success($this->translate('Command has been sent, event handlers will be enabled')); } } @@ -840,12 +840,12 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host', 'service', 'global')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Disable Flapping Detection')); + $form->setSubmitLabel($this->translate('Disable Flapping Detection')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Disable flapping detection on a program-wide basis.')); + $form->addNote($this->translate('Disable flapping detection on a program-wide basis.')); } else { - $form->addNote(t('Disable flapping detection for this object.')); + $form->addNote($this->translate('Disable flapping detection for this object.')); } $form->setCommand( @@ -861,7 +861,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, flap detection will be disabled'); + Notification::success($this->translate('Command has been sent, flap detection will be disabled')); } } @@ -873,12 +873,12 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host', 'service', 'global')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Enable Flapping Detection')); + $form->setSubmitLabel($this->translate('Enable Flapping Detection')); if ($form->provideGlobalCommand() === true) { - $form->addNote(t('Enable flapping detection on a program-wide basis.')); + $form->addNote($this->translate('Enable flapping detection on a program-wide basis.')); } else { - $form->addNote(t('Enable flapping detection for this object.')); + $form->addNote($this->translate('Enable flapping detection for this object.')); } $form->setCommand( @@ -894,7 +894,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, flap detection will be enabled'); + Notification::success($this->translate('Command has been sent, flap detection will be enabled')); } } @@ -912,7 +912,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Your new comment has been submitted'); + Notification::success($this->translate('Your new comment has been submitted')); } } @@ -927,13 +927,13 @@ class Monitoring_CommandController extends ActionController $form->setRequest($this->_request); $form->setCommand('DEL_HOST_COMMENT', 'DEL_SVC_COMMENT'); $form->setParameterName('commentid'); - $form->setSubmitLabel(t('Remove comment')); + $form->setSubmitLabel($this->translate('Remove comment')); $form->setObjectIgnoreFlag(true); $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Comment removal has been requested'); + Notification::success($this->translate('Comment removal has been requested')); } } @@ -945,8 +945,8 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host', 'service')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Reset Attributes')); - $form->addNote(t('Reset modified attributes to its default.')); + $form->setSubmitLabel($this->translate('Reset Attributes')); + $form->addNote($this->translate('Reset modified attributes to its default.')); $form->setCommand('CHANGE_HOST_MODATTR', 'CHANGE_SVC_MODATTR'); $form->setParameterValue(0); $this->setForm($form); @@ -969,7 +969,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Acknowledgement has been sent'); + Notification::success($this->translate('Acknowledgement has been sent')); } $this->setForm($form); @@ -984,14 +984,14 @@ class Monitoring_CommandController extends ActionController $this->setSupportedParameters(array('host', 'service')); $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Remove Problem Acknowledgement')); - $form->addNote(t('Remove problem acknowledgement for this object.')); + $form->setSubmitLabel($this->translate('Remove Problem Acknowledgement')); + $form->addNote($this->translate('Remove problem acknowledgement for this object.')); $form->setCommand('REMOVE_HOST_ACKNOWLEDGEMENT', 'REMOVE_SVC_ACKNOWLEDGEMENT'); $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Acknowledgement removal has been requested'); + Notification::success($this->translate('Acknowledgement removal has been requested')); } } @@ -1008,7 +1008,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Notification delay has been requested'); + Notification::success($this->translate('Notification delay has been requested')); } } @@ -1021,16 +1021,16 @@ class Monitoring_CommandController extends ActionController $form = new SingleArgumentCommandForm(); $form->setRequest($this->getRequest()); - $form->setSubmitLabel(t('Delete Downtime')); + $form->setSubmitLabel($this->translate('Delete Downtime')); $form->setParameterName('downtimeid'); - $form->addNote(t('Delete a single downtime with the id shown above')); + $form->addNote($this->translate('Delete a single downtime with the id shown above')); $form->setCommand('DEL_HOST_DOWNTIME', 'DEL_SVC_DOWNTIME'); $form->setObjectIgnoreFlag(true); $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Downtime removal has been requested'); + Notification::success($this->translate('Downtime removal has been requested')); } } @@ -1043,14 +1043,14 @@ class Monitoring_CommandController extends ActionController $form = new SingleArgumentCommandForm(); $form->setRequest($this->_request); - $form->setSubmitLabel(t('Shutdown monitoring process')); - $form->addNote(t('Stop monitoring instance. You have to start it again from command line.')); + $form->setSubmitLabel($this->translate('Shutdown monitoring process')); + $form->addNote($this->translate('Stop monitoring instance. You have to start it again from command line.')); $form->setGlobalCommands('SHUTDOWN_PROCESS'); $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, process will shut down'); + Notification::success($this->translate('Command has been sent, process will shut down')); } } @@ -1063,15 +1063,15 @@ class Monitoring_CommandController extends ActionController $form = new SingleArgumentCommandForm(); $form->setRequest($this->_request); - $form->setSubmitLabel(t('Restart monitoring process')); - $form->addNote(t('Restart the monitoring process.')); + $form->setSubmitLabel($this->translate('Restart monitoring process')); + $form->addNote($this->translate('Restart the monitoring process.')); $form->setGlobalCommands('RESTART_PROCESS'); $this->setForm($form); if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, monitoring process will restart now'); + Notification::success($this->translate('Command has been sent, monitoring process will restart now')); } } @@ -1084,8 +1084,8 @@ class Monitoring_CommandController extends ActionController $form = new SingleArgumentCommandForm(); $form->setRequest($this->_request); - $form->setSubmitLabel(t('Disable Performance Data')); - $form->addNote(t('Disable processing of performance data on a program-wide basis.')); + $form->setSubmitLabel($this->translate('Disable Performance Data')); + $form->addNote($this->translate('Disable processing of performance data on a program-wide basis.')); $form->setGlobalCommands('DISABLE_PERFORMANCE_DATA'); @@ -1093,7 +1093,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, performance data processing will be disabled'); + Notification::success($this->translate('Command has been sent, performance data processing will be disabled')); } } @@ -1106,8 +1106,8 @@ class Monitoring_CommandController extends ActionController $form = new SingleArgumentCommandForm(); $form->setRequest($this->_request); - $form->setSubmitLabel(t('Enable Performance Data')); - $form->addNote(t('Enable processing of performance data on a program-wide basis.')); + $form->setSubmitLabel($this->translate('Enable Performance Data')); + $form->addNote($this->translate('Enable processing of performance data on a program-wide basis.')); $form->setGlobalCommands('ENABLE_PERFORMANCE_DATA'); @@ -1115,7 +1115,7 @@ class Monitoring_CommandController extends ActionController if ($form->IsSubmittedAndValid() === true) { $this->target->sendCommand($form->createCommand(), $this->view->objects); - Notification::success('Command has been sent, performance data processing will be enabled'); + Notification::success($this->translate('Command has been sent, performance data processing will be enabled')); } } } From 92d3e4e9f8a5286ac183be48873a00fe1afeb18a Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 27 May 2014 21:48:05 +0000 Subject: [PATCH 14/96] Translation: global translation for view helpers As our pagination helper is used in multiple domains gettext would fail if we don't explicitely call the correct translation function carrying the "global" domain. refs #6338 --- application/views/scripts/mixedPagination.phtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/views/scripts/mixedPagination.phtml b/application/views/scripts/mixedPagination.phtml index f6b542855..61055f35d 100644 --- a/application/views/scripts/mixedPagination.phtml +++ b/application/views/scripts/mixedPagination.phtml @@ -12,7 +12,7 @@ if ($this->pageCount <= 1) return; ?>
    translate('%d to %d of %d'); +$fromto = t('%d to %d of %d'); $total = $this->totalItemCount; $limit = $this->itemCountPerPage; $title_prev = sprintf( @@ -42,10 +42,10 @@ if (isset($this->previous)) { array('page' => $this->previous) )->getAbsoluteUrl(), $title_prev, - '« ' . $this->translate('Prev') + '« ' . t('Prev') ); } else { - echo ' >
  • « ' . $this->translate('Prev') . '
  • « ' . t('Prev') . 'pagesInRange as $page) { @@ -80,10 +80,10 @@ if (isset($this->next)) { array('page' => $this->next) )->getAbsoluteUrl(), $title_next, - $this->translate('Next') . ' »' + t('Next') . ' »' ); } else { - echo ' >
  • ' . $this->translate('Next') . ' »
  • ' . t('Next') . ' » From 3ae4f762d8e5ff7aa7766bd2762a6e26dbccbbb5 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 27 May 2014 21:50:16 +0000 Subject: [PATCH 15/96] Translation: initial German translation refs #6340 --- .../locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo | Bin 0 -> 4165 bytes .../locale/de_DE.UTF-8/LC_MESSAGES/icinga.po | 489 ++++++++ .../de_DE.UTF-8/LC_MESSAGES/monitoring.mo | Bin 0 -> 9748 bytes .../de_DE.UTF-8/LC_MESSAGES/monitoring.po | 1034 +++++++++++++++++ 4 files changed, 1523 insertions(+) create mode 100644 application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo create mode 100644 application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.po create mode 100644 modules/monitoring/application/locale/de_DE.UTF-8/LC_MESSAGES/monitoring.mo create mode 100644 modules/monitoring/application/locale/de_DE.UTF-8/LC_MESSAGES/monitoring.po diff --git a/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo b/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo new file mode 100644 index 0000000000000000000000000000000000000000..a71f6b7d1b4a0dcaf5d89d890f2a6e112da48e83 GIT binary patch literal 4165 zcmai$ON<;x8GtJ$fU{r>4vz!~)Gl!z_V##pV>@P&Se|{^8}F`H-nFd+3DMJCGgC}Y z_oTaecGpJ)hzkbw6G%N3tEX22P6a>5D|h4C`iZ>;(!40{oOsYk2uiU z>TjyL>aYJ*_3zuq?tfYFJVW~|?eF&~bp`(7eY|)Mzh9}3zz5(l_)x`@@Wb@a!w6t!n)D@G$*9 z!TaG~tNvXma{gJ3A4VyWa|DXs55lAHG59Jx3q`Nr!VkfJK(Xf#!bQ$e_z-*qeiELA zC*TTv9Bx6Ds8^xLeI3fWx1h-RITXMB3W^?ogs7(e3`L*6!7+H~fzpm6P~;qgd{Pro ze^|6g|#CkvCg$6^gzuRt%u%89|Bb*Pz(-?P~mc zQ0Bi;jo*Twq5o4TcKrs*e!qjV|6icUxeGeUzLtAHo*GSJCU!hQlf0gw$#aNyoF=}OM{JZwd@y{({}0p7RRg%B@VRuW>#Fdf z++$~G9?=2uIu`B}D^q@kMYn4qg&$7Z^jY>7Y#_*|6AauY_W?-;9iol6Kq1?V6gaR-x4O(Hgzz+sK4%g|=m$k1kfzi<3>Qd?K)(!_}-keTVWIQgZVPvWQ`Pg4^+ zo$*bQs^`bKA4S``xvhf;Aw&BDKj@fAouuWLBpZFGBs9}x6Lp7@YHBGC5`+g%=Zwds zr>yP|lX6K?uveznQk*$ioGg&;)f!^b;G&THgjk8e7Ms5s_ZfsAzCdb z)$!mAZIeFQmaa^SNm;G1qezSQoQf_k&uXOpa9)w;%rB^mxSMd)Up501je14K45xCY zYPFhtBZ9o?SI}7=NI+V7G_F?tfo+%8ubM5V)+C^ku&pGI!y5hSB(M3-;Y+nfXvkk8 zhhuyl=e?#$nU|z2=3X!a73uPOP`qrCXX>i)!y^0{fekv7degT~;z%SaXT^OqTrWOX z5dFpf5>i6hjo3fY2BDy`b{ooFyQ>{Ui*&6e!BD8o_pVW_q~7F z#4-22Q;n|NJ|0OFOT1ImWThdorYVz8;4rMJhu{CpP8v%?gGHQ>qDWlaeCc zo4L;V#1Y29Oomgz(kqo5O!{v_0a+510F>Mm8s z8QnEj6yK+)s4j)AZJH*=Hg1!ul%Rd)Oca@SDRWS~_-9v!mc+DW0l_~`$9SSFB_?kA zad$9MKuSqDRvej8&u#asO0w?!IP}wySjw%+f=sVS>CiXX;W^=p+#k>k!8b^pxJikPJ~)irTd0ifyx2N{(nN*!7DIM}3 zS9zqQ=k2RKav7;cQ{qW}b8nY%B>cm{(GP9XRuZ*SInev+&kbX#Dct>_3Uu3WT1BE7 z`ctjsoT8L}Gbu;9IDo5puZPF^T^zcq7A;sRJF&+9Xz^ms$q%~fdXjPuEfFMUsNir^ iPp{{4HAzuQ5$fkH&FZ$_G^+SgzQwA2agd56$@^bYuTgLS literal 0 HcmV?d00001 diff --git a/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.po b/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.po new file mode 100644 index 000000000..04fbbebf0 --- /dev/null +++ b/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.po @@ -0,0 +1,489 @@ +# Icinga Web 2 - Head for multiple monitoring backends. +# Copyright (C) 2014 Icinga Development Team +# This file is distributed under the same license as Icinga Web 2. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Icinga Web 2 (0.1)\n" +"Report-Msgid-Bugs-To: dev@icinga.org\n" +"POT-Creation-Date: 2014-05-27 20:55+0000\n" +"PO-Revision-Date: 2014-05-27 22:44+0100\n" +"Last-Translator: Thomas Gelf \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:15 +#, php-format +msgid "%d to %d of %d" +msgstr "%d bis %d von %d" + +#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:9 +#, php-format +msgid "%s: %d to %d of %d" +msgstr "%s: %d bis %d von %d" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:117 +msgid "Application Prefix" +msgstr "Anwendungspräfix" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:78 +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:80 +msgid "Backend Name" +msgstr "Backend-Name" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:282 +msgid "Bind DN" +msgstr "Bind DN" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:294 +msgid "Bind Password" +msgstr "Bind Kennwort" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:358 +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/BaseBackendForm.php:139 +msgid "Check this box to enforce changes without connectivity validation" +msgstr "" +"Aktiviere dieses Häkchen um die Änderungen ohne Validierung der Verbindung " +"zu speichern" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:73 +msgid "Check this to enable logging." +msgstr "Aktiviere dieses Häkchen um das Logging zu aktivieren." + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:187 +msgid "Connection Validation Failed: " +msgstr "Überprüfung der Verbindung fehlgeschlagen: " + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:477 +msgid "" +"Connectivity validation failed, connection to the given resource not " +"possible." +msgstr "" +"Überprüfung fehlgeschlagen, konnte keine Verbindung zu der angegebenen " +"Ressource herstellen." + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:454 +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:470 +msgid "Connectivity validation failed, the provided file does not exist." +msgstr "Überprüfung fehlgeschlagen, die angegebene Datei existiert nicht." + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:90 +msgid "Database Connection" +msgstr "Datenbankverbindung" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:183 +msgid "Database Name" +msgstr "Datenbankname" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:144 +msgid "Database Type" +msgstr "Datenbanktyp" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:89 +msgid "Debug" +msgstr "Debug" + +#: /usr/local/src/bugfix.master/application/forms/Config/GeneralForm.php:185 +msgid "Default Language" +msgstr "Standardsprache" + +#: /usr/local/src/bugfix.master/application/controllers/ErrorController.php:62 +#, php-format +msgid "Enabling the \"%s\" module might help!" +msgstr "Das Modul \"%s\" zu aktivieren könnte helfen!" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:86 +msgid "Error" +msgstr "Fehler" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:139 +msgid "Facility" +msgstr "Facility" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:383 +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:102 +msgid "File" +msgstr "Datei" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:220 +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:231 +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:308 +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:155 +msgid "Filepath" +msgstr "Dateipfad" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:357 +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/BaseBackendForm.php:138 +msgid "Force Changes" +msgstr "Änderungen erzwingen" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:160 +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:260 +msgid "Host" +msgstr "Host" + +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:26 +#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:28 +msgid "Hosts" +msgstr "Hosts" + +#: /usr/local/src/bugfix.master/application/views/scripts/authentication/login.phtml:8 +msgid "Icinga Users Login" +msgstr "Icinga Benutzeranmeldung" + +#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:63 +msgid "Icingaweb Login" +msgstr "Icingaweb Anmeldung" + +#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:17 +msgid "" +"If this message does not disappear, it might be necessary to quit the " +"current session manually by clearing the cache, or by closing the current " +"browser session." +msgstr "" +"Wenn diese Nachricht nicht verschwindet könnte es nötig sein die aktuelle " +"Sitzung manuell zu beenden indem der Cache gelöscht order die Browsersitzung " +"geschlossen wird." + +#: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:118 +msgid "Incorrect username or password" +msgstr "Benutzername oder Kennwort ungültig" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:88 +msgid "Information" +msgstr "Information" + +#: /usr/local/src/bugfix.master/library/Icinga/Web/Wizard/Wizard.php:337 +#: /usr/local/src/bugfix.master/library/Icinga/Web/Wizard/Wizard.php:380 +msgid "Install" +msgstr "" + +#: /usr/local/src/bugfix.master/application/views/scripts/install/index.phtml:29 +msgid "Installation" +msgstr "Installation" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:92 +msgid "LDAP Resource" +msgstr "LDAP Ressource" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:115 +msgid "LDAP User Name Attribute" +msgstr "LDAP-Attribut für Benutzername" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:104 +msgid "LDAP User Object Class" +msgstr "LDAP Objektklasse für Benutzer" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:232 +msgid "Location of your icinga objects.cache file" +msgstr "Pfad zur Datei objects.cache von Icinga" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:221 +msgid "Location of your icinga status.dat file" +msgstr "Pfad zur Datei status.dat von Icinga" + +#: /usr/local/src/bugfix.master/application/controllers/InstallController.php:69 +msgid "Logging" +msgstr "Logging" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:72 +msgid "Logging Enabled" +msgstr "Logging aktiv" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:82 +msgid "Logging Level" +msgstr "Log-Level" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:98 +msgid "Logging Type" +msgstr "Logging-Typ" + +#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:15 +msgid "Logging out..." +msgstr "Abmelden..." + +#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:28 +msgid "Login" +msgstr "Anmelden" + +#: /usr/local/src/bugfix.master/application/layouts/scripts/body.phtml:39 +#: /usr/local/src/bugfix.master/application/layouts/scripts/parts/topbar.phtml:35 +msgid "Logout" +msgstr "Abmelden" + +#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:64 +msgid "" +"Logout not possible, it may be necessary to quit the session manually by " +"clearing the cache, or closing the current browser session. Error: " +msgstr "" + +#: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:69 +msgid "Logout successful!" +msgstr "Abmelden erfolgreich!" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/ReorderForm.php:137 +msgid "Move down in authentication order" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/ReorderForm.php:111 +msgid "Move up in authentication order" +msgstr "" + +#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:16 +msgid "Navigation" +msgstr "Navigation" + +#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:83 +#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:86 +#: /usr/local/src/bugfix.master/library/Icinga/Web/Wizard/Wizard.php:337 +#: /usr/local/src/bugfix.master/library/Icinga/Web/Wizard/Wizard.php:380 +msgid "Next" +msgstr "Weiter" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:144 +msgid "No users found under the specified database backend" +msgstr "" + +#: /usr/local/src/bugfix.master/application/controllers/ErrorController.php:59 +msgid "Page not found." +msgstr "Seite nicht gefunden." + +#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:65 +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:206 +msgid "Password" +msgstr "Kennwort" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:319 +msgid "Pattern" +msgstr "Muster" + +#: /usr/local/src/bugfix.master/library/Icinga/Web/Form/Element/Number.php:61 +msgid "Please enter a number." +msgstr "Bitte eine Nummer eingeben." + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:171 +msgid "Port" +msgstr "Port" + +#: /usr/local/src/bugfix.master/application/layouts/scripts/body.phtml:38 +#: /usr/local/src/bugfix.master/application/layouts/scripts/parts/topbar.phtml:32 +msgid "Preferences" +msgstr "Einstellungen" + +#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:45 +#: /usr/local/src/bugfix.master/application/views/scripts/mixedPagination.phtml:48 +msgid "Prev" +msgstr "Zurück" + +#: /usr/local/src/bugfix.master/library/Icinga/Web/Wizard/Wizard.php:326 +#: /usr/local/src/bugfix.master/library/Icinga/Web/Wizard/Wizard.php:367 +msgid "Previous" +msgstr "Vorheriges" + +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:19 +msgid "Ready to search, waiting for your input" +msgstr "Bereit zum Suchen, warte auf Eingabe" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:333 +msgid "Resource Name" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:375 +msgid "Resource Type" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:271 +msgid "Root DN" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:379 +msgid "SQL Database" +msgstr "" + +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:22 +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:23 +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:49 +msgid "Search" +msgstr "Suche" + +#: /usr/local/src/bugfix.master/application/layouts/scripts/parts/navigation.phtml:17 +msgid "Search..." +msgstr "Suche..." + +#: /usr/local/src/bugfix.master/application/forms/Config/GeneralForm.php:189 +msgid "" +"Select the language to use by default. Can be overwritten by a user in his " +"preferences." +msgstr "" + +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:34 +#: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:34 +msgid "Services" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:245 +msgid "Socket" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:140 +msgid "The Syslog facility to utilize." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:116 +msgid "The attribute name used for storing the user name on the ldap server" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:91 +msgid "The database connection to use for authenticating with this provider" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:309 +msgid "The filename to fetch information from" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:161 +msgid "The hostname of the database." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:261 +msgid "The hostname or address of the LDAP server to use for authentication" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:156 +msgid "The logfile to write messages to." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:83 +msgid "The maximum loglevel to emit." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:118 +msgid "The name of the application by which to prefix syslog messages." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:184 +msgid "The name of the database to use" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:81 +msgid "The name of this authentication backend" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:79 +msgid "The name of this authentication provider" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:105 +msgid "The object class used for storing users on the ldap server" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:207 +msgid "The password to use for authentication" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:295 +msgid "The password to use for querying the ldap server" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:246 +msgid "The path to your livestatus socket used for querying monitoring data" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:272 +msgid "The path where users can be found on the ldap server" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:172 +msgid "The port to use." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:320 +msgid "The regular expression by which to identify columns" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:93 +msgid "The resource to use for authenticating with this provider" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:145 +msgid "The type of SQL database you want to create." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:99 +msgid "The type of logging to utilize." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:376 +msgid "The type of resource" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:334 +msgid "The unique name of this resource" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:283 +msgid "The user dn to use for querying the ldap server" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:195 +msgid "The user name to use for authentication." +msgstr "" + +#: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:6 +msgid "There is no such module installed." +msgstr "" + +#: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:32 +msgid "This module has no dependencies" +msgstr "" + +#: /usr/local/src/bugfix.master/library/Icinga/Application/Modules/Module.php:383 +msgid "This module has no description" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:100 +msgid "Use Default Language" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:109 +msgid "Use the following language to display texts and messages" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Authentication/LoginForm.php:57 +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:194 +msgid "Username" +msgstr "Benutzername" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:169 +msgid "" +"Using ldap is not possible, the php extension \"ldap\" is not installed." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:148 +#, php-format +msgid "Using the specified backend failed: %s" +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:87 +msgid "Warning" +msgstr "Warnung" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:435 +msgid "" +"You need to install the php extension \"mysql\" and the Zend_Pdo_Mysql " +"classes to use MySQL database resources." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:442 +msgid "" +"You need to install the php extension \"pgsql\" and the Zend_Pdo_Pgsql " +"classes to use PostgreSQL database resources." +msgstr "" + +#: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:106 +msgid "Your Current Language" +msgstr "" diff --git a/modules/monitoring/application/locale/de_DE.UTF-8/LC_MESSAGES/monitoring.mo b/modules/monitoring/application/locale/de_DE.UTF-8/LC_MESSAGES/monitoring.mo new file mode 100644 index 0000000000000000000000000000000000000000..2b779c0995c80bd9c61710ab6fb6ca451a5453a2 GIT binary patch literal 9748 zcmb7}dyE}dea8>MQ0l}1LU@%&Psz(payM&ZCuZXq@5|nocb(mJ+@zt+?7ipSJK4K4 zo0+-0_L^4_J_v7xYw$Jj3-Fcj0^9??0#*Mx_*!@w-Uy$E*TZWm zbRE0_{w%x`YDmW*Ma;P8eV%2woBU;{`sX44%%}KK{Xg*OKY^OZ1$YR46&{2?fST97 zYmM0tAAonlk3*HaHb$6GeCY7>iZK=?OcYce+`pXdq?3tFos9qQ*ao*0Eb{7 zlP|$XpvLt%_zw8TQ1kr;WN7BwKK*a-7f8PVSt@f4N|K&l%MV?f8{zBWLC*>JbEF^g z>GSYSq<;&l{Xd0j|7j>a{WX;Sp7Z=y_-4{C`Shz<>^G9W5vu+XsQRN2)tEV`bzOk3 zfRWG7JU;|g@6(VenBRvg{}hyc{3X;nehsSrbDrPw`In)}eHUt8&qL{L7lY>2Tmx0# zLR4&SgBsrvcsrc%`K$0I(vSM@e-5uA{S1^IE<&~YtWSRnYTV!P{GR{*BGkNJg6eM< z$`@Y`HIADhsx$kc>~;jc0p9EL>+tQQ&qKBIdp`X|sQO=rYVX@n>;65TekF}){%?do z4-Y`;bJnxsxdJthN1@vJ6qG)mfSS*jp!ED@sB&M0Z-IXYweH{b=^sP+hc~hKn#Uoi z@)xC7?jGr2Ffnq2JeD5!b9*uSc0F1{qSq>PWXLz5bi~( zO1}px{Wz3=corUkdvK-$Z~`8HAAxG;%kU_C-g7TTG)cM!$KliP82n$Tc^<_`q_;6B zeWp~f{{fk@`ESqH+1B?yNS2v^48=SQwSJF6>E&^# z{-1#IJAVeH$G?FrmH9`gdOw8f?|O_}_4+;U@tlAf#~Ju?7($JI$@9HX^LWgsABVET z&qMY9G}O4h0%b4HLfP-%L#^XwpZ<4<>dlKjy&GpNJG>66y_=!taVONio`LUz3s83Q zS*Z1X%76b3yo&UHLh1ecQ2qWGYFxY69Lm2IYW#18vZHrE&2Jx6yN5l;q3S&V*^;IL zHIDN>{YfbM{{oa={|ajS|KQUvLiKkwhppOu1GMlKsC5~Gn2dP{YF$47HSf=PehI4F zMW}gPhHB?upvL=OQ1kc++y!5CQ%k>lpw{~>P~$oT)y^D5)n*Z@{wJX3_gN@A_#-I& zJq@Mz3ou_d$W+W_pZ`DbWuzZKZb$Ayei>mH`8hiaHO?{Qy-4??_Vv6R(U{+dXbwxr zZAkI_5--w)o;va|WEGK~mJx=K>rU&h=T{KTY5jAa46T`-#kVQm#)bnm+FY*`?BC?}jM1B?NeuhcN#z&Ao|KY<>dc6-hiF^cE zK(scGAjNYFFNcvqpK+@A0HdyV%-h`S)3Q_fu;RIyml(;AG9v%CA1NN$$!TN;S@W3> zL;1&j$Q*JvqDQtaJ9rRjA|F6xKYFUjE09zP9)}!3&LDRndSr{^$O&W;k&WrugEWwL zA}dHg@*(6QL)n%Q!b zT#d-iy0qCS5_8lpJO5=qTq<7OSyygq&1}}mYy_E$%IAD(G|pStsMwi>hg~^K%`npp zqDsMz&a~LK+n}YFa;_J<8Zz|-XDeaaQiZR*vs#4~wy2c%(e5H~DH)Zf6n>=&=}%L` zt+b3Msx(~Eskz;Bwy3tve5#FL*;ZVJnzbf7)!i1=w&`psj>0TX!l-7KlNiJFvqOzp zkYsF57QVIA>laIVz1rUGJ00fcwYC{$ypS?74RWX5Y^_-W?5yn{Bj(?Iw7r}buLEAeWS&shFU zGuJM-f|K+`9=Y;GCWAGB0JZA?yeP z%6-&G%aPb#_gmzS=G%1)_r!KJMecF-)v|OtQtYkvr|!PecJ8SzosO_B#fOS1#$o5r zExUFqHKVzwUpFeB**hqoxyhLPm);@y%nc(NjVd~fg6R>9-pSu9cg zcIhEcwp|Wi-Pw>MtNmg}nn`}Do8vJ@h#i(&Z@pK{7{``hX}zXo=wP4XY-;T$Gv#WI zqhcx~XQpcBn#;>^!fvvDH>Kue7&S8oJMQSX3o?$!)J(gxMMKjuhiR6CoS)UWNt0yg z)a<0X-Ak`+tq(v@FsD>ImQY(Ae}?~+4YtFDP9V@-Dm62cW~T5>W+u}9J(m-|n$`2S zRp%D-mvb&i%&C@}DcI6vYBnrvcZPg|N~GvdJF)YcD=^QJ68!cvvkGGzR@k0g9+3F# z!glwj`-+l2blR#$*+(?K0nP~pTHVU??H4C6?G~@zRJt;v_Hx<~k5UNdtQb+-K%|1kmvp?HswZ+=I+vk-a`SSbxPYiVgd9$-VQ91HWpeQ{FTeQIXDG@P)-X{Cg7bp!T5 z|Neue{zIh$ci98`2M!#(t)GX2rCGNUs<%zby>sBeq1*cRQ%>%tG@k@fO5_?R19rY1 zFL9kX;TlzYgz%Zfu^NfK$Yn<<9@Uyb&6Va|ury$&2B%M)9y~E>k4#M+YlIr&(cLG< zPmXqGy1%b~x6U;duOzoWU^6WFj^#!WMt9@rf&>G;=k)yX(&0`yji>68(r8qUD`;xK z9$pBu-MT6bxhN>tldxRRxCcadNW0ohDxiAlnS@Z84UrZ`Xjf1;=UK+RX)eR_xyX!$ zSlaqlHm#huYgf2I&~J@)sh^o4cG0CL>72F-53tac*Z$sBlySC3*=c6#(gilVK2%)7 zczmOsl4#mhlc3hy44n=xa(8O|`XePZlPzBpB(@$#YfV(4;c;_v+!uA33REd{Nq$pu zHfUB`s#?mw+eLq^QVCSq-mG~GMXI}zCdOj-j<_(|aIu=y#cFPN%;d+N9c-qxV8LIS zN~1~5Ekq$fjn2Z-y-mj$4P_W|Jz@6gnhX8StJIxc37RhPwWf5*S~C+aTg!<0ExaguNH&o4O2Yqc;ZQH)IEjn>c ziLJKQx@OVm!}-diocusz@wZUs`fV;}vE$X=y7IPT$In;ehTIc3ubt^=eU)wdDDF4@}wLO z5&4>ItQtnSH?^Di_V!_tU){D3w^crqo|hU?3>wZ8(o{0``BZomWz&$NoPoSyTyz^LmMSnAvYFFjeV zbN?wCoaDqNybZYyUV5_TIE|{Uut**PH;1=@QlA)`k+RK zU2oKuwoN?u7oDBv1D@W}D2yAUR;J}t6~o#2pq7&}B49x^tut}C?()nDcDcVSUg6G| zd#>(FWILmEXY9H%qQLg<@Av^5aEr~O%AQS5tV{G7G3;VPaBI{R+~@kRv8^BJp!2oe zPgmZRYfKYXD5#*r+-&kV!)Hu;1BhA{Wz(2Hnq`&+^aa{?N4wS}l;ZF4SRgHJa`q}3 zDNfugf9`9~yck%ai6Xt;BJ{r<3eSD8Sy1P`uFc#STldUj*Azi1`NWI5PU3BymErIQ zCoYxwK9Wgt$Ef=#UY;nAI1~GTVh8TB{=%S5XvXp@B$a(;E1Jyx*XFg_gHVv`, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Icinga Web 2 (0.1)\n" +"Report-Msgid-Bugs-To: dev@icinga.org\n" +"POT-Creation-Date: 2014-05-27 21:24+0000\n" +"PO-Revision-Date: 2014-05-27 23:25+0100\n" +"Last-Translator: Thomas Gelf \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:66 +msgid " If you work with other administrators you may find it useful to share information about a host or service that is having problems if more than one of you may be working on it. Make sure you enter a brief description of what you are doing." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10 +#, php-format +msgid "%d Hosts DOWN" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22 +#, php-format +msgid "%d Hosts PENDING" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17 +#, php-format +msgid "%d Hosts UNREACHABLE" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15 +#, php-format +msgid "%d Hosts UP" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:57 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:127 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:197 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:232 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:267 +#, php-format +msgid "%d are not checked at all" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:32 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:102 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:172 +#, php-format +msgid "%d are passively checked" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:62 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:132 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:202 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:237 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:272 +#, php-format +msgid "%d is not checked at all" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:37 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:107 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:177 +#, php-format +msgid "%d is passively checked" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/notifications.phtml:22 +#, php-format +msgid "%s notications have been sent for this issue" +msgstr "%s Benachrichtigungen wurden für dieses Problem versandt" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:101 +msgid "4 Hours" +msgstr "4 Stunden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/notifications.phtml:17 +#, php-format +msgid "A notication has been sent for this issue %s ago" +msgstr "Eine Benachrichtigung für dieses Problem wurde vor %s gesendet" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:37 +msgid "Acknowledge" +msgstr "Bestätigen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:141 +msgid "Acknowledge Problem" +msgstr "Problem bestätigen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:50 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:80 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:146 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:180 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:214 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:53 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:83 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:149 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:183 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:217 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156 +msgid "Acknowledged" +msgstr "Bestätigt" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:972 +msgid "Acknowledgement has been sent" +msgstr "Bestätigung wurde gesendet" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:994 +msgid "Acknowledgement removal has been requested" +msgstr "Löschung der Bestätigung wurde angefragt" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:63 +msgid "Acknowledgements" +msgstr "Bestätigungen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:20 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:52 +msgid "Active" +msgstr "Aktiv" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:24 +msgid "Active Checks" +msgstr "Aktive Checks" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/comments.phtml:45 +msgid "Add comment" +msgstr "Kommentar hinzufügen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:28 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:95 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:146 +msgid "All hosts enabled" +msgstr "Alle Hosts aktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/services.phtml:3 +msgid "All services configured on this host" +msgstr "Alle auf diesem Host konfigurierten Services" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:56 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:115 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:166 +msgid "All services enabled" +msgstr "Alle Services aktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommandForm.php:118 +msgid "Author (Your Name)" +msgstr "Autor (Dein Name)" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:88 +msgid "Broadcast" +msgstr "Broadcast" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:78 +msgid "CRITICAL" +msgstr "KRITISCH" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:165 +msgid "Check Output" +msgstr "Check Ausgabe" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:141 +msgid "Check Result" +msgstr "Check-Ergebnis" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checksource.phtml:3 +msgid "Check Source" +msgstr "Check-Quelle" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:58 +msgid "Check Time" +msgstr "Ausführungszeit" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:32 +msgid "Check execution time" +msgstr "Check-Ausführungsdauer" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:38 +msgid "Check latency" +msgstr "Check-Latenz" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:8 +msgid "Check now" +msgstr "Jetzt prüfen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:277 +msgid "Child Objects" +msgstr "Kind-Objekte" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/command.phtml:7 +msgid "Command" +msgstr "Befehl" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:317 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:748 +msgid "Command has been sent, active checks will be disabled" +msgstr "Befehl wurde gesendet, aktive Checks werden deaktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:342 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:768 +msgid "Command has been sent, active checks will be enabled" +msgstr "Befehl wurde gesendet, aktive Checks werden aktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:361 +msgid "Command has been sent, check will be rescheduled" +msgstr "Befehl wurde gesendet, Check wird neu geplant" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:728 +msgid "Command has been sent, checks will be rescheduled" +msgstr "Befehl wurde gesendet, Checks werden neu geplant" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:799 +msgid "Command has been sent, event handlers will be disabled" +msgstr "Befehl wurde gesendet, Eventhandler werden deaktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:831 +msgid "Command has been sent, event handlers will be enabled" +msgstr "Befehl wurde gesendet, Eventhandler werden aktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:864 +msgid "Command has been sent, flap detection will be disabled" +msgstr "Befehl wurde gesendet, Flap-Erkennung wird deaktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:897 +msgid "Command has been sent, flap detection will be enabled" +msgstr "Befehl wurde gesendet, Flap-Erkennung wird aktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1074 +msgid "Command has been sent, monitoring process will restart now" +msgstr "Befehl wurde gesendet, der Monitoring-Prozess wird jetzt neustarten" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:537 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:565 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:688 +msgid "Command has been sent, notifications will be disabled" +msgstr "Befehl wurde gesendet, Benachrichtigungen werden deaktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:595 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:709 +msgid "Command has been sent, notifications will be enabled" +msgstr "Befehl wurde gesendet, Benachrichtigungen werden aktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:418 +msgid "Command has been sent, obsessing will be disabled" +msgstr "Befehl wurde gesendet, Verfolgung wird deaktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:452 +msgid "Command has been sent, obsessing will be enabled" +msgstr "Befehl wurde gesendet, Verfolgung wird aktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:519 +msgid "Command has been sent, passive check results will be accepted" +msgstr "Befehl wurde gesendet, passive Checks werden akzeptiert werden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:486 +msgid "Command has been sent, passive check results will be refused" +msgstr "Befehl wurde gesendet, passive Checks werden abgewiesen werden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1096 +msgid "Command has been sent, performance data processing will be disabled" +msgstr "Befehl wurde gesendet, Performancedatenverarbeitung wird deaktiviert werden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1118 +msgid "Command has been sent, performance data processing will be enabled" +msgstr "Befehl wurde gesendet, Performancedatenverarbeitung wird aktiviert werden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1053 +msgid "Command has been sent, process will shut down" +msgstr "Befehl wurde gesendet, der Monitoringprozess wird herunterfahren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:61 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:55 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:59 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:158 +msgid "Comment" +msgstr "Kommentar" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:936 +msgid "Comment removal has been requested" +msgstr "Löschung des Kommentars wurde angefordert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:58 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/comments.phtml:43 +msgid "Comments" +msgstr "Kommentare" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/contacts.phtml:33 +msgid "Contactgroups" +msgstr "Kontaktgruppen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/contacts.phtml:14 +msgid "Contacts" +msgstr "Kontakte" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:611 +msgid "Custom notification has been sent" +msgstr "Benutzerdefinierte Bestätigung wurde gesendet" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:77 +msgid "Custom notifications normally follow the regular notification logic in Icinga. Selecting this option will force the notification to be sent out, regardless of time restrictions, whether or not notifications are enabled, etc." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:72 +msgid "DOWN" +msgstr "DOWN" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DelayNotificationForm.php:76 +msgid "Delay Notification" +msgstr "Benachrichtigung verzögern" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1024 +msgid "Delete Downtime" +msgstr "Downtime löschen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1026 +msgid "Delete a single downtime with the id shown above" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:305 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:740 +msgid "Disable Active Checks" +msgstr "Aktive Checks deaktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:780 +msgid "Disable Event Handler" +msgstr "Event-Handler deaktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:843 +msgid "Disable Flapping Detection" +msgstr "Flap-Erkennung deaktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:550 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:679 +msgid "Disable Notifications" +msgstr "Benachrichtigungen deaktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1087 +msgid "Disable Performance Data" +msgstr "Performancedaten deaktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:741 +msgid "Disable active checks for this host and its services." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:310 +msgid "Disable active checks for this object." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:308 +msgid "Disable active checks on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:783 +msgid "Disable event handler for the whole system." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:785 +msgid "Disable event handler for this object." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:848 +msgid "Disable flapping detection for this object." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:846 +msgid "Disable flapping detection on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:553 +msgid "Disable notifications on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:399 +msgid "Disable obsessing on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:467 +msgid "Disable passive checks on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1088 +msgid "Disable processing of performance data on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:40 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:72 +msgid "Disabled" +msgstr "Deaktiviert" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:280 +msgid "Do nothing with child objects" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:209 +msgid "Downtime Type" +msgstr "Downtime-Typ" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1033 +msgid "Downtime removal has been requested" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:667 +msgid "Downtime removal requested" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:630 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:648 +msgid "Downtime scheduling requested" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/downtime.phtml:48 +msgid "Downtimes" +msgstr "Downtimes" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:332 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:760 +msgid "Enable Active Checks" +msgstr "Aktive Checks aktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:812 +msgid "Enable Event Handler" +msgstr "Eventhandler aktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:876 +msgid "Enable Flapping Detection" +msgstr "Flap-Erkennung aktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:580 +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:700 +msgid "Enable Notifications" +msgstr "Benachrichtigungen aktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1109 +msgid "Enable Performance Data" +msgstr "Performancedaten aktivieren" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:761 +msgid "Enable active checks for this host and its services." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:336 +msgid "Enable active checks for this object." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:334 +msgid "Enable active checks on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:817 +msgid "Enable event handler for this object." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:815 +msgid "Enable event handlers on the whole system." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:881 +msgid "Enable flapping detection for this object." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:879 +msgid "Enable flapping detection on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:583 +msgid "Enable notifications on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:433 +msgid "Enable obsessing on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:501 +msgid "Enable passive checks on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1110 +msgid "Enable processing of performance data on a program-wide basis." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:197 +msgid "End Time" +msgstr "Endzeitpunkt" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:73 +msgid "Ended downtimes" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:262 +msgid "Enter here the duration of the downtime. Icinga will automatically delete the downtime after this time expired." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:106 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php:57 +msgid "Enter the expire date/time for this acknowledgement here. Icinga will delete the acknowledgement after this date expired." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:46 +msgid "Event Handler" +msgstr "Eventhandler" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:124 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:126 +msgid "Event handlers" +msgstr "Eventhandler" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:102 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php:53 +msgid "Expire Time" +msgstr "Verfallszeitpunkt" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:169 +msgid "Fill in the check output string which should be send to Icinga." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:180 +msgid "Fill in the performance data string which should be send to Icinga." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:76 +msgid "Fixed" +msgstr "Fix" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:57 +msgid "Flap Detection" +msgstr "Flap-Erkennung" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8 +msgid "Flap detection" +msgstr "Flap-Erkennung" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:77 +msgid "Flexible" +msgstr "Flexibel" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:233 +msgid "Flexible Duration" +msgstr "Flexible Dauer" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:71 +msgid "Force Check" +msgstr "Check erzwingen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:75 +msgid "Forced" +msgstr "Erzwungen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hosts.phtml:84 +msgid "Hard" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:53 +msgid "Hard state changes" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2 +msgid "Host- and Servicechecks" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:13 +msgid "Hostgroups" +msgstr "Hostgruppen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:19 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:22 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7 +msgid "Hosts" +msgstr "Hosts" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:241 +msgid "Hours" +msgstr "Stunden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:91 +msgid "If the acknowledgement should expire, check this option." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:135 +msgid "If you do not want an acknowledgement notification to be sent out to the appropriate contacts, uncheck this option." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:222 +msgid "If you select the fixed option, the downtime will be in effect between the start and end times you specify whereas a flexible downtime starts when the service enters a non-OK state (sometime between the start and end times you specified) and lasts as long as the duration of time you enter. The duration fields do not apply for fixed downtime." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:74 +msgid "If you select this option, Icinga will force a check regardless of both what time the scheduled check occurs and whether or not checks are enabled." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:74 +msgid "If you uncheck this option, the comment will automatically be deleted the next time Icinga is restarted." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:122 +msgid "If you want the acknowledgement to disable notifications until the host/service recovers, check this option." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:60 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:64 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:163 +msgid "If you work with other administrators, you may find it useful to share information about a host or service that is having problems if more than one of you may be working on it. Make sure you enter a brief description of what you are doing." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:80 +msgid "If you would like the comment to remain even when the acknowledgement is removed, check this option." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:6 +msgid "Last check" +msgstr "Letzter Check" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/timeline/index.phtml:15 +msgid "Legend" +msgstr "Legende" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/command/list.phtml:1 +msgid "List Of Supported Commands" +msgstr "Liste unterstützter Befehle" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:246 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:255 +msgid "Minutes" +msgstr "Minuten" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2 +msgid "Monitoring Features" +msgstr "Monitoring-Features" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:21 +msgid "Next check" +msgstr "Nächster Check" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:41 +msgid "No History Available For This Object" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:11 +msgid "No entries found" +msgstr "Keine Einträge gefunden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hosts.phtml:18 +msgid "No host found" +msgstr "Kein Host gefunden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/notifications.phtml:31 +msgid "No notification has been sent for this issue" +msgstr "Für dieses Problem wurde keine Benachrichtigung gesendet" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:32 +msgid "Not acknowledged" +msgstr "Nicht bestätigt" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DelayNotificationForm.php:55 +msgid "Notification Delay (Minutes From Now)" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1011 +msgid "Notification delay has been requested" +msgstr "Benachrichtigungsverzögerung wurde angefragt" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:48 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:35 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:75 +msgid "Notifications" +msgstr "Benachrichtigungen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:680 +msgid "Notifications for this host and its services will be disabled." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:701 +msgid "Notifications for this host and its services will be enabled." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:555 +msgid "Notifications for this object will be disabled." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:585 +msgid "Notifications for this object will be enabled." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:76 +msgid "OK" +msgstr "OK" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:68 +msgid "Obsessing" +msgstr "Verfolgung" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:102 +msgid "One day" +msgstr "Ein Tag" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:104 +msgid "One month" +msgstr "Ein Monat" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:103 +msgid "One week" +msgstr "Eine Woche" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:105 +msgid "One year" +msgstr "Ein Jahr" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:30 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:62 +msgid "Passive" +msgstr "Passiv" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/flags.phtml:13 +msgid "Passive Checks" +msgstr "Passive Checks" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:384 +msgid "Passive check result has been submitted" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:503 +msgid "Passive checks for this object will be accepted." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:469 +msgid "Passive checks for this object will be omitted." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:177 +msgid "Performance Data" +msgstr "Performancedaten" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3 +msgid "Performance data" +msgstr "Performancedaten" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:71 +msgid "Persistent" +msgstr "Persisten" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:77 +msgid "Persistent Comment" +msgstr "Persistenter Kommentar" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:80 +msgid "Post Comment" +msgstr "Kommentar absenden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:25 +msgid "Remove Acknowledgement" +msgstr "Bestätigung entfernen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:660 +msgid "Remove Downtime(s)" +msgstr "Downtime(s) entfernen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:987 +msgid "Remove Problem Acknowledgement" +msgstr "Problembestätigung entfernen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:930 +msgid "Remove comment" +msgstr "Kommentar entfernen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:661 +msgid "Remove downtime(s) from this host and its services." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:26 +msgid "Remove problem acknowledgement" +msgstr "Problembestätigung entfernen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:988 +msgid "Remove problem acknowledgement for this object." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:28 +msgid "Reschedule" +msgstr "Neu planen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:89 +msgid "Reschedule Check" +msgstr "Check neu planen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:9 +msgid "Reschedule next check immediately" +msgstr "Nächsten Check sofort einplanen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:948 +msgid "Reset Attributes" +msgstr "Attribute zurücksetzen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:949 +msgid "Reset modified attributes to its default." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1066 +msgid "Restart monitoring process" +msgstr "Monitoring-Prozess neu starten" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1067 +msgid "Restart the monitoring process." +msgstr "Monitoring-Prozess neu starten." + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:302 +msgid "Schedule Downtime" +msgstr "Downtime planen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/downtime.phtml:50 +msgid "Schedule downtime" +msgstr "Downtime planen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:282 +msgid "Schedule non-triggered downtime for all child objects" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:281 +msgid "Schedule triggered downtime for all child objects" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:90 +msgid "Selecting this option causes the notification to be sent out to all normal (non-escalated) and escalated contacts. These options allow you to override the normal notification logic if you need to get an important message out." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:97 +msgid "Send Custom Notification" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:132 +msgid "Send Notification" +msgstr "Benachrichtigung senden" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/header.phtml:23 +msgid "Service" +msgstr "Service" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:54 +msgid "Service Problems" +msgstr "Service-Probleme" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:14 +msgid "Servicegroups" +msgstr "Servicegruppen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hostgroups.phtml:20 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicegroups.phtml:23 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:28 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:22 +msgid "Services" +msgstr "Services" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:62 +msgid "Set the date/time when this check should be executed." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:200 +msgid "Set the end date/time for the downtime." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:189 +msgid "Set the start date/time for the downtime." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:157 +msgid "Set the state which should be send to Icinga for this objects." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1046 +msgid "Shutdown monitoring process" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/services.phtml:44 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hosts.phtml:81 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/header.phtml:9 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/header.phtml:21 +msgid "Since" +msgstr "Seit" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hosts.phtml:84 +msgid "Soft" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/notifications.phtml:4 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/eventhistory.phtml:4 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/servicematrix.phtml:5 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/services.phtml:8 +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/hosts.phtml:7 +msgid "Sort by" +msgstr "Sortiere nach" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:498 +msgid "Start Accepting Passive Checks" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:186 +msgid "Start Time" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:430 +msgid "Start obsessing" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:435 +msgid "Start obsessing over this object." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/TimelineController.php:68 +msgid "Started downtimes" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:119 +msgid "Sticky Acknowledgement" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:464 +msgid "Stop Accepting Passive Checks" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:1047 +msgid "Stop monitoring instance. You have to start it again from command line." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:396 +msgid "Stop obsessing" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:401 +msgid "Stop obsessing over this object." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:184 +msgid "Submit Passive Check Result" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:86 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:299 +msgid "TODO: Help message when with children is disabled" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:84 +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:271 +msgid "TODO: Help message when with children is enabled" +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/components/notifications.phtml:25 +#, php-format +msgid "The last one occured %s ago" +msgstr "Die letzte geschah vor %s" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DelayNotificationForm.php:70 +msgid "The notification delay will be disregarded if the host/service changes state before the next notification is scheduled to be sent out." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:49 +msgid "This command is used to acknowledge host or service problems. When a problem is acknowledged, future notifications about problems are temporarily disabled until the host/service changes from its current state." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CommentForm.php:47 +msgid "This command is used to add a comment to hosts or services." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/DelayNotificationForm.php:49 +msgid "This command is used to delay the next problem notification that is sent out." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:145 +msgid "This command is used to schedule downtime for hosts/services. During the specified downtime, Icinga will not send notifications out about the affected objects. When the scheduled downtime expires, Icinga will send out notifications as it normally would. Scheduled downtimes are preserved across program shutdowns and restarts." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:49 +msgid "This command is used to schedule the next check of hosts/services. Icinga will re-queue the check at the time you specify." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/CustomNotificationForm.php:47 +msgid "This command is used to send a custom notification about hosts or services. Useful in emergencies when you need to notify admins of an issue regarding a monitored system or service." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:131 +msgid "This command is used to submit a passive check result for particular hosts/services. It is particularly useful for resetting security-related objects to OK states once they have been dealt with." +msgstr "" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/host.phtml:3 +msgid "This host's current state" +msgstr "Aktueller Zustand dieses Host" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/history.phtml:36 +msgid "This object's event history" +msgstr "Historie dieses Objekts" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/show/service.phtml:3 +msgid "This service's current state" +msgstr "Aktueller Zustand dieses Services" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:174 +msgid "Triggered by" +msgstr "Ausgelöst von" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:79 +msgid "UNKNOWN" +msgstr "UNBEKANNT" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:73 +msgid "UNREACHABLE" +msgstr "UNERREICHBAR" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:71 +msgid "UP" +msgstr "UP" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/AcknowledgeForm.php:90 +msgid "Use Expire Time" +msgstr "Verfallszeitpunkt nutzen" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:77 +msgid "WARNING" +msgstr "WARNUNG" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/controllers/CommandController.php:915 +msgid "Your new comment has been submitted" +msgstr "Dein neuer Kommentar wurde gesendet" + +#: /usr/local/src/bugfix.master/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml:14 +msgid "critical events on " +msgstr "kritische Ereignisse auf" + From b7d3f0e54c17a007d9eedc1dfdf6760f2389c751 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 27 May 2014 22:15:19 +0000 Subject: [PATCH 16/96] Translation: another global view helper refs #6338 --- application/views/scripts/pivottablePagination.phtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/scripts/pivottablePagination.phtml b/application/views/scripts/pivottablePagination.phtml index 3cc1e4455..52bcb0351 100644 --- a/application/views/scripts/pivottablePagination.phtml +++ b/application/views/scripts/pivottablePagination.phtml @@ -6,14 +6,14 @@ if ($xAxisPaginator->count() <= 1 && $yAxisPaginator->count() <= 1) { return; // Display this pagination only if there are multiple pages } -$fromTo = $this->translate('%s: %d to %d of %d'); +$fromTo = t('%s: %d to %d of %d'); $xAxisPages = $xAxisPaginator->getPages('all'); $yAxisPages = $yAxisPaginator->getPages('all'); ?>
    - translate('Navigation'); ?> + pagesInRange as $yAxisPage): ?> @@ -25,13 +25,13 @@ $yAxisPages = $yAxisPaginator->getPages('all'); array('page' => $xAxisPage . ',' . $yAxisPage) )->getAbsoluteUrl(); ?>" title="translate('Hosts'), + t('Hosts'), ($yAxisPage - 1) * $yAxisPages->itemCountPerPage + 1, $yAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $yAxisPage * $yAxisPages->itemCountPerPage, $yAxisPages->totalItemCount ) . '; ' . sprintf( $fromTo, - $this->translate('Services'), + t('Services'), ($xAxisPage - 1) * $xAxisPages->itemCountPerPage + 1, $xAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $xAxisPage * $xAxisPages->itemCountPerPage, $xAxisPages->totalItemCount From 7b581343782d70ca649ea9222bdbbfa7b6cf1b9f Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 27 May 2014 22:16:45 +0000 Subject: [PATCH 17/96] show/history: sorry, typo --- modules/monitoring/application/views/scripts/show/history.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml index 2b7aa63d9..7403d45e7 100644 --- a/modules/monitoring/application/views/scripts/show/history.phtml +++ b/modules/monitoring/application/views/scripts/show/history.phtml @@ -38,7 +38,7 @@ $states = array( history->count() === 0): ?> -translate('No History Available For This Object' ?> +translate('No History Available For This Object') ?> From f790e0c323e880fb28abe3a26b782e11349ea7ac Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 27 May 2014 22:20:21 +0000 Subject: [PATCH 18/96] Translation: keep translation domain with partial We should try to avoid partial and pass translation domain where forced to use it. refs #6338 --- .../application/views/scripts/tactical/components/ok_hosts.phtml | 1 + .../views/scripts/tactical/components/problem_hosts.phtml | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml index 4bb3708e1..0543f58c5 100644 --- a/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml +++ b/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml @@ -29,6 +29,7 @@ $service_problems = ( partial( 'tactical/components/parts/servicestatesummarybyhoststate.phtml', array( + 'translationDomain' => $this->translationDomain, 'host_problem' => 0, 'services_ok' => $this->statusSummary->services_ok_on_ok_hosts, 'services_ok_not_checked' => $this->statusSummary->services_ok_not_checked_on_ok_hosts, diff --git a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml index c5ecbe2fb..ba14a1b0d 100644 --- a/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml +++ b/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml @@ -23,6 +23,7 @@ partial( 'tactical/components/parts/servicestatesummarybyhoststate.phtml', array( + 'translationDomain' => $this->translationDomain, 'host_problem' => 1, 'services_ok' => $this->statusSummary->services_ok_on_problem_hosts, 'services_ok_not_checked' => $this->statusSummary->services_ok_not_checked_on_problem_hosts, From 7a0173e2fb557ac452444b37872b5a791aebb450 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 28 May 2014 09:39:38 +0000 Subject: [PATCH 19/96] monitoring/IdoQuery: IDO version is cached in a session namespace. This fails where you are using multiple IDO backends with different versions. We still have no backend-specific base class where we could handle this, so for now I continue to do so in the IdoQuery. This patch creates one namespace per Host/dbname combination. --- .../library/Monitoring/Backend/Ido/Query/IdoQuery.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php index 471856775..f48ab7b6c 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php @@ -599,11 +599,13 @@ abstract class IdoQuery extends Query protected function getIdoVersion() { if (self::$idoVersion === null) { + $dbconf = $this->db->getConfig(); + $id = $dbconf['host'] . '/' . $dbconf['dbname']; $session = null; if (Icinga::app()->isWeb()) { // TODO: Once we have version per connection we should choose a // namespace based on resource name - $session = Session::getSession()->getNamespace('monitoring/ido'); + $session = Session::getSession()->getNamespace('monitoring/ido/' . $id); if (isset($session->version)) { self::$idoVersion = $session->version; return self::$idoVersion; From 92f454c36dde062dc0854b5df0ea4f72f923e20a Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 28 May 2014 10:20:34 +0000 Subject: [PATCH 20/96] Chart\InlinePie: locale-ignorant casts for floats PHP respects locales (LC_NUMERIC) when casting floats to string. That affected the generated HTML for our inline pie charts. This patch is not that beautiful - but fixes this. fixes #6348 --- library/Icinga/Web/Widget/Chart/InlinePie.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php index 4b9152b88..48416b8ec 100644 --- a/library/Icinga/Web/Widget/Chart/InlinePie.php +++ b/library/Icinga/Web/Widget/Chart/InlinePie.php @@ -220,12 +220,17 @@ EOD; public function render() { $template = $this->template; + // Locale-ignorant string cast: + $data = array(); + foreach ($this->data as $dat) { + $data[] = sprintf('%F', $dat); + } $template = preg_replace('{{url}}', $this->url, $template); $template = preg_replace('{{width}}', $this->width, $template); $template = preg_replace('{{height}}', $this->height, $template); $template = preg_replace('{{title}}', $this->title, $template); $template = preg_replace('{{style}}', $this->style, $template); - $template = preg_replace('{{data}}', implode(',', $this->data), $template); + $template = preg_replace('{{data}}', implode(',', $data), $template); $template = preg_replace('{{colors}}', implode(',', $this->colors), $template); return $template; } From f7c511942448db06fdbfc1faf8691c6e26910882 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 28 May 2014 11:13:41 +0000 Subject: [PATCH 21/96] Search: split result and search hint There was an ugly if/else in the view script, this patch creates two of them and adds friendlier search suggestions. --- application/controllers/SearchController.php | 9 ++++++++- application/views/scripts/search/hint.phtml | 12 ++++++++++++ application/views/scripts/search/index.phtml | 6 ------ 3 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 application/views/scripts/search/hint.phtml diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php index f648ce8a7..f14e1b544 100644 --- a/application/controllers/SearchController.php +++ b/application/controllers/SearchController.php @@ -16,7 +16,14 @@ class SearchController extends ActionController $this->setAutorefreshInterval(10); $search = $this->_request->getParam('q'); if (! $search) { - $this->view->hint = $this->translate('Ready to search, waiting for your input'); + $this->view->tabs = Widget::create('tabs')->add( + 'search', + array( + 'title' => $this->translate('Search'), + 'url' => '/search', + ) + )->activate('search'); + $this->render('hint'); return; } $dashboard = Widget::create('dashboard')->createPane($this->translate('Search')); diff --git a/application/views/scripts/search/hint.phtml b/application/views/scripts/search/hint.phtml new file mode 100644 index 000000000..91a85e9fe --- /dev/null +++ b/application/views/scripts/search/hint.phtml @@ -0,0 +1,12 @@ +
    +tabs ?> +
    + +
    +

    translate("I'm ready to search, waiting for your input") ?>

    +

    translate('Hint') ?>: translate( + 'Please use the asterisk (*) as a placeholder for wildcard searches.' + . " For convenience I'll always add a wildcard after the last character" + . ' you typed.' +) ?>

    +
    diff --git a/application/views/scripts/search/index.phtml b/application/views/scripts/search/index.phtml index fe596cdbe..52dc7a14c 100644 --- a/application/views/scripts/search/index.phtml +++ b/application/views/scripts/search/index.phtml @@ -2,12 +2,6 @@ tabs ?> -dashboard): ?>
    dashboard ?>
    - -
    -hint ?> -
    - From d10b4c5e93ca37363630f01f854e0eb321dcd2d0 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 28 May 2014 11:16:11 +0000 Subject: [PATCH 22/96] Translation: a few more German strings Especially search suggestions refs #6340 --- .../locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo | Bin 4165 -> 5113 bytes .../locale/de_DE.UTF-8/LC_MESSAGES/icinga.po | 97 ++++++++---------- 2 files changed, 42 insertions(+), 55 deletions(-) diff --git a/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo b/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo index a71f6b7d1b4a0dcaf5d89d890f2a6e112da48e83..d29da64ba1b19ba6fc6e4f4c6faad97f58919c34 100644 GIT binary patch delta 2490 zcmZ{kTWl0n7=TZ?^&-%6t%}GIX$vh~TFSM6T3E0&2uL*u8k4iTr#oY(GtJCw8!Bes zyhbrpp74POUW~>V8jU7~#1M=L;l+@kCSJeqbJosn-`OZ0W&VM`q z>_vU6rTojnS*H}T8+`=L&QQugZx#<^a<)?Q;a_l}EX=8J5uD4k8CJtCI1g@vJ#a5v z4&Q-~!jIs7_+9$Gkwc4=Dyt(5rl>p3dO+}P|ke|rBYX*RPq{>fF|J_{HuQ$NNI1wI@rKNGFt}4kcPyhI-oe%3MGIZ zcoMzMs$!$%2&d z{dD6g*vb4f6vvn0$M70l1>Yr2l2zxR1ady*B}i=Q2PhT%BV{#ZXkp$0<@^CCe&aF& z$>=zg$liux_=A*Zpk(k#%Fm%hejakY>I#%he@)kKK-oW)uFs~imNB0Tzl5uyBzg^s z-|`Ix63I;{2B)9|Qcc>jVF8rVt$<>C*VVH0!n2rL$Uu8l%~B7 zX_Z7)%l9vhBBk1aZc3Ib4=SzrFG|X_E?u7qx1jPzCDMvY!*qkvX~t=hY(%8Yay62rl(ZY2maPodpi-%gXcsC%vWZ9& zi%11Uo*D%pW4|^tWoxm&DP!9y59(BD!-h>4mSrg_R8)ft!mh*u>Vtv>8d8_xf zc%C-is5yp#LIERp4w(V$C!Rc9>AbVRgeEU*$AXfMj}6auCEiyI=J`yH96L zY;we?`V)sKGMNmcaKz2qNImD+&}ui*exRdL-qAxrq2#gRN3rodTgb45*XgoDV(cu~ zVe1!&*iB5_`+i@#A2z?v9OZ9Z2251MP?Gh#O(Jo%C$CUfnCBmR*#x6=Ke|pZiTCFBR+V?UF&lH%FU4b47pO%)_4hI2S8m;lbYC!N!!he7ivt(F4s~KPaixcF ze9$xTm}5LSnV~SD_!}^J$C0pjL4ex1aMmw!3&iXW4Y43bHu?7+)(#!Y8wta+@feYf z1imh~p)T6k9Uf-ksKhb;eSK^BaEYM2_PdQ?{haX!RT5X_d0$^VZHv|)y>K>+-6HJ~ z>p>#WQQ%46>Sv@$rh9}E#Tk{Q74E!oOyz*pJ-H;6J#G;LvGxCN-%cCl9WEwUq8IvO m;}`f)qG39mPiw@6qe;JwuWMM^m`w_52IG>YL3Mv+lll)c{ktsy delta 1540 zcmZY9OGs2v9LMp$ra8WAw6x5+nrW#`rezzv4;4XV%CGtmT;i?(#`TP6a851S%W!Tw_*l%VJ`OKZVX~6-odr_7`t)CyT4_r zS%F#1&TyiE7d_+1GjEn$99J=D4~`*wYmZRl zo+E!Y%|VrzMJ;qbhx*rYlEPEUIDpD@8|uMUBuU$gE3g|?fqw6P2(?ASs25(w3A};& zX4JisMQcHgyz%tXAL@dZ3}8kD1hxCR24NPr*C5`v58Pq$+bEq zu%6Iwh`x(|TO%E+vVITL0))1Wg~V(lC;Ga}3AI#W1EF%OX_acK!eY}FtRkAd4vLa2 zyDq)otz;GTgSL$*BbtcSL>-|@sp^Hv&yW+UW)9&`d`?eGT{Ao~YV90GtfMa!9tb*z zM%>7Vb6|KN6pq*UJ|v1V+fw3lS?l8IzN)fbHyG&~v;_izfa&RQaLBd8!AO|#@u}=k z#&)N^uBEXtzCWi-=k=T?!Z{^N%Kv*=n;VXfo_8a`@Q{1DKg#%L`QPJ3nR$tsW$h{P zxBkkGHaFsiMxFD~A*VOmH|U0IowLEnsOtoyr<{FC`J`*fI}1l;wK(nH%$V8!03V>J A-2eap diff --git a/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.po b/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.po index 04fbbebf0..08aefb040 100644 --- a/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.po +++ b/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.po @@ -2,14 +2,13 @@ # Copyright (C) 2014 Icinga Development Team # This file is distributed under the same license as Icinga Web 2. # FIRST AUTHOR , YEAR. -# -#, fuzzy +# msgid "" msgstr "" "Project-Id-Version: Icinga Web 2 (0.1)\n" "Report-Msgid-Bugs-To: dev@icinga.org\n" -"POT-Creation-Date: 2014-05-27 20:55+0000\n" -"PO-Revision-Date: 2014-05-27 22:44+0100\n" +"POT-Creation-Date: 2014-05-28 11:05+0000\n" +"PO-Revision-Date: 2014-05-28 13:11+0100\n" "Last-Translator: Thomas Gelf \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -46,9 +45,7 @@ msgstr "Bind Kennwort" #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:358 #: /usr/local/src/bugfix.master/application/forms/Config/Authentication/BaseBackendForm.php:139 msgid "Check this box to enforce changes without connectivity validation" -msgstr "" -"Aktiviere dieses Häkchen um die Änderungen ohne Validierung der Verbindung " -"zu speichern" +msgstr "Aktiviere dieses Häkchen um die Änderungen ohne Validierung der Verbindung zu speichern" #: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:73 msgid "Check this to enable logging." @@ -59,12 +56,8 @@ msgid "Connection Validation Failed: " msgstr "Überprüfung der Verbindung fehlgeschlagen: " #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:477 -msgid "" -"Connectivity validation failed, connection to the given resource not " -"possible." -msgstr "" -"Überprüfung fehlgeschlagen, konnte keine Verbindung zu der angegebenen " -"Ressource herstellen." +msgid "Connectivity validation failed, connection to the given resource not possible." +msgstr "Überprüfung fehlgeschlagen, konnte keine Verbindung zu der angegebenen Ressource herstellen." #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:454 #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:470 @@ -121,33 +114,32 @@ msgstr "Dateipfad" msgid "Force Changes" msgstr "Änderungen erzwingen" +#: /usr/local/src/bugfix.master/application/views/scripts/search/hint.phtml:7 +msgid "Hint" +msgstr "Hinweis" + #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:160 #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:260 msgid "Host" msgstr "Host" -#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:26 +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:33 #: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:28 msgid "Hosts" msgstr "Hosts" -#: /usr/local/src/bugfix.master/application/views/scripts/authentication/login.phtml:8 -msgid "Icinga Users Login" -msgstr "Icinga Benutzeranmeldung" +#: /usr/local/src/bugfix.master/application/views/scripts/search/hint.phtml:6 +msgid "I'm ready to search, waiting for your input" +msgstr "Ich bin bereit zur Suche, warte auf deine Eingabe" #: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:63 +#: /usr/local/src/bugfix.master/application/views/scripts/authentication/login.phtml:8 msgid "Icingaweb Login" msgstr "Icingaweb Anmeldung" #: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:17 -msgid "" -"If this message does not disappear, it might be necessary to quit the " -"current session manually by clearing the cache, or by closing the current " -"browser session." -msgstr "" -"Wenn diese Nachricht nicht verschwindet könnte es nötig sein die aktuelle " -"Sitzung manuell zu beenden indem der Cache gelöscht order die Browsersitzung " -"geschlossen wird." +msgid "If this message does not disappear, it might be necessary to quit the current session manually by clearing the cache, or by closing the current browser session." +msgstr "Wenn diese Nachricht nicht verschwindet könnte es nötig sein die aktuelle Sitzung manuell zu beenden indem der Cache gelöscht order die Browsersitzung geschlossen wird." #: /usr/local/src/bugfix.master/application/controllers/AuthenticationController.php:118 msgid "Incorrect username or password" @@ -160,7 +152,7 @@ msgstr "Information" #: /usr/local/src/bugfix.master/library/Icinga/Web/Wizard/Wizard.php:337 #: /usr/local/src/bugfix.master/library/Icinga/Web/Wizard/Wizard.php:380 msgid "Install" -msgstr "" +msgstr "Installieren" #: /usr/local/src/bugfix.master/application/views/scripts/install/index.phtml:29 msgid "Installation" @@ -216,9 +208,7 @@ msgid "Logout" msgstr "Abmelden" #: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:64 -msgid "" -"Logout not possible, it may be necessary to quit the session manually by " -"clearing the cache, or closing the current browser session. Error: " +msgid "Logout not possible, it may be necessary to quit the session manually by clearing the cache, or closing the current browser session. Error: " msgstr "" #: /usr/local/src/bugfix.master/application/views/scripts/authentication/logout.phtml:69 @@ -265,6 +255,10 @@ msgstr "Muster" msgid "Please enter a number." msgstr "Bitte eine Nummer eingeben." +#: /usr/local/src/bugfix.master/application/views/scripts/search/hint.phtml:8 +msgid "Please use the asterisk (*) as a placeholder for wildcard searches. For convenience I'll always add a wildcard after the last character you typed." +msgstr "Bitte benutze das Sternchen (*) als Jokerzeichen für eine Suche mit Platzhaltern. Der Einfachheit halber hänge ich immer einen Platzhalter hinter das letzte von dir getippte Zeichen." + #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:171 msgid "Port" msgstr "Port" @@ -284,10 +278,6 @@ msgstr "Zurück" msgid "Previous" msgstr "Vorheriges" -#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:19 -msgid "Ready to search, waiting for your input" -msgstr "Bereit zum Suchen, warte auf Eingabe" - #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:333 msgid "Resource Name" msgstr "" @@ -298,15 +288,16 @@ msgstr "" #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:271 msgid "Root DN" -msgstr "" +msgstr "Wurzel-DN" #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:379 msgid "SQL Database" -msgstr "" +msgstr "SQL Datenbank" #: /usr/local/src/bugfix.master/application/controllers/SearchController.php:22 -#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:23 -#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:49 +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:29 +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:30 +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:56 msgid "Search" msgstr "Suche" @@ -315,15 +306,13 @@ msgid "Search..." msgstr "Suche..." #: /usr/local/src/bugfix.master/application/forms/Config/GeneralForm.php:189 -msgid "" -"Select the language to use by default. Can be overwritten by a user in his " -"preferences." +msgid "Select the language to use by default. Can be overwritten by a user in his preferences." msgstr "" -#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:34 +#: /usr/local/src/bugfix.master/application/controllers/SearchController.php:41 #: /usr/local/src/bugfix.master/application/views/scripts/pivottablePagination.phtml:34 msgid "Services" -msgstr "" +msgstr "Services" #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:245 msgid "Socket" @@ -435,19 +424,19 @@ msgstr "" #: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:6 msgid "There is no such module installed." -msgstr "" +msgstr "Gegenwärtig ist kein solches Modul installiert." #: /usr/local/src/bugfix.master/application/views/scripts/config/module.phtml:32 msgid "This module has no dependencies" -msgstr "" +msgstr "Dieses Modul hat keine Abhängigkeiten" #: /usr/local/src/bugfix.master/library/Icinga/Application/Modules/Module.php:383 msgid "This module has no description" -msgstr "" +msgstr "Dieses Modul hat keine Beschreibung" #: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:100 msgid "Use Default Language" -msgstr "" +msgstr "Standardsprache verwenden" #: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:109 msgid "Use the following language to display texts and messages" @@ -459,8 +448,7 @@ msgid "Username" msgstr "Benutzername" #: /usr/local/src/bugfix.master/application/forms/Config/Authentication/LdapBackendForm.php:169 -msgid "" -"Using ldap is not possible, the php extension \"ldap\" is not installed." +msgid "Using ldap is not possible, the php extension \"ldap\" is not installed." msgstr "" #: /usr/local/src/bugfix.master/application/forms/Config/Authentication/DbBackendForm.php:148 @@ -473,17 +461,16 @@ msgid "Warning" msgstr "Warnung" #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:435 -msgid "" -"You need to install the php extension \"mysql\" and the Zend_Pdo_Mysql " -"classes to use MySQL database resources." +msgid "You need to install the php extension \"mysql\" and the Zend_Pdo_Mysql classes to use MySQL database resources." msgstr "" #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:442 -msgid "" -"You need to install the php extension \"pgsql\" and the Zend_Pdo_Pgsql " -"classes to use PostgreSQL database resources." +msgid "You need to install the php extension \"pgsql\" and the Zend_Pdo_Pgsql classes to use PostgreSQL database resources." msgstr "" #: /usr/local/src/bugfix.master/application/forms/Preference/GeneralForm.php:106 msgid "Your Current Language" -msgstr "" +msgstr "Deine aktuelle Sprache" + +#~ msgid "Icinga Users Login" +#~ msgstr "Icinga Benutzeranmeldung" From 5b24ed1a15360a5dd5520d0241067ca35e444bfc Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 28 May 2014 11:45:58 +0000 Subject: [PATCH 23/96] CLI/ModuleCommand: helpful message with no module 'icingacli module list' gave "There is no module installed" instead of "There is no enabled module". Fixed this, the former message is still shown when doing 'icingacli module list installed'. --- application/clicommands/ModuleCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/clicommands/ModuleCommand.php b/application/clicommands/ModuleCommand.php index 1fb0932fd..8bbc1cad0 100644 --- a/application/clicommands/ModuleCommand.php +++ b/application/clicommands/ModuleCommand.php @@ -54,7 +54,7 @@ class ModuleCommand extends Command $modules = $this->modules->listInstalledModules(); } if (empty($modules)) { - echo "There are no modules installed\n"; + echo "There are no $type modules\n"; return; } if ($this->isVerbose) { From cf6f1f8bf46d214d72426dc16bb90e19932fee26 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 28 May 2014 15:59:42 +0000 Subject: [PATCH 24/96] icinga/loader.js: play nice with invalid responses Even responses with no HTML or no root node or similar must be rendered successfully to their containers. --- public/js/icinga/loader.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index d88e5adcc..11954a251 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -599,7 +599,10 @@ } var origFocus = document.activeElement; - var $content = $(content); + + // TODO: We do not want to wrap this twice... + var $content = $('
    ' + content + '
    '); + if (false && $('.dashboard', $content).length > 0 && $('.dashboard', $container).length === 0 From b0b2d2175196ce16beb7d0e633c430a5bfee9391 Mon Sep 17 00:00:00 2001 From: Ulf Lange Date: Wed, 28 May 2014 21:00:37 +0200 Subject: [PATCH 25/96] icingaweb2.spec: Fixes for SLES 11 Refs #4075 Signed-off-by: Michael Friedrich --- icingaweb2.spec | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/icingaweb2.spec b/icingaweb2.spec index e66046a9f..385be86e6 100644 --- a/icingaweb2.spec +++ b/icingaweb2.spec @@ -9,13 +9,21 @@ %define sharedir %{_datadir}/icingaweb %define prefixdir %{_datadir}/icingaweb %define logdir %{sharedir}/log +%define usermodparam -a -G #%define logdir %{_localstatedir}/log/icingaweb %if "%{_vendor}" == "suse" %define phpname php5 %define phpzendname php5-ZendFramework +%define apache2modphpname apache2-mod_php5 %endif -%if "%{_vendor}" == "redhat" +# SLE 11 = 1110 +%if 0%{?suse_version} == 1110 +%define apache2modphpname apache2-mod_php53 +%define usermodparam -A +%endif + +%if "%{_vendor}" == "redhat" || 0%{?suse_version} == 1110 %define phpname php %define phpzendname php-ZendFramework %endif @@ -53,7 +61,7 @@ BuildArch: noarch AutoReqProv: Off %endif -Source0: icingaweb2-%{version}.tar.gz +Source0: icingaweb2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -62,9 +70,11 @@ BuildRequires: %{phpname}-devel >= 5.3.0 BuildRequires: %{phpname}-ldap BuildRequires: %{phpname}-pdo BuildRequires: %{phpzendname} +%if "%{_vendor}" != "suse" BuildRequires: %{phpzendname}-Db-Adapter-Pdo BuildRequires: %{phpzendname}-Db-Adapter-Pdo-Mysql BuildRequires: %{phpzendname}-Db-Adapter-Pdo-Pgsql +%endif %if "%{_vendor}" == "redhat" %endif @@ -76,11 +86,13 @@ BuildRequires: %{phpname}-dom %endif Requires: %{phpname} >= 5.3.0 -Requires: %{phpzendname} +Requires: %{phpzendname} Requires: %{phpname}-ldap Requires: %{phpname}-pdo %if "%{_vendor}" == "redhat" Requires: %{phpname}-common +Requires: %{phpzendname}-Db-Adapter-Pdo +Requires: %{phpzendname}-Db-Adapter-Pdo-Mysql Requires: php-pear %endif %if "%{_vendor}" == "suse" @@ -90,12 +102,9 @@ Requires: %{phpname}-tokenizer Requires: %{phpname}-gettext Requires: %{phpname}-ctype Requires: %{phpname}-json -Requires: apache2-mod_php5 +Requires: %{apache2modphpname} %endif -Requires: %{phpzendname}-Db-Adapter-Pdo -Requires: %{phpzendname}-Db-Adapter-Pdo-Mysql - Requires: php-Icinga @@ -137,7 +146,7 @@ IcingaWeb for RHEL and SUSE =========================== Please check ./doc/installation.md -for requirements and database setup. +for requirements and database setup. EOF %install @@ -187,7 +196,7 @@ rm -f %{buildroot}/%{_datadir}/%{name}/public/.htaccess.in getent group icingacmd > /dev/null if [ $? -eq 0 ]; then -%{_sbindir}/usermod -a -G icingacmd %{apacheuser} +%{_sbindir}/usermod %{usermodparam} icingacmd %{apacheuser} fi # uncomment if building from git From 88460189cd768f207f10b4c73f588a341fadd55a Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 28 May 2014 21:34:36 +0000 Subject: [PATCH 26/96] Encoding: no ASCII chars > 127 in HTTP headers Had quite some trouble with this, decided to URL-encode titles and notifications. --- library/Icinga/Web/Controller/ActionController.php | 4 ++-- public/js/icinga/loader.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index e2c514f82..6d78dac3a 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -420,7 +420,7 @@ class ActionController extends Zend_Controller_Action $notifications = Notification::getInstance(); if ($isXhr && ! $this->isRedirect && $notifications->hasMessages()) { foreach ($notifications->getMessages() as $m) { - header('X-Icinga-Notification: ' . $m->type . ' ' . $m->message); + header('X-Icinga-Notification: ' . rawurlencode($m->type . ' ' . $m->message)); } } @@ -442,7 +442,7 @@ class ActionController extends Zend_Controller_Action // TODO: Innocent exception and error log for hack attempts throw new Exception('No way, guy'); } - header('X-Icinga-Title: ' . $this->view->title . ' :: Icinga Web'); + header('X-Icinga-Title: ' . rawurlencode($this->view->title . ' :: Icinga Web')); } // TODO: _render=layout? if ($this->getParam('_render') === 'layout') { diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index 11954a251..3ed006eae 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -287,6 +287,9 @@ } var notifications = req.getResponseHeader('X-Icinga-Notification'); + if (notifications) { + notifications = decodeURIComponent(notifications); + } var target = req.getResponseHeader('X-Icinga-Container'); var newBody = false; From e7e7ae72bacf34029f7543fe69b122706d9e09c6 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 28 May 2014 21:39:34 +0000 Subject: [PATCH 27/96] Encoding: decode encoded titles Related to the last commit, forgot to decode titles --- public/js/icinga/loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index 3ed006eae..1d22639d2 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -341,7 +341,7 @@ var title = req.getResponseHeader('X-Icinga-Title'); if (title && ! req.autorefresh && req.$target.closest('.dashboard').length === 0) { - this.icinga.ui.setTitle(title); + this.icinga.ui.setTitle(decodeURIComponent(title)); } var refresh = req.getResponseHeader('X-Icinga-Refresh'); From d01a98b7e6d141645afa9d84c92b684d65ef7e12 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 29 May 2014 11:26:02 +0200 Subject: [PATCH 28/96] Fix some of the time-related grammar mistakes This updates some of the messages to use "For" instead of "Since" where appropriate. fixes #5981 --- library/Icinga/Cli/Documentation.php | 2 +- library/Icinga/Util/Format.php | 49 +++++++++++++++---- library/Icinga/Web/View/helpers/format.php | 12 +++++ .../application/clicommands/ListCommand.php | 3 +- .../views/scripts/list/hosts.phtml | 2 +- .../views/scripts/list/services.phtml | 2 +- .../views/scripts/process/info.phtml | 5 +- .../scripts/show/components/header.phtml | 4 +- public/js/icinga/loader.js | 2 +- 9 files changed, 61 insertions(+), 20 deletions(-) diff --git a/library/Icinga/Cli/Documentation.php b/library/Icinga/Cli/Documentation.php index e0a27d47f..02fbd6873 100644 --- a/library/Icinga/Cli/Documentation.php +++ b/library/Icinga/Cli/Documentation.php @@ -53,7 +53,7 @@ class Documentation . " --debug Show debug output\n" . " --help Show help\n" . " --benchmark Show benchmark summary\n" - . " --watch [s] Refresh output each seconds (default: 5)\n" + . " --watch [s] Refresh output every seconds (default: 5)\n" ; $d .= "\nShow help on a specific command : icingacli help " . "\nShow help on a specific module : icingacli help " diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php index d7772211f..2b4bf9fa3 100644 --- a/library/Icinga/Util/Format.php +++ b/library/Icinga/Util/Format.php @@ -101,20 +101,32 @@ class Format return self::showHourMin($duration); } - protected static function showHourMin($sec) + protected static function showHourMin($sec, $returnPrefix = false) { $min = floor($sec / 60); if ($min < 60) { - return $min . 'm ' . ($sec % 60) . 's'; + if ($returnPrefix) { + return 'For'; + } else { + return $min . 'm ' . ($sec % 60) . 's'; + } } $hour = floor($min / 60); if ($hour < 24) { - return date('H:i', time() - $sec); + if ($returnPrefix) { + return 'Since'; + } else { + return date('H:i', time() - $sec); + } + } + if ($returnPrefix) { + return 'For'; + } else { + return floor($hour / 24) . 'd ' . ($hour % 24) . 'h'; } - return floor($hour / 24) . 'd ' . ($hour % 24) . 'h'; } - protected static function smartTimeDiff($diff, $timestamp) + protected static function smartTimeDiff($diff, $timestamp, $returnPrefix = false) { if ($timestamp === null || $timestamp === false) { return '-'; @@ -125,15 +137,22 @@ class Format $prefix = ''; if ($diff < 0) { $prefix = '-'; - $diff *= -1; } - if ($diff > 3600 * 24 * 3) { + if (abs($diff) > 3600 * 24 * 3) { if (date('Y') === date('Y', $timestamp)) { - return date('d.m.', $timestamp); + if ($returnPrefix) { + return 'Since'; + } else { + return date('d.m.', $timestamp); + } + } + if ($returnPrefix) { + return 'Since'; + } else { + return date('m.Y', $timestamp); } - return date('m.Y', $timestamp); } - return $prefix . self::showHourMin($diff); + return $prefix . self::showHourMin(abs($diff), $returnPrefix); } public static function timeSince($timestamp) @@ -141,11 +160,21 @@ class Format return self::smartTimeDiff(time() - $timestamp, $timestamp); } + public static function timeSincePrefix($timestamp) + { + return self::smartTimeDiff(time() - $timestamp, $timestamp, true); + } + public static function timeUntil($timestamp) { return self::smartTimeDiff($timestamp - time(), $timestamp); } + public static function timeUntilPrefix($timestamp) + { + return self::smartTimeDiff($timestamp - time(), $timestamp, true); + } + protected static function formatForUnits($value, & $units, $base) { $sign = ''; diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php index d06988cc2..5d38cce62 100644 --- a/library/Icinga/Web/View/helpers/format.php +++ b/library/Icinga/Web/View/helpers/format.php @@ -15,6 +15,12 @@ $this->addHelperFunction('timeSince', function ($timestamp) { . ''; }); +$this->addHelperFunction('timeSincePrefix', function ($timestamp) { + return '' + . $this->translate(Format::timeSincePrefix($timestamp)) + . ' '; +}); + $this->addHelperFunction('timeUnless', function ($timestamp) { if (! $timestamp) return ''; return '' @@ -22,3 +28,9 @@ $this->addHelperFunction('timeUnless', function ($timestamp) { . ''; }); +$this->addHelperFunction('timeUnlessPrefix', function ($timestamp) { + if (! $timestamp) return ''; + return '' + . $this->translate(Format::timeUntilPrefix($timestamp)) + . ''; +}); diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php index 4ddf2e781..15224cb1a 100644 --- a/modules/monitoring/application/clicommands/ListCommand.php +++ b/modules/monitoring/application/clicommands/ListCommand.php @@ -291,10 +291,11 @@ class ListCommand extends Command $maxCols - 13 ) . "\n"; $out .= sprintf( - " %1s─ %s%s (since %s)", + " %1s─ %s%s (%s %s)", $leaf, $screen->underline($row->service_description), $screen->colorize($utils->objectStateFlags('service', $row) . $perf, 'lightblue'), + strtolower(Format::timeSincePrefix($row->service_last_state_change)), Format::timeSince($row->service_last_state_change) ); if ($this->isVerbose) { diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index bb169c892..2f2ddf4d3 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -78,7 +78,7 @@ if ($hosts->count() === 0) { monitoringState($host, 'host')); ?>
    - translate('Since') ?> timeSince($host->host_last_state_change); ?> + timeSincePrefix($host->host_last_state_change) ?> timeSince($host->host_last_state_change); ?> host_state > 0): ?>
    host_state_type === '1') ? $this->translate('Hard') : $this->translate('Soft') ?> host_current_check_attempt; ?>/host_max_check_attempts; ?> diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index d16690d52..a7d393ab6 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -41,7 +41,7 @@ foreach ($services as $service):
    translate(strtoupper($helper->monitoringState($service, 'service'))) ?>
    - compact): ?>translate('Since') ?> timeSince($service->service_last_state_change); ?> + compact): ?>timeSincePrefix($service->service_last_state_change) ?> timeSince($service->service_last_state_change); ?> service_state > 0 && (int) $service->service_state_type === 0): ?>
    Soft service_attempt ?> diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml index ada365d02..8eadc0a1d 100644 --- a/modules/monitoring/application/views/scripts/process/info.phtml +++ b/modules/monitoring/application/views/scripts/process/info.phtml @@ -9,9 +9,8 @@ $cf = $this->getHelper('CommandForm'); ?>
    -

    Backend backendName; ?> is -is_currently_running === '1' ? sprintf('running with pid %d', $ps->process_id) : 'not running'; ?> - since timeSince($ps->program_start_time); ?>. +

    Backend backendName; ?> +is_currently_running === '1' ? sprintf('has been running with PID %d %s ', $ps->process_id, strtolower($this->timeSincePrefix($ps->program_start_time))) . $this->timeSince($ps->program_start_time) : 'is not running'; ?>. diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml index 774c1edf0..51a8e4f05 100644 --- a/modules/monitoring/application/views/scripts/show/components/header.phtml +++ b/modules/monitoring/application/views/scripts/show/components/header.phtml @@ -6,7 +6,7 @@ diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml index 8eadc0a1d..57406664c 100644 --- a/modules/monitoring/application/views/scripts/process/info.phtml +++ b/modules/monitoring/application/views/scripts/process/info.phtml @@ -43,7 +43,7 @@ $cf = $this->getHelper('CommandForm'); notifications_enabled === '1'): ?> Temporarily disabledisable_notif_expire_time): ?> -Will be re-enabled in timeUnless($ps->disable_notif_expire_time) ?> +Will be re-enabled in timeUntil($ps->disable_notif_expire_time) ?> diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml index e5cf0e0a4..f0b39e603 100644 --- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml +++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml @@ -25,7 +25,7 @@ $cf = $this->getHelper('CommandForm'); 'host' => $object->host_name, 'service' => $object->service_description ) - ) ?>">img('img/icons/reschedule_petrol.png') ?> translate('Reschedule') ?>timeUnless($object->next_check) ?> + ) ?>">img('img/icons/reschedule_petrol.png') ?> translate('Reschedule') ?>timeUntil($object->next_check) ?>check_execution_time): ?> diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml index 829c108cd..8fcb1e892 100644 --- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml +++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml @@ -18,9 +18,9 @@ foreach ($object->downtimes as $downtime) { $state = 'in downtime since ' . $this->timeSince($downtime->start); } else { if ($downtime->is_fixed) { - $state = 'scheduled ' . $this->timeUnless($downtime->start); + $state = 'scheduled ' . $this->timeUntil($downtime->start); } else { - $state = 'scheduled flexible ' . $this->timeUnless($downtime->start); + $state = 'scheduled flexible ' . $this->timeUntil($downtime->start); } } From a66a1a47299eb0c11961e10dcd10efbd1b5413d1 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 29 May 2014 13:03:10 +0200 Subject: [PATCH 30/96] Refactor the timeSincePrefix and timeUntilPrefix functions Instead of having two separate functions to get the prefix and the formatted time interval the new functions return both the prefix and the time interval. refs #5981 --- library/Icinga/Util/Format.php | 52 +++++++------------ library/Icinga/Web/View/helpers/format.php | 8 +-- .../application/clicommands/ListCommand.php | 3 +- .../views/scripts/list/hosts.phtml | 2 +- .../views/scripts/list/services.phtml | 2 +- .../views/scripts/process/info.phtml | 2 +- .../scripts/show/components/header.phtml | 4 +- 7 files changed, 30 insertions(+), 43 deletions(-) diff --git a/library/Icinga/Util/Format.php b/library/Icinga/Util/Format.php index 2b4bf9fa3..33c7ebd83 100644 --- a/library/Icinga/Util/Format.php +++ b/library/Icinga/Util/Format.php @@ -101,32 +101,20 @@ class Format return self::showHourMin($duration); } - protected static function showHourMin($sec, $returnPrefix = false) + protected static function showHourMin($sec, $includePrefix = false) { $min = floor($sec / 60); if ($min < 60) { - if ($returnPrefix) { - return 'For'; - } else { - return $min . 'm ' . ($sec % 60) . 's'; - } + return ($includePrefix ? t('for') . ' ' : '') . $min . 'm ' . ($sec % 60) . 's'; } $hour = floor($min / 60); if ($hour < 24) { - if ($returnPrefix) { - return 'Since'; - } else { - return date('H:i', time() - $sec); - } - } - if ($returnPrefix) { - return 'For'; - } else { - return floor($hour / 24) . 'd ' . ($hour % 24) . 'h'; + return ($includePrefix ? t('since') . ' ' : '') . date('H:i', time() - $sec); } + return ($includePrefix ? t('for') . ' ' : '') . floor($hour / 24) . 'd ' . ($hour % 24) . 'h'; } - protected static function smartTimeDiff($diff, $timestamp, $returnPrefix = false) + protected static function smartTimeDiff($diff, $timestamp, $includePrefix = false) { if ($timestamp === null || $timestamp === false) { return '-'; @@ -140,19 +128,11 @@ class Format } if (abs($diff) > 3600 * 24 * 3) { if (date('Y') === date('Y', $timestamp)) { - if ($returnPrefix) { - return 'Since'; - } else { - return date('d.m.', $timestamp); - } - } - if ($returnPrefix) { - return 'Since'; - } else { - return date('m.Y', $timestamp); + return ($includePrefix ? t('since') . ' ' : '') . date('d.m.', $timestamp); } + return ($includePrefix ? t('since') . ' ' : '') . date('m.Y', $timestamp); } - return $prefix . self::showHourMin(abs($diff), $returnPrefix); + return $prefix . self::showHourMin(abs($diff), $includePrefix); } public static function timeSince($timestamp) @@ -160,9 +140,13 @@ class Format return self::smartTimeDiff(time() - $timestamp, $timestamp); } - public static function timeSincePrefix($timestamp) + public static function prefixedTimeSince($timestamp, $ucfirst = false) { - return self::smartTimeDiff(time() - $timestamp, $timestamp, true); + $result = self::smartTimeDiff(time() - $timestamp, $timestamp, true); + if ($ucfirst) { + $result = ucfirst($result); + } + return $result; } public static function timeUntil($timestamp) @@ -170,9 +154,13 @@ class Format return self::smartTimeDiff($timestamp - time(), $timestamp); } - public static function timeUntilPrefix($timestamp) + public static function prefixedTimeUntil($timestamp, $ucfirst) { - return self::smartTimeDiff($timestamp - time(), $timestamp, true); + $result = self::smartTimeDiff($timestamp - time(), $timestamp, true); + if ($ucfirst) { + $result = ucfirst($result); + } + return $result; } protected static function formatForUnits($value, & $units, $base) diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php index 01ec92ea5..60861e7ee 100644 --- a/library/Icinga/Web/View/helpers/format.php +++ b/library/Icinga/Web/View/helpers/format.php @@ -15,9 +15,9 @@ $this->addHelperFunction('timeSince', function ($timestamp) { . ''; }); -$this->addHelperFunction('timeSincePrefix', function ($timestamp) { +$this->addHelperFunction('prefixedTimeSince', function ($timestamp, $ucfirst = false) { return '' - . $this->translate(Format::timeSincePrefix($timestamp)) + . Format::prefixedTimeSince($timestamp, $ucfirst) . ' '; }); @@ -28,9 +28,9 @@ $this->addHelperFunction('timeUntil', function ($timestamp) { . ''; }); -$this->addHelperFunction('timeUntilPrefix', function ($timestamp) { +$this->addHelperFunction('prefixedTimeUntil', function ($timestamp, $ucfirst = false) { if (! $timestamp) return ''; return '' - . $this->translate(Format::timeUntilPrefix($timestamp)) + . Format::prefixedTimeUntil($timestamp, $ucfirst) . ''; }); diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php index 15224cb1a..71bf1083f 100644 --- a/modules/monitoring/application/clicommands/ListCommand.php +++ b/modules/monitoring/application/clicommands/ListCommand.php @@ -295,8 +295,7 @@ class ListCommand extends Command $leaf, $screen->underline($row->service_description), $screen->colorize($utils->objectStateFlags('service', $row) . $perf, 'lightblue'), - strtolower(Format::timeSincePrefix($row->service_last_state_change)), - Format::timeSince($row->service_last_state_change) + Format::prefixedTimeSince($row->service_last_state_change, true) ); if ($this->isVerbose) { $out .= $emptyLine . preg_replace( diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 2f2ddf4d3..d12b11a73 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -78,7 +78,7 @@ if ($hosts->count() === 0) { monitoringState($host, 'host')); ?>
    - timeSincePrefix($host->host_last_state_change) ?> timeSince($host->host_last_state_change); ?> + prefixedTimeSince($host->host_last_state_change, true) ?> host_state > 0): ?>
    host_state_type === '1') ? $this->translate('Hard') : $this->translate('Soft') ?> host_current_check_attempt; ?>/host_max_check_attempts; ?> diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index a7d393ab6..11795da5b 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -41,7 +41,7 @@ foreach ($services as $service):
    > translate($this->util()->getHostStateName($object->host_state)) ?>
    - translate('Since') ?> timeSince($object->host_last_state_change) ?> + timeSincePrefix($object->host_last_state_change) ?> timeSince($object->host_last_state_change) ?>     		escape($object->host_name) ?>host_address && $object->host_address !== $object->host_name): ?> @@ -18,7 +18,7 @@
    translate($this->util()->getServiceStateName($object->service_state)) ?>
    - translate('Since') ?> timeSince($object->service_last_state_change) ?> + timeSincePrefix($object->service_last_state_change) ?> timeSince($object->service_last_state_change) ?>     		translate('Service') ?>: escape($object->service_description) ?> diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index 1d22639d2..c659a91e7 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -549,7 +549,7 @@ if (this.failureNotice === null) { this.failureNotice = this.createNotice( 'error', - 'The connection to the Icinga web server has been lost at ' + + 'The connection to the Icinga web server was lost at ' + this.icinga.utils.timeShort() + '.', true From 7b0a48bef571d5d26e52edb00ebc2430d3efec0a Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 29 May 2014 12:38:59 +0200 Subject: [PATCH 29/96] Rename timeUnless to timeUntil refs #5981 --- library/Icinga/Web/View/helpers/format.php | 8 ++++---- .../application/views/scripts/list/comments.phtml | 2 +- .../application/views/scripts/process/info.phtml | 2 +- .../views/scripts/show/components/checkstatistics.phtml | 2 +- .../views/scripts/show/components/downtime.phtml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php index 5d38cce62..01ec92ea5 100644 --- a/library/Icinga/Web/View/helpers/format.php +++ b/library/Icinga/Web/View/helpers/format.php @@ -21,16 +21,16 @@ $this->addHelperFunction('timeSincePrefix', function ($timestamp) { . ' '; }); -$this->addHelperFunction('timeUnless', function ($timestamp) { +$this->addHelperFunction('timeUntil', function ($timestamp) { if (! $timestamp) return ''; - return '' + return '' . Format::timeUntil($timestamp) . ''; }); -$this->addHelperFunction('timeUnlessPrefix', function ($timestamp) { +$this->addHelperFunction('timeUntilPrefix', function ($timestamp) { if (! $timestamp) return ''; - return '' + return '' . $this->translate(Format::timeUntilPrefix($timestamp)) . ''; }); diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml index 8f1ea2d7b..00c9c128e 100644 --- a/modules/monitoring/application/views/scripts/list/comments.phtml +++ b/modules/monitoring/application/views/scripts/list/comments.phtml @@ -58,7 +58,7 @@ foreach ($comments as $comment): persistent): ?>Comment is persistent
    Expires: expiration) ? - $this->timeUnless($comment->expiration) : + $this->timeUntil($comment->expiration) : 'Never' ?>
    translate(strtoupper($helper->monitoringState($service, 'service'))) ?>
    - compact): ?>timeSincePrefix($service->service_last_state_change) ?> timeSince($service->service_last_state_change); ?> + compact): ?>prefixedTimeSince($service->service_last_state_change); ?>timeSince($service->service_last_state_change); ?> service_state > 0 && (int) $service->service_state_type === 0): ?>
    Soft service_attempt ?> diff --git a/modules/monitoring/application/views/scripts/process/info.phtml b/modules/monitoring/application/views/scripts/process/info.phtml index 57406664c..350966c49 100644 --- a/modules/monitoring/application/views/scripts/process/info.phtml +++ b/modules/monitoring/application/views/scripts/process/info.phtml @@ -10,7 +10,7 @@ $cf = $this->getHelper('CommandForm');

    Backend backendName; ?> -is_currently_running === '1' ? sprintf('has been running with PID %d %s ', $ps->process_id, strtolower($this->timeSincePrefix($ps->program_start_time))) . $this->timeSince($ps->program_start_time) : 'is not running'; ?>. +is_currently_running === '1' ? sprintf('has been running with PID %d ', $ps->process_id) . $this->prefixedTimeSince($ps->program_start_time) : 'is not running'; ?>. diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml index 51a8e4f05..6f4d3e058 100644 --- a/modules/monitoring/application/views/scripts/show/components/header.phtml +++ b/modules/monitoring/application/views/scripts/show/components/header.phtml @@ -6,7 +6,7 @@
    > translate($this->util()->getHostStateName($object->host_state)) ?>
    - timeSincePrefix($object->host_last_state_change) ?> timeSince($object->host_last_state_change) ?> + prefixedTimeSince($object->host_last_state_change, true) ?>     		escape($object->host_name) ?>host_address && $object->host_address !== $object->host_name): ?> @@ -18,7 +18,7 @@
    translate($this->util()->getServiceStateName($object->service_state)) ?>
    - timeSincePrefix($object->service_last_state_change) ?> timeSince($object->service_last_state_change) ?> + prefixedTimeSince($object->service_last_state_change, true) ?>     		translate('Service') ?>: escape($object->service_description) ?> From f767fb2de3a2ef64630a9a1cee3ae9dc3614d1ab Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 29 May 2014 11:09:52 +0000 Subject: [PATCH 31/96] js/ui: rename timeunless to timeuntil CSS filter adjusted to fit recent changes refs #5981 --- public/js/icinga/ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js index e6e57db7c..ed68a2dd4 100644 --- a/public/js/icinga/ui.js +++ b/public/js/icinga/ui.js @@ -537,7 +537,7 @@ } }); - $('.timeunless').each(function (idx, el) { + $('.timeuntil').each(function (idx, el) { var m = el.innerHTML.match(/^(-?\d+)m\s(-?\d+)s/); if (m !== null) { var nm = parseInt(m[1]); From 5cc69b53cf56ede54105f85661a8a0716cc37bca Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 29 May 2014 13:10:10 +0200 Subject: [PATCH 32/96] Remove superfluous space in prefixedTimeSince refs #5981 --- library/Icinga/Web/View/helpers/format.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Icinga/Web/View/helpers/format.php b/library/Icinga/Web/View/helpers/format.php index 60861e7ee..e62162ccc 100644 --- a/library/Icinga/Web/View/helpers/format.php +++ b/library/Icinga/Web/View/helpers/format.php @@ -18,7 +18,7 @@ $this->addHelperFunction('timeSince', function ($timestamp) { $this->addHelperFunction('prefixedTimeSince', function ($timestamp, $ucfirst = false) { return '' . Format::prefixedTimeSince($timestamp, $ucfirst) - . ' '; + . ''; }); $this->addHelperFunction('timeUntil', function ($timestamp) { From 324a4c973df2c085b7622befa697e24180fbe3f5 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 29 May 2014 11:21:02 +0000 Subject: [PATCH 33/96] Translation: new time-related since/for strings Updated German translation refs #5981 --- .../locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo | Bin 5113 -> 5165 bytes .../locale/de_DE.UTF-8/LC_MESSAGES/icinga.po | 19 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo b/application/locale/de_DE.UTF-8/LC_MESSAGES/icinga.mo index d29da64ba1b19ba6fc6e4f4c6faad97f58919c34..4b6e03d32680b5a10fd80cc62ba6e62b1c5994cb 100644 GIT binary patch delta 1242 zcmXZaT}YEr9LMo9+ly{9pQ)2xbj_4G%xaH9G9@g6NhR6aMWYuOl`$_2tcxUJ7j>6i zw9!Q*(UoBmK?c22K@`+QbdwPDLKnrLTVqHReSdkz_I%Dc&vX9g|Nrk<>bR3Ee5vG8qQ{55V=zv$zf?QJtB_Mtp*L?ma5tM~vb(T!9r-tAFDz50!G7{=y;Jp#4WN zg5#(}F4oe21-illUvrI17H?rMdg#|iOye;;g*)&y^75D&z<*}3bv*sTtYHkw% delta 1202 zcmXZaPe{{Y9LMqRWZTbdwmGvun9WSLktX{w#I!m{2GyaUQ&t3ZX@{bSZW+H@R1!u@ z3M|+)`a?8|x(FSLLc9&Epg;3qhb{{&C>Heo=ri12&-3^^&-c&o_c;3}6MRXAr;N{D zzMJ@tHkh5nGhu%C)FNhU@Fym<5M8kqV@%WNVIG@tCywBL?7#`!j1TZ2zH|Ry&!JYc zz{VKp;92J-B$i#n1WsZ%mfZRqY-B!*%CX|+A5r%#xb>Rz7wW#h*o!(GhdwM3-*z!j zhM#dY){(u|xN4=s1nS}r+WY?L7jVo3h)AT?k%cQ6;vmysDx@5CBFS; zpw|AwCQR_7%GyyEbs{-g4i#VsmB0wz!Xv2tKTrkK+`NuD7h+N8nox-(k*8oO42WrI z2Fn4ki}?_y@Hnb75QTv{vE_{V;_!KaVZA4;A<*>fCAM&(1aL z`7^l8Y!K&hJI3kL3EYi)@E-EA*f-R{CDertv`4LsqdL{bPapQ6Dm;uzcnr1g6sq6? zD)9?(`mc\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -97,15 +97,15 @@ msgstr "Fehler" msgid "Facility" msgstr "Facility" -#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:383 #: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:102 +#: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:383 msgid "File" msgstr "Datei" +#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:155 #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:220 #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:231 #: /usr/local/src/bugfix.master/application/forms/Config/ResourceForm.php:308 -#: /usr/local/src/bugfix.master/application/forms/Config/LoggingForm.php:155 msgid "Filepath" msgstr "Dateipfad" @@ -472,5 +472,16 @@ msgstr "" msgid "Your Current Language" msgstr "Deine aktuelle Sprache" +#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:108 +#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:114 +msgid "for" +msgstr "für" + +#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:112 +#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:131 +#: /usr/local/src/bugfix.master/library/Icinga/Util/Format.php:133 +msgid "since" +msgstr "seit" + #~ msgid "Icinga Users Login" #~ msgstr "Icinga Benutzeranmeldung" From 31f4c9b1b2127f132f0eec902f7e01cc34c7f05e Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 30 May 2014 16:21:04 +0200 Subject: [PATCH 34/96] Require at least Vagrant 1.2.x in Vagrantfile Users don't read READMEs or documentation, they'll just fire 'vagrant up'. Vagrant already checks the Virtualbox version itself, but for the Vagrant version no checks exist. Vagrant 1.4 provides a method 'require_version' which is pretty useless for older versions, like on Debian Wheezy (1.0.3). So we'll ship our own version comparison. fixes #6366 --- Vagrantfile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index c8c279647..8668795f1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,7 +1,20 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -Vagrant.configure("2") do |config| +VAGRANTFILE_API_VERSION = "2" +VAGRANT_REQUIRED_VERSION = "1.2.0" + +# Require 1.2.x at least +if ! defined? Vagrant.require_version + if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new(VAGRANT_REQUIRED_VERSION) + puts "Vagrant >= " + VAGRANT_REQUIRED_VERSION + " required. Your version is " + Vagrant::VERSION + exit 1 + end +else + Vagrant.require_version ">= " + VAGRANT_REQUIRED_VERSION +end + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # All Vagrant configuration is done here. The most common configuration # options are documented and commented below. For a complete reference, # please see the online documentation at vagrantup.com. From 1619d682c7e7e4cbc15d1153609db674a29bf348 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 10:45:30 +0200 Subject: [PATCH 35/96] vendor: Remove executeable bit from a read me file of HTMLPurifier refs #5982 --- .../library/HTMLPurifier/DefinitionCache/Serializer/README | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer/README diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer/README b/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer/README old mode 100755 new mode 100644 From 3a25f019c574a6c139099082191ab96c0d09276b Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 10:47:44 +0200 Subject: [PATCH 36/96] Vagrant/finalize.sh: Remove dmode and fmode options from mount.vboxsf The dmode and fmode options seem to set the execute bit even when the mode is 775. refs #5982 --- .vagrant-puppet/manifests/finalize.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vagrant-puppet/manifests/finalize.sh b/.vagrant-puppet/manifests/finalize.sh index cd04ebb7a..3bc31beba 100644 --- a/.vagrant-puppet/manifests/finalize.sh +++ b/.vagrant-puppet/manifests/finalize.sh @@ -12,7 +12,7 @@ installJquery () { mountIcinga2webConfd () { # Remount /vagrant/config/ with appropriate permissions since the group apache is missing initially - mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=775 /vagrant/config/ /vagrant/config/ + mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache` /vagrant/config/ /vagrant/config/ } startServicesWithNonLSBCompliantExitStatusCodes () { @@ -23,7 +23,7 @@ startServicesWithNonLSBCompliantExitStatusCodes () { mountIcinga2webVarLog () { # Remount /vagrant/var/log/ with appropriate permissions since the group apache is missing initially - mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=775 /vagrant/var/log/ /vagrant/var/log/ + mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache` /vagrant/var/log/ /vagrant/var/log/ } installJquery From 50e01d1284a58d596d775d91438c22792cc77a74 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 12:09:16 +0200 Subject: [PATCH 37/96] Config: Rename `configPath' to `config_path' We use underscore_case notation for all configuration keys. refs #4952 --- application/forms/Config/GeneralForm.php | 4 ++-- config/config.ini.in | 2 +- library/Icinga/User/Preferences/PreferencesStore.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php index 484bda497..3da7923e8 100644 --- a/application/forms/Config/GeneralForm.php +++ b/application/forms/Config/GeneralForm.php @@ -330,7 +330,7 @@ class GeneralForm extends Form 'label' => 'User Preference Filepath', 'required' => $backend === 'ini', 'condition' => $backend === 'ini', - 'value' => $cfg->get('configPath') + 'value' => $cfg->get('config_path') ) ); @@ -432,7 +432,7 @@ class GeneralForm extends Form $cfg->preferences->type = $values['preferences_type']; if ($cfg->preferences->type === 'ini') { - $cfg->preferences->configPath = $values['preferences_ini_path']; + $cfg->preferences->config_path = $values['preferences_ini_path']; } elseif ($cfg->preferences->type === 'db') { $cfg->preferences->resource = $values['preferences_db_resource']; } diff --git a/config/config.ini.in b/config/config.ini.in index c8724ad77..537eaae2f 100644 --- a/config/config.ini.in +++ b/config/config.ini.in @@ -44,7 +44,7 @@ level = 1 [preferences] ; Use INI file storage to save preferences to a local disk type = "ini" -configPath = "@icingaweb_config_path@/preferences" +config_path = "@icingaweb_config_path@/preferences" ; Use database storage to save preferences in either a MySQL or PostgreSQL database ;type = db diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php index b5ea62cc3..80b43a330 100644 --- a/library/Icinga/User/Preferences/PreferencesStore.php +++ b/library/Icinga/User/Preferences/PreferencesStore.php @@ -27,7 +27,7 @@ use Icinga\Application\Config as IcingaConfig; * $store = PreferencesStore::create( * new Zend_Config( * 'type' => 'ini', - * 'configPath' => '/path/to/preferences' + * 'config_path' => '/path/to/preferences' * ), * $user // Instance of \Icinga\User * ); @@ -132,7 +132,7 @@ abstract class PreferencesStore } if ($type === 'Ini') { - $config->location = IcingaConfig::resolvePath($config->configPath); + $config->location = IcingaConfig::resolvePath($config->config_path); } elseif ($type === 'Db') { $config->connection = new DbConnection(ResourceFactory::getResourceConfig($config->resource)); } From 93829bde92b8b7be43711e2363279699ceb9432f Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 13:33:17 +0200 Subject: [PATCH 38/96] config.ini: Fix indents --- config/config.ini.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.ini.in b/config/config.ini.in index 537eaae2f..c7a93f800 100644 --- a/config/config.ini.in +++ b/config/config.ini.in @@ -43,8 +43,8 @@ level = 1 [preferences] ; Use INI file storage to save preferences to a local disk -type = "ini" -config_path = "@icingaweb_config_path@/preferences" +type = "ini" +config_path = "@icingaweb_config_path@/preferences" ; Use database storage to save preferences in either a MySQL or PostgreSQL database ;type = db From a379502b157c1dcc60000721635d5495d275b58d Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 13:33:55 +0200 Subject: [PATCH 39/96] Preferences: Rename `showBenchmark' to `show_benchmark' We use underscore_case notation for all configuration keys. refs #4952 --- application/forms/Preference/GeneralForm.php | 14 +++++++------- library/Icinga/Web/Controller/ActionController.php | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php index 512b54689..4ed214945 100644 --- a/application/forms/Preference/GeneralForm.php +++ b/application/forms/Preference/GeneralForm.php @@ -261,10 +261,10 @@ class GeneralForm extends Form $this->addElement( 'checkbox', - 'showBenchmark', + 'show_benchmark', array( 'label' => 'Use benchmark', - 'value' => $this->getUserPreferences()->get('app.showBenchmark') + 'value' => $this->getUserPreferences()->get('app.show_benchmark') ) ); } @@ -278,11 +278,11 @@ class GeneralForm extends Form { $values = $this->getValues(); return array( - 'app.language' => $values['default_language'] ? null : $values['language'], - 'app.timezone' => $values['default_timezone'] ? null : $values['timezone'], - 'app.dateFormat' => $values['default_date_format'] ? null : $values['date_format'], - 'app.timeFormat' => $values['default_time_format'] ? null : $values['time_format'], - 'app.showBenchmark' => $values['showBenchmark'] === '1' ? true : false + 'app.language' => $values['default_language'] ? null : $values['language'], + 'app.timezone' => $values['default_timezone'] ? null : $values['timezone'], + 'app.dateFormat' => $values['default_date_format'] ? null : $values['date_format'], + 'app.timeFormat' => $values['default_time_format'] ? null : $values['time_format'], + 'app.show_benchmark' => $values['show_benchmark'] === '1' ? true : false ); } } diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 6d78dac3a..3761cfa8a 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -399,9 +399,9 @@ class ActionController extends Zend_Controller_Action } if ($user = $this->getRequest()->getUser()) { - // Cast preference app.showBenchmark to bool because preferences loaded from a preferences storage are + // Cast preference app.show_benchmark to bool because preferences loaded from a preferences storage are // always strings - if ((bool) $user->getPreferences()->get('app.showBenchmark', false) === true) { + if ((bool) $user->getPreferences()->get('app.show_benchmark', false) === true) { Benchmark::measure('Response ready'); $layout->benchmark = $this->renderBenchmark(); } From ede403977a2caea48b373c734a4985ab205df415 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 14:04:45 +0200 Subject: [PATCH 40/96] Auth: Get password from form only once Before, the user's password was retrieved for every authentication backend tried for authentication. --- application/controllers/AuthenticationController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php index a26034082..5dface280 100644 --- a/application/controllers/AuthenticationController.php +++ b/application/controllers/AuthenticationController.php @@ -75,8 +75,6 @@ class AuthenticationController extends ActionController } if ($this->view->form->isSubmittedAndValid()) { - $user = new User($this->view->form->getValue('username')); - try { $config = Config::app('authentication'); } catch (NotReadableError $e) { @@ -88,6 +86,8 @@ class AuthenticationController extends ActionController . ' up. Please contact your Icinga Web administrator' ); } + $user = new User($this->view->form->getValue('username')); + $password = $this->view->form->getValue('password'); // TODO(el): Currently the user is only notified about authentication backend problems when all backends // have errors. It may be the case that the authentication backend which provides the user has errors @@ -98,7 +98,7 @@ class AuthenticationController extends ActionController $backendsWithError = 0; $chain = new AuthChain($config); foreach ($chain as $backend) { - $authenticated = $backend->authenticate($user, $this->view->form->getValue('password')); + $authenticated = $backend->authenticate($user, $password); if ($authenticated === true) { $auth->setAuthenticated($user); $this->redirectNow($redirectUrl); From 5559cf6c2b21a41fddbda847a23a0f4aa96b7819 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 14:07:59 +0200 Subject: [PATCH 41/96] lib: Add AuthenticationException for exceptions thrown during authentication Our user backends log exceptions thrown during authentication but they don't throw a exception to inform the caller that an error occured. The new `AuthenticationException' class should be thrown in that case. --- .../Icinga/Exception/AuthenticationException.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 library/Icinga/Exception/AuthenticationException.php diff --git a/library/Icinga/Exception/AuthenticationException.php b/library/Icinga/Exception/AuthenticationException.php new file mode 100644 index 000000000..91180b796 --- /dev/null +++ b/library/Icinga/Exception/AuthenticationException.php @@ -0,0 +1,14 @@ + Date: Mon, 2 Jun 2014 14:41:17 +0200 Subject: [PATCH 42/96] Config: Remove base path subsitution Test for leading slash and prepend base path to allow absolute configuration files. fixes #5556 --- library/Icinga/Application/Config.php | 25 ++++++++----------- library/Icinga/Logger/Writer/FileWriter.php | 2 +- .../User/Preferences/PreferencesStore.php | 2 +- .../Form/Validator/WritablePathValidator.php | 1 - 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/library/Icinga/Application/Config.php b/library/Icinga/Application/Config.php index be0c43a60..596e1fe2b 100644 --- a/library/Icinga/Application/Config.php +++ b/library/Icinga/Application/Config.php @@ -82,7 +82,7 @@ class Config extends Zend_Config $filepath = realpath($filename); if ($filepath === false) { $this->configFile = $filename; - } else if (is_readable($filepath)) { + } elseif (is_readable($filepath)) { $this->configFile = $filepath; $this->merge(new Zend_Config_Ini($filepath)); } else { @@ -102,8 +102,7 @@ class Config extends Zend_Config public static function app($configname = 'config', $fromDisk = false) { if (!isset(self::$app[$configname]) || $fromDisk) { - $filename = self::$configDir . '/' . $configname . '.ini'; - self::$app[$configname] = new Config($filename); + self::$app[$configname] = new Config(self::resolvePath($configname . '.ini')); } return self::$app[$configname]; } @@ -125,7 +124,7 @@ class Config extends Zend_Config $moduleConfigs = self::$modules[$modulename]; if (!isset($moduleConfigs[$configname]) || $fromDisk) { $moduleConfigs[$configname] = new Config( - self::$configDir . '/modules/' . $modulename . '/' . $configname . '.ini' + self::resolvePath('modules/' . $modulename . '/' . $configname . '.ini') ); } return $moduleConfigs[$configname]; @@ -159,21 +158,17 @@ class Config extends Zend_Config } /** - * Return the input path with resolved path variables + * Prepend configuration base dir if input is relative * - * Currently only %app% is considered a path variable and points to the application paths - * - * @param string $path The path to resolve - * - * @return string The resolved path + * @param string $path Input path + * @return string Absolute path */ public static function resolvePath($path) { - try { - $appDir = realpath(Icinga::app()->getApplicationDir() . '/..'); - } catch (ProgrammingError $appNotStarted) { - $appDir = realpath(__DIR__ . '/../../..'); + if (strpos($path, DIRECTORY_SEPARATOR) === 0) { + return $path; } - return str_replace('{app}', $appDir, $path); + + return self::$configDir . DIRECTORY_SEPARATOR . $path; } } diff --git a/library/Icinga/Logger/Writer/FileWriter.php b/library/Icinga/Logger/Writer/FileWriter.php index 1208f3f3b..e77c0c577 100644 --- a/library/Icinga/Logger/Writer/FileWriter.php +++ b/library/Icinga/Logger/Writer/FileWriter.php @@ -28,7 +28,7 @@ class FileWriter extends LogWriter */ public function __construct(Zend_Config $config) { - $this->path = Config::resolvePath($config->target); + $this->path = $config->target; $this->setup(); } diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php index 80b43a330..381bb39c0 100644 --- a/library/Icinga/User/Preferences/PreferencesStore.php +++ b/library/Icinga/User/Preferences/PreferencesStore.php @@ -132,7 +132,7 @@ abstract class PreferencesStore } if ($type === 'Ini') { - $config->location = IcingaConfig::resolvePath($config->config_path); + $config->location = $config->config_path; } elseif ($type === 'Db') { $config->connection = new DbConnection(ResourceFactory::getResourceConfig($config->resource)); } diff --git a/library/Icinga/Web/Form/Validator/WritablePathValidator.php b/library/Icinga/Web/Form/Validator/WritablePathValidator.php index 3d9cb5dbc..888f6bd1b 100644 --- a/library/Icinga/Web/Form/Validator/WritablePathValidator.php +++ b/library/Icinga/Web/Form/Validator/WritablePathValidator.php @@ -81,7 +81,6 @@ class WritablePathValidator extends Zend_Validate_Abstract $value = (string) $value; $this->_setValue($value); - $value = IcingaConfig::resolvePath($value); if ($this->requireExistence && !file_exists($value)) { $this->_error('DOES_NOT_EXIST'); return false; From 2274b6e11ed267eef4aa1e80f9241204705203d7 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 15:46:15 +0200 Subject: [PATCH 43/96] lib: Add phpdoc to class `AuthChain' refs #5685 --- library/Icinga/Authentication/AuthChain.php | 41 +++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/library/Icinga/Authentication/AuthChain.php b/library/Icinga/Authentication/AuthChain.php index 99e5de13c..8f34ed84b 100644 --- a/library/Icinga/Authentication/AuthChain.php +++ b/library/Icinga/Authentication/AuthChain.php @@ -7,40 +7,81 @@ use Zend_Config; use Icinga\Logger\Logger; use Icinga\Exception\ConfigurationError; +/** + * Iterate user backends created from config + */ class AuthChain implements Iterator { + /** + * User backends configuration + * + * @var Zend_Config + */ private $config; + /** + * The consecutive user backend while looping + * + * @var UserBackend + */ private $currentBackend; + /** + * Create a new authentication chain from config + * + * @param Zend_Config $config User backends configuration + */ public function __construct(Zend_Config $config) { $this->config = $config; } + /** + * Rewind the chain + */ public function rewind() { $this->config->rewind(); + $this->currentBackend = null; } + /** + * Return the current user backend + * + * @return UserBackend + */ public function current() { return $this->currentBackend; } + /** + * Return the key of the current user backend config + * + * @return string + */ public function key() { return $this->config->key(); } + /** + * Move forward to the next user backend config + */ public function next() { $this->config->next(); } + /** + * Check if the current user backend is valid, i.e. it's enabled and the config's valid + * + * @return bool + */ public function valid() { if (!$this->config->valid()) { + // Stop when there are no more backends to check return false; } $backendConfig = $this->config->current(); From 086e2b61978e3d704f5335a438056e6074a7db71 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 15:47:21 +0200 Subject: [PATCH 44/96] Auth: Log and notify user about authentication backend errors refs #5685 --- .../controllers/AuthenticationController.php | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php index 5dface280..34fc04b67 100644 --- a/application/controllers/AuthenticationController.php +++ b/application/controllers/AuthenticationController.php @@ -36,6 +36,7 @@ use Icinga\Form\Authentication\LoginForm; use Icinga\Authentication\AuthChain; use Icinga\Application\Config; use Icinga\Logger\Logger; +use Icinga\Exception\AuthenticationException; use Icinga\Exception\NotReadableError; use Icinga\Exception\ConfigurationError; use Icinga\User; @@ -83,39 +84,45 @@ class AuthenticationController extends ActionController ); throw new ConfigurationError( 'No authentication methods available. It seems that none authentication method has been set' - . ' up. Please contact your Icinga Web administrator' + . ' up. Please check the system log or Icinga Web 2 log for more information' ); } $user = new User($this->view->form->getValue('username')); $password = $this->view->form->getValue('password'); - - // TODO(el): Currently the user is only notified about authentication backend problems when all backends - // have errors. It may be the case that the authentication backend which provides the user has errors - // but other authentication backends work. In that scenario the user is presented an error message - // saying "Incorrect username or password". We must inform the user that not all authentication methods - // are available. $backendsTried = 0; $backendsWithError = 0; $chain = new AuthChain($config); foreach ($chain as $backend) { - $authenticated = $backend->authenticate($user, $password); + ++$backendsTried; + try { + $authenticated = $backend->authenticate($user, $password); + } catch (AuthenticationException $e) { + Logger::error($e); + ++$backendsWithError; + continue; + } if ($authenticated === true) { $auth->setAuthenticated($user); $this->redirectNow($redirectUrl); - } elseif ($authenticated === null) { - $backendsWithError += 1; } - $backendsTried += 1; } - if ($backendsWithError === $backendsTried) { throw new ConfigurationError( - 'No authentication methods available. It seems that all set up authentication methods have' - . ' errors. Please contact your Icinga Web administrator' + $this->translate( + 'No authentication methods available. It seems that all set up authentication methods have' + . ' errors. Please check the system log or Icinga Web 2 log for more information' + ) ); } - - $this->view->form->getElement('password')->addError(t('Incorrect username or password')); + if ($backendsWithError) { + $this->view->form->addNote( + $this->translate( + 'Note that not all authentication backends are available for authentication because they' + . ' have errors. Please check the system log or Icinga Web 2 log for more information' + ) + ); + } + $this->view->form->getElement('password')->addError($this->translate('Incorrect username or password')); } } catch (Exception $e) { $this->view->errorInfo = $e->getMessage(); From cfcaf019bdac01c493ef06650a26d130e175c1dc Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 15:52:58 +0200 Subject: [PATCH 45/96] User backends: Throw exception when authentication fails due to an exception refs #5685 --- .../Authentication/Backend/DbUserBackend.php | 14 ++++++++------ .../Authentication/Backend/LdapUserBackend.php | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/library/Icinga/Authentication/Backend/DbUserBackend.php b/library/Icinga/Authentication/Backend/DbUserBackend.php index 03464adc7..fb36b70f3 100644 --- a/library/Icinga/Authentication/Backend/DbUserBackend.php +++ b/library/Icinga/Authentication/Backend/DbUserBackend.php @@ -34,8 +34,8 @@ use \Zend_Db_Expr; use \Zend_Db_Select; use Icinga\Authentication\UserBackend; use Icinga\Data\Db\Connection; -use Icinga\Logger\Logger; use Icinga\User; +use Icinga\Exception\AuthenticationException; class DbUserBackend extends UserBackend { @@ -75,6 +75,7 @@ class DbUserBackend extends UserBackend * @param string $password * * @return bool|null + * @throws AuthenticationException */ public function authenticate(User $user, $password) { @@ -96,13 +97,14 @@ class DbUserBackend extends UserBackend return ($row !== false) ? true : false; } catch (Exception $e) { - Logger::error( + throw new AuthenticationException( sprintf( - 'Failed to authenticate user "%s" with backend "%s". Exception occured: %s', + 'Failed to authenticate user "%s" against backend "%s". An exception was thrown:', $user->getUsername(), - $this->getName(), - $e->getMessage() - ) + $this->getName() + ), + 0, + $e ); } } diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php index f0922e092..d17cb3624 100644 --- a/library/Icinga/Authentication/Backend/LdapUserBackend.php +++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php @@ -31,9 +31,9 @@ namespace Icinga\Authentication\Backend; use \Exception; use Icinga\User; -use Icinga\Logger\Logger; use Icinga\Authentication\UserBackend; use Icinga\Protocol\Ldap\Connection; +use Icinga\Exception\AuthenticationException; class LdapUserBackend extends UserBackend { @@ -95,6 +95,7 @@ class LdapUserBackend extends UserBackend * @param string $password * * @return bool|null + * @throws AuthenticationException */ public function authenticate(User $user, $password) { @@ -104,13 +105,14 @@ class LdapUserBackend extends UserBackend $password ); } catch (Exception $e) { - Logger::error( + throw new AuthenticationException( sprintf( - 'Failed to authenticate user "%s" with backend "%s". Exception occured: %s', + 'Failed to authenticate user "%s" against backend "%s". An exception was thrown:', $user->getUsername(), - $this->getName(), - $e->getMessage() - ) + $this->getName() + ), + 0, + $e ); } } From 473d986dfb01b988cbc252e196ae3b6b11d1d54e Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 2 Jun 2014 18:07:18 +0200 Subject: [PATCH 46/96] Revert "Vagrant/finalize.sh: Remove dmode and fmode options from mount.vboxsf" This reverts commit 3a25f019c574a6c139099082191ab96c0d09276b. The "wrong" permissions do of course come from fmode=775 rather than dmode=775. I'm just blind. refs #5982 --- .vagrant-puppet/manifests/finalize.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vagrant-puppet/manifests/finalize.sh b/.vagrant-puppet/manifests/finalize.sh index 3bc31beba..cd04ebb7a 100644 --- a/.vagrant-puppet/manifests/finalize.sh +++ b/.vagrant-puppet/manifests/finalize.sh @@ -12,7 +12,7 @@ installJquery () { mountIcinga2webConfd () { # Remount /vagrant/config/ with appropriate permissions since the group apache is missing initially - mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache` /vagrant/config/ /vagrant/config/ + mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=775 /vagrant/config/ /vagrant/config/ } startServicesWithNonLSBCompliantExitStatusCodes () { @@ -23,7 +23,7 @@ startServicesWithNonLSBCompliantExitStatusCodes () { mountIcinga2webVarLog () { # Remount /vagrant/var/log/ with appropriate permissions since the group apache is missing initially - mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache` /vagrant/var/log/ /vagrant/var/log/ + mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=775 /vagrant/var/log/ /vagrant/var/log/ } installJquery From 02007cf9fb9208c1b6238d59d59b85446321f3f1 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 3 Jun 2014 13:11:28 +0200 Subject: [PATCH 47/96] Vagrant: No longer remount the config/ directory The virtual machine uses its own config files beneath /etc/icingaweb. --- .vagrant-puppet/manifests/finalize.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.vagrant-puppet/manifests/finalize.sh b/.vagrant-puppet/manifests/finalize.sh index cd04ebb7a..d30b2ba21 100644 --- a/.vagrant-puppet/manifests/finalize.sh +++ b/.vagrant-puppet/manifests/finalize.sh @@ -10,11 +10,6 @@ installJquery () { fi } -mountIcinga2webConfd () { - # Remount /vagrant/config/ with appropriate permissions since the group apache is missing initially - mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=775 /vagrant/config/ /vagrant/config/ -} - startServicesWithNonLSBCompliantExitStatusCodes () { # Unfortunately the ido2db init script is not LSB compliant and hence not started via puppet service ido2db-mysql start || true @@ -27,7 +22,6 @@ mountIcinga2webVarLog () { } installJquery -mountIcinga2webConfd startServicesWithNonLSBCompliantExitStatusCodes mountIcinga2webVarLog From 274fc58d0f9aed995610113681a9300213cfd5ae Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 3 Jun 2014 13:17:07 +0200 Subject: [PATCH 48/96] Vagrant: Fix file permissions of mount.vboxsf refs #5982 --- .vagrant-puppet/manifests/finalize.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vagrant-puppet/manifests/finalize.sh b/.vagrant-puppet/manifests/finalize.sh index d30b2ba21..02bee09a0 100644 --- a/.vagrant-puppet/manifests/finalize.sh +++ b/.vagrant-puppet/manifests/finalize.sh @@ -18,7 +18,7 @@ startServicesWithNonLSBCompliantExitStatusCodes () { mountIcinga2webVarLog () { # Remount /vagrant/var/log/ with appropriate permissions since the group apache is missing initially - mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=775 /vagrant/var/log/ /vagrant/var/log/ + mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=664 /vagrant/var/log/ /vagrant/var/log/ } installJquery From 160a95e32dd8c053c1d35c831a12118a47c6a6d2 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Tue, 3 Jun 2014 14:14:30 +0200 Subject: [PATCH 49/96] Bootstrap/Web: Only load authentication.ini if needed fixes #6238 --- library/Icinga/Application/Web.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php index d6624ac58..ca7972a18 100644 --- a/library/Icinga/Application/Web.php +++ b/library/Icinga/Application/Web.php @@ -201,13 +201,19 @@ class Web extends ApplicationBootstrap } /** - * Create user object and inject preference interface + * Create user object * * @return self - * @throws ConfigurationError */ private function setupUser() { + $authenticationManager = AuthenticationManager::getInstance(); + + if ($authenticationManager->isAuthenticated() === true) { + $this->user = $authenticationManager->getUser(); + return $this; + } + try { $config = Config::app('authentication'); } catch (NotReadableError $e) { @@ -216,15 +222,13 @@ class Web extends ApplicationBootstrap ); $config = null; } - $authenticationManager = AuthenticationManager::getInstance($config); + if ($config !== null && $config->global !== null && $config->global->get('authenticationMode', 'internal') === 'external' ) { $authenticationManager->authenticateFromRemoteUser(); } - if ($authenticationManager->isAuthenticated() === true) { - $this->user = $authenticationManager->getUser(); - } + return $this; } From 9b5c704da88298fa14016f25b93680db3f889b2b Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Tue, 3 Jun 2014 14:44:13 +0200 Subject: [PATCH 50/96] Puppet/Icinga2: Fix installation for Icinga2-2.0.0beta2 --- .vagrant-puppet/files/etc/icinga2/constants.conf | 15 +++++++++++++++ .vagrant-puppet/manifests/default.pp | 9 ++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .vagrant-puppet/files/etc/icinga2/constants.conf diff --git a/.vagrant-puppet/files/etc/icinga2/constants.conf b/.vagrant-puppet/files/etc/icinga2/constants.conf new file mode 100644 index 000000000..9e6ed51af --- /dev/null +++ b/.vagrant-puppet/files/etc/icinga2/constants.conf @@ -0,0 +1,15 @@ +/** + * This file defines global constants which can be used in + * the other configuration files. + */ + +/* The directory which contains the plugins from the Monitoring Plugins project. */ +const PluginDir = "/usr/lib64/nagios/plugins" + +/* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`. + * This should be the common name from the API certificate. +*/ +const NodeName = "localhost" + +/* Our local zone name. */ +const ZoneName = NodeName diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index 64f829fd2..fa1fde291 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -6,7 +6,7 @@ include openldap Exec { path => '/bin:/usr/bin:/sbin' } $icingaVersion = '1.11.2' -$icinga2Version = '0.0.11' +$icinga2Version = '2.0.0' exec { 'create-mysql-icinga-db': unless => 'mysql -uicinga -picinga icinga', @@ -411,6 +411,13 @@ file { '/etc/icinga2/conf.d/commands.conf': require => Exec['install icinga2'] } +file { '/etc/icinga2/constants.conf': + source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/constants.conf', + owner => 'icinga', + group => 'icinga', + require => Exec['install icinga2'] +} + service { 'icinga2': ensure => running, require => [ From a0459d01723230cd27f31547d8fb128c7c0c329f Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Tue, 3 Jun 2014 15:26:15 +0200 Subject: [PATCH 51/96] ExternalAuthentication: Move authenticationMode to config.ini fixes #6214 --- library/Icinga/Application/Web.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php index ca7972a18..20b1c7d3c 100644 --- a/library/Icinga/Application/Web.php +++ b/library/Icinga/Application/Web.php @@ -215,10 +215,10 @@ class Web extends ApplicationBootstrap } try { - $config = Config::app('authentication'); + $config = Config::app(); } catch (NotReadableError $e) { Logger::error( - new Exception('Cannot load authentication configuration. An exception was thrown:', 0, $e) + new Exception('Cannot load global configuration (config.ini). An exception was thrown:', 0, $e) ); $config = null; } @@ -227,6 +227,7 @@ class Web extends ApplicationBootstrap $config->global->get('authenticationMode', 'internal') === 'external' ) { $authenticationManager->authenticateFromRemoteUser(); + $this->user = $authenticationManager->getUser(); } return $this; From 29f593a3574728460d0043a5ed65affde52ea3b8 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Tue, 3 Jun 2014 17:59:22 +0200 Subject: [PATCH 52/96] Authentication: Add backend to handle external authentication Drop external auth configuration from config.ini and move implementation into a single backend provider named 'autologin'. This provider can strip realm names from username with a custom regexp. fixes #6081 --- .../files/etc/icingaweb/authentication.ini | 6 ++ .../controllers/AuthenticationController.php | 47 +++++++--- config/authentication.ini.in | 5 ++ config/config.ini.in | 4 - library/Icinga/Application/Web.php | 17 ---- .../Backend/AutoLoginBackend.php | 89 +++++++++++++++++++ library/Icinga/Authentication/UserBackend.php | 6 ++ .../controllers/ListController.php | 3 + 8 files changed, 144 insertions(+), 33 deletions(-) create mode 100644 library/Icinga/Authentication/Backend/AutoLoginBackend.php diff --git a/.vagrant-puppet/files/etc/icingaweb/authentication.ini b/.vagrant-puppet/files/etc/icingaweb/authentication.ini index 551cee143..3da806df1 100644 --- a/.vagrant-puppet/files/etc/icingaweb/authentication.ini +++ b/.vagrant-puppet/files/etc/icingaweb/authentication.ini @@ -1,3 +1,9 @@ +[autologin] +backend = autologin +; +; If you want to strip the domain +; strip_username_regexp = /\@[^$]+$/ + [internal_ldap_authentication] backend = ldap resource = internal_ldap diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php index 34fc04b67..b2e5294e3 100644 --- a/application/controllers/AuthenticationController.php +++ b/application/controllers/AuthenticationController.php @@ -30,6 +30,7 @@ # namespace Icinga\Application\Controllers; +use Icinga\Authentication\Backend\AutoLoginBackend; use Icinga\Web\Controller\ActionController; use Icinga\Authentication\Manager as AuthManager; use Icinga\Form\Authentication\LoginForm; @@ -62,6 +63,8 @@ class AuthenticationController extends ActionController $this->view->form = new LoginForm(); $this->view->form->setRequest($this->_request); $this->view->title = $this->translate('Icingaweb Login'); + $user = new User(''); + $password = ''; try { $redirectUrl = Url::fromPath($this->_request->getParam('redirect', 'dashboard')); @@ -71,29 +74,49 @@ class AuthenticationController extends ActionController } $auth = AuthManager::getInstance(); + if ($auth->isAuthenticated()) { $this->redirectNow($redirectUrl); } - if ($this->view->form->isSubmittedAndValid()) { - try { - $config = Config::app('authentication'); - } catch (NotReadableError $e) { - Logger::error( - new Exception('Cannot load authentication configuration. An exception was thrown:', 0, $e) - ); - throw new ConfigurationError( - 'No authentication methods available. It seems that none authentication method has been set' - . ' up. Please check the system log or Icinga Web 2 log for more information' - ); + try { + $config = Config::app('authentication'); + } catch (NotReadableError $e) { + Logger::error( + new Exception('Cannot load authentication configuration. An exception was thrown:', 0, $e) + ); + throw new ConfigurationError( + 'No authentication methods available. It seems that none authentication method has been set' + . ' up. Please check the system log or Icinga Web 2 log for more information' + ); + } + + $chain = new AuthChain($config); + + + if ($this->getRequest()->isGet()) { + foreach ($chain as $backend) { + if ($backend instanceof AutoLoginBackend) { + $authenticated = $backend->authenticate($user, $password); + if ($authenticated === true) { + $auth->setAuthenticated($user); + $this->redirectNow($redirectUrl); + } + } } + } elseif ($this->view->form->isSubmittedAndValid()) { $user = new User($this->view->form->getValue('username')); $password = $this->view->form->getValue('password'); $backendsTried = 0; $backendsWithError = 0; - $chain = new AuthChain($config); + foreach ($chain as $backend) { ++$backendsTried; + + if ($backend instanceof AutoLoginBackend) { + continue; + } + try { $authenticated = $backend->authenticate($user, $password); } catch (AuthenticationException $e) { diff --git a/config/authentication.ini.in b/config/authentication.ini.in index bbb4d666b..554356492 100644 --- a/config/authentication.ini.in +++ b/config/authentication.ini.in @@ -6,6 +6,11 @@ ; The backends will be processed from top to bottom using the first backend for authentication which reports that ; the user trying to log in is available. +[autologin] +backend = autologin +; +; If you want to strip the domain +; strip_username_regexp = /\@[^$]+$/ [internal_ldap_authentication] @ldap_auth_disabled@ diff --git a/config/config.ini.in b/config/config.ini.in index c7a93f800..35febdb3b 100644 --- a/config/config.ini.in +++ b/config/config.ini.in @@ -11,10 +11,6 @@ timeFormat = "g:i A" ; won't show up in the list of disabled modules ; modulePath = "/vagrant/modules:/usr/share/icingaweb/modules" -; The used authentication-mode can be either "internal" to handle the authentication in IcingaWeb -; or "external" to delegate the authentication to the used WebServer -authenticationMode = "internal" - [logging] enable = true ; Writing to a Stream diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php index 20b1c7d3c..be78f018b 100644 --- a/library/Icinga/Application/Web.php +++ b/library/Icinga/Application/Web.php @@ -211,23 +211,6 @@ class Web extends ApplicationBootstrap if ($authenticationManager->isAuthenticated() === true) { $this->user = $authenticationManager->getUser(); - return $this; - } - - try { - $config = Config::app(); - } catch (NotReadableError $e) { - Logger::error( - new Exception('Cannot load global configuration (config.ini). An exception was thrown:', 0, $e) - ); - $config = null; - } - - if ($config !== null && $config->global !== null && - $config->global->get('authenticationMode', 'internal') === 'external' - ) { - $authenticationManager->authenticateFromRemoteUser(); - $this->user = $authenticationManager->getUser(); } return $this; diff --git a/library/Icinga/Authentication/Backend/AutoLoginBackend.php b/library/Icinga/Authentication/Backend/AutoLoginBackend.php new file mode 100644 index 000000000..8fd7a7c5c --- /dev/null +++ b/library/Icinga/Authentication/Backend/AutoLoginBackend.php @@ -0,0 +1,89 @@ +stripUsernameRegexp = $config->get('strip_username_regexp'); + } + + /** + * (PHP 5 >= 5.1.0)
    + * Count elements of an object + * @link http://php.net/manual/en/countable.count.php + * @return int The custom count as an integer. + *

    + *

    + * The return value is cast to an integer. + */ + public function count() + { + return 1; + } + + /** + * Test whether the given user exists + * + * @param User $user + * + * @return bool + */ + public function hasUser(User $user) + { + if (isset($_SERVER['PHP_AUTH_USER']) + && isset($_SERVER['AUTH_TYPE']) + && in_array($_SERVER['AUTH_TYPE'], array('Basic', 'Digest')) === true + ) { + $username = filter_var( + $_SERVER['PHP_AUTH_USER'], + FILTER_SANITIZE_STRING, + FILTER_FLAG_ENCODE_HIGH|FILTER_FLAG_ENCODE_LOW + ); + + if ($username !== false) { + if ($this->stripUsernameRegexp !== null) { + $username = preg_replace($this->stripUsernameRegexp, '', $username); + } + return true; + } + } + + return false; + } + + /** + * Authenticate + * + * @param User $user + * @param string $password + * + * @return bool + */ + public function authenticate(User $user, $password) + { + return $this->hasUser($user); + } +} diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php index 216072c28..70070aa2f 100644 --- a/library/Icinga/Authentication/UserBackend.php +++ b/library/Icinga/Authentication/UserBackend.php @@ -30,6 +30,7 @@ namespace Icinga\Authentication; use Countable; +use Icinga\Authentication\Backend\AutoLoginBackend; use Zend_Config; use Icinga\Authentication\Backend\DbUserBackend; use Icinga\Authentication\Backend\LdapUserBackend; @@ -84,6 +85,11 @@ abstract class UserBackend implements Countable } return new $backendConfig->class($backendConfig); } + if ($name === 'autologin') { + $backend = new AutoLoginBackend($backendConfig); + $backend->setName($name); + return $backend; + } if ($backendConfig->resource === null) { throw new ConfigurationError( 'Authentication configuration for backend "' . $name diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index af72007f2..34854ba32 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -287,6 +287,9 @@ class Monitoring_ListController extends Controller ) )->getQuery(); $this->view->contacts = $query->paginate(); + + file_put_contents('/tmp/query.txt', (string) $query); + $this->setupSortControl(array( 'contact_name' => 'Name', 'contact_alias' => 'Alias', From 8fe804bbd4570fab4aff5d4f107dab3c6bfff704 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 4 Jun 2014 16:09:50 +0200 Subject: [PATCH 53/96] Enable icinga snapshot repository and fetch latest icinga2 packages Furthermore get rid of multiple 'exec' calls and use 'package' instead. Additional refactoring for icinga 2 features. fixes #6405 --- .vagrant-puppet/manifests/default.pp | 121 ++++++++++++++++++--------- 1 file changed, 83 insertions(+), 38 deletions(-) diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index fa1fde291..fa85b48fd 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -50,7 +50,7 @@ group { 'icinga-cmd': group { 'icingacmd': ensure => present, - require => Exec['install icinga2'] + require => Package['icinga2'] } user { 'icinga': @@ -343,50 +343,95 @@ package { ['cmake', 'boost-devel', 'bison', 'flex']: ensure => installed } +# icinga 2 +define icinga2::feature ($feature = $title) { + exec { "icinga2-feature-${feature}": + path => '/bin:/usr/bin:/sbin:/usr/sbin', + unless => "readlink /etc/icinga2/features-enabled/${feature}.conf", + command => "icinga2-enable-feature ${feature}", + require => [ Package['icinga2'] ], + notify => Service['icinga2'] + } +} + yumrepo { 'icinga2-repo': baseurl => "http://packages.icinga.org/epel/6/snapshot/", - enabled => '0', + enabled => '1', gpgcheck => '1', gpgkey => 'http://packages.icinga.org/icinga.key', descr => "Icinga Repository - ${::architecture}" } -exec { 'install icinga2': - command => 'yum -d 0 -e 0 -y --enablerepo=icinga2-repo install icinga2', - unless => 'rpm -qa | grep icinga2', - require => Yumrepo['icinga2-repo'] -} - -exec { 'install icinga2-classicui-config': - command => 'yum -d 0 -e 0 -y --enablerepo=icinga2-repo install icinga2-classicui-config', - unless => 'rpm -qa | grep icinga2-classicui-config', - require => [ Yumrepo['icinga2-repo'], Exec['install icinga2'], Exec['install icinga2-ido-mysql'] ] -} - -exec { 'install icinga2-ido-mysql': - command => 'yum -d 0 -e 0 -y --enablerepo=icinga2-repo install icinga2-ido-mysql', - unless => 'rpm -qa | grep icinga2-ido-mysql', - require => [ Yumrepo['icinga2-repo'], Exec['install icinga2'] ], -} - exec { 'install nagios-plugins-all': command => 'yum -d 0 -e 0 -y --enablerepo=epel install nagios-plugins-all', unless => 'rpm -qa | grep nagios-plugins-all', - require => [ Class['epel'], Exec['install icinga2'] ], + require => [ Class['epel'], Package['icinga2'] ], } -file { '/etc/icinga2/features-enabled/': - ensure => directory, - owner => icinga, - group => icinga, - require => Exec['install icinga2-ido-mysql'] +package { 'icinga2': + ensure => latest, + require => Yumrepo['icinga2-repo'], + alias => 'icinga2' } +package { 'icinga2-bin': + ensure => latest, + require => [ Yumrepo['icinga2-repo'], Package['icinga2'] ], + alias => 'icinga2-bin' +} + +package { 'icinga2-doc': + ensure => latest, + require => Yumrepo['icinga2-repo'], + alias => 'icinga2-doc' +} + +# icinga 2 classic ui +package { 'icinga2-classicui-config': + ensure => latest, + before => Package["icinga-gui"], + require => [ Yumrepo['icinga2-repo'], Package['icinga2'] ], + notify => Service['apache'] +} + +package { 'icinga-gui': + ensure => latest, + require => Yumrepo['icinga2-repo'], + alias => 'icinga-gui' +} + +icinga2::feature { 'statusdata': + require => Package['icinga2-classicui-config'] +} + +icinga2::feature { 'command': + require => Package['icinga2-classicui-config'] +} + +icinga2::feature { 'compatlog': + require => Package['icinga2-classicui-config'] +} + +# icinga 2 ido mysql +package { 'icinga2-ido-mysql': + ensure => latest, + require => Yumrepo['icinga2-repo'], + alias => 'icinga2-ido-mysql' +} + +exec { 'populate-icinga2-mysql-db': + unless => 'mysql -uicinga2 -picinga2 icinga2 -e "SELECT * FROM icinga_dbversion;" &> /dev/null', + command => "mysql -uroot icinga2 < /usr/share/doc/icinga2-ido-mysql-$icinga2Version/schema/mysql.sql", + require => [ Exec['create-mysql-icinga2-db'], Package['icinga2-ido-mysql'] ] +} + + file { '/etc/icinga2/features-available/ido-mysql.conf': source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf', owner => 'icinga', group => 'icinga', - require => Exec['install icinga2-ido-mysql'] + require => Package['icinga2'], + notify => Service['icinga2'] } file { '/etc/icinga2/features-enabled/ido-mysql.conf': @@ -394,46 +439,46 @@ file { '/etc/icinga2/features-enabled/ido-mysql.conf': target => '/etc/icinga2/features-available/ido-mysql.conf', owner => 'root', group => 'root', - require => Exec['install icinga2-ido-mysql'] + require => Package['icinga2-ido-mysql'] } +icinga2::feature { 'ido-mysql': + require => Exec['populate-icinga2-mysql-db'] +} + + +# icinga 2 test config file { '/etc/icinga2/conf.d/test-config.conf': source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/conf.d/test-config.conf', owner => 'icinga', group => 'icinga', - require => [ Exec['install icinga2'], Exec['create_monitoring_test_config'] ] + require => [ Package['icinga2'], Exec['create_monitoring_test_config'] ] } file { '/etc/icinga2/conf.d/commands.conf': source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/conf.d/commands.conf', owner => 'icinga', group => 'icinga', - require => Exec['install icinga2'] + require => Package['icinga2'] } file { '/etc/icinga2/constants.conf': source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/constants.conf', owner => 'icinga', group => 'icinga', - require => Exec['install icinga2'] + require => Package['icinga2'] } service { 'icinga2': ensure => running, require => [ - Exec['install icinga2'], + Package['icinga2'], File['/etc/icinga2/features-enabled/ido-mysql.conf'], File['/etc/icinga2/conf.d/test-config.conf'], File['/etc/icinga2/conf.d/commands.conf'] ] } -exec { 'populate-icinga2-mysql-db': - unless => 'mysql -uicinga2 -picinga2 icinga2 -e "SELECT * FROM icinga_dbversion;" &> /dev/null', - command => "mysql -uroot icinga2 < /usr/share/doc/icinga2-ido-mysql-$icinga2Version/schema/mysql.sql", - require => [ Exec['create-mysql-icinga2-db'], Exec['install icinga2-ido-mysql'] ] -} - # cmmi { 'icinga2': # url => "https://github.com/Icinga/icinga2/releases/download/v${icinga2Version}/icinga2-${icinga2Version}.tar.gz", # output => "icinga2-${icinga2Version}.tar.gz", From e992f152bbcef42a78a3740b3a3b5e97db478853 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 21:02:25 +0000 Subject: [PATCH 54/96] packaging/configuration: get rid of _ENV We should use _SERVER for our settings as it works fine on CLI and for web servers. refs #6400 --- library/Icinga/Application/ApplicationBootstrap.php | 2 -- packages/rhel/usr/share/icingaweb/public/index.php | 1 - public/index.php.in | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index c0cb83841..6fbe2d27a 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -143,8 +143,6 @@ abstract class ApplicationBootstrap if ($configDir === null) { if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) { $configDir = $_SERVER['ICINGAWEB_CONFIGDIR']; - } else if (array_key_exists('ICINGAWEB_CONFIGDIR', $_ENV)) { - $configDir = $_ENV['ICINGAWEB_CONFIGDIR']; } else { $configDir = '/etc/icingaweb'; } diff --git a/packages/rhel/usr/share/icingaweb/public/index.php b/packages/rhel/usr/share/icingaweb/public/index.php index 45ac69392..7dd0fd899 100644 --- a/packages/rhel/usr/share/icingaweb/public/index.php +++ b/packages/rhel/usr/share/icingaweb/public/index.php @@ -1,5 +1,4 @@ Date: Wed, 4 Jun 2014 21:11:27 +0000 Subject: [PATCH 55/96] packaging/config: rename ICINGA_APPDIR Renamed ICINGA_APPDIR to ICINGAWEB_APPDIR for consistency. This way it fits ICINGAWEB_CONFIGDIR. refs #6400 --- application/clicommands/WebCommand.php | 2 +- application/forms/Config/GeneralForm.php | 2 +- library/Icinga/Application/ApplicationBootstrap.php | 8 ++++---- library/Icinga/Cli/Loader.php | 2 +- test/php/bootstrap.php | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application/clicommands/WebCommand.php b/application/clicommands/WebCommand.php index 12d140f43..54141e0c7 100644 --- a/application/clicommands/WebCommand.php +++ b/application/clicommands/WebCommand.php @@ -29,7 +29,7 @@ class WebCommand extends Command // throw new Exception('Socket is required'); } if ($basedir === null) { - $basedir = dirname(ICINGA_APPDIR) . '/public'; + $basedir = dirname(ICINGAWEB_APPDIR) . '/public'; if (! file_exists($basedir) || ! is_dir($basedir)) { throw new Exception('Basedir is required'); } diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php index 3da7923e8..346dcaf87 100644 --- a/application/forms/Config/GeneralForm.php +++ b/application/forms/Config/GeneralForm.php @@ -248,7 +248,7 @@ class GeneralForm extends Form 'helptext' => 'Contains the directories that will be searched for available modules, separated by ' . ' colons. Modules that don\'t exist in these directories can still be symlinked in the module ' . ' folder, but won\'t show up in the list of disabled modules.', - 'value' => $cfg->get('modulePath', realpath(ICINGA_APPDIR . '/../modules')) + 'value' => $cfg->get('modulePath', realpath(ICINGAWEB_APPDIR . '/../modules')) ) ); } diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index 6fbe2d27a..a634eb89e 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -136,8 +136,8 @@ abstract class ApplicationBootstrap // TODO: Make appdir configurable for packagers $this->appDir = realpath($this->libDir. '/../application'); - if (!defined('ICINGA_APPDIR')) { - define('ICINGA_APPDIR', $this->appDir); + if (!defined('ICINGAWEB_APPDIR')) { + define('ICINGAWEB_APPDIR', $this->appDir); } if ($configDir === null) { @@ -337,8 +337,8 @@ abstract class ApplicationBootstrap explode( ':', $this->config->global !== null - ? $this->config->global->get('modulePath', ICINGA_APPDIR . '/../modules') - : ICINGA_APPDIR . '/../modules' + ? $this->config->global->get('modulePath', ICINGAWEB_APPDIR . '/../modules') + : ICINGAWEB_APPDIR . '/../modules' ) ); return $this; diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php index 76aecc984..866697263 100644 --- a/library/Icinga/Cli/Loader.php +++ b/library/Icinga/Cli/Loader.php @@ -64,7 +64,7 @@ class Loader public function __construct(App $app) { $this->app = $app; - $this->coreAppDir = ICINGA_APPDIR . '/clicommands'; + $this->coreAppDir = ICINGAWEB_APPDIR . '/clicommands'; } /** diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php index 4fc192e7d..4978a1788 100644 --- a/test/php/bootstrap.php +++ b/test/php/bootstrap.php @@ -7,8 +7,8 @@ $testLibraryPath = realpath(dirname(__FILE__) . '/library/'); $configPath = realpath($libraryPath . '/../config'); // Is usually done in the application's bootstrap and is used by some of our internals -if (!defined('ICINGA_APPDIR')) { - define('ICINGA_APPDIR', $applicationPath); +if (!defined('ICINGAWEB_APPDIR')) { + define('ICINGAWEB_APPDIR', $applicationPath); } if (!defined('ICINGA_LIBDIR')) { define('ICINGA_LIBDIR', $libraryPath); From bdc3423d4e9e652002707c35382ea261415047f3 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 21:22:29 +0000 Subject: [PATCH 56/96] packaging/config: allow to override APPDIR It is now possible to either define ICINGAWEB_APPDIR in an Environment variable or to define it as a PHP constant before bootstrapping. fixes #6400 --- library/Icinga/Application/ApplicationBootstrap.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index a634eb89e..405b41009 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -133,8 +133,13 @@ abstract class ApplicationBootstrap define('ICINGA_LIBDIR', $this->libDir); } - // TODO: Make appdir configurable for packagers - $this->appDir = realpath($this->libDir. '/../application'); + if (defined('ICINGAWEB_APPDIR')) { + $this->appDir = ICINGAWEB_APPDIR; + } elseif (array_key_exists('ICINGAWEB_APPDIR', $_SERVER)) { + $this->appDir = $_SERVER['ICINGAWEB_APPDIR']; + } else { + $this->appDir = realpath($this->libDir. '/../application'); + } if (!defined('ICINGAWEB_APPDIR')) { define('ICINGAWEB_APPDIR', $this->appDir); From d66055bce24249def672826825564ae8511b61fa Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 21:25:26 +0000 Subject: [PATCH 57/96] CLI/monitoring/list: fix formatting-related error Small fix, this got broken by language-related changes in a66a1a47. --- modules/monitoring/application/clicommands/ListCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php index 71bf1083f..2548c138e 100644 --- a/modules/monitoring/application/clicommands/ListCommand.php +++ b/modules/monitoring/application/clicommands/ListCommand.php @@ -291,7 +291,7 @@ class ListCommand extends Command $maxCols - 13 ) . "\n"; $out .= sprintf( - " %1s─ %s%s (%s %s)", + " %1s─ %s%s (%s)", $leaf, $screen->underline($row->service_description), $screen->colorize($utils->objectStateFlags('service', $row) . $perf, 'lightblue'), From 76a9e67e35cc4b7840ed7999cb8c811efef38ae1 Mon Sep 17 00:00:00 2001 From: Carlos Cesario Date: Tue, 3 Jun 2014 12:17:32 -0300 Subject: [PATCH 58/96] Added initial pt_BR translation fixes #6395 Signed-off-by: Thomas Gelf --- .../locale/pt_BR.UTF-8/LC_MESSAGES/icinga.mo | Bin 0 -> 10193 bytes .../locale/pt_BR.UTF-8/LC_MESSAGES/icinga.po | 559 ++++++++ .../pt_BR.UTF-8/LC_MESSAGES/monitoring.mo | Bin 0 -> 25934 bytes .../pt_BR.UTF-8/LC_MESSAGES/monitoring.po | 1158 +++++++++++++++++ 4 files changed, 1717 insertions(+) create mode 100644 application/locale/pt_BR.UTF-8/LC_MESSAGES/icinga.mo create mode 100644 application/locale/pt_BR.UTF-8/LC_MESSAGES/icinga.po create mode 100644 modules/monitoring/application/locale/pt_BR.UTF-8/LC_MESSAGES/monitoring.mo create mode 100644 modules/monitoring/application/locale/pt_BR.UTF-8/LC_MESSAGES/monitoring.po diff --git a/application/locale/pt_BR.UTF-8/LC_MESSAGES/icinga.mo b/application/locale/pt_BR.UTF-8/LC_MESSAGES/icinga.mo new file mode 100644 index 0000000000000000000000000000000000000000..955b4f8f672819c211fff9056c6fa651a5f1198b GIT binary patch literal 10193 zcmbuEYm6k)!6ZRAQi5V3EX5MCP*`Ef;9#N1-;5MMg9sr)dMW-wsybkAS}b&V!!?-v@pT{Autz;2H47J^uMc@SR-$I;i(v4fy-u^;~}y z{4ww^!1sfH7w%tw6EwKK3A_%xC0ySMiq5`pe>UK~pyD4@7=%`Kg}(m{BZ@F7t0{WEYc_)YLO@V`N}Zf@gc?e}i*2zU>ub=sihQGr_j8PM?uKF{@w zpx$dSS^GNz>iQ8-?=6BXVO9b@28vD!itndE@%af56`D_j7r|cz_5R<7=l=wX-+u=e z!FQuP;p5;3z$>8a;ZMW;Z-d(BfgktxSHMTOz66TS7eUGOYv7&W8{i!HUW6oi7r|NZ z6QI`lJ@6>_uOOt&T^N_-GzUHa=HNl_w?WbWEASTZd!PmPaB&ZK0MvSqf&0K`LCt>| zl%0G9Jv8d!n*P!2!M3*aZ;V$AP?;`boN zCAtrR(%(4{QJNGKoo!Hd@Jrwl_&HGgeghPLH{5E>$G{JOr@&8xlJ}p3qW9f^Z+(xa zcPof#n7yFnJPXP$J`8G|CqS*+1re#~gQ&p#GAKLvJgE6!0AaMFTMkcukV42;P*j9YZhQi^d1K#k9AP; zehRz-{z`a$kel+O!yqBl90Nsf5ftAm0iOUxrw59k0VsKX29$iB2fN@G!u=bqpMNtb zyLu0J7Mur9gTDsKPX8K|Km8YY4!n&E?XLv&-fw`b;2(o`g74xb-G3OA{u5Aip95#W zZ-V!MH{Fg+fXBfF@I_F3|1CHR{tNgBc>DX=JJ<%b?hByo<&QvAX}%6V1pXuV064SX z82(I$FG!f@Kv*+h0;SKdgPQkUQ2wzWW*-Ib17#1-fs)%FfS19qg1-nJXEU1rhu~X4 z)ad+S4bkxxbYa{Va9_D?Mr*qI{L6B=lhbMY!;I+Kf};x zmChuQLb8?|<{2>qb8&jT2bA0}cPHN) zz;`h8k^GyFbSil+Gh{Dq#&wKE#$613KFW}<$j&wx(xW~nJeZ#c<%_f7`Z%~0ehc2p z_y_~ln1mt!P>hiM$YyS2$oHg2eWZ7N6bIKCXBfvA`p72d7*8-h#L(w@#s$XDF%-*g zXEdK~^8II;PclBnxR-IBp^xlQvDz~9`B{DKk8NF8zKadM&Hidm z7vs0)`~56!M|E1{cC}14(#z&})V`GDu{{&@5_3G|*WwwEt5H>L6=iG|x=H(zt-EPu z*Ne*{nB*Hp*-mV`8|9s(vRi50Ee5r17kQqv>vS`%x9w(>rLkLUoPv8hTF(-j6`f9+ zcUop4yaiK_4&SjSqclt6IXiqjMbvJ%2?vLZ@;b!pZely>W|G@7sfvNP%!}Igi>gXl zb+p>G$caF|EH=|PiR}hF*tlSeB9dHAtGZF^MAKi0u9L_ku-A~M7vOehW zy%7zv+AbrqLDWgii5xK?0LSva{nb9(E8+p`_0mqaw%sJ_?=>gNvM9~TsGVlW)SQGL z_tlT;t~u$Hu;7(oPN#WoP8XH`s?5?IJ!BBY+Y(EaL}j~s&~8O(tu@h~-9|h%&HIDe zEVa2AZ6)h=xj-pqX~XNgmsAzJjzkcrRn+f8?4V8S!09?7PTHDTy0xAj@JM2856Uvh zYZgcNsHYd@gDA_k?fSNDXAo(2-;UbdGUvZ2&6OL@D1c)PX( z?&lb<-tIRhyCehcdE;BktD04L#i75syg0vV&jkxH?&^XTkoxR=U6<+lpiagfoLzrP zt1V zn-R8m+;t!H%&Kf#p6%XgaUDY5YE;*lm086~adeo2SY-1-Z#^lQ=Wk$V9a{&onpRx){b3 zx1bLUBnHVYj{3;IgfmBEXbnx)@(Dy660LEgBw#AVLB?_Kl7lCr1mPAz6dOt1?y^VT z_Myjalts_2)g>%@UKCid{9uWGJENy88^1o=el$Ax(<%EnX#7B8sIny37IV936@-*12Wab3rh-`K7W9KxLZF`sUaqU_= z!u`W;ygJIHGsvQnngyl#^gFIesv83C26?#12EDv;D>KnoOl;u?a{~n-nXE#{Q2B~Z zTM_vma&0P+I(Tn089P(~=-3|j?&f*Jj^k~Rr$}wgO0kZ~2`Jpgt_Ey)ABtI?G_5Nc zh$nZA-4?l%Bx+!(oDyn)6NC~i^|gco?|H?9aJx(JXJ(xADX9s=DPe8b=T*B*`zpiD z1;Wi$rJ-($=ZzxEiY>_~3ss|pMGZ!Nq0}Pn;YuXC#uG)&6+`@RZz<$C?nf2yK}WgY z?PD55XIGf*lW_JmGsiaP$%vIv77flC>Ti0C%3O@fob}8{(0HEUiEtUH?6z8OyLvj? z=QtPXk0PumSL5Qz72Wp^?ZTEbLc6j(VO5RNtJa%cuHV^xxmDf2YPnTHb*D`Jmo-bf z5X#bFEx%e8Di3Ft;+aQ@J1BO}`kLBaq^Le@@0@KNx@*t5q>rD@tW=#eo;g0~R5Ry` zIm~7ASn3MMR#A5Lte!nTvmkeY%FH5OGiMLa9y&TRd*96L5qs#~xx+^e%pRVdW#Y`a zWHZ%jyUaU0H~RoDFmIWnVdi`pcae~6ZXO7+Wv718TBE$69_w21(NILdck=2w;ULhtLytH{GN=!xSfP9`W7 zeLus~VhZuPAgXm}Gs{AGx@CMv?B}sH5xWf2cwa`#J!j@8)(SI*%Y|tNDZqwrqFJ{J z-C3o^kg^U7iV#39!aKj?n&q8WsSsLkmV99)pmY#?`>xyb?N?uqP_$%zMtwLexw1u3Io{Mh!M9El0{VYXd5(+ATNgv`Xc6Zf1l z`$>g3@Fyfsw_jo#a8(T=wGw3%N4{HAvKY4BRKniCdPHRkx1QHWj9WsJ1{-2-BQ9~d zhI{9V{I`lyGGBx$t4bQAv5d0NY(uN2v(D09KM2P6rtrIw==cV}luJ-NIewchbm=J*wi z>#jr5tA<<2ZtStzZkhm3SccIU-DKY_NhbsALn?y4#!F)z_~aYs8V6);e30HLIHbR} z-C$_!|BQ1Ju`=}9@KR&D)A!e+ombJ-)o+Yi_%-wiWjT3~j-2tJT+<)4?5=lzyz>9o zxEy2-OD7=^AacyZ@$8#+9kLMl)(L{{nVR*Uv_wg-lCmAtt_DBMZKrrCWUe)pP99_P z*0NgeyhfLTWU(}QmBuvi8v>YIhgFB6`s(0-2l;lt%}lepbA<|%#U;!kg-A^&p`CW$ zM-F;t0_7&(@=gU=7MA5oOXzJvFDKP zLHR8ycV40Jj4CtFaUg?}2~H5397h~c*f%5d^w*1Ltd0RV4jvD+mMX}sHnD8+PUTRam!_5tlpAkws#aY0r^*S`#u*D))6;-_#SyVAcf`962d=jB*7OXFNIgfH zASq2BvhGe0CV31=iu$GD(mUVTVLdMoc!Pl3T~Bl!CvVD?@{aVdp|PfveEuIK$Q4cHEJ}h~RWlFs1yF0G;HUmIWrS z+OpUCgo1VnXXsw%4451C?laS*Oq+^uWKlYl@OjO*k5jhfQ|azRrn#I)T&hKPo!wZC zjCiPZXRv396~3l%F`LK!90F;N9ZpR7#2C5CmuK2@IH=%soEiu1H-rmp&eBVawyOWM zM0hf;IE=VV*u|UF3vnxF&JB0}RJ{IIbYOI78H-1ttO?A)ZZ1rZMmd z^LAlTUcK{ro{~7I?1&0Y zL_Rx|A!o7E#Jnetsb*5s<9^X-Vs{eLKHu_%hA-2pE?m-WYG>cVy99GWtTy*uI;~yW z*Fi^, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Icinga Web 2 (0.1)\n" +"Report-Msgid-Bugs-To: dev@icinga.org\n" +"POT-Creation-Date: 2014-06-03 15:23+0200\n" +"PO-Revision-Date: 2014-06-03 12:09-0300\n" +"Last-Translator: Carlos Cesario \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" +"X-Generator: Poedit 1.5.4\n" + +#: /usr/local/icingaweb/application/views/scripts/mixedPagination.phtml:15 +#, php-format +msgid "%d to %d of %d" +msgstr "%d para %d de %d" + +#: /usr/local/icingaweb/application/views/scripts/pivottablePagination.phtml:9 +#, php-format +msgid "%s: %d to %d of %d" +msgstr "%s: %d para %d de %d" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:117 +msgid "Application Prefix" +msgstr "Prefixo da aplicação" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/DbBackendForm.php:78 +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:80 +msgid "Backend Name" +msgstr "Nome do backend" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:282 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:282 +msgid "Bind DN" +msgstr "Bind DN" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:294 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:294 +msgid "Bind Password" +msgstr "Senha Bind" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:358 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:358 +#: /usr/local/icingaweb/application/forms/Config/Authentication/BaseBackendForm.php:139 +msgid "Check this box to enforce changes without connectivity validation" +msgstr "Marque esta caixa para aplicar as mudanças sem validação conectividade" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:73 +msgid "Check this to enable logging." +msgstr "Marque esta opção para ativar o registro log." + +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:187 +msgid "Connection Validation Failed: " +msgstr "Validação de conexão falhou:" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:477 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:457 +msgid "" +"Connectivity validation failed, connection to the given resource not " +"possible." +msgstr "" +"A validação de conectividade falhou, a conexão com o recurso selecionado não " +"é possível." + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:454 +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:470 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:434 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:450 +msgid "Connectivity validation failed, the provided file does not exist." +msgstr "A validação de conectividade falhou, o arquivo fornecido não existe." + +#: /usr/local/icingaweb/application/forms/Config/Authentication/DbBackendForm.php:90 +msgid "Database Connection" +msgstr "Conexão com o banco de dados" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:183 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:183 +msgid "Database Name" +msgstr "Nome do banco de dados" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:144 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:144 +msgid "Database Type" +msgstr "Tipo do banco de dados" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:89 +msgid "Debug" +msgstr "Depurar" + +#: /usr/local/icingaweb/application/forms/Config/GeneralForm.php:185 +msgid "Default Language" +msgstr "Idioma padrão" + +#: /usr/local/icingaweb/application/controllers/ErrorController.php:62 +#, php-format +msgid "Enabling the \"%s\" module might help!" +msgstr "Habilitando o módulo \"%s\" pode ajudar!" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:86 +msgid "Error" +msgstr "Erro" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:139 +msgid "Facility" +msgstr "Facilidade" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:102 +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:383 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:383 +msgid "File" +msgstr "Arquivo" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:155 +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:220 +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:231 +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:308 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:220 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:231 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:308 +msgid "Filepath" +msgstr "Caminho do arquivo" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:357 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:357 +#: /usr/local/icingaweb/application/forms/Config/Authentication/BaseBackendForm.php:138 +msgid "Force Changes" +msgstr "Forçar mudanças" + +#: /usr/local/icingaweb/application/views/scripts/search/hint.phtml:7 +msgid "Hint" +msgstr "Sugestão" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:160 +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:260 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:160 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:260 +msgid "Host" +msgstr "Host" + +#: /usr/local/icingaweb/application/views/scripts/pivottablePagination.phtml:28 +#: /usr/local/icingaweb/application/controllers/SearchController.php:33 +msgid "Hosts" +msgstr "Hosts" + +#: /usr/local/icingaweb/application/views/scripts/search/hint.phtml:6 +msgid "I'm ready to search, waiting for your input" +msgstr "Estou pronto para pesquisar, aguardando sua entrada" + +#: /usr/local/icingaweb/application/views/scripts/authentication/login.phtml:8 +#: /usr/local/icingaweb/application/controllers/AuthenticationController.php:63 +msgid "Icingaweb Login" +msgstr "Login no Icingaweb" + +#: /usr/local/icingaweb/application/views/scripts/authentication/logout.phtml:17 +msgid "" +"If this message does not disappear, it might be necessary to quit the " +"current session manually by clearing the cache, or by closing the current " +"browser session." +msgstr "" +"Se esta mensagem não desaparecer, pode ser necessário sair da sessão atual " +"manualmente, limpando o cache ou fechando a sessão atual do navegador. " + +#: /usr/local/icingaweb/application/controllers/AuthenticationController.php:118 +msgid "Incorrect username or password" +msgstr "Usuário ou senha inválido" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:88 +msgid "Information" +msgstr "Informação" + +#: /usr/local/icingaweb/library/Icinga/Web/Wizard/Wizard.php:337 +#: /usr/local/icingaweb/library/Icinga/Web/Wizard/Wizard.php:380 +msgid "Install" +msgstr "Instalar" + +#: /usr/local/icingaweb/application/views/scripts/install/index.phtml:29 +msgid "Installation" +msgstr "Instalação" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:92 +msgid "LDAP Resource" +msgstr "Recurso LDAP" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:115 +msgid "LDAP User Name Attribute" +msgstr "Atributo LDAP Nome de usuário" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:104 +msgid "LDAP User Object Class" +msgstr "Classe LDAP Objeto de usuário" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:232 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:232 +msgid "Location of your icinga objects.cache file" +msgstr "Localização do arquivo objects.cache do seu icinga" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:221 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:221 +msgid "Location of your icinga status.dat file" +msgstr "Localização do arquivo status.dat do seu icinga" + +#: /usr/local/icingaweb/application/controllers/InstallController.php:69 +msgid "Logging" +msgstr "Registro de log" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:72 +msgid "Logging Enabled" +msgstr "Registro de log habilitado" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:82 +msgid "Logging Level" +msgstr "Nível do registro de log" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:98 +msgid "Logging Type" +msgstr "Tipo do registro de log" + +#: /usr/local/icingaweb/application/views/scripts/authentication/logout.phtml:15 +msgid "Logging out..." +msgstr "Saída do registro de log..." + +#: /usr/local/icingaweb/application/views/scripts/authentication/logout.phtml:28 +msgid "Login" +msgstr "Login" + +#: /usr/local/icingaweb/application/layouts/scripts/body.phtml:39 +#: /usr/local/icingaweb/application/layouts/scripts/parts/topbar.phtml:35 +msgid "Logout" +msgstr "Sair" + +#: /usr/local/icingaweb/application/views/scripts/authentication/logout.phtml:64 +msgid "" +"Logout not possible, it may be necessary to quit the session manually by " +"clearing the cache, or closing the current browser session. Error: " +msgstr "" +"Não foi possível, é necessário sair da sessão manualmente, limpando o cache " +"ou fechando a sessão atual do navegador. Erro:" + +#: /usr/local/icingaweb/application/views/scripts/authentication/logout.phtml:69 +msgid "Logout successful!" +msgstr "Sucesso na saída!" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/ReorderForm.php:137 +msgid "Move down in authentication order" +msgstr "Mover para baixo na ordem de autenticação" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/ReorderForm.php:111 +msgid "Move up in authentication order" +msgstr "Mover para cima na ordem de autenticação" + +#: /usr/local/icingaweb/application/views/scripts/pivottablePagination.phtml:16 +msgid "Navigation" +msgstr "Navegação" + +#: /usr/local/icingaweb/application/views/scripts/mixedPagination.phtml:83 +#: /usr/local/icingaweb/application/views/scripts/mixedPagination.phtml:86 +#: /usr/local/icingaweb/library/Icinga/Web/Wizard/Wizard.php:337 +#: /usr/local/icingaweb/library/Icinga/Web/Wizard/Wizard.php:380 +msgid "Next" +msgstr "Próximo" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/DbBackendForm.php:144 +msgid "No users found under the specified database backend" +msgstr "Nenhum usuário encontrado no backend do banco de dados especificado" + +#: /usr/local/icingaweb/application/controllers/ErrorController.php:59 +msgid "Page not found." +msgstr "Página não encontrada." + +#: /usr/local/icingaweb/application/forms/Authentication/LoginForm.php:65 +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:206 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:206 +msgid "Password" +msgstr "Senha" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:319 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:319 +msgid "Pattern" +msgstr "Padrão" + +#: /usr/local/icingaweb/library/Icinga/Web/Form/Element/Number.php:61 +msgid "Please enter a number." +msgstr "Por favor entre com um número." + +#: /usr/local/icingaweb/application/views/scripts/search/hint.phtml:8 +msgid "" +"Please use the asterisk (*) as a placeholder for wildcard searches. For " +"convenience I'll always add a wildcard after the last character you typed." +msgstr "" +"Por favor utilize o asterisco (*) como caractere curinga nas pesquisas. Para " +"maior comodidade vou sempre adicionar um curinga após o último caractere " +"digitado." + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:171 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:171 +msgid "Port" +msgstr "Porta" + +#: /usr/local/icingaweb/application/layouts/scripts/body.phtml:38 +#: /usr/local/icingaweb/application/layouts/scripts/parts/topbar.phtml:32 +msgid "Preferences" +msgstr "Preferências" + +#: /usr/local/icingaweb/application/views/scripts/mixedPagination.phtml:45 +#: /usr/local/icingaweb/application/views/scripts/mixedPagination.phtml:48 +msgid "Prev" +msgstr "Ant" + +#: /usr/local/icingaweb/library/Icinga/Web/Wizard/Wizard.php:326 +#: /usr/local/icingaweb/library/Icinga/Web/Wizard/Wizard.php:367 +msgid "Previous" +msgstr "Anterior" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:333 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:333 +msgid "Resource Name" +msgstr "Nome do recurso" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:375 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:375 +msgid "Resource Type" +msgstr "Tipo do recurso" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:271 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:271 +msgid "Root DN" +msgstr "DN Root" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:379 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:379 +msgid "SQL Database" +msgstr "Banco de dados SQL" + +#: /usr/local/icingaweb/application/controllers/SearchController.php:22 +#: /usr/local/icingaweb/application/controllers/SearchController.php:29 +#: /usr/local/icingaweb/application/controllers/SearchController.php:30 +#: /usr/local/icingaweb/application/controllers/SearchController.php:56 +msgid "Search" +msgstr "Pesquisar" + +#: /usr/local/icingaweb/application/layouts/scripts/parts/navigation.phtml:17 +msgid "Search..." +msgstr "Pesquisar..." + +#: /usr/local/icingaweb/application/forms/Config/GeneralForm.php:189 +msgid "" +"Select the language to use by default. Can be overwritten by a user in his " +"preferences." +msgstr "" +"Selecione o idioma padrão a ser utilizado. Pode ser substituído por um " +"usuário em suas preferências." + +#: /usr/local/icingaweb/application/views/scripts/pivottablePagination.phtml:34 +#: /usr/local/icingaweb/application/controllers/SearchController.php:41 +msgid "Services" +msgstr "Serviços" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:245 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:245 +msgid "Socket" +msgstr "Soquete" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:140 +msgid "The Syslog facility to utilize." +msgstr "A facilidade do SysLog a ser utilizada" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:116 +msgid "The attribute name used for storing the user name on the ldap server" +msgstr "" +"O nome do atributo utilizado para armazenar o nome do usuário no servidor " +"ldap" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/DbBackendForm.php:91 +msgid "The database connection to use for authenticating with this provider" +msgstr "" +"A conexão com o banco a ser utilizada para autenticar com este provedor" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:309 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:309 +msgid "The filename to fetch information from" +msgstr "O nome do arquivo a ser consultado" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:161 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:161 +msgid "The hostname of the database." +msgstr "O nome do host do banco de dados." + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:261 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:261 +msgid "The hostname or address of the LDAP server to use for authentication" +msgstr "" +"O nome do host ou endereço do servidor LDAP a ser utilizado para a " +"autenticação" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:156 +msgid "The logfile to write messages to." +msgstr "O arquivo de log para salvar as mensagens." + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:83 +msgid "The maximum loglevel to emit." +msgstr "O nível máximo de log a ser emitido." + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:118 +msgid "The name of the application by which to prefix syslog messages." +msgstr "" +"O nome da aplicação que será adicionado como prefixo nas mensagens do syslog." + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:184 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:184 +msgid "The name of the database to use" +msgstr "O nome do banco de dados a ser utilizado" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:81 +msgid "The name of this authentication backend" +msgstr "O nome deste backend de autenticação" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/DbBackendForm.php:79 +msgid "The name of this authentication provider" +msgstr "O nome deste provedor de autenticação" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:105 +msgid "The object class used for storing users on the ldap server" +msgstr "" +"A classe de objeto a ser utilizada para armazenar os usuários no servidor " +"ldap" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:207 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:207 +msgid "The password to use for authentication" +msgstr "A senha a ser utilizada para a autenticação" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:295 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:295 +msgid "The password to use for querying the ldap server" +msgstr "A senha a ser utilizada para consultar o servidor ldap" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:246 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:246 +msgid "The path to your livestatus socket used for querying monitoring data" +msgstr "" +"O caminho para o socket do livestatus utilizado para consultar os dados de " +"monitoramento" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:272 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:272 +msgid "The path where users can be found on the ldap server" +msgstr "O caminho onde os usuários possam ser encontrados no servidor ldap" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:172 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:172 +msgid "The port to use." +msgstr "A porta utilizada." + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:320 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:320 +msgid "The regular expression by which to identify columns" +msgstr "A expressão regular para identificar as colunas" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:93 +msgid "The resource to use for authenticating with this provider" +msgstr "O recurso a ser utilizado para autenticação com este provedor" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:145 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:145 +msgid "The type of SQL database you want to create." +msgstr "O tipo do banco de dados SQL que você quer criar." + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:99 +msgid "The type of logging to utilize." +msgstr "O tipo do registro de log a ser utilizado." + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:376 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:376 +msgid "The type of resource" +msgstr "O tipo do recurso" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:334 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:334 +msgid "The unique name of this resource" +msgstr "O nome único deste recurso" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:283 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:283 +msgid "The user dn to use for querying the ldap server" +msgstr "O usuário DN a ser utilizado para consultar o servidor ldap." + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:195 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:195 +msgid "The user name to use for authentication." +msgstr "O nome do usuário a ser utilizado para a autenticação." + +#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:6 +msgid "There is no such module installed." +msgstr "Não existe nenhum módulo instalado." + +#: /usr/local/icingaweb/application/views/scripts/config/module.phtml:32 +msgid "This module has no dependencies" +msgstr "Este módulo não tem dependências" + +#: /usr/local/icingaweb/library/Icinga/Application/Modules/Module.php:383 +msgid "This module has no description" +msgstr "Este módulo não tem descrição" + +#: /usr/local/icingaweb/application/forms/Preference/GeneralForm.php:100 +msgid "Use Default Language" +msgstr "Utilizar idioma padrão" + +#: /usr/local/icingaweb/application/forms/Preference/GeneralForm.php:109 +msgid "Use the following language to display texts and messages" +msgstr "Utilizar o seguinte idioma para exibir textos e mensagens" + +#: /usr/local/icingaweb/application/forms/Authentication/LoginForm.php:57 +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:194 +#: /usr/local/icingaweb/application/forms/Config/Resource/ResourceForm.php:194 +msgid "Username" +msgstr "Nome do usuário" + +#: /usr/local/icingaweb/application/forms/Config/Authentication/LdapBackendForm.php:169 +msgid "" +"Using ldap is not possible, the php extension \"ldap\" is not installed." +msgstr "" +"A utilização do ldap não é possível, a extensão php \"ldap\" não está " +"instalada." + +#: /usr/local/icingaweb/application/forms/Config/Authentication/DbBackendForm.php:148 +#, php-format +msgid "Using the specified backend failed: %s" +msgstr "A utilização do backend especificado falhou: %s" + +#: /usr/local/icingaweb/application/forms/Config/LoggingForm.php:87 +msgid "Warning" +msgstr "Atenção" + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:435 +msgid "" +"You need to install the php extension \"mysql\" and the Zend_Pdo_Mysql " +"classes to use MySQL database resources." +msgstr "" +"Você precisa instalar a extensão php \"mysql\" e as classes Zend_Pdo_Mysql " +"para usar o recurso de banco de dados MySQL." + +#: /usr/local/icingaweb/application/forms/Config/ResourceForm.php:442 +msgid "" +"You need to install the php extension \"pgsql\" and the Zend_Pdo_Pgsql " +"classes to use PostgreSQL database resources." +msgstr "" +"Você precisa instalar a extensão php \"pgsql\" e as classes Zend_Pdo_Pgsql " +"para usar o recurso de banco de dados PostgreSQL." + +#: /usr/local/icingaweb/application/forms/Preference/GeneralForm.php:106 +msgid "Your Current Language" +msgstr "Seu idioma atual" diff --git a/modules/monitoring/application/locale/pt_BR.UTF-8/LC_MESSAGES/monitoring.mo b/modules/monitoring/application/locale/pt_BR.UTF-8/LC_MESSAGES/monitoring.mo new file mode 100644 index 0000000000000000000000000000000000000000..4c56486d5319983c550717de91b7b3e17cfdd697 GIT binary patch literal 25934 zcmds<3!Gh5eeX921|pP~JgkBnB$&X=5W>?KB9qL7#3VBzGa&^;*>lc5Gn<@q_PF;s zNd_PHS_MVxt(I!7*Lsayi-1^K#42rV?I>++)oR6Rds`pXUTJS@AD>oj?c@7fYwg!L zXC?#pb8kPNo)3%P+54>LfBoNUP5$)s>1Lt>9*G z3;5&UF!*Uu^ZI-60`Q+ft@pg=+I74T)bo|#`QT>o>)>tRao{LSAbM>BPXTWNHGTv_ zdhgv19|q~#d)z&L17zyn_du=dR5tG-a2q%Rw!llk_qg}J?Vi62Ue5dHo@eV#g4*xb zf|r8#gD(NU3TocZdA{X~3qbA5b>IuY2~hJ%-0yD%wOgKq+raZBpz6IGTnGLHsP%pn+zfsj)VwcbGepl} zFb1y$?*JbHwT`tcLLzq+D1IIXUjp6$ZUx^C9uGbNs@@+v{0mV1{{R&K9}DxV{j)*I zi4PtJz7W*D4uM+lOF;4Yeo+0+IGh8o;kgZ_;Cva1YNZn>q)sdZFhv!Flkz z;GckX@Uv@ezZ)Qi#=jQSzKnsZz*m5h^I1^izY1gs?=DdC{U9iM{3vA2OkDa|Dfi33X>H2;A-$PP;}k|o&-*Us0#08?tKcv%HCa|`u_kZ{{M)3{~b{M zuY#%6-_@Y{-vYu)-jsXpf{?_!3lx1H24Q9IcR}&NUpo93Q1W;R#E?E22fqm(0wu3E zGnne9py+ZZsPWzko(#Sh6n#Dfs-H(e(c>>cjeo{^OaE&@REYO#Q2g{R@Hp_jp!&TR z)Vd!8wXV;Ar+`m@TGzKh&0`gl6uq7Uq8hyQ;Pv1HD0;mU^uZ5+8t-w3-vsaC`Cq{= zfOjICF9!ER+}+?k;5PX98=&NFEsJ>+ychgU@FtY9^uqJ5w*6iOqRPCz;7MQ%Y8|fz zp9Q`F6koj!)H?2QzuyZYir$0Z8Q|x^eT@5OdJn$nMV79&ZnS)I0MtIb7F54K16}~$ z3u-?f2Yv9*LD6Fsi((1h8c_4O3FId)07cjLfMoX${UIp3diiy>-W)j2^M}Bl;NO8ez|EtUPHzH5zmI_8^WOk9@4o=G zuJ3_b|A|aOzn>0%AKV0r@2_MsXM-C-?eAWYrFaLx=YjWw=Yx-fs8sJepy+#Joftug1fX@fN3|<8OBdGPAyWR51RUj zPk@M|_Ya`vy%u6?-Y)|+?{|ROpRc(0C%@FrdmE_zc^xP_{#o!m@SEW4z+?FF4dClR z@z)8vto}F;)IMDa?g6g{r@?oDtHHklwGZEScqYU-k>?Gd*1HK5zwZH000Zzi@OJRI zU<{rMz6BH?-wz%Se$3$~K=I$Fz}JBP1b*ch&pSNfdB4c>4NPhQe8vsT9efRV7QY{} z*YjS<^Ep#?J#PkA@%%ne<9*OQKMrc&J_nu#eg_nv{1d2sTE}9~0>{8Bz*|7A=WXES z;1N*!_XMc<{}5y=y=U#Saxn#Je|{F!{(TWV7CiAr+s{ehGkHE2)ch_4Mb{zs{%ZGr zGbsJA4HQ4!1Zw;{!7IRzgU<&4+TkA%>s{JPLEN~JO|24o1!MngS!3V)n z@RQ&L;4^;A_J0wmeZ2)#KOwjdJPe)zz8~BGeiRfvo^*KXO_sh_JG=ozFL3 z{66?MpvHUhX1k7)Zn6AwK6p0oF9tQv7EtrJ5xfq(4b-?tK+)k#;1=-2ms!2A3lu-K zLGfJ&d=|I>YTb8&>h}Rq`~3-U82leD^i*Sn#hw)%#mebUHb-dhl#e`+E(@u;v5FjSu?s;D;!`O;KC* ztB>Y+#C)?l;x@j&m%ZuB7M#`MrlI&(i~+4_NSi6=W+t#Lnmg zy}n=nEtvYv7`Ws!0wWjiJNyoWD8?H)c2 z`ji8dI^}fAFHr8HOjEMYf62Z$JP%AL&!qesT<v<-bFc^aydnx+bKUu`6$u)43oC{ixlDlUC4);B~?OA_5iD#N&EA^v>--_vj-`jrN4*l3pN#o6g zW@f5S&rxT@-yIwX{j^JcO*?FNG+BQpiNc0o57Sx_&6`=!$srA>TAE=!rjrqGP2Jzl zyi$K`a{ol}v}b%`Y{$g)#fyCtd&ft&ZXeyUYrOPwkG`w7cHHr6b7Ad3$TN#=HnU&m zgEWl}hRucScm2Ss2e;sd0S!#;sAkA%=oLbUuni^K9UnqNDjG&<+6}!cSWh=ey-|(e z+CbuT$rk>a)DLE3Z?txx9Up3j_1Uoe-QQ#PrTng5erRbDl>z#GO~O`uFlZLFlJJ$? zFztkW9Wn1(2XZ;^w~D5`tk?Zo+|p3qXp@f2mWAyAj-e0UIHpRe)^0?z@Izf3VhE$! z)k=BGZf6eit-T47`4d4aT<2{`;-Fp&Xt8zgj_Dm+M|XK<68>bjGvDQ{X5{Y;({3|+ zn4)zpbiYhTt?X-fIIMLI^L2`s&7c#uYYVP66z5yitoxHQw}-V(>TPA2LA#z|K{IXk zkRKTGSYApIP?nBN)T7jr!nIymtBeXuG&20050M~Cb78$Jf-l#gnA8edgauEHDc~n9NGD|J3bg(6w9c8dq+>X$cPO;U()U6Jpbb_RVaI*1st9v&~ za@)wIeWlYJ-0CQ^jAv42rb(`JnEn<=8N#VE%dtMoM{bIp4r;Y!RVyR zG!7GEh1wXKde8}EVzd)aWxew&=;LS9>dG|jxIGnQ$a{HOBd zif;ClxNHng&8t_{eQxTFE5)FAKxuCJAcC9g60KrmVwS2VPfZdsn*^=lLs1!&h5Y*n~Nc1x_~urEngQGrFRC>t%gvATF%$Fg1SeYa+Pb2TD?$iN3B{>Of2kZ z#4D*D_`Of79Ibub8;d0abK)w)sx{*^SR%nl85>V8%)_(U(=s}xuTJ5U_i}(-xL>Mb;a>Jhg?qmQdoLjr%QwonY+$V=cg58nBoQSpA5_b* ziquS1Zd}!s$ivcAk2c*EN`o6<1;XHJu2dGX>V*}4N}@21zBAr6U-0hhj>*M`3i^mr z6*HpJy9BB7@MKu@>?)2p^JNWj(8Xj@uVyS@-I|GVbw6mRTVvpieF_iHM}!q4Zames zujE{Wmzp}c_6mw<$_7Zxt~vo+QDd6aPjBtg(CXWbqoFJI#y$}y8~528Hxslp+NQ_= zi>=+b0s0Eg1~RMZOMhlw#9Lu%ldLz99&n0ZUNS*Jv_P7ZOqyXi}d{8B1p8RS`4A5mpH3enU?o2D{C|OgfS0ZN5{IcZE$VwZ;wtwpP#>3?o zO68~q!6~WKPU)**c=HO~lt1iM_BkX>$@AMLkL+HLIqz_7y3TX2_SlT~QZ1YyXSFkn zLI-|BENZOxK)xEu+F<;3)=}pD@|>3Vx!_t$Xmyt*WlLY}ZkAsdV_+3?M6#(ax1+hB z8ezvD?I6rEMm^XUt+-C!2K5o-zsPNofYifAK>p4QY|@zhX-@TOev;1X|9QllVj{AT zMNTGvlaaEhBd3Dt&CcSO6vo>S0>2$bRqEVQBQ093yoGV9{r>`ldu4*w%bDA? zTbo`wld$PxT0}NB^z)5(GhXiHAODrsU^6RXNRW!9n^uQ3lDGt_$sjV^S=*31JF8`Fm~9d7sZ zQ#PTZf0unBwsE19;Y%}ydMz)U4donO@7&4CA;kckmpGeObV^N_VLrhGC%E|VN)mGx z0yUL?CoyAn64h7=wIr*{Y)Uq3YdLa{UMa9%T9y})gu@)fcU^#DPPP@yLIxAi$}G9u zz%n~1V#7=W&Y&!J_w$y&&t4Z%4Acq}qL-S&31dApW@gz8X&3C>6S%Ws%$#mHKoP~^ z;)x(rbP&;=LX_BenOR#^g}ho_Vz#o@i-!APUIdN+-a?j7DeIXpJ%Z=c+_d&ea=Pfm=lRx~|4odoTajf#_v z{?;IA#;LzGOwq)#zo}-PIX%|nb+g3p%@OqHW?HsqyLel}(_zrs=_-2ZnW(cGFUda`*A^e}xtTQ+H0O*~m*gE41!~Ap+2qxnTV`oI0_73EMntn=dZ8IkOqfIo zo#=WO%+5<)?_z%UlC84yu(YtVX#{s@KFi+m8lRXRpDHeN?U)$dwRLo2@r{eGyK#I+ z=?COt4JJh+sdGRMZcvBFhH#yjud3pHwOWM>MQn3kwbI3r?Dc>Sj_^*m#;WZ-yrs<8 zxJ^ObU@XG+!6>L>dCXLpfeecYFavWPED2I?A5<$fW&w>j%32O+Xk4>SvUnsVpd)x; zwP8~F>KFT*zm4i~@m)(V55fgA<-KCJUE(!$il3a-gT+G z4QKPrsz&QHh}&=wvPegZN03f$TAShXpS3)5!A#Utx9m{kj9tArw)j?Vj!k+~!Qw;pfGEfA^=#N;Ve*C|JX z5Od26vh>he@@@nT73k>620WFPIrRp%%Lc^vVW1=Migvm#W>|g@H?N}pfLX<;p>{Nn zF-H-KsK!=82s;*vBwNz}VjQJ$zN`UF*$UkNaeE~l#$gFbF1Js8qYql^O1jABFrWh? zsJixKxXDF@MzatCI#P4B7ruchEt?D?cu9E}bFflw7~HOy@ZjA-g8d6@meO*fI$UGpL1J=^HfPmG{9pNjH_I>1XPEpWNOs7r3AK z@uhqM+s8D6RwVoil%Qycc2o=#>*S+GmDkF**!N+mhg`IZD?9K5zWO%xYj1K zs9;TGF7Yb+-Hx-0sm_&LZ=x^fZLr*TZ?V znWkXp!D#RuiAs8rJn?J-{~_Oc8OFdly@56^^+)aUowreZCo9^eI`?92=Sl0BC`R;x z9TZneo4OxFfyKv=dxbzrwT`b1WI0@gYheoc74Dx2qQf!w=`vM`&FwJ}l^+KxTvJ1) zTS|Co#aQX6v@Dih`Du`RR4Vk&u;l2-#{1%jt`TtK%IdP)GV3d~R?yYKwOqD(8%H&; z&a3=G>oS>bs5Tr(s*+<#Lvz;A3Rci=iAf%v=uf}lO4nK4Nq?oyu)n=}eWgu{{m+&8 zN}H}sfv&7Kl;wncCq*R0&Js2wU^uB&hip2s>ab5Dd!6UL3cYGpM_EpNU_SZ;yrhsv zjhiK{WE_NL>+Uff!J4@`;Yy8jod)QG;-`TuUTV6mHYmEOa!|Sb083f=x!?mEIFxvO z2|ZAZxlG$k3oKK4IR+`34J1!#k`?i{qCBt(Ng&Q2t**)26vHe><2o#7KqrP}Q4u3oL28a&s0ztKGuWo|RMz|-zE4vXX zOtGBr>%siuBd~}`5a7Q*Bt|i}-GT(mQk?;Z z?3ePlQHo$(9XlcE2it}2{1hSlz)9(ZJeiJ3)#RPCvwa(9(m5uQfYs~`OG2n2 z8mG&TUUKjA$tmn|8%0W_Uk+g!d}9e8TK8Z?hQ++$;9aRFs{@Q@AGH@BB6fg~_yAGM zEHKMd+T$$J%Q*FIcv5Cqi|@C?`R)=DS#8*xq@N-YRNKi zIdD^sIbR19)Cz2lDtDfouR!cni#dqxl8E==QWw*4*_z%nnIyxISw{>&X~vdU;Rv&R zbg-25Z*-?P?kO!V)4E={3Wbik^ zgmCa?%z*|A<*$^*$a92zNbH^0l78@5u!A*=r&% zGeEC3S^o6HhHE+TFq>JLrMI88ICn@MClZ=#hw~{koXMiDTe6MDE(Kr{?v9x?$Ai*Y zxyv;$Sdkf2bSVkVGxH-)zn_X$8jxJeXJfbIX$)U&SQ(G2th;-nea^1ni9pa=e83)M zrQD!yn^%GHt#w*PMlw%GW#PUzsWe;vi3^)$4%kfCY|qaIHP6;&QorauqX|pwI5J?! ztc@tF(OC`$jHx6E;f< z>cVOf$QSot6ZA{9p|O0~iDK4CMG56y2c}n(Cg|&59Ev0lWMW+@wUb-H&`Vdzb_h+F zMX`I`L6S}{t+~!ku#V%hSGlpwG!qvp%}rT*2un@pr(o^OeOaUDvUgGd*=wb%j0+*{ zXgCJHA*f46wMyr_L1Y(c8rQa>CRbd|=5DeLE$ycFG=4FO=i$I4xs@`OoGX`Lj#4c( z^OM6RyXTZdN%Et$pUSf7@?PPJ+%Hp(%$R=TUG;re>-S|wc4MgIX~MNScNdjMqpS_d$MmVuyjp1Ff*QW z@h)qmtT{fm!eWKlHm-LbtO>rWPA`{jTu^NO0TVV;dFQ?k^uk%_0p9q)CYJYC(8w|c zydgFy=3}-VUpM#NbA_CzQca3nCsf>J)E@}2C0OK&c(It2WP!QWJDG4OLtT6rZ-))5 zpc2~}&Qx6W+@O?`J1(xv8}_HGmifuusHs?!Jw|cDmqmWn1$)X7?X75Y{Xv^eD;b|- znJKGRDfJ2wbV{Xr!He(Lm4OleMth6MaYd%2+WfmcHl8RsI7mm-CdmR_ofoLT@W{qs z(@H0|Oa3ru`A#@W7Q4vVAn(RvW6>8MlZ%Qo?t-i}M)~Th%A~ZgIS%Xf(+~;*Q4A1@ zBISy`In$DrFxrPX^Pdb;5wouG6_vFjW;@;E!U?uo_l40)(zGV4qNq_1xgd}DH&}-rM>(snPP3kjH%|}diZNK4qO_d7 zx|KELSsKzr;kst*_E+AcGRyK<@_4S7CS34h--&CbvY{A%LWT+urF74#Z_V5*({ZiL zAGRdOFYB-jNRx-ML3!cDqWk;P$+_KO?F^)F!9;1j@`H_KHAH<1yJ9!ebZdmLB!hPP z*(7rgvGKlL{p`V3=&+kqSJR4mLtJ6fF_tKL%TzL7)?i6N8Fq3vnb{z729aV% zv-~1z0_KuRHXUJ*m3*)nF}qjpOtg=G%zj(mF=AHP^xRL&<)*wdlUat`B*(eu9CFL6 z8Ip8P_|u#$2cv&8r^xBZ*7T+22C#K8ElX8n_e&cH4^}L?6Tn=y3l{em->tisDBT`{ znQPJRmXHhPD;`JAFX(mTHUG!?>^)B?E?0#0*t?4P-ObD*>RxwteKWHP10}d`sR|A9 zc*+iwZ$uVTnH|%Skxo7gN0_CTw`cKg36;BFZMm*=4V6C)u{pt<{dIxbI+iSV@qNsm zf8s4@lhV$G)2bx?Om!#hHm@WNWMB@4xbPW z`e8uRjF23lq*}RHI_BR38lT!aIkA0w>yEKWuX3++muGHQ!-%;IXGwCCbo552$8`nu c^;{q{w+jzeLaj>3n%!fokzR$GR`|Ss2SaawT>t<8 literal 0 HcmV?d00001 diff --git a/modules/monitoring/application/locale/pt_BR.UTF-8/LC_MESSAGES/monitoring.po b/modules/monitoring/application/locale/pt_BR.UTF-8/LC_MESSAGES/monitoring.po new file mode 100644 index 000000000..3084118e0 --- /dev/null +++ b/modules/monitoring/application/locale/pt_BR.UTF-8/LC_MESSAGES/monitoring.po @@ -0,0 +1,1158 @@ +# Icinga Web 2 - Head for multiple monitoring backends. +# Copyright (C) 2014 Icinga Development Team +# This file is distributed under the same license as Icinga Web 2. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Icinga Web 2 (0.1)\n" +"Report-Msgid-Bugs-To: dev@icinga.org\n" +"POT-Creation-Date: 2014-06-03 15:22+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Carlos Cesario \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:66 +msgid "" +" If you work with other administrators you may find it useful to share " +"information about a host or service that is having problems if more than one " +"of you may be working on it. Make sure you enter a brief description of what " +"you are doing." +msgstr "" +"Se você trabalha com outros administradores você pode achar isso útil para " +"compartilhar informações sobre um host ou serviço que está tendo problemas, " +"se mais do que um de vocês possa estar trabalhando nisso. Certifique-se de " +"inserir uma breve descrição do que você está fazendo." + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:10 +#, php-format +msgid "%d Hosts DOWN" +msgstr "%d Hosts DOWN" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:22 +#, php-format +msgid "%d Hosts PENDING" +msgstr "%d Hosts PENDENTES" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:17 +#, php-format +msgid "%d Hosts UNREACHABLE" +msgstr "%d Hosts INALCANÇÁVEIS" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:15 +#, php-format +msgid "%d Hosts UP" +msgstr "%d Hosts UP" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:57 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:127 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:197 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:232 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:267 +#, php-format +msgid "%d are not checked at all" +msgstr "%d não estão checados para todos" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:32 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:102 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:172 +#, php-format +msgid "%d are passively checked" +msgstr "%d estão passivamente checados" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:62 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:132 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:202 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:237 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:272 +#, php-format +msgid "%d is not checked at all" +msgstr "%d não está checado para todos" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:37 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:107 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:177 +#, php-format +msgid "%d is passively checked" +msgstr "%d está passivamente checado" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:22 +#, php-format +msgid "%s notications have been sent for this issue" +msgstr "%s notificações foram enviadas para este problema" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:101 +msgid "4 Hours" +msgstr "4 Horas" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:17 +#, php-format +msgid "A notication has been sent for this issue %s ago" +msgstr "Uma notificação foi enviada para este problema %s atrás" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:37 +msgid "Acknowledge" +msgstr "Reconhecer" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:141 +msgid "Acknowledge Problem" +msgstr "Reconhecer o problema" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:50 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:80 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:146 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:180 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:214 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:53 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:83 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:149 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:183 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:217 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:16 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:86 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/parts/servicestatesummarybyhoststate.phtml:156 +msgid "Acknowledged" +msgstr "Reconhecido" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:972 +msgid "Acknowledgement has been sent" +msgstr "Reconhecimento foi enviado" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:994 +msgid "Acknowledgement removal has been requested" +msgstr "A remoção da conhecimento foi solicitada" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:63 +msgid "Acknowledgements" +msgstr "Reconhecimentos" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:20 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:52 +msgid "Active" +msgstr "Ativo" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/flags.phtml:24 +msgid "Active Checks" +msgstr "Checagens ativas" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/comments.phtml:45 +msgid "Add comment" +msgstr "Adicionar comentário" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:28 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:95 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:146 +msgid "All hosts enabled" +msgstr "Todos os hosts habilitados" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/services.phtml:3 +msgid "All services configured on this host" +msgstr "Todos os serviços configurados neste host" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:56 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:115 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:166 +msgid "All services enabled" +msgstr "Todos os serviços habilitados" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CommandForm.php:118 +msgid "Author (Your Name)" +msgstr "Autor (Seu nome)" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CustomNotificationForm.php:88 +msgid "Broadcast" +msgstr "Broadcast" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:78 +msgid "CRITICAL" +msgstr "CRÍTICO" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:165 +msgid "Check Output" +msgstr "Saída da checagem" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:141 +msgid "Check Result" +msgstr "Resultado da checagem" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checksource.phtml:3 +msgid "Check Source" +msgstr "Origem da checagem" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:58 +msgid "Check Time" +msgstr "Tempo de checagem" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:32 +msgid "Check execution time" +msgstr "Tempo de execução da checagem" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:38 +msgid "Check latency" +msgstr "Latência da checagem" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:8 +msgid "Check now" +msgstr "Checar agora" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:277 +msgid "Child Objects" +msgstr "Objetos filhos" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/command.phtml:7 +msgid "Command" +msgstr "Comando" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:317 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:748 +msgid "Command has been sent, active checks will be disabled" +msgstr "Comando enviado, as checagens ativas serão desabilitadas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:342 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:768 +msgid "Command has been sent, active checks will be enabled" +msgstr "Comando enviado, as checagens ativas serão habilitadas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:361 +msgid "Command has been sent, check will be rescheduled" +msgstr "Comando enviado, a checagem será reagendada" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:728 +msgid "Command has been sent, checks will be rescheduled" +msgstr "Comando enviado, as checagens serão reagendadas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:799 +msgid "Command has been sent, event handlers will be disabled" +msgstr "Comando enviado, o manipulador de eventos será desabilitado" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:831 +msgid "Command has been sent, event handlers will be enabled" +msgstr "Comando enviado, o manipulador de eventos será habilitado" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:864 +msgid "Command has been sent, flap detection will be disabled" +msgstr "Comando enviado, a detecção de intermitência será desabilitada" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:897 +msgid "Command has been sent, flap detection will be enabled" +msgstr "Comando enviado, a detecção de intermitência será habilitada" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1074 +msgid "Command has been sent, monitoring process will restart now" +msgstr "Comando enviado, o processo de monitoramento será reiniciado agora" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:537 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:565 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:688 +msgid "Command has been sent, notifications will be disabled" +msgstr "Comando enviado, as notificações serão desabilitadas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:595 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:709 +msgid "Command has been sent, notifications will be enabled" +msgstr "Comando enviado, as notificações serão habilitadas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:418 +msgid "Command has been sent, obsessing will be disabled" +msgstr "Comando enviado, o modo \"obsessão\" será desabilitado" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:452 +msgid "Command has been sent, obsessing will be enabled" +msgstr "Comando enviado, o modo \"obsessão\" será habilitado" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:519 +msgid "Command has been sent, passive check results will be accepted" +msgstr "Comando enviado, os resultados de checagens passivas serão aceitos" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:486 +msgid "Command has been sent, passive check results will be refused" +msgstr "Comando enviado, os resultados de checagens passivas serão recusados" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1096 +msgid "Command has been sent, performance data processing will be disabled" +msgstr "" +"Comando enviado, o processamento de dados de performance será desabilitado" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1118 +msgid "Command has been sent, performance data processing will be enabled" +msgstr "" +"Comando enviado, o processamento de dados de performance será habilitado" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1053 +msgid "Command has been sent, process will shut down" +msgstr "Comando enviado, o processo será desligado" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:61 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:158 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CustomNotificationForm.php:59 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CommentForm.php:55 +msgid "Comment" +msgstr "Comentário" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:936 +msgid "Comment removal has been requested" +msgstr "A remoção do comentário foi solicitada" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/comments.phtml:43 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:58 +msgid "Comments" +msgstr "Comentários" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/contacts.phtml:33 +msgid "Contactgroups" +msgstr "Grupo de contatos" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/contacts.phtml:14 +msgid "Contacts" +msgstr "Contatos" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:611 +msgid "Custom notification has been sent" +msgstr "A notificação personalizada foi enviada" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CustomNotificationForm.php:77 +msgid "" +"Custom notifications normally follow the regular notification logic in " +"Icinga. Selecting this option will force the notification to be sent out, " +"regardless of time restrictions, whether or not notifications are enabled, " +"etc." +msgstr "" +"As notificações personalizadas normalmente seguem uma lógica normal de " +"notificação no Icinga. Ao selecionar esta opção, forçará o envio da " +"notificação, independentemente de restrições de tempo, não ativação das " +"notificações, etc." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:72 +msgid "DOWN" +msgstr "DOWN" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/DelayNotificationForm.php:76 +msgid "Delay Notification" +msgstr "Atraso de notificação" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1024 +msgid "Delete Downtime" +msgstr "Apagar parada programada" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1026 +msgid "Delete a single downtime with the id shown above" +msgstr "Apagar uma única parada programada com o id mostrado abaixo" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:305 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:740 +msgid "Disable Active Checks" +msgstr "Desabilitar checagens ativas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:780 +msgid "Disable Event Handler" +msgstr "Desabilitar manipulador de evento" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:843 +msgid "Disable Flapping Detection" +msgstr "Desativar detecção de intermitência" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:550 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:679 +msgid "Disable Notifications" +msgstr "Desabilitar notificações" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1087 +msgid "Disable Performance Data" +msgstr "Desabilitar dados de performance" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:741 +msgid "Disable active checks for this host and its services." +msgstr "Desabilitar checagens ativas para este host e seus serviços." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:310 +msgid "Disable active checks for this object." +msgstr "Desabilitar checagens ativas para este objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:308 +msgid "Disable active checks on a program-wide basis." +msgstr "Desabilitar checagens ativas na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:783 +msgid "Disable event handler for the whole system." +msgstr "Desabilitar manipulador de eventos para todo o sistema." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:785 +msgid "Disable event handler for this object." +msgstr "Desabilitar manipulador de evento para este objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:848 +msgid "Disable flapping detection for this object." +msgstr "Desativar detecção de intermitência para este objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:846 +msgid "Disable flapping detection on a program-wide basis." +msgstr "Desativar detecção de intermitência na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:553 +msgid "Disable notifications on a program-wide basis." +msgstr "Desabilitar notificações na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:399 +msgid "Disable obsessing on a program-wide basis." +msgstr "Desabilitar o modo \"obsessão\" na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:467 +msgid "Disable passive checks on a program-wide basis." +msgstr "Desabilitar checagens passivas na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1088 +msgid "Disable processing of performance data on a program-wide basis." +msgstr "" +"Desabilitar processamento de dados de performance na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:40 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:72 +msgid "Disabled" +msgstr "Desabilitado" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:280 +msgid "Do nothing with child objects" +msgstr "Não fazer nada com os objetos filhos" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:209 +msgid "Downtime Type" +msgstr "Tipo de parada programada" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1033 +msgid "Downtime removal has been requested" +msgstr "A remoção da parada programada foi solicitada" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:667 +msgid "Downtime removal requested" +msgstr "Remoção de parada programada solicitada" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:630 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:648 +msgid "Downtime scheduling requested" +msgstr "Agendamento de parada programada solicitada" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/downtime.phtml:48 +msgid "Downtimes" +msgstr "Paradas programadas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:332 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:760 +msgid "Enable Active Checks" +msgstr "Habilitar checagens ativas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:812 +msgid "Enable Event Handler" +msgstr "Habilitar manipulador de evento" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:876 +msgid "Enable Flapping Detection" +msgstr "Habilitar detecção de intermitência" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:580 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:700 +msgid "Enable Notifications" +msgstr "Habilitar notificações" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1109 +msgid "Enable Performance Data" +msgstr "Habilitar dados de performance" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:761 +msgid "Enable active checks for this host and its services." +msgstr "Habilitar checagens ativas para este host e seus serviços." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:336 +msgid "Enable active checks for this object." +msgstr "Habilitar checagens ativas para este objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:334 +msgid "Enable active checks on a program-wide basis." +msgstr "Habilitar checagens ativas na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:817 +msgid "Enable event handler for this object." +msgstr "Habilitar manipulador de evento para este sistema." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:815 +msgid "Enable event handlers on the whole system." +msgstr "Desativar manipulador de eventos em todo o sistema." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:881 +msgid "Enable flapping detection for this object." +msgstr "Habilitar detecção de intermitência para este objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:879 +msgid "Enable flapping detection on a program-wide basis." +msgstr "Habilitar detecção de intermitência na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:583 +msgid "Enable notifications on a program-wide basis." +msgstr "habilitar notificações na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:433 +msgid "Enable obsessing on a program-wide basis." +msgstr "Habilitar o modo \"obsessão\" na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:501 +msgid "Enable passive checks on a program-wide basis." +msgstr "Desabilitar checagens passivas na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1110 +msgid "Enable processing of performance data on a program-wide basis." +msgstr "" +"Habilitar processamento de dados de performance na base de todo o programa." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:197 +msgid "End Time" +msgstr "Horário de término" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:73 +msgid "Ended downtimes" +msgstr "Paradas programadas encerradas" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:262 +msgid "" +"Enter here the duration of the downtime. Icinga will automatically delete " +"the downtime after this time expired." +msgstr "" +"Digite aqui a duração da parada programada. O Icinga excluirá " +"automaticamente a parada programada após este período expirar." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php:57 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:106 +msgid "" +"Enter the expire date/time for this acknowledgement here. Icinga will " +"delete the acknowledgement after this date expired." +msgstr "" +"Digite aqui a data/hora de expiração para este reconhecimento. O Icinga " +"excluirá o reconhecimento após a expiração dessa data." + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/flags.phtml:46 +msgid "Event Handler" +msgstr "Manipulador de evento" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:124 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:126 +msgid "Event handlers" +msgstr "Manipulador de eventos" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/DisableNotificationWithExpireForm.php:53 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:102 +msgid "Expire Time" +msgstr "Tempo de validade" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:169 +msgid "Fill in the check output string which should be send to Icinga." +msgstr "" +"Preencha a string da saída de checagem, na qual deve ser enviada para o " +"Icinga." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:180 +msgid "Fill in the performance data string which should be send to Icinga." +msgstr "" +"Preencha a string dos dados de performance , na qual deve ser enviada para o " +"Icinga." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:76 +msgid "Fixed" +msgstr "Permanente" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/flags.phtml:57 +msgid "Flap Detection" +msgstr "Detecção de intermitência" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:6 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8 +msgid "Flap detection" +msgstr "Detecção de intermitência" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:77 +msgid "Flexible" +msgstr "Flexível" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:233 +msgid "Flexible Duration" +msgstr "Duração flexível" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:71 +msgid "Force Check" +msgstr "Forçar checagem" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CustomNotificationForm.php:75 +msgid "Forced" +msgstr "Forçado" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:84 +msgid "Hard" +msgstr "Hard" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:53 +msgid "Hard state changes" +msgstr "Alterações no estado hard" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:2 +msgid "Host- and Servicechecks" +msgstr "Checagem de hosts e serviços" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:13 +msgid "Hostgroups" +msgstr "Grupo de hosts" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:19 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:22 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:7 +msgid "Hosts" +msgstr "Hosts" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:241 +msgid "Hours" +msgstr "Horas" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:91 +msgid "If the acknowledgement should expire, check this option." +msgstr "Se a confirmação deve expirar, marque esta opção." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:135 +msgid "" +"If you do not want an acknowledgement notification to be sent out to the " +"appropriate contacts, uncheck this option." +msgstr "" +"Se você não quer que uma notificação de confirmação a ser enviada para os " +"contatos apropriados, desmarque esta opção." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:222 +msgid "" +"If you select the fixed option, the downtime will be in effect between the " +"start and end times you specify whereas a flexible downtime starts when the " +"service enters a non-OK state (sometime between the start and end times you " +"specified) and lasts as long as the duration of time you enter. The duration " +"fields do not apply for fixed downtime." +msgstr "" +"Se você selecionar a opção permanente, a parada programada entrará em vigor " +"entre os horários de início e o fim que você especificar, enquanto uma " +"parada programada flexível iniciará quando o serviço entrar em um estado " +"diferente de OK (em algum momento entre os horários de início e o fim que " +"você especificou) e o tempo como a duração será o período de tempo que você " +"definir. Os campos de duração não se aplicam para a parada programada " +"permanente." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:74 +msgid "" +"If you select this option, Icinga will force a check regardless of both what " +"time the scheduled check occurs and whether or not checks are enabled." +msgstr "" +"Se você selecionar esta opção, o Icinga forçará uma verificação independente " +"do período em que agendamento de checagem ocorreu ou se não houver " +"checagens habilitadas." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CommentForm.php:74 +msgid "" +"If you uncheck this option, the comment will automatically be deleted the " +"next time Icinga is restarted." +msgstr "" +"Se você desmarcar esta opção, o comentário será excluído automaticamente na " +"próxima vez que Icinga for reiniciado." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:122 +msgid "" +"If you want the acknowledgement to disable notifications until the host/" +"service recovers, check this option." +msgstr "" +"Se você quiser a confirmação para desativar as notificações até que estado " +"do host/serviço se recupere, marque esta opção." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:163 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CustomNotificationForm.php:64 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CommentForm.php:60 +msgid "" +"If you work with other administrators, you may find it useful to share " +"information about a host or service that is having problems if more than one " +"of you may be working on it. Make sure you enter a brief description of what " +"you are doing." +msgstr "" +"Se você trabalha com outros administradores, você pode achar isso útil para " +"compartilhar informações sobre um host ou serviço que está tendo problemas, " +"se caso os dois estiverem trabalhando nisso. Certifique-se de inserir uma " +"breve descrição do que você está fazendo." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:80 +msgid "" +"If you would like the comment to remain even when the acknowledgement is " +"removed, check this option." +msgstr "" +"Se você gostaria que o comentário permanecesse mesmo quando o reconhecimento " +"for removido, marque esta opção." + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:6 +msgid "Last check" +msgstr "Última verificação" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/timeline/index.phtml:15 +msgid "Legend" +msgstr "Legenda" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/command/list.phtml:1 +msgid "List Of Supported Commands" +msgstr "Lista dos comandos suportados" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:246 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:255 +msgid "Minutes" +msgstr "Minutos" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:2 +msgid "Monitoring Features" +msgstr "Recursos de monitoramento" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:21 +msgid "Next check" +msgstr "Próxima checagem" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:41 +msgid "No History Available For This Object" +msgstr "Nenhum histórico disponível para este objeto" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:11 +msgid "No entries found" +msgstr "Nenhuma entrada encontrada" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:18 +msgid "No host found" +msgstr "Nenhum host encontrado" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:31 +msgid "No notification has been sent for this issue" +msgstr "Nenhuma notificação foi enviada para este problema" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:32 +msgid "Not acknowledged" +msgstr "Não reconhecido" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/DelayNotificationForm.php:55 +msgid "Notification Delay (Minutes From Now)" +msgstr "Atraso da notificação (minutos a partir de agora)" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1011 +msgid "Notification delay has been requested" +msgstr "Atraso da notificação foi solicitada" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:10 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/flags.phtml:35 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:73 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:75 +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:48 +msgid "Notifications" +msgstr "Notificações" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:680 +msgid "Notifications for this host and its services will be disabled." +msgstr "As notificações para este host e seus serviços serão desabilitadas." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:701 +msgid "Notifications for this host and its services will be enabled." +msgstr "As notificações para este host e seus serviços serão habilitadas." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:555 +msgid "Notifications for this object will be disabled." +msgstr "As notificações para este objeto serão desabilitadas." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:585 +msgid "Notifications for this object will be enabled." +msgstr "As notificações para este objeto serão habilitadas." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:76 +msgid "OK" +msgstr "OK" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/flags.phtml:68 +msgid "Obsessing" +msgstr "Modo \"obsessão\"" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:102 +msgid "One day" +msgstr "Um dia" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:104 +msgid "One month" +msgstr "Um mês" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:103 +msgid "One week" +msgstr "Uma semana" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:105 +msgid "One year" +msgstr "Um ano" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:30 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:62 +msgid "Passive" +msgstr "Passivo" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/flags.phtml:13 +msgid "Passive Checks" +msgstr "Checagens passivas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:384 +msgid "Passive check result has been submitted" +msgstr "O resultado da checagem passiva foi enviado" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:503 +msgid "Passive checks for this object will be accepted." +msgstr "Checagens passivas serão aceitas para este objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:469 +msgid "Passive checks for this object will be omitted." +msgstr "Checagens passivas serão omitidas para este objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:177 +msgid "Performance Data" +msgstr "Dados de performance" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/perfdata.phtml:3 +msgid "Performance data" +msgstr "Dados de performance" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CommentForm.php:71 +msgid "Persistent" +msgstr "Persistente" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:77 +msgid "Persistent Comment" +msgstr "Comentário persistente" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CommentForm.php:80 +msgid "Post Comment" +msgstr "Enviar comentário" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:25 +msgid "Remove Acknowledgement" +msgstr "Remover reconhecimento" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:660 +msgid "Remove Downtime(s)" +msgstr "Remover parada(s) programada(s)" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:987 +msgid "Remove Problem Acknowledgement" +msgstr "Remover o reconhecimento do problema" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:930 +msgid "Remove comment" +msgstr "Remover o comentário" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:661 +msgid "Remove downtime(s) from this host and its services." +msgstr "Remover a(s) parada(s) programada(s) deste host e seus serviços." + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:26 +msgid "Remove problem acknowledgement" +msgstr "Remover reconhecimento do problema" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:988 +msgid "Remove problem acknowledgement for this object." +msgstr "Remover reconhecimento do problema para esse objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:28 +msgid "Reschedule" +msgstr "Reagendar" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:89 +msgid "Reschedule Check" +msgstr "Reagendar checagem" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:9 +msgid "Reschedule next check immediately" +msgstr "Reagendar próxima checagem imediatamente" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:948 +msgid "Reset Attributes" +msgstr "Redefinir atributos" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:949 +msgid "Reset modified attributes to its default." +msgstr "Redefinir os atributos modificados para o padrão." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1066 +msgid "Restart monitoring process" +msgstr "Reiniciar o processo de monitoramento." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1067 +msgid "Restart the monitoring process." +msgstr "Reiniciar o processo de monitoramento." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:302 +msgid "Schedule Downtime" +msgstr "Agendar parada programada" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/downtime.phtml:50 +msgid "Schedule downtime" +msgstr "Agendar parada programada" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:282 +msgid "Schedule non-triggered downtime for all child objects" +msgstr "Agendar parada programada não-acionada para todos os objetos filhos" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:281 +msgid "Schedule triggered downtime for all child objects" +msgstr "Agendar parada programada acionada para todos os objetos filhos" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CustomNotificationForm.php:90 +msgid "" +"Selecting this option causes the notification to be sent out to all normal " +"(non-escalated) and escalated contacts. These options allow you to override " +"the normal notification logic if you need to get an important message out." +msgstr "" +"Selecionando esta opção faz com que a notificação seja enviada para todos os " +"contatos (não escalados) e escalados. Estas opções permitem-lhe substituir a " +"lógica normal notificação se você precisar obter uma importante mensagem de " +"saída." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CustomNotificationForm.php:97 +msgid "Send Custom Notification" +msgstr "Enviar notificação personalizada" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:132 +msgid "Send Notification" +msgstr "Enviar notificação" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/header.phtml:23 +msgid "Service" +msgstr "Serviço" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:55 +msgid "Service Problems" +msgstr "Problemas com serviços" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:14 +msgid "Servicegroups" +msgstr "Grupos de serviços" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hostgroups.phtml:20 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicegroups.phtml:23 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:8 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/problem_hosts.phtml:22 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:28 +msgid "Services" +msgstr "Serviços" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:62 +msgid "Set the date/time when this check should be executed." +msgstr "Defina a data/hora em que essa verificação deve ser executada." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:200 +msgid "Set the end date/time for the downtime." +msgstr "Defina a data/hora final para a parada programada." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:189 +msgid "Set the start date/time for the downtime." +msgstr "Defina a data/hora inicial para a parada programada." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:157 +msgid "Set the state which should be send to Icinga for this objects." +msgstr "Defina o estado que deve ser enviado ao Icinga para estes objetos." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1046 +msgid "Shutdown monitoring process" +msgstr "Desligar sistema de monitoramento" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/header.phtml:9 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/header.phtml:21 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:81 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:44 +msgid "Since" +msgstr "Desde" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:84 +msgid "Soft" +msgstr "Soft" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/servicematrix.phtml:5 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/hosts.phtml:7 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/notifications.phtml:4 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/eventhistory.phtml:4 +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/services.phtml:8 +msgid "Sort by" +msgstr "Ordenar por" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:498 +msgid "Start Accepting Passive Checks" +msgstr "Iniciar a receber checagens passivas" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:186 +msgid "Start Time" +msgstr "Horário de início" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:430 +msgid "Start obsessing" +msgstr "Iniciar o modo \"obsessão\"" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:435 +msgid "Start obsessing over this object." +msgstr "Iniciar o modo \"obsessão\" sobre este objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/TimelineController.php:68 +msgid "Started downtimes" +msgstr "Paradas programadas iniciadas" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:119 +msgid "Sticky Acknowledgement" +msgstr "Reconhecimento fixo" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:464 +msgid "Stop Accepting Passive Checks" +msgstr "Parar de receber checagens passivas" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:1047 +msgid "Stop monitoring instance. You have to start it again from command line." +msgstr "" +"Parar o monitoramento da instância. Você tem que iniciar novamente a partir " +"da linha de comando." + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:396 +msgid "Stop obsessing" +msgstr "Parar o modo \"obsessão\"" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:401 +msgid "Stop obsessing over this object." +msgstr "Parar o modo \"obsessão\" sobre este objeto." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:184 +msgid "Submit Passive Check Result" +msgstr "Enviar resultado de checagem passiva" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:299 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:86 +msgid "TODO: Help message when with children is disabled" +msgstr "" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:271 +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:84 +msgid "TODO: Help message when with children is enabled" +msgstr "" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/components/notifications.phtml:25 +#, php-format +msgid "The last one occured %s ago" +msgstr "O último ocorreu %s atrás" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/DelayNotificationForm.php:70 +msgid "" +"The notification delay will be disregarded if the host/service changes state " +"before the next notification is scheduled to be sent out." +msgstr "" +"O atraso da notificação será desconsiderado se o estado do host/serviço " +"mudar antes da próxima notificação agendada a ser enviada." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:49 +msgid "" +"This command is used to acknowledge host or service problems. When a problem " +"is acknowledged, future notifications about problems are temporarily " +"disabled until the host/service changes from its current state." +msgstr "" +"Este comando é usado para reconhecer os problemas dos hosts ou dos serviços. " +"Quando um problema é reconhecido, as futuras notificações sobre problemas " +"são temporariamente desativadas até que o host/serviço tenha eu estado atual " +"mudado." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CommentForm.php:47 +msgid "This command is used to add a comment to hosts or services." +msgstr "" +"Este comando é utilizado para adicionar um comentário aos hosts ou serviços." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/DelayNotificationForm.php:49 +msgid "" +"This command is used to delay the next problem notification that is sent out." +msgstr "" +"Este comando é usado atrasar a próxima notificação do problema a ser enviada." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:145 +msgid "" +"This command is used to schedule downtime for hosts/services. During the " +"specified downtime, Icinga will not send notifications out about the " +"affected objects. When the scheduled downtime expires, Icinga will send out " +"notifications as it normally would. Scheduled downtimes are preserved across " +"program shutdowns and restarts." +msgstr "" +"Este comando é usado para agendar a parada programada para os hosts/" +"serviços. Durante o tempo da parada programada especificado, o Icinga não " +"enviará notificações sobre os objetos afetados. Quando o tempo da parada " +"programada expirar, o Icinga enviará as notificações como normalmente faria. " +"Os agendamentos das paradas programadas são preservados em situações de " +"desligamento e reinício do programa." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php:49 +msgid "" +"This command is used to schedule the next check of hosts/services. Icinga " +"will re-queue the check at the time you specify." +msgstr "" +"Este comando é usado para agendar a próxima checagem dos hosts/serviços. O " +"Icinga irá re-enfileirar a checagem no período que você especificar." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/CustomNotificationForm.php:47 +msgid "" +"This command is used to send a custom notification about hosts or services. " +"Useful in emergencies when you need to notify admins of an issue regarding a " +"monitored system or service." +msgstr "" +"Este comando é usado para enviar uma notificação personalizada sobre hosts " +"ou serviços. Útil em situações de emergência quando você precisa notificar " +"os administradores de uma questão sobre um sistema ou serviço monitorado." + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:131 +msgid "" +"This command is used to submit a passive check result for particular hosts/" +"services. It is particularly useful for resetting security-related objects " +"to OK states once they have been dealt with." +msgstr "" +"Este comando é usado para enviar o resultado de uma checagem passiva para " +"determinados hosts/serviços. É particularmente útil para redefinir objetos " +"relacionados à segurança para os estados OK depois de terem sido tratados." + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/host.phtml:3 +msgid "This host's current state" +msgstr "Estado atual deste host" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/history.phtml:36 +msgid "This object's event history" +msgstr "Histórico de eventos deste objeto" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/show/service.phtml:3 +msgid "This service's current state" +msgstr "Estado atual deste serviço" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php:174 +msgid "Triggered by" +msgstr "Disparado por" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:79 +msgid "UNKNOWN" +msgstr "DESCONHECIDO" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:73 +msgid "UNREACHABLE" +msgstr "INALCANÇÁVEL" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:71 +msgid "UP" +msgstr "UP" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/AcknowledgeForm.php:90 +msgid "Use Expire Time" +msgstr "Usar o tempo de expiração" + +#: /usr/local/icingaweb/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php:77 +msgid "WARNING" +msgstr "ATENÇÃO" + +#: /usr/local/icingaweb/modules/monitoring/application/controllers/CommandController.php:915 +msgid "Your new comment has been submitted" +msgstr "Seu novo comentário foi enviado" + +#: /usr/local/icingaweb/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml:14 +msgid "critical events on " +msgstr "eventos críticos em " From 602b44850564a886fd465dfd51edb0f4a33bbcab Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 22:46:16 +0000 Subject: [PATCH 59/96] bootstrapping: only web should depend on forms This fixes the problem that CLI scripts or other applications without an application directory would badly fail because of missing web forms. refs #6411 --- .../Icinga/Application/ApplicationBootstrap.php | 1 - library/Icinga/Application/Web.php | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index 405b41009..e8d407216 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -301,7 +301,6 @@ abstract class ApplicationBootstrap $this->loader = new Loader(); $this->loader->registerNamespace('Icinga', $this->libDir. '/Icinga'); - $this->loader->registerNamespace('Icinga\\Form', $this->appDir. '/forms'); $this->loader->register(); return $this; diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php index be78f018b..f0964e779 100644 --- a/library/Icinga/Application/Web.php +++ b/library/Icinga/Application/Web.php @@ -124,6 +124,7 @@ class Web extends ApplicationBootstrap ->setupInternationalization() ->setupRequest() ->setupZendMvc() + ->setupFormNamespace() ->setupModuleManager() ->loadEnabledModules() ->setupRoute() @@ -359,5 +360,19 @@ class Web extends ApplicationBootstrap } return $this; } + + /** + * Setup an autoloader namespace for Icinga\Form + * + * @return self + */ + private function setupFormNamespace() + { + $this->getLoader()->registerNamespace( + 'Icinga\\Form', + $this->getApplicationDir('forms') + ); + return $this; + } } // @codeCoverageIgnoreEnd From a221afd9333d89c5a9f3f7e44776f8a4d80b351f Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 22:50:08 +0000 Subject: [PATCH 60/96] bootstrapping: autoloader exceptions should not... ...require to be autoloaded. refs #6411 --- library/Icinga/Application/Loader.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Application/Loader.php b/library/Icinga/Application/Loader.php index 9cb74a167..4bc93f06a 100644 --- a/library/Icinga/Application/Loader.php +++ b/library/Icinga/Application/Loader.php @@ -4,7 +4,7 @@ namespace Icinga\Application; -use Icinga\Exception\ProgrammingError; +use Exception; class Loader { @@ -39,7 +39,11 @@ class Loader public function registerNamespace($namespace, $directory) { if (!is_dir($directory)) { - throw new ProgrammingError('Directory does not exist: ' . $directory); + throw new Exception(sprintf( + 'Namespace directory "%s" for "%s" does not exist', + $namespace, + $directory + )); } $this->namespaces[$namespace] = $directory; From e076d2d1d643d1492ec75e832c02a4bd0bff8f37 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 22:52:38 +0000 Subject: [PATCH 61/96] bootstrapping: create only one CLI loader instance This used to work fine as long as you didn't try to interfere from outside to influence the cli loader. The instance returned by cliLoader() was not the same as used internally once dispatching the CLI command. refs #6411 --- library/Icinga/Application/Cli.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php index 72b2b43f8..c5dfc092a 100644 --- a/library/Icinga/Application/Cli.php +++ b/library/Icinga/Application/Cli.php @@ -138,7 +138,7 @@ class Cli extends ApplicationBootstrap protected function dispatchOnce() { - $loader = new Loader($this); + $loader = $this->cliLoader(); $loader->parseParams(); $loader->dispatch(); Benchmark::measure('All done'); @@ -149,7 +149,7 @@ class Cli extends ApplicationBootstrap protected function dispatchEndless() { - $loader = new Loader($this); + $loader = $this->cliLoader(); $loader->parseParams(); $screen = Screen::instance(); From 0e6aecbd433e470080750666251f8e246d0f8014 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 22:57:50 +0000 Subject: [PATCH 62/96] bootstrapping: allow to load modules neither... ...enabled nor installed by passing their base directory. In favour of this parameter I dropped the possibility to inject a Module class for testing purposes. There is no such test and I see no point in doing so. refs #6411 --- library/Icinga/Application/Modules/Manager.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php index 6fefd3930..a6ca914da 100644 --- a/library/Icinga/Application/Modules/Manager.php +++ b/library/Icinga/Application/Modules/Manager.php @@ -196,23 +196,22 @@ class Manager /** * Try to load the module and register it in the application * - * @param string $name The name of the module to load - * @param mixed $moduleBase Alternative class to use instead of \Icinga\Application\Modules\Module for - * instantiating modules, used for testing + * @param string $name The name of the module to load + * @param mixed $basedir Optional module base directory * - * @return self + * @return self */ - public function loadModule($name, $moduleBase = null) + public function loadModule($name, $basedir = null) { if ($this->hasLoaded($name)) { return $this; } $module = null; - if ($moduleBase === null) { + if ($basedir === null) { $module = new Module($this->app, $name, $this->getModuleDir($name)); } else { - $module = new $moduleBase($this->app, $name, $this->getModuleDir($name)); + $module = new Module($this->app, $name, $basedir); } $module->register(); $this->loadedModules[$name] = $module; From eadb6cb5181fbf17079c2460e63ce0dc6e623968 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 22:59:48 +0000 Subject: [PATCH 63/96] bootstrapping: allow to retrieve a modules base... ...directory if it has been loaded but neither enabled nor installed. refs #6411 --- library/Icinga/Application/Modules/Manager.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php index a6ca914da..c0e835c8d 100644 --- a/library/Icinga/Application/Modules/Manager.php +++ b/library/Icinga/Application/Modules/Manager.php @@ -331,6 +331,10 @@ class Manager */ public function getModuleDir($name, $subdir = '') { + if ($this->hasLoaded($name)) { + return $this->getModule($name)->getBaseDir() . $subdir; + } + if ($this->hasEnabled($name)) { return $this->enabledDirs[$name]. $subdir; } From bdcec5a2537c3c8e1ea400ac49ffbf1bf87e1a73 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 23:04:11 +0000 Subject: [PATCH 64/96] Cli\Loader: allow injecting a module name This helps those who prefer to create their own executables instead of creating icingacli subcommands. refs #6411 --- library/Icinga/Cli/Loader.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php index 866697263..34b15bc47 100644 --- a/library/Icinga/Cli/Loader.php +++ b/library/Icinga/Cli/Loader.php @@ -109,6 +109,12 @@ class Loader return $this->moduleName; } + public function setModuleName($name) + { + $this->moduleName = $name; + return $this; + } + public function getCommandName() { return $this->commandName; @@ -180,7 +186,13 @@ class Loader if (! $first) { return; } - $found = $this->resolveName($first); + + if ($this->moduleName === null) { + $found = $this->resolveName($first); + } else { + $found = $this->moduleName; + $params->unshift($first); + } if (! $found) { $msg = "There is no such module or command: '$first'"; printf("%s: %s\n", $this->screen()->colorize('ERROR', 'red'), $msg); @@ -419,7 +431,10 @@ class Loader { if ($this->modules === null) { $this->modules = array(); - $this->modules = $this->app->getModuleManager()->listEnabledModules(); + $this->modules = array_merge( + $this->app->getModuleManager()->listEnabledModules(), + $this->app->getModuleManager()->listLoadedModules() + ); sort($this->modules); } return $this->modules; From 4202e34d13b88195b8c7fbe7938cc5570b80b117 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 23:37:36 +0000 Subject: [PATCH 65/96] bootstrapping: play nice with duplicate modules A module loaded manually could also exist in the list of enabled modules if a configuration is given and a module with the same name has been enabled. This used to confuse documentation. --- library/Icinga/Cli/Loader.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/library/Icinga/Cli/Loader.php b/library/Icinga/Cli/Loader.php index 34b15bc47..b4cd27741 100644 --- a/library/Icinga/Cli/Loader.php +++ b/library/Icinga/Cli/Loader.php @@ -182,16 +182,15 @@ class Loader if ($params === null) { $params = $this->app->getParams(); } - $first = $params->shift(); - if (! $first) { - return; - } if ($this->moduleName === null) { + $first = $params->shift(); + if (! $first) { + return; + } $found = $this->resolveName($first); } else { $found = $this->moduleName; - $params->unshift($first); } if (! $found) { $msg = "There is no such module or command: '$first'"; @@ -431,11 +430,10 @@ class Loader { if ($this->modules === null) { $this->modules = array(); - $this->modules = array_merge( + $this->modules = array_unique(array_merge( $this->app->getModuleManager()->listEnabledModules(), $this->app->getModuleManager()->listLoadedModules() - ); - sort($this->modules); + )); } return $this->modules; } From 8df26bb5f5da206a3a54080a3abbfcab4e223e9a Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 4 Jun 2014 23:39:12 +0000 Subject: [PATCH 66/96] bootstrapping: add a dispatchModule() shortcut This allows to easily jump into a specific modules CLI controllers. refs #6411 --- library/Icinga/Application/Cli.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php index c5dfc092a..d5f2e08c2 100644 --- a/library/Icinga/Application/Cli.php +++ b/library/Icinga/Application/Cli.php @@ -124,6 +124,13 @@ class Cli extends ApplicationBootstrap return $this->params; } + public function dispatchModule($name, $basedir = null) + { + $this->getModuleManager()->loadModule($name, $basedir); + $this->cliLoader()->setModuleName($name); + $this->dispatch(); + } + public function dispatch() { Benchmark::measure('Dispatching CLI command'); From c5922362580add9d2ed4c4ab43e9969724bac117 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 00:10:49 +0000 Subject: [PATCH 67/96] vendorlibs: library/vendor to libary/IcingaVendor This doesn't make it much better but allows to build a package libicinga-vendor-php placing those files to /usr/share/php/IcingaVendor or similar. refs #4075 --- library/Icinga/File/Pdf.php | 4 ++-- library/Icinga/Web/JavaScript.php | 2 +- library/Icinga/Web/LessCompiler.php | 2 +- library/{vendor => IcingaVendor}/JShrink/LICENSE | 0 .../{vendor => IcingaVendor}/JShrink/Minifier.php | 0 library/{vendor => IcingaVendor}/JShrink/SOURCE | 0 .../{vendor => IcingaVendor}/Parsedown/LICENSE.txt | 0 .../Parsedown/Parsedown.php | 0 library/{vendor => IcingaVendor}/Parsedown/SOURCE | 0 library/{vendor => IcingaVendor}/dompdf/.gitignore | 0 .../{vendor => IcingaVendor}/dompdf/LICENSE.LGPL | 0 .../{vendor => IcingaVendor}/dompdf/changelog.txt | 0 .../dompdf/docblox.dist.xml | 0 library/{vendor => IcingaVendor}/dompdf/dompdf.php | 0 .../dompdf/dompdf_config.custom.inc.php | 0 .../dompdf/dompdf_config.inc.php | 0 .../dompdf/include/absolute_positioner.cls.php | 0 .../dompdf/include/abstract_renderer.cls.php | 0 .../dompdf/include/attribute_translator.cls.php | 0 .../dompdf/include/autoload.inc.php | 0 .../dompdf/include/block_frame_decorator.cls.php | 0 .../dompdf/include/block_frame_reflower.cls.php | 0 .../dompdf/include/block_positioner.cls.php | 0 .../dompdf/include/block_renderer.cls.php | 0 .../dompdf/include/cached_pdf_decorator.cls.php | 0 .../dompdf/include/canvas.cls.php | 0 .../dompdf/include/canvas_factory.cls.php | 0 .../dompdf/include/cellmap.cls.php | 0 .../dompdf/include/cpdf_adapter.cls.php | 0 .../dompdf/include/css_color.cls.php | 0 .../dompdf/include/dompdf.cls.php | 0 .../dompdf/include/dompdf_exception.cls.php | 0 .../dompdf/include/dompdf_image_exception.cls.php | 0 .../dompdf/include/file.skel | 0 .../dompdf/include/fixed_positioner.cls.php | 0 .../dompdf/include/font_metrics.cls.php | 0 .../dompdf/include/frame.cls.php | 0 .../dompdf/include/frame_decorator.cls.php | 0 .../dompdf/include/frame_factory.cls.php | 0 .../dompdf/include/frame_reflower.cls.php | 0 .../dompdf/include/frame_tree.cls.php | 0 .../dompdf/include/functions.inc.php | 0 .../dompdf/include/gd_adapter.cls.php | 0 .../dompdf/include/image_cache.cls.php | 0 .../dompdf/include/image_frame_decorator.cls.php | 0 .../dompdf/include/image_frame_reflower.cls.php | 0 .../dompdf/include/image_renderer.cls.php | 0 .../dompdf/include/inline_frame_decorator.cls.php | 0 .../dompdf/include/inline_frame_reflower.cls.php | 0 .../dompdf/include/inline_positioner.cls.php | 0 .../dompdf/include/inline_renderer.cls.php | 0 .../dompdf/include/javascript_embedder.cls.php | 0 .../dompdf/include/line_box.cls.php | 0 .../include/list_bullet_frame_decorator.cls.php | 0 .../include/list_bullet_frame_reflower.cls.php | 0 .../list_bullet_image_frame_decorator.cls.php | 0 .../dompdf/include/list_bullet_positioner.cls.php | 0 .../dompdf/include/list_bullet_renderer.cls.php | 0 .../dompdf/include/null_frame_decorator.cls.php | 0 .../dompdf/include/null_frame_reflower.cls.php | 0 .../dompdf/include/null_positioner.cls.php | 0 .../dompdf/include/page_cache.cls.php | 0 .../dompdf/include/page_frame_decorator.cls.php | 0 .../dompdf/include/page_frame_reflower.cls.php | 0 .../dompdf/include/pdflib_adapter.cls.php | 0 .../dompdf/include/php_evaluator.cls.php | 0 .../dompdf/include/positioner.cls.php | 0 .../dompdf/include/renderer.cls.php | 0 .../dompdf/include/style.cls.php | 0 .../dompdf/include/stylesheet.cls.php | 0 .../include/table_cell_frame_decorator.cls.php | 0 .../include/table_cell_frame_reflower.cls.php | 0 .../dompdf/include/table_cell_positioner.cls.php | 0 .../dompdf/include/table_cell_renderer.cls.php | 0 .../dompdf/include/table_frame_decorator.cls.php | 0 .../dompdf/include/table_frame_reflower.cls.php | 0 .../include/table_row_frame_decorator.cls.php | 0 .../dompdf/include/table_row_frame_reflower.cls.php | 0 .../include/table_row_group_frame_decorator.cls.php | 0 .../include/table_row_group_frame_reflower.cls.php | 0 .../dompdf/include/table_row_group_renderer.cls.php | 0 .../dompdf/include/table_row_positioner.cls.php | 0 .../dompdf/include/tcpdf_adapter.cls.php | 0 .../dompdf/include/text_frame_decorator.cls.php | 0 .../dompdf/include/text_frame_reflower.cls.php | 0 .../dompdf/include/text_renderer.cls.php | 0 library/{vendor => IcingaVendor}/dompdf/index.php | 0 .../dompdf/lib/class.pdf.php | 0 .../dompdf/lib/fonts/Courier-Bold.afm | 0 .../dompdf/lib/fonts/Courier-BoldOblique.afm | 0 .../dompdf/lib/fonts/Courier-Oblique.afm | 0 .../dompdf/lib/fonts/Courier.afm | 0 .../dompdf/lib/fonts/DejaVuSans-Bold.ttf | Bin .../dompdf/lib/fonts/DejaVuSans-Bold.ufm | 0 .../dompdf/lib/fonts/DejaVuSans-BoldOblique.ttf | Bin .../dompdf/lib/fonts/DejaVuSans-BoldOblique.ufm | 0 .../dompdf/lib/fonts/DejaVuSans-ExtraLight.ttf | Bin .../dompdf/lib/fonts/DejaVuSans-ExtraLight.ufm | 0 .../dompdf/lib/fonts/DejaVuSans-Oblique.ttf | Bin .../dompdf/lib/fonts/DejaVuSans-Oblique.ufm | 0 .../dompdf/lib/fonts/DejaVuSans.ttf | Bin .../dompdf/lib/fonts/DejaVuSans.ufm | 0 .../dompdf/lib/fonts/DejaVuSansCondensed-Bold.ttf | Bin .../dompdf/lib/fonts/DejaVuSansCondensed-Bold.ufm | 0 .../lib/fonts/DejaVuSansCondensed-BoldOblique.ttf | Bin .../lib/fonts/DejaVuSansCondensed-BoldOblique.ufm | 0 .../lib/fonts/DejaVuSansCondensed-Oblique.ttf | Bin .../lib/fonts/DejaVuSansCondensed-Oblique.ufm | 0 .../dompdf/lib/fonts/DejaVuSansCondensed.ttf | Bin .../dompdf/lib/fonts/DejaVuSansCondensed.ufm | 0 .../dompdf/lib/fonts/DejaVuSansMono-Bold.ttf | Bin .../dompdf/lib/fonts/DejaVuSansMono-Bold.ufm | 0 .../dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ttf | Bin .../dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ufm | 0 .../dompdf/lib/fonts/DejaVuSansMono-Oblique.ttf | Bin .../dompdf/lib/fonts/DejaVuSansMono-Oblique.ufm | 0 .../dompdf/lib/fonts/DejaVuSansMono.ttf | Bin .../dompdf/lib/fonts/DejaVuSansMono.ufm | 0 .../dompdf/lib/fonts/DejaVuSerif-Bold.ttf | Bin .../dompdf/lib/fonts/DejaVuSerif-Bold.ufm | 0 .../dompdf/lib/fonts/DejaVuSerif-BoldItalic.ttf | Bin .../dompdf/lib/fonts/DejaVuSerif-BoldItalic.ufm | 0 .../dompdf/lib/fonts/DejaVuSerif-Italic.ttf | Bin .../dompdf/lib/fonts/DejaVuSerif-Italic.ufm | 0 .../dompdf/lib/fonts/DejaVuSerif.ttf | Bin .../dompdf/lib/fonts/DejaVuSerif.ufm | 0 .../dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ttf | Bin .../dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ufm | 0 .../lib/fonts/DejaVuSerifCondensed-BoldItalic.ttf | Bin .../lib/fonts/DejaVuSerifCondensed-BoldItalic.ufm | 0 .../lib/fonts/DejaVuSerifCondensed-Italic.ttf | Bin .../lib/fonts/DejaVuSerifCondensed-Italic.ufm | 0 .../dompdf/lib/fonts/DejaVuSerifCondensed.ttf | Bin .../dompdf/lib/fonts/DejaVuSerifCondensed.ufm | 0 .../dompdf/lib/fonts/Helvetica-Bold.afm | 0 .../dompdf/lib/fonts/Helvetica-Bold.afm.php | 0 .../dompdf/lib/fonts/Helvetica-BoldOblique.afm | 0 .../dompdf/lib/fonts/Helvetica-Oblique.afm | 0 .../dompdf/lib/fonts/Helvetica.afm | 0 .../dompdf/lib/fonts/Helvetica.afm.php | 0 .../dompdf/lib/fonts/Symbol.afm | 0 .../dompdf/lib/fonts/Times-Bold.afm | 0 .../dompdf/lib/fonts/Times-BoldItalic.afm | 0 .../dompdf/lib/fonts/Times-Italic.afm | 0 .../dompdf/lib/fonts/Times-Roman.afm | 0 .../dompdf/lib/fonts/Times-Roman.afm.php | 0 .../dompdf/lib/fonts/ZapfDingbats.afm | 0 .../lib/fonts/dompdf_font_family_cache.dist.php | 0 .../dompdf/lib/fonts/log.htm | 0 .../dompdf/lib/fonts/mustRead.html | 0 .../dompdf/lib/html5lib/Data.php | 0 .../dompdf/lib/html5lib/InputStream.php | 0 .../dompdf/lib/html5lib/Parser.php | 0 .../dompdf/lib/html5lib/Tokenizer.php | 0 .../dompdf/lib/html5lib/TreeBuilder.php | 0 .../lib/html5lib/named-character-references.ser | 0 .../php-font-lib/classes/adobe_font_metrics.cls.php | 0 .../lib/php-font-lib/classes/encoding_map.cls.php | 0 .../dompdf/lib/php-font-lib/classes/font.cls.php | 0 .../php-font-lib/classes/font_binary_stream.cls.php | 0 .../lib/php-font-lib/classes/font_eot.cls.php | 0 .../lib/php-font-lib/classes/font_header.cls.php | 0 .../lib/php-font-lib/classes/font_opentype.cls.php | 0 .../font_opentype_table_directory_entry.cls.php | 0 .../lib/php-font-lib/classes/font_table.cls.php | 0 .../php-font-lib/classes/font_table_cmap.cls.php | 0 .../classes/font_table_directory_entry.cls.php | 0 .../php-font-lib/classes/font_table_glyf.cls.php | 0 .../php-font-lib/classes/font_table_head.cls.php | 0 .../php-font-lib/classes/font_table_hhea.cls.php | 0 .../php-font-lib/classes/font_table_hmtx.cls.php | 0 .../php-font-lib/classes/font_table_kern.cls.php | 0 .../php-font-lib/classes/font_table_loca.cls.php | 0 .../php-font-lib/classes/font_table_maxp.cls.php | 0 .../php-font-lib/classes/font_table_name.cls.php | 0 .../classes/font_table_name_record.cls.php | 0 .../lib/php-font-lib/classes/font_table_os2.cls.php | 0 .../php-font-lib/classes/font_table_post.cls.php | 0 .../lib/php-font-lib/classes/font_truetype.cls.php | 0 .../classes/font_truetype_collection.cls.php | 0 .../classes/font_truetype_header.cls.php | 0 .../font_truetype_table_directory_entry.cls.php | 0 .../lib/php-font-lib/classes/font_woff.cls.php | 0 .../php-font-lib/classes/font_woff_header.cls.php | 0 .../classes/font_woff_table_directory_entry.cls.php | 0 .../php-font-lib/maps/adobe-standard-encoding.map | 0 .../dompdf/lib/php-font-lib/maps/cp1250.map | 0 .../dompdf/lib/php-font-lib/maps/cp1251.map | 0 .../dompdf/lib/php-font-lib/maps/cp1252.map | 0 .../dompdf/lib/php-font-lib/maps/cp1253.map | 0 .../dompdf/lib/php-font-lib/maps/cp1254.map | 0 .../dompdf/lib/php-font-lib/maps/cp1255.map | 0 .../dompdf/lib/php-font-lib/maps/cp1257.map | 0 .../dompdf/lib/php-font-lib/maps/cp1258.map | 0 .../dompdf/lib/php-font-lib/maps/cp874.map | 0 .../dompdf/lib/php-font-lib/maps/iso-8859-1.map | 0 .../dompdf/lib/php-font-lib/maps/iso-8859-11.map | 0 .../dompdf/lib/php-font-lib/maps/iso-8859-15.map | 0 .../dompdf/lib/php-font-lib/maps/iso-8859-16.map | 0 .../dompdf/lib/php-font-lib/maps/iso-8859-2.map | 0 .../dompdf/lib/php-font-lib/maps/iso-8859-4.map | 0 .../dompdf/lib/php-font-lib/maps/iso-8859-5.map | 0 .../dompdf/lib/php-font-lib/maps/iso-8859-7.map | 0 .../dompdf/lib/php-font-lib/maps/iso-8859-9.map | 0 .../dompdf/lib/php-font-lib/maps/koi8-r.map | 0 .../dompdf/lib/php-font-lib/maps/koi8-u.map | 0 .../dompdf/lib/res/broken_image.png | Bin .../dompdf/lib/res/html.css | 0 .../{vendor => IcingaVendor}/dompdf/load_font.php | 0 library/{vendor => IcingaVendor}/dompdf/readme.html | 0 .../dompdf/www/controller.php | 0 .../dompdf/www/cssSandpaper/css/reset.css | 0 .../dompdf/www/cssSandpaper/js/EventHelpers.js | 0 .../dompdf/www/cssSandpaper/js/cssQuery-p.js | 0 .../dompdf/www/cssSandpaper/js/cssSandpaper.js | 0 .../www/cssSandpaper/js/jcoglan.com/sylvester.js | 0 .../dompdf/www/debugger.php | 0 .../{vendor => IcingaVendor}/dompdf/www/demo.php | 0 .../dompdf/www/examples.php | 0 .../{vendor => IcingaVendor}/dompdf/www/fonts.php | 0 .../{vendor => IcingaVendor}/dompdf/www/foot.inc | 0 .../dompdf/www/functions.inc.php | 0 .../{vendor => IcingaVendor}/dompdf/www/head.inc | 0 .../dompdf/www/images/arrow_01.gif | Bin .../dompdf/www/images/arrow_02.gif | Bin .../dompdf/www/images/arrow_03.gif | Bin .../dompdf/www/images/arrow_04.gif | Bin .../dompdf/www/images/arrow_05.gif | Bin .../dompdf/www/images/arrow_06.gif | Bin .../dompdf/www/images/css2.png | Bin .../dompdf/www/images/dompdf_simple.png | Bin .../dompdf/www/images/favicon.ico | Bin .../dompdf/www/images/favicon.png | Bin .../dompdf/www/images/h_bar.gif | Bin .../dompdf/www/images/left_arrow.gif | Bin .../dompdf/www/images/logo.png | Bin .../dompdf/www/images/logo.xcf | Bin .../dompdf/www/images/php5-power-micro.png | Bin .../dompdf/www/images/small_logo.png | Bin .../dompdf/www/images/star_01.gif | Bin .../dompdf/www/images/star_02.gif | Bin .../dompdf/www/images/star_03.gif | Bin .../dompdf/www/images/star_04.gif | Bin .../dompdf/www/images/star_05.gif | Bin .../dompdf/www/images/title.gif | Bin .../dompdf/www/images/v_bar.gif | Bin .../dompdf/www/images/xhtml10.png | Bin .../{vendor => IcingaVendor}/dompdf/www/index.php | 0 .../dompdf/www/jquery-1.4.2.js | 0 .../{vendor => IcingaVendor}/dompdf/www/setup.php | 0 .../{vendor => IcingaVendor}/dompdf/www/style.css | 0 .../backgroundcolor_fontdecoration_pageborder.html | 0 .../dompdf/www/test/css/common.css | 0 .../dompdf/www/test/css/importabs.css | 0 .../dompdf/www/test/css/importall.css | 0 .../dompdf/www/test/css/importdisplay.css | 0 .../dompdf/www/test/css/importprint.css | 0 .../dompdf/www/test/css/importsub.css | 0 .../dompdf/www/test/css/linkall.css | 0 .../dompdf/www/test/css/linkdefault.css | 0 .../dompdf/www/test/css/linkdisplay.css | 0 .../dompdf/www/test/css/linkprint.css | 0 .../dompdf/www/test/css/print_static.css | 0 .../dompdf/www/test/css_2d_transforms.html | 0 .../dompdf/www/test/css_at_font_face.html | 0 .../dompdf/www/test/css_baseline.html | 0 .../dompdf/www/test/css_border.html | 0 .../dompdf/www/test/css_color_cmyk.html | 0 .../dompdf/www/test/css_content.html | 0 .../dompdf/www/test/css_float.html | 0 .../dompdf/www/test/css_font_selection.html | 0 .../dompdf/www/test/css_important_flag.html | 0 .../dompdf/www/test/css_letter_spacing.html | 0 .../dompdf/www/test/css_line_height.html | 0 .../dompdf/www/test/css_margin.html | 0 .../dompdf/www/test/css_media.html | 0 .../dompdf/www/test/css_multiple_class.html | 0 .../dompdf/www/test/css_nth_child.html | 0 .../dompdf/www/test/css_opacity.html | 0 .../dompdf/www/test/css_outline.html | 0 .../dompdf/www/test/css_overflow_hidden.html | 0 .../dompdf/www/test/css_position_absolute.html | 0 .../dompdf/www/test/css_position_all.html | 0 .../dompdf/www/test/css_position_fixed.html | 0 .../dompdf/www/test/css_selectors.html | 0 .../dompdf/www/test/css_table_height.html | 0 .../dompdf/www/test/css_text_align.html | 0 .../dompdf/www/test/css_vertical_align.html | 0 .../dompdf/www/test/css_vertical_align_w3.html | 0 .../dompdf/www/test/css_whitespace.html | 0 .../dompdf/www/test/css_word_wrap.html | 0 .../dompdf/www/test/css_z_index.html | 0 .../dompdf/www/test/demo_01.html | 0 .../dompdf/www/test/dom_anchor_link.html | 0 .../dompdf/www/test/dom_br.html | 0 .../dompdf/www/test/dom_large_table.html | 0 .../dompdf/www/test/dom_long_table.php | 0 .../dompdf/www/test/dom_nbsp.html | 0 .../dompdf/www/test/dom_nested_table.html | 0 .../dompdf/www/test/dom_ol.html | 0 .../dompdf/www/test/dom_simple_ul.html | 0 .../dompdf/www/test/dom_table.html | 0 .../dompdf/www/test/dom_table_image.html | 0 .../dompdf/www/test/dom_ul.html | 0 .../dompdf/www/test/encoding_entities.html | 0 .../dompdf/www/test/encoding_latin1.html | 0 .../dompdf/www/test/encoding_special.html | 0 .../dompdf/www/test/encoding_symbols.html | 0 .../dompdf/www/test/encoding_unicode.html | 0 .../dompdf/www/test/encoding_unicode_wrapping.html | 0 .../dompdf/www/test/encoding_utf-8.html | 0 .../dompdf/www/test/encoding_utf-8_all.html | 0 .../dompdf/www/test/encoding_utf-8_w3.html | 0 .../dompdf/www/test/image_background.html | 0 .../dompdf/www/test/image_basic.html | 0 .../dompdf/www/test/image_bmp.html | 0 .../dompdf/www/test/image_datauri.html | 0 .../dompdf/www/test/image_dimensions.html | 0 .../dompdf/www/test/image_gif.html | 0 .../dompdf/www/test/image_remote.html | 0 .../dompdf/www/test/image_transparent_gif.html | 0 .../dompdf/www/test/image_transparent_png.html | 0 .../dompdf/www/test/image_variants.html | 0 .../dompdf/www/test/images/bmp/test1.bmp | Bin .../dompdf/www/test/images/bmp/test1.png | Bin .../dompdf/www/test/images/bmp/test16.bmp | Bin .../dompdf/www/test/images/bmp/test16.png | Bin .../dompdf/www/test/images/bmp/test16bf555.bmp | Bin .../dompdf/www/test/images/bmp/test16bf555.png | Bin .../dompdf/www/test/images/bmp/test16bf565.bmp | Bin .../dompdf/www/test/images/bmp/test16bf565.png | Bin .../dompdf/www/test/images/bmp/test24.bmp | Bin .../dompdf/www/test/images/bmp/test24.png | Bin .../dompdf/www/test/images/bmp/test32.bmp | Bin .../dompdf/www/test/images/bmp/test32.png | Bin .../dompdf/www/test/images/bmp/test32bf.bmp | Bin .../dompdf/www/test/images/bmp/test32bf.png | Bin .../dompdf/www/test/images/bmp/test32bfv4.bmp | Bin .../dompdf/www/test/images/bmp/test32bfv4.png | Bin .../dompdf/www/test/images/bmp/test32v5.bmp | Bin .../dompdf/www/test/images/bmp/test32v5.png | Bin .../dompdf/www/test/images/bmp/test4.bmp | Bin .../dompdf/www/test/images/bmp/test4.png | Bin .../dompdf/www/test/images/bmp/test4os2v2.bmp | Bin .../dompdf/www/test/images/bmp/test4os2v2.png | Bin .../dompdf/www/test/images/bmp/test8.bmp | Bin .../dompdf/www/test/images/bmp/test8.png | Bin .../dompdf/www/test/images/bmp/test8os2.bmp | Bin .../dompdf/www/test/images/bmp/test8os2.png | Bin .../dompdf/www/test/images/bmp/testcompress4.bmp | Bin .../dompdf/www/test/images/bmp/testcompress4.png | Bin .../dompdf/www/test/images/bmp/testcompress8.bmp | Bin .../dompdf/www/test/images/bmp/testcompress8.png | Bin .../dompdf/www/test/images/bmp/trans.bmp | Bin .../dompdf/www/test/images/bmp/trans.png | Bin .../dompdf/www/test/images/cmyk_test2.jpg | Bin .../dompdf/www/test/images/dokuwiki-128.png | Bin .../dompdf/www/test/images/dompdf_simple.png | Bin .../dompdf/www/test/images/goldengate.jpg | Bin .../dompdf/www/test/images/green.gif | Bin .../dompdf/www/test/images/grid-36.gif | Bin .../dompdf/www/test/images/html.png | Bin .../dompdf/www/test/images/no_extension | Bin .../dompdf/www/test/images/pdf.png | Bin .../dompdf/www/test/images/php.gif | Bin .../dompdf/www/test/images/png.png | Bin .../dompdf/www/test/images/png/gray16a.png | Bin .../dompdf/www/test/images/png/gray16a_bk.png | Bin .../dompdf/www/test/images/png/gray16b.png | Bin .../dompdf/www/test/images/png/gray16b_bk.png | Bin .../dompdf/www/test/images/png/gray8a.png | Bin .../dompdf/www/test/images/png/gray8a_bk.png | Bin .../dompdf/www/test/images/png/gray8b.png | Bin .../dompdf/www/test/images/png/gray8b_bk.png | Bin .../dompdf/www/test/images/png/pal.png | Bin .../dompdf/www/test/images/png/pal_bk.png | Bin .../dompdf/www/test/images/png/pal_bk_notrns.png | Bin .../dompdf/www/test/images/png/palb.png | Bin .../dompdf/www/test/images/png/result_16ns.gif | Bin .../dompdf/www/test/images/png/result_1trns.gif | Bin .../dompdf/www/test/images/png/result_bla.gif | Bin .../dompdf/www/test/images/png/result_dith.gif | Bin .../dompdf/www/test/images/png/result_gra.gif | Bin .../dompdf/www/test/images/png/result_mag.gif | Bin .../dompdf/www/test/images/png/result_magthr1.gif | Bin .../dompdf/www/test/images/png/result_no.gif | Bin .../dompdf/www/test/images/png/result_nsbug.gif | Bin .../dompdf/www/test/images/png/result_ok.gif | Bin .../dompdf/www/test/images/png/result_oprbug.gif | Bin .../dompdf/www/test/images/png/result_thr1.gif | Bin .../dompdf/www/test/images/png/result_thr128.gif | Bin .../dompdf/www/test/images/png/result_thr255.gif | Bin .../dompdf/www/test/images/png/result_whi.gif | Bin .../dompdf/www/test/images/png/result_yel.gif | Bin .../dompdf/www/test/images/png/result_yelthr1.gif | Bin .../dompdf/www/test/images/png/resultb_bla.gif | Bin .../dompdf/www/test/images/png/resultb_bug.gif | Bin .../dompdf/www/test/images/png/resultb_mag.gif | Bin .../dompdf/www/test/images/png/resultb_moz2.gif | Bin .../dompdf/www/test/images/png/resultb_no.gif | Bin .../dompdf/www/test/images/png/resultb_ok.gif | Bin .../dompdf/www/test/images/png/resultb_whi.gif | Bin .../dompdf/www/test/images/png/resultb_yel.gif | Bin .../dompdf/www/test/images/png/resultg_bla.gif | Bin .../dompdf/www/test/images/png/resultg_dgr.gif | Bin .../dompdf/www/test/images/png/resultg_lgr.gif | Bin .../dompdf/www/test/images/png/resultg_no.gif | Bin .../dompdf/www/test/images/png/resultga.gif | Bin .../dompdf/www/test/images/png/resultgb.gif | Bin .../dompdf/www/test/images/png/resultgb_dgr.gif | Bin .../dompdf/www/test/images/png/resultgb_no.gif | Bin .../dompdf/www/test/images/png/resultpb_no.gif | Bin .../dompdf/www/test/images/png/rgb16_t.png | Bin .../dompdf/www/test/images/png/rgb16_t_bk.png | Bin .../dompdf/www/test/images/png/rgb8_t.png | Bin .../dompdf/www/test/images/png/rgb8_t_bk.png | Bin .../dompdf/www/test/images/png/rgba16.png | Bin .../dompdf/www/test/images/png/rgba16_bk.png | Bin .../dompdf/www/test/images/png/rgba8.png | Bin .../dompdf/www/test/images/png/rgba8_bk.png | Bin .../dompdf/www/test/images/png/stripe.gif | Bin .../dompdf/www/test/images/smiley.png | Bin .../dompdf/www/test/images/unknown_extension.foo | Bin .../dompdf/www/test/images/vblank.gif | Bin .../dompdf/www/test/images/what_ordered.gif | Bin .../dompdf/www/test/page_pages.html | 0 .../dompdf/www/test/quirks_center_table.html | 0 .../dompdf/www/test/quirks_font_tag.html | 0 .../dompdf/www/test/quirks_html_attributes.html | 0 .../dompdf/www/test/script_javascript.html | 0 .../dompdf/www/test/script_php.php | 0 .../htmlpurifier-4.6.0-lite/CREDITS | 0 .../htmlpurifier-4.6.0-lite/INSTALL | 0 .../htmlpurifier-4.6.0-lite/LICENSE | 0 .../htmlpurifier-4.6.0-lite/NEWS | 0 .../library/HTMLPurifier.auto.php | 0 .../library/HTMLPurifier.autoload.php | 0 .../library/HTMLPurifier.composer.php | 0 .../library/HTMLPurifier.func.php | 0 .../library/HTMLPurifier.includes.php | 0 .../library/HTMLPurifier.kses.php | 0 .../library/HTMLPurifier.path.php | 0 .../library/HTMLPurifier.php | 0 .../library/HTMLPurifier.safe-includes.php | 0 .../library/HTMLPurifier/Arborize.php | 0 .../library/HTMLPurifier/AttrCollections.php | 0 .../library/HTMLPurifier/AttrDef.php | 0 .../library/HTMLPurifier/AttrDef/CSS.php | 0 .../library/HTMLPurifier/AttrDef/CSS/AlphaValue.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Background.php | 0 .../HTMLPurifier/AttrDef/CSS/BackgroundPosition.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Border.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Color.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Composite.php | 0 .../AttrDef/CSS/DenyElementDecorator.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Filter.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Font.php | 0 .../library/HTMLPurifier/AttrDef/CSS/FontFamily.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Ident.php | 0 .../HTMLPurifier/AttrDef/CSS/ImportantDecorator.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Length.php | 0 .../library/HTMLPurifier/AttrDef/CSS/ListStyle.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Multiple.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Number.php | 0 .../library/HTMLPurifier/AttrDef/CSS/Percentage.php | 0 .../HTMLPurifier/AttrDef/CSS/TextDecoration.php | 0 .../library/HTMLPurifier/AttrDef/CSS/URI.php | 0 .../library/HTMLPurifier/AttrDef/Clone.php | 0 .../library/HTMLPurifier/AttrDef/Enum.php | 0 .../library/HTMLPurifier/AttrDef/HTML/Bool.php | 0 .../library/HTMLPurifier/AttrDef/HTML/Class.php | 0 .../library/HTMLPurifier/AttrDef/HTML/Color.php | 0 .../HTMLPurifier/AttrDef/HTML/FrameTarget.php | 0 .../library/HTMLPurifier/AttrDef/HTML/ID.php | 0 .../library/HTMLPurifier/AttrDef/HTML/Length.php | 0 .../library/HTMLPurifier/AttrDef/HTML/LinkTypes.php | 0 .../HTMLPurifier/AttrDef/HTML/MultiLength.php | 0 .../library/HTMLPurifier/AttrDef/HTML/Nmtokens.php | 0 .../library/HTMLPurifier/AttrDef/HTML/Pixels.php | 0 .../library/HTMLPurifier/AttrDef/Integer.php | 0 .../library/HTMLPurifier/AttrDef/Lang.php | 0 .../library/HTMLPurifier/AttrDef/Switch.php | 0 .../library/HTMLPurifier/AttrDef/Text.php | 0 .../library/HTMLPurifier/AttrDef/URI.php | 0 .../library/HTMLPurifier/AttrDef/URI/Email.php | 0 .../HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php | 0 .../library/HTMLPurifier/AttrDef/URI/Host.php | 0 .../library/HTMLPurifier/AttrDef/URI/IPv4.php | 0 .../library/HTMLPurifier/AttrDef/URI/IPv6.php | 0 .../library/HTMLPurifier/AttrTransform.php | 0 .../HTMLPurifier/AttrTransform/Background.php | 0 .../library/HTMLPurifier/AttrTransform/BdoDir.php | 0 .../library/HTMLPurifier/AttrTransform/BgColor.php | 0 .../HTMLPurifier/AttrTransform/BoolToCSS.php | 0 .../library/HTMLPurifier/AttrTransform/Border.php | 0 .../HTMLPurifier/AttrTransform/EnumToCSS.php | 0 .../HTMLPurifier/AttrTransform/ImgRequired.php | 0 .../library/HTMLPurifier/AttrTransform/ImgSpace.php | 0 .../library/HTMLPurifier/AttrTransform/Input.php | 0 .../library/HTMLPurifier/AttrTransform/Lang.php | 0 .../library/HTMLPurifier/AttrTransform/Length.php | 0 .../library/HTMLPurifier/AttrTransform/Name.php | 0 .../library/HTMLPurifier/AttrTransform/NameSync.php | 0 .../library/HTMLPurifier/AttrTransform/Nofollow.php | 0 .../HTMLPurifier/AttrTransform/SafeEmbed.php | 0 .../HTMLPurifier/AttrTransform/SafeObject.php | 0 .../HTMLPurifier/AttrTransform/SafeParam.php | 0 .../HTMLPurifier/AttrTransform/ScriptRequired.php | 0 .../HTMLPurifier/AttrTransform/TargetBlank.php | 0 .../library/HTMLPurifier/AttrTransform/Textarea.php | 0 .../library/HTMLPurifier/AttrTypes.php | 0 .../library/HTMLPurifier/AttrValidator.php | 0 .../library/HTMLPurifier/Bootstrap.php | 0 .../library/HTMLPurifier/CSSDefinition.php | 0 .../library/HTMLPurifier/ChildDef.php | 0 .../library/HTMLPurifier/ChildDef/Chameleon.php | 0 .../library/HTMLPurifier/ChildDef/Custom.php | 0 .../library/HTMLPurifier/ChildDef/Empty.php | 0 .../library/HTMLPurifier/ChildDef/List.php | 0 .../library/HTMLPurifier/ChildDef/Optional.php | 0 .../library/HTMLPurifier/ChildDef/Required.php | 0 .../HTMLPurifier/ChildDef/StrictBlockquote.php | 0 .../library/HTMLPurifier/ChildDef/Table.php | 0 .../library/HTMLPurifier/Config.php | 0 .../library/HTMLPurifier/ConfigSchema.php | 0 .../ConfigSchema/Builder/ConfigSchema.php | 0 .../HTMLPurifier/ConfigSchema/Builder/Xml.php | 0 .../library/HTMLPurifier/ConfigSchema/Exception.php | 0 .../HTMLPurifier/ConfigSchema/Interchange.php | 0 .../ConfigSchema/Interchange/Directive.php | 0 .../HTMLPurifier/ConfigSchema/Interchange/Id.php | 0 .../ConfigSchema/InterchangeBuilder.php | 0 .../library/HTMLPurifier/ConfigSchema/Validator.php | 0 .../HTMLPurifier/ConfigSchema/ValidatorAtom.php | 0 .../library/HTMLPurifier/ConfigSchema/schema.ser | Bin .../ConfigSchema/schema/Attr.AllowedClasses.txt | 0 .../schema/Attr.AllowedFrameTargets.txt | 0 .../ConfigSchema/schema/Attr.AllowedRel.txt | 0 .../ConfigSchema/schema/Attr.AllowedRev.txt | 0 .../ConfigSchema/schema/Attr.ClassUseCDATA.txt | 0 .../ConfigSchema/schema/Attr.DefaultImageAlt.txt | 0 .../schema/Attr.DefaultInvalidImage.txt | 0 .../schema/Attr.DefaultInvalidImageAlt.txt | 0 .../ConfigSchema/schema/Attr.DefaultTextDir.txt | 0 .../ConfigSchema/schema/Attr.EnableID.txt | 0 .../ConfigSchema/schema/Attr.ForbiddenClasses.txt | 0 .../ConfigSchema/schema/Attr.IDBlacklist.txt | 0 .../ConfigSchema/schema/Attr.IDBlacklistRegexp.txt | 0 .../ConfigSchema/schema/Attr.IDPrefix.txt | 0 .../ConfigSchema/schema/Attr.IDPrefixLocal.txt | 0 .../schema/AutoFormat.AutoParagraph.txt | 0 .../ConfigSchema/schema/AutoFormat.Custom.txt | 0 .../schema/AutoFormat.DisplayLinkURI.txt | 0 .../ConfigSchema/schema/AutoFormat.Linkify.txt | 0 .../schema/AutoFormat.PurifierLinkify.DocURL.txt | 0 .../schema/AutoFormat.PurifierLinkify.txt | 0 ...AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt | 0 .../schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt | 0 .../ConfigSchema/schema/AutoFormat.RemoveEmpty.txt | 0 .../AutoFormat.RemoveSpansWithoutAttributes.txt | 0 .../ConfigSchema/schema/CSS.AllowImportant.txt | 0 .../ConfigSchema/schema/CSS.AllowTricky.txt | 0 .../ConfigSchema/schema/CSS.AllowedFonts.txt | 0 .../ConfigSchema/schema/CSS.AllowedProperties.txt | 0 .../ConfigSchema/schema/CSS.DefinitionRev.txt | 0 .../ConfigSchema/schema/CSS.ForbiddenProperties.txt | 0 .../ConfigSchema/schema/CSS.MaxImgLength.txt | 0 .../ConfigSchema/schema/CSS.Proprietary.txt | 0 .../ConfigSchema/schema/CSS.Trusted.txt | 0 .../ConfigSchema/schema/Cache.DefinitionImpl.txt | 0 .../ConfigSchema/schema/Cache.SerializerPath.txt | 0 .../schema/Cache.SerializerPermissions.txt | 0 .../ConfigSchema/schema/Core.AggressivelyFixLt.txt | 0 .../schema/Core.AllowHostnameUnderscore.txt | 0 .../ConfigSchema/schema/Core.CollectErrors.txt | 0 .../ConfigSchema/schema/Core.ColorKeywords.txt | 0 .../schema/Core.ConvertDocumentToFragment.txt | 0 .../schema/Core.DirectLexLineNumberSyncInterval.txt | 0 .../ConfigSchema/schema/Core.DisableExcludes.txt | 0 .../ConfigSchema/schema/Core.EnableIDNA.txt | 0 .../ConfigSchema/schema/Core.Encoding.txt | 0 .../schema/Core.EscapeInvalidChildren.txt | 0 .../ConfigSchema/schema/Core.EscapeInvalidTags.txt | 0 .../schema/Core.EscapeNonASCIICharacters.txt | 0 .../ConfigSchema/schema/Core.HiddenElements.txt | 0 .../ConfigSchema/schema/Core.Language.txt | 0 .../ConfigSchema/schema/Core.LexerImpl.txt | 0 .../schema/Core.MaintainLineNumbers.txt | 0 .../ConfigSchema/schema/Core.NormalizeNewlines.txt | 0 .../ConfigSchema/schema/Core.RemoveInvalidImg.txt | 0 .../schema/Core.RemoveProcessingInstructions.txt | 0 .../schema/Core.RemoveScriptContents.txt | 0 .../ConfigSchema/schema/Filter.Custom.txt | 0 .../schema/Filter.ExtractStyleBlocks.Escaping.txt | 0 .../schema/Filter.ExtractStyleBlocks.Scope.txt | 0 .../schema/Filter.ExtractStyleBlocks.TidyImpl.txt | 0 .../schema/Filter.ExtractStyleBlocks.txt | 0 .../ConfigSchema/schema/Filter.YouTube.txt | 0 .../ConfigSchema/schema/HTML.Allowed.txt | 0 .../ConfigSchema/schema/HTML.AllowedAttributes.txt | 0 .../ConfigSchema/schema/HTML.AllowedComments.txt | 0 .../schema/HTML.AllowedCommentsRegexp.txt | 0 .../ConfigSchema/schema/HTML.AllowedElements.txt | 0 .../ConfigSchema/schema/HTML.AllowedModules.txt | 0 .../ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt | 0 .../ConfigSchema/schema/HTML.BlockWrapper.txt | 0 .../ConfigSchema/schema/HTML.CoreModules.txt | 0 .../ConfigSchema/schema/HTML.CustomDoctype.txt | 0 .../ConfigSchema/schema/HTML.DefinitionID.txt | 0 .../ConfigSchema/schema/HTML.DefinitionRev.txt | 0 .../ConfigSchema/schema/HTML.Doctype.txt | 0 .../schema/HTML.FlashAllowFullScreen.txt | 0 .../schema/HTML.ForbiddenAttributes.txt | 0 .../ConfigSchema/schema/HTML.ForbiddenElements.txt | 0 .../ConfigSchema/schema/HTML.MaxImgLength.txt | 0 .../ConfigSchema/schema/HTML.Nofollow.txt | 0 .../ConfigSchema/schema/HTML.Parent.txt | 0 .../ConfigSchema/schema/HTML.Proprietary.txt | 0 .../ConfigSchema/schema/HTML.SafeEmbed.txt | 0 .../ConfigSchema/schema/HTML.SafeIframe.txt | 0 .../ConfigSchema/schema/HTML.SafeObject.txt | 0 .../ConfigSchema/schema/HTML.SafeScripting.txt | 0 .../ConfigSchema/schema/HTML.Strict.txt | 0 .../ConfigSchema/schema/HTML.TargetBlank.txt | 0 .../ConfigSchema/schema/HTML.TidyAdd.txt | 0 .../ConfigSchema/schema/HTML.TidyLevel.txt | 0 .../ConfigSchema/schema/HTML.TidyRemove.txt | 0 .../ConfigSchema/schema/HTML.Trusted.txt | 0 .../HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt | 0 .../schema/Output.CommentScriptContents.txt | 0 .../ConfigSchema/schema/Output.FixInnerHTML.txt | 0 .../ConfigSchema/schema/Output.FlashCompat.txt | 0 .../ConfigSchema/schema/Output.Newline.txt | 0 .../ConfigSchema/schema/Output.SortAttr.txt | 0 .../ConfigSchema/schema/Output.TidyFormat.txt | 0 .../ConfigSchema/schema/Test.ForceNoIconv.txt | 0 .../ConfigSchema/schema/URI.AllowedSchemes.txt | 0 .../HTMLPurifier/ConfigSchema/schema/URI.Base.txt | 0 .../ConfigSchema/schema/URI.DefaultScheme.txt | 0 .../ConfigSchema/schema/URI.DefinitionID.txt | 0 .../ConfigSchema/schema/URI.DefinitionRev.txt | 0 .../ConfigSchema/schema/URI.Disable.txt | 0 .../ConfigSchema/schema/URI.DisableExternal.txt | 0 .../schema/URI.DisableExternalResources.txt | 0 .../ConfigSchema/schema/URI.DisableResources.txt | 0 .../HTMLPurifier/ConfigSchema/schema/URI.Host.txt | 0 .../ConfigSchema/schema/URI.HostBlacklist.txt | 0 .../ConfigSchema/schema/URI.MakeAbsolute.txt | 0 .../HTMLPurifier/ConfigSchema/schema/URI.Munge.txt | 0 .../ConfigSchema/schema/URI.MungeResources.txt | 0 .../ConfigSchema/schema/URI.MungeSecretKey.txt | 0 .../schema/URI.OverrideAllowedSchemes.txt | 0 .../ConfigSchema/schema/URI.SafeIframeRegexp.txt | 0 .../HTMLPurifier/ConfigSchema/schema/info.ini | 0 .../library/HTMLPurifier/ContentSets.php | 0 .../library/HTMLPurifier/Context.php | 0 .../library/HTMLPurifier/Definition.php | 0 .../library/HTMLPurifier/DefinitionCache.php | 0 .../HTMLPurifier/DefinitionCache/Decorator.php | 0 .../DefinitionCache/Decorator/Cleanup.php | 0 .../DefinitionCache/Decorator/Memory.php | 0 .../DefinitionCache/Decorator/Template.php.in | 0 .../library/HTMLPurifier/DefinitionCache/Null.php | 0 .../HTMLPurifier/DefinitionCache/Serializer.php | 0 .../HTMLPurifier/DefinitionCache/Serializer/README | 0 .../library/HTMLPurifier/DefinitionCacheFactory.php | 0 .../library/HTMLPurifier/Doctype.php | 0 .../library/HTMLPurifier/DoctypeRegistry.php | 0 .../library/HTMLPurifier/ElementDef.php | 0 .../library/HTMLPurifier/Encoder.php | 0 .../library/HTMLPurifier/EntityLookup.php | 0 .../library/HTMLPurifier/EntityLookup/entities.ser | 0 .../library/HTMLPurifier/EntityParser.php | 0 .../library/HTMLPurifier/ErrorCollector.php | 0 .../library/HTMLPurifier/ErrorStruct.php | 0 .../library/HTMLPurifier/Exception.php | 0 .../library/HTMLPurifier/Filter.php | 0 .../HTMLPurifier/Filter/ExtractStyleBlocks.php | 0 .../library/HTMLPurifier/Filter/YouTube.php | 0 .../library/HTMLPurifier/Generator.php | 0 .../library/HTMLPurifier/HTMLDefinition.php | 0 .../library/HTMLPurifier/HTMLModule.php | 0 .../library/HTMLPurifier/HTMLModule/Bdo.php | 0 .../HTMLPurifier/HTMLModule/CommonAttributes.php | 0 .../library/HTMLPurifier/HTMLModule/Edit.php | 0 .../library/HTMLPurifier/HTMLModule/Forms.php | 0 .../library/HTMLPurifier/HTMLModule/Hypertext.php | 0 .../library/HTMLPurifier/HTMLModule/Iframe.php | 0 .../library/HTMLPurifier/HTMLModule/Image.php | 0 .../library/HTMLPurifier/HTMLModule/Legacy.php | 0 .../library/HTMLPurifier/HTMLModule/List.php | 0 .../library/HTMLPurifier/HTMLModule/Name.php | 0 .../library/HTMLPurifier/HTMLModule/Nofollow.php | 0 .../HTMLModule/NonXMLCommonAttributes.php | 0 .../library/HTMLPurifier/HTMLModule/Object.php | 0 .../HTMLPurifier/HTMLModule/Presentation.php | 0 .../library/HTMLPurifier/HTMLModule/Proprietary.php | 0 .../library/HTMLPurifier/HTMLModule/Ruby.php | 0 .../library/HTMLPurifier/HTMLModule/SafeEmbed.php | 0 .../library/HTMLPurifier/HTMLModule/SafeObject.php | 0 .../HTMLPurifier/HTMLModule/SafeScripting.php | 0 .../library/HTMLPurifier/HTMLModule/Scripting.php | 0 .../HTMLPurifier/HTMLModule/StyleAttribute.php | 0 .../library/HTMLPurifier/HTMLModule/Tables.php | 0 .../library/HTMLPurifier/HTMLModule/Target.php | 0 .../library/HTMLPurifier/HTMLModule/TargetBlank.php | 0 .../library/HTMLPurifier/HTMLModule/Text.php | 0 .../library/HTMLPurifier/HTMLModule/Tidy.php | 0 .../library/HTMLPurifier/HTMLModule/Tidy/Name.php | 0 .../HTMLPurifier/HTMLModule/Tidy/Proprietary.php | 0 .../library/HTMLPurifier/HTMLModule/Tidy/Strict.php | 0 .../HTMLPurifier/HTMLModule/Tidy/Transitional.php | 0 .../library/HTMLPurifier/HTMLModule/Tidy/XHTML.php | 0 .../HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php | 0 .../HTMLPurifier/HTMLModule/XMLCommonAttributes.php | 0 .../library/HTMLPurifier/HTMLModuleManager.php | 0 .../library/HTMLPurifier/IDAccumulator.php | 0 .../library/HTMLPurifier/Injector.php | 0 .../library/HTMLPurifier/Injector/AutoParagraph.php | 0 .../HTMLPurifier/Injector/DisplayLinkURI.php | 0 .../library/HTMLPurifier/Injector/Linkify.php | 0 .../HTMLPurifier/Injector/PurifierLinkify.php | 0 .../library/HTMLPurifier/Injector/RemoveEmpty.php | 0 .../Injector/RemoveSpansWithoutAttributes.php | 0 .../library/HTMLPurifier/Injector/SafeObject.php | 0 .../library/HTMLPurifier/Language.php | 0 .../HTMLPurifier/Language/classes/en-x-test.php | 0 .../HTMLPurifier/Language/messages/en-x-test.php | 0 .../Language/messages/en-x-testmini.php | 0 .../library/HTMLPurifier/Language/messages/en.php | 0 .../library/HTMLPurifier/LanguageFactory.php | 0 .../library/HTMLPurifier/Length.php | 0 .../library/HTMLPurifier/Lexer.php | 0 .../library/HTMLPurifier/Lexer/DOMLex.php | 0 .../library/HTMLPurifier/Lexer/DirectLex.php | 0 .../library/HTMLPurifier/Lexer/PH5P.php | 0 .../library/HTMLPurifier/Node.php | 0 .../library/HTMLPurifier/Node/Comment.php | 0 .../library/HTMLPurifier/Node/Element.php | 0 .../library/HTMLPurifier/Node/Text.php | 0 .../library/HTMLPurifier/PercentEncoder.php | 0 .../library/HTMLPurifier/Printer.php | 0 .../library/HTMLPurifier/Printer/CSSDefinition.php | 0 .../library/HTMLPurifier/Printer/ConfigForm.css | 0 .../library/HTMLPurifier/Printer/ConfigForm.js | 0 .../library/HTMLPurifier/Printer/ConfigForm.php | 0 .../library/HTMLPurifier/Printer/HTMLDefinition.php | 0 .../library/HTMLPurifier/PropertyList.php | 0 .../library/HTMLPurifier/PropertyListIterator.php | 0 .../library/HTMLPurifier/Queue.php | 0 .../library/HTMLPurifier/Strategy.php | 0 .../library/HTMLPurifier/Strategy/Composite.php | 0 .../library/HTMLPurifier/Strategy/Core.php | 0 .../library/HTMLPurifier/Strategy/FixNesting.php | 0 .../HTMLPurifier/Strategy/MakeWellFormed.php | 0 .../HTMLPurifier/Strategy/RemoveForeignElements.php | 0 .../HTMLPurifier/Strategy/ValidateAttributes.php | 0 .../library/HTMLPurifier/StringHash.php | 0 .../library/HTMLPurifier/StringHashParser.php | 0 .../library/HTMLPurifier/TagTransform.php | 0 .../library/HTMLPurifier/TagTransform/Font.php | 0 .../library/HTMLPurifier/TagTransform/Simple.php | 0 .../library/HTMLPurifier/Token.php | 0 .../library/HTMLPurifier/Token/Comment.php | 0 .../library/HTMLPurifier/Token/Empty.php | 0 .../library/HTMLPurifier/Token/End.php | 0 .../library/HTMLPurifier/Token/Start.php | 0 .../library/HTMLPurifier/Token/Tag.php | 0 .../library/HTMLPurifier/Token/Text.php | 0 .../library/HTMLPurifier/TokenFactory.php | 0 .../library/HTMLPurifier/URI.php | 0 .../library/HTMLPurifier/URIDefinition.php | 0 .../library/HTMLPurifier/URIFilter.php | 0 .../HTMLPurifier/URIFilter/DisableExternal.php | 0 .../URIFilter/DisableExternalResources.php | 0 .../HTMLPurifier/URIFilter/DisableResources.php | 0 .../HTMLPurifier/URIFilter/HostBlacklist.php | 0 .../library/HTMLPurifier/URIFilter/MakeAbsolute.php | 0 .../library/HTMLPurifier/URIFilter/Munge.php | 0 .../library/HTMLPurifier/URIFilter/SafeIframe.php | 0 .../library/HTMLPurifier/URIParser.php | 0 .../library/HTMLPurifier/URIScheme.php | 0 .../library/HTMLPurifier/URIScheme/data.php | 0 .../library/HTMLPurifier/URIScheme/file.php | 0 .../library/HTMLPurifier/URIScheme/ftp.php | 0 .../library/HTMLPurifier/URIScheme/http.php | 0 .../library/HTMLPurifier/URIScheme/https.php | 0 .../library/HTMLPurifier/URIScheme/mailto.php | 0 .../library/HTMLPurifier/URIScheme/news.php | 0 .../library/HTMLPurifier/URIScheme/nntp.php | 0 .../library/HTMLPurifier/URISchemeRegistry.php | 0 .../library/HTMLPurifier/UnitConverter.php | 0 .../library/HTMLPurifier/VarParser.php | 0 .../library/HTMLPurifier/VarParser/Flexible.php | 0 .../library/HTMLPurifier/VarParser/Native.php | 0 .../library/HTMLPurifier/VarParserException.php | 0 .../library/HTMLPurifier/Zipper.php | 0 .../{vendor => IcingaVendor}/lessphp/.travis.yml | 0 library/{vendor => IcingaVendor}/lessphp/LICENSE | 0 library/{vendor => IcingaVendor}/lessphp/SOURCE | 0 .../{vendor => IcingaVendor}/lessphp/lessc.inc.php | 0 modules/doc/library/Doc/DocParser.php | 2 +- .../application/views/helpers/PluginOutput.php | 2 +- 803 files changed, 6 insertions(+), 6 deletions(-) rename library/{vendor => IcingaVendor}/JShrink/LICENSE (100%) rename library/{vendor => IcingaVendor}/JShrink/Minifier.php (100%) rename library/{vendor => IcingaVendor}/JShrink/SOURCE (100%) rename library/{vendor => IcingaVendor}/Parsedown/LICENSE.txt (100%) rename library/{vendor => IcingaVendor}/Parsedown/Parsedown.php (100%) rename library/{vendor => IcingaVendor}/Parsedown/SOURCE (100%) rename library/{vendor => IcingaVendor}/dompdf/.gitignore (100%) rename library/{vendor => IcingaVendor}/dompdf/LICENSE.LGPL (100%) rename library/{vendor => IcingaVendor}/dompdf/changelog.txt (100%) rename library/{vendor => IcingaVendor}/dompdf/docblox.dist.xml (100%) rename library/{vendor => IcingaVendor}/dompdf/dompdf.php (100%) rename library/{vendor => IcingaVendor}/dompdf/dompdf_config.custom.inc.php (100%) rename library/{vendor => IcingaVendor}/dompdf/dompdf_config.inc.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/absolute_positioner.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/abstract_renderer.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/attribute_translator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/autoload.inc.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/block_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/block_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/block_positioner.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/block_renderer.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/cached_pdf_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/canvas.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/canvas_factory.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/cellmap.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/cpdf_adapter.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/css_color.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/dompdf.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/dompdf_exception.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/dompdf_image_exception.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/file.skel (100%) rename library/{vendor => IcingaVendor}/dompdf/include/fixed_positioner.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/font_metrics.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/frame.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/frame_factory.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/frame_tree.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/functions.inc.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/gd_adapter.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/image_cache.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/image_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/image_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/image_renderer.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/inline_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/inline_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/inline_positioner.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/inline_renderer.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/javascript_embedder.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/line_box.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/list_bullet_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/list_bullet_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/list_bullet_image_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/list_bullet_positioner.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/list_bullet_renderer.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/null_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/null_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/null_positioner.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/page_cache.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/page_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/page_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/pdflib_adapter.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/php_evaluator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/positioner.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/renderer.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/style.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/stylesheet.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_cell_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_cell_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_cell_positioner.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_cell_renderer.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_row_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_row_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_row_group_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_row_group_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_row_group_renderer.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/table_row_positioner.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/tcpdf_adapter.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/text_frame_decorator.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/text_frame_reflower.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/include/text_renderer.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/index.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/class.pdf.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Courier-Bold.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Courier-BoldOblique.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Courier-Oblique.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Courier.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans-Bold.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans-Bold.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans-BoldOblique.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans-BoldOblique.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans-ExtraLight.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans-ExtraLight.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans-Oblique.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans-Oblique.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSans.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansCondensed.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansCondensed.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansMono-Bold.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansMono-Bold.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansMono-Oblique.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansMono-Oblique.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansMono.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSansMono.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerif-Bold.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerif-Bold.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerif-Italic.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerif-Italic.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerif.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerif.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerifCondensed.ttf (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/DejaVuSerifCondensed.ufm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Helvetica-Bold.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Helvetica-Bold.afm.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Helvetica-BoldOblique.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Helvetica-Oblique.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Helvetica.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Helvetica.afm.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Symbol.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Times-Bold.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Times-BoldItalic.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Times-Italic.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Times-Roman.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/Times-Roman.afm.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/ZapfDingbats.afm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/dompdf_font_family_cache.dist.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/log.htm (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/fonts/mustRead.html (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/html5lib/Data.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/html5lib/InputStream.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/html5lib/Parser.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/html5lib/Tokenizer.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/html5lib/TreeBuilder.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/html5lib/named-character-references.ser (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/adobe_font_metrics.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/encoding_map.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_binary_stream.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_eot.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_header.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_opentype.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_opentype_table_directory_entry.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_cmap.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_directory_entry.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_glyf.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_head.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_hhea.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_hmtx.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_kern.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_loca.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_maxp.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_name.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_name_record.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_os2.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_table_post.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_truetype.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_truetype_collection.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_truetype_header.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_truetype_table_directory_entry.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_woff.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_woff_header.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/classes/font_woff_table_directory_entry.cls.php (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/adobe-standard-encoding.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/cp1250.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/cp1251.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/cp1252.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/cp1253.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/cp1254.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/cp1255.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/cp1257.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/cp1258.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/cp874.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/iso-8859-1.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/iso-8859-11.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/iso-8859-15.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/iso-8859-16.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/iso-8859-2.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/iso-8859-4.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/iso-8859-5.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/iso-8859-7.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/iso-8859-9.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/koi8-r.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/php-font-lib/maps/koi8-u.map (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/res/broken_image.png (100%) rename library/{vendor => IcingaVendor}/dompdf/lib/res/html.css (100%) rename library/{vendor => IcingaVendor}/dompdf/load_font.php (100%) rename library/{vendor => IcingaVendor}/dompdf/readme.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/controller.php (100%) rename library/{vendor => IcingaVendor}/dompdf/www/cssSandpaper/css/reset.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/cssSandpaper/js/EventHelpers.js (100%) rename library/{vendor => IcingaVendor}/dompdf/www/cssSandpaper/js/cssQuery-p.js (100%) rename library/{vendor => IcingaVendor}/dompdf/www/cssSandpaper/js/cssSandpaper.js (100%) rename library/{vendor => IcingaVendor}/dompdf/www/cssSandpaper/js/jcoglan.com/sylvester.js (100%) rename library/{vendor => IcingaVendor}/dompdf/www/debugger.php (100%) rename library/{vendor => IcingaVendor}/dompdf/www/demo.php (100%) rename library/{vendor => IcingaVendor}/dompdf/www/examples.php (100%) rename library/{vendor => IcingaVendor}/dompdf/www/fonts.php (100%) rename library/{vendor => IcingaVendor}/dompdf/www/foot.inc (100%) rename library/{vendor => IcingaVendor}/dompdf/www/functions.inc.php (100%) rename library/{vendor => IcingaVendor}/dompdf/www/head.inc (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/arrow_01.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/arrow_02.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/arrow_03.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/arrow_04.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/arrow_05.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/arrow_06.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/css2.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/dompdf_simple.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/favicon.ico (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/favicon.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/h_bar.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/left_arrow.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/logo.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/logo.xcf (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/php5-power-micro.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/small_logo.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/star_01.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/star_02.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/star_03.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/star_04.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/star_05.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/title.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/v_bar.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/images/xhtml10.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/index.php (100%) rename library/{vendor => IcingaVendor}/dompdf/www/jquery-1.4.2.js (100%) rename library/{vendor => IcingaVendor}/dompdf/www/setup.php (100%) rename library/{vendor => IcingaVendor}/dompdf/www/style.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/backgroundcolor_fontdecoration_pageborder.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/common.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/importabs.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/importall.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/importdisplay.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/importprint.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/importsub.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/linkall.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/linkdefault.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/linkdisplay.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/linkprint.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css/print_static.css (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_2d_transforms.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_at_font_face.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_baseline.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_border.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_color_cmyk.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_content.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_float.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_font_selection.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_important_flag.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_letter_spacing.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_line_height.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_margin.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_media.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_multiple_class.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_nth_child.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_opacity.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_outline.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_overflow_hidden.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_position_absolute.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_position_all.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_position_fixed.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_selectors.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_table_height.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_text_align.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_vertical_align.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_vertical_align_w3.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_whitespace.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_word_wrap.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/css_z_index.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/demo_01.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_anchor_link.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_br.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_large_table.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_long_table.php (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_nbsp.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_nested_table.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_ol.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_simple_ul.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_table.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_table_image.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/dom_ul.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/encoding_entities.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/encoding_latin1.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/encoding_special.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/encoding_symbols.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/encoding_unicode.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/encoding_unicode_wrapping.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/encoding_utf-8.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/encoding_utf-8_all.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/encoding_utf-8_w3.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_background.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_basic.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_bmp.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_datauri.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_dimensions.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_gif.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_remote.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_transparent_gif.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_transparent_png.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/image_variants.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test1.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test1.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test16.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test16.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test16bf555.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test16bf555.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test16bf565.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test16bf565.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test24.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test24.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test32.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test32.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test32bf.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test32bf.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test32bfv4.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test32bfv4.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test32v5.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test32v5.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test4.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test4.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test4os2v2.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test4os2v2.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test8.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test8.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test8os2.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/test8os2.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/testcompress4.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/testcompress4.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/testcompress8.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/testcompress8.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/trans.bmp (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/bmp/trans.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/cmyk_test2.jpg (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/dokuwiki-128.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/dompdf_simple.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/goldengate.jpg (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/green.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/grid-36.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/html.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/no_extension (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/pdf.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/php.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/gray16a.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/gray16a_bk.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/gray16b.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/gray16b_bk.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/gray8a.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/gray8a_bk.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/gray8b.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/gray8b_bk.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/pal.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/pal_bk.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/pal_bk_notrns.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/palb.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_16ns.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_1trns.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_bla.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_dith.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_gra.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_mag.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_magthr1.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_no.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_nsbug.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_ok.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_oprbug.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_thr1.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_thr128.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_thr255.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_whi.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_yel.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/result_yelthr1.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultb_bla.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultb_bug.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultb_mag.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultb_moz2.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultb_no.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultb_ok.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultb_whi.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultb_yel.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultg_bla.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultg_dgr.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultg_lgr.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultg_no.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultga.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultgb.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultgb_dgr.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultgb_no.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/resultpb_no.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/rgb16_t.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/rgb16_t_bk.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/rgb8_t.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/rgb8_t_bk.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/rgba16.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/rgba16_bk.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/rgba8.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/rgba8_bk.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/png/stripe.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/smiley.png (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/unknown_extension.foo (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/vblank.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/images/what_ordered.gif (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/page_pages.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/quirks_center_table.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/quirks_font_tag.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/quirks_html_attributes.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/script_javascript.html (100%) rename library/{vendor => IcingaVendor}/dompdf/www/test/script_php.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/CREDITS (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/INSTALL (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/LICENSE (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/NEWS (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier.auto.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier.autoload.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier.composer.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier.func.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier.includes.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier.kses.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier.path.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier.safe-includes.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Arborize.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrCollections.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Background.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Border.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Color.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Composite.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Filter.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Font.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/FontFamily.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Ident.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Length.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ListStyle.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Multiple.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Number.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Percentage.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/URI.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Clone.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Enum.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Bool.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Class.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Color.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/ID.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Length.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/MultiLength.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Pixels.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Integer.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Lang.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Switch.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Text.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Host.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv4.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv6.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Background.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BdoDir.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BgColor.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BoolToCSS.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Border.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/EnumToCSS.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgRequired.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgSpace.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Input.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Lang.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Length.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Name.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/NameSync.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Nofollow.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeEmbed.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeObject.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeParam.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ScriptRequired.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/TargetBlank.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Textarea.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTypes.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrValidator.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Bootstrap.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/CSSDefinition.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Chameleon.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Custom.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Empty.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/List.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Optional.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Required.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/StrictBlockquote.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Table.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Config.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/Xml.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Exception.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Id.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Validator.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema.ser (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/info.ini (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ContentSets.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Context.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Definition.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Null.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer/README (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCacheFactory.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Doctype.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DoctypeRegistry.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ElementDef.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Encoder.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup/entities.ser (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityParser.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorCollector.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorStruct.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Exception.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/ExtractStyleBlocks.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/YouTube.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Generator.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLDefinition.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Bdo.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/CommonAttributes.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Edit.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Forms.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Hypertext.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Iframe.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Image.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Legacy.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/List.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Name.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Nofollow.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Object.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Presentation.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Proprietary.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Ruby.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeEmbed.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeObject.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeScripting.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Scripting.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/StyleAttribute.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tables.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Target.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/TargetBlank.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Text.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Name.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Strict.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModuleManager.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/IDAccumulator.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/AutoParagraph.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/DisplayLinkURI.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/Linkify.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/PurifierLinkify.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveEmpty.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/SafeObject.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/classes/en-x-test.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-test.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-testmini.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/LanguageFactory.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Length.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DOMLex.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DirectLex.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/PH5P.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Comment.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Element.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Text.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PercentEncoder.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/CSSDefinition.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.css (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.js (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/HTMLDefinition.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyList.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyListIterator.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Queue.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Composite.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Core.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/FixNesting.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/MakeWellFormed.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/RemoveForeignElements.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/ValidateAttributes.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHash.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHashParser.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Font.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Simple.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Comment.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Empty.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/End.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Start.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Tag.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Text.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TokenFactory.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URI.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIDefinition.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternal.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternalResources.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableResources.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/HostBlacklist.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/MakeAbsolute.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/Munge.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/SafeIframe.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIParser.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/data.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/file.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/ftp.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/http.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/https.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/mailto.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/news.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/nntp.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URISchemeRegistry.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/UnitConverter.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Flexible.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Native.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParserException.php (100%) rename library/{vendor => IcingaVendor}/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Zipper.php (100%) rename library/{vendor => IcingaVendor}/lessphp/.travis.yml (100%) rename library/{vendor => IcingaVendor}/lessphp/LICENSE (100%) rename library/{vendor => IcingaVendor}/lessphp/SOURCE (100%) rename library/{vendor => IcingaVendor}/lessphp/lessc.inc.php (100%) diff --git a/library/Icinga/File/Pdf.php b/library/Icinga/File/Pdf.php index 77f5bf001..304fc9bfe 100644 --- a/library/Icinga/File/Pdf.php +++ b/library/Icinga/File/Pdf.php @@ -11,7 +11,7 @@ use Icinga\Web\StyleSheet; use Icinga\Web\Url; use Icinga\Exception\ProgrammingError; -require_once 'vendor/dompdf/dompdf_config.inc.php'; +require_once 'IcingaVendor/dompdf/dompdf_config.inc.php'; spl_autoload_register('DOMPDF_autoload'); @@ -60,4 +60,4 @@ class Pdf extends DOMPDF ) ); } -} \ No newline at end of file +} diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php index bb55a4a88..5a2739189 100644 --- a/library/Icinga/Web/JavaScript.php +++ b/library/Icinga/Web/JavaScript.php @@ -74,7 +74,7 @@ class JavaScript } } if ($minified) { - require_once ICINGA_LIBDIR . '/vendor/JShrink/Minifier.php'; + require_once 'IcingaVendor/JShrink/Minifier.php'; $out .= Minifier::minify($js, array('flaggedComments' => false)); } else { $out .= $js; diff --git a/library/Icinga/Web/LessCompiler.php b/library/Icinga/Web/LessCompiler.php index 6d1568e69..8a3a0dc94 100644 --- a/library/Icinga/Web/LessCompiler.php +++ b/library/Icinga/Web/LessCompiler.php @@ -67,7 +67,7 @@ class LessCompiler */ public function __construct() { - require_once 'vendor/lessphp/lessc.inc.php'; + require_once 'IcingaVendor/lessphp/lessc.inc.php'; $this->lessc = new lessc(); $this->lessc->setVariables( diff --git a/library/vendor/JShrink/LICENSE b/library/IcingaVendor/JShrink/LICENSE similarity index 100% rename from library/vendor/JShrink/LICENSE rename to library/IcingaVendor/JShrink/LICENSE diff --git a/library/vendor/JShrink/Minifier.php b/library/IcingaVendor/JShrink/Minifier.php similarity index 100% rename from library/vendor/JShrink/Minifier.php rename to library/IcingaVendor/JShrink/Minifier.php diff --git a/library/vendor/JShrink/SOURCE b/library/IcingaVendor/JShrink/SOURCE similarity index 100% rename from library/vendor/JShrink/SOURCE rename to library/IcingaVendor/JShrink/SOURCE diff --git a/library/vendor/Parsedown/LICENSE.txt b/library/IcingaVendor/Parsedown/LICENSE.txt similarity index 100% rename from library/vendor/Parsedown/LICENSE.txt rename to library/IcingaVendor/Parsedown/LICENSE.txt diff --git a/library/vendor/Parsedown/Parsedown.php b/library/IcingaVendor/Parsedown/Parsedown.php similarity index 100% rename from library/vendor/Parsedown/Parsedown.php rename to library/IcingaVendor/Parsedown/Parsedown.php diff --git a/library/vendor/Parsedown/SOURCE b/library/IcingaVendor/Parsedown/SOURCE similarity index 100% rename from library/vendor/Parsedown/SOURCE rename to library/IcingaVendor/Parsedown/SOURCE diff --git a/library/vendor/dompdf/.gitignore b/library/IcingaVendor/dompdf/.gitignore similarity index 100% rename from library/vendor/dompdf/.gitignore rename to library/IcingaVendor/dompdf/.gitignore diff --git a/library/vendor/dompdf/LICENSE.LGPL b/library/IcingaVendor/dompdf/LICENSE.LGPL similarity index 100% rename from library/vendor/dompdf/LICENSE.LGPL rename to library/IcingaVendor/dompdf/LICENSE.LGPL diff --git a/library/vendor/dompdf/changelog.txt b/library/IcingaVendor/dompdf/changelog.txt similarity index 100% rename from library/vendor/dompdf/changelog.txt rename to library/IcingaVendor/dompdf/changelog.txt diff --git a/library/vendor/dompdf/docblox.dist.xml b/library/IcingaVendor/dompdf/docblox.dist.xml similarity index 100% rename from library/vendor/dompdf/docblox.dist.xml rename to library/IcingaVendor/dompdf/docblox.dist.xml diff --git a/library/vendor/dompdf/dompdf.php b/library/IcingaVendor/dompdf/dompdf.php similarity index 100% rename from library/vendor/dompdf/dompdf.php rename to library/IcingaVendor/dompdf/dompdf.php diff --git a/library/vendor/dompdf/dompdf_config.custom.inc.php b/library/IcingaVendor/dompdf/dompdf_config.custom.inc.php similarity index 100% rename from library/vendor/dompdf/dompdf_config.custom.inc.php rename to library/IcingaVendor/dompdf/dompdf_config.custom.inc.php diff --git a/library/vendor/dompdf/dompdf_config.inc.php b/library/IcingaVendor/dompdf/dompdf_config.inc.php similarity index 100% rename from library/vendor/dompdf/dompdf_config.inc.php rename to library/IcingaVendor/dompdf/dompdf_config.inc.php diff --git a/library/vendor/dompdf/include/absolute_positioner.cls.php b/library/IcingaVendor/dompdf/include/absolute_positioner.cls.php similarity index 100% rename from library/vendor/dompdf/include/absolute_positioner.cls.php rename to library/IcingaVendor/dompdf/include/absolute_positioner.cls.php diff --git a/library/vendor/dompdf/include/abstract_renderer.cls.php b/library/IcingaVendor/dompdf/include/abstract_renderer.cls.php similarity index 100% rename from library/vendor/dompdf/include/abstract_renderer.cls.php rename to library/IcingaVendor/dompdf/include/abstract_renderer.cls.php diff --git a/library/vendor/dompdf/include/attribute_translator.cls.php b/library/IcingaVendor/dompdf/include/attribute_translator.cls.php similarity index 100% rename from library/vendor/dompdf/include/attribute_translator.cls.php rename to library/IcingaVendor/dompdf/include/attribute_translator.cls.php diff --git a/library/vendor/dompdf/include/autoload.inc.php b/library/IcingaVendor/dompdf/include/autoload.inc.php similarity index 100% rename from library/vendor/dompdf/include/autoload.inc.php rename to library/IcingaVendor/dompdf/include/autoload.inc.php diff --git a/library/vendor/dompdf/include/block_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/block_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/block_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/block_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/block_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/block_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/block_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/block_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/block_positioner.cls.php b/library/IcingaVendor/dompdf/include/block_positioner.cls.php similarity index 100% rename from library/vendor/dompdf/include/block_positioner.cls.php rename to library/IcingaVendor/dompdf/include/block_positioner.cls.php diff --git a/library/vendor/dompdf/include/block_renderer.cls.php b/library/IcingaVendor/dompdf/include/block_renderer.cls.php similarity index 100% rename from library/vendor/dompdf/include/block_renderer.cls.php rename to library/IcingaVendor/dompdf/include/block_renderer.cls.php diff --git a/library/vendor/dompdf/include/cached_pdf_decorator.cls.php b/library/IcingaVendor/dompdf/include/cached_pdf_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/cached_pdf_decorator.cls.php rename to library/IcingaVendor/dompdf/include/cached_pdf_decorator.cls.php diff --git a/library/vendor/dompdf/include/canvas.cls.php b/library/IcingaVendor/dompdf/include/canvas.cls.php similarity index 100% rename from library/vendor/dompdf/include/canvas.cls.php rename to library/IcingaVendor/dompdf/include/canvas.cls.php diff --git a/library/vendor/dompdf/include/canvas_factory.cls.php b/library/IcingaVendor/dompdf/include/canvas_factory.cls.php similarity index 100% rename from library/vendor/dompdf/include/canvas_factory.cls.php rename to library/IcingaVendor/dompdf/include/canvas_factory.cls.php diff --git a/library/vendor/dompdf/include/cellmap.cls.php b/library/IcingaVendor/dompdf/include/cellmap.cls.php similarity index 100% rename from library/vendor/dompdf/include/cellmap.cls.php rename to library/IcingaVendor/dompdf/include/cellmap.cls.php diff --git a/library/vendor/dompdf/include/cpdf_adapter.cls.php b/library/IcingaVendor/dompdf/include/cpdf_adapter.cls.php similarity index 100% rename from library/vendor/dompdf/include/cpdf_adapter.cls.php rename to library/IcingaVendor/dompdf/include/cpdf_adapter.cls.php diff --git a/library/vendor/dompdf/include/css_color.cls.php b/library/IcingaVendor/dompdf/include/css_color.cls.php similarity index 100% rename from library/vendor/dompdf/include/css_color.cls.php rename to library/IcingaVendor/dompdf/include/css_color.cls.php diff --git a/library/vendor/dompdf/include/dompdf.cls.php b/library/IcingaVendor/dompdf/include/dompdf.cls.php similarity index 100% rename from library/vendor/dompdf/include/dompdf.cls.php rename to library/IcingaVendor/dompdf/include/dompdf.cls.php diff --git a/library/vendor/dompdf/include/dompdf_exception.cls.php b/library/IcingaVendor/dompdf/include/dompdf_exception.cls.php similarity index 100% rename from library/vendor/dompdf/include/dompdf_exception.cls.php rename to library/IcingaVendor/dompdf/include/dompdf_exception.cls.php diff --git a/library/vendor/dompdf/include/dompdf_image_exception.cls.php b/library/IcingaVendor/dompdf/include/dompdf_image_exception.cls.php similarity index 100% rename from library/vendor/dompdf/include/dompdf_image_exception.cls.php rename to library/IcingaVendor/dompdf/include/dompdf_image_exception.cls.php diff --git a/library/vendor/dompdf/include/file.skel b/library/IcingaVendor/dompdf/include/file.skel similarity index 100% rename from library/vendor/dompdf/include/file.skel rename to library/IcingaVendor/dompdf/include/file.skel diff --git a/library/vendor/dompdf/include/fixed_positioner.cls.php b/library/IcingaVendor/dompdf/include/fixed_positioner.cls.php similarity index 100% rename from library/vendor/dompdf/include/fixed_positioner.cls.php rename to library/IcingaVendor/dompdf/include/fixed_positioner.cls.php diff --git a/library/vendor/dompdf/include/font_metrics.cls.php b/library/IcingaVendor/dompdf/include/font_metrics.cls.php similarity index 100% rename from library/vendor/dompdf/include/font_metrics.cls.php rename to library/IcingaVendor/dompdf/include/font_metrics.cls.php diff --git a/library/vendor/dompdf/include/frame.cls.php b/library/IcingaVendor/dompdf/include/frame.cls.php similarity index 100% rename from library/vendor/dompdf/include/frame.cls.php rename to library/IcingaVendor/dompdf/include/frame.cls.php diff --git a/library/vendor/dompdf/include/frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/frame_factory.cls.php b/library/IcingaVendor/dompdf/include/frame_factory.cls.php similarity index 100% rename from library/vendor/dompdf/include/frame_factory.cls.php rename to library/IcingaVendor/dompdf/include/frame_factory.cls.php diff --git a/library/vendor/dompdf/include/frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/frame_tree.cls.php b/library/IcingaVendor/dompdf/include/frame_tree.cls.php similarity index 100% rename from library/vendor/dompdf/include/frame_tree.cls.php rename to library/IcingaVendor/dompdf/include/frame_tree.cls.php diff --git a/library/vendor/dompdf/include/functions.inc.php b/library/IcingaVendor/dompdf/include/functions.inc.php similarity index 100% rename from library/vendor/dompdf/include/functions.inc.php rename to library/IcingaVendor/dompdf/include/functions.inc.php diff --git a/library/vendor/dompdf/include/gd_adapter.cls.php b/library/IcingaVendor/dompdf/include/gd_adapter.cls.php similarity index 100% rename from library/vendor/dompdf/include/gd_adapter.cls.php rename to library/IcingaVendor/dompdf/include/gd_adapter.cls.php diff --git a/library/vendor/dompdf/include/image_cache.cls.php b/library/IcingaVendor/dompdf/include/image_cache.cls.php similarity index 100% rename from library/vendor/dompdf/include/image_cache.cls.php rename to library/IcingaVendor/dompdf/include/image_cache.cls.php diff --git a/library/vendor/dompdf/include/image_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/image_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/image_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/image_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/image_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/image_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/image_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/image_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/image_renderer.cls.php b/library/IcingaVendor/dompdf/include/image_renderer.cls.php similarity index 100% rename from library/vendor/dompdf/include/image_renderer.cls.php rename to library/IcingaVendor/dompdf/include/image_renderer.cls.php diff --git a/library/vendor/dompdf/include/inline_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/inline_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/inline_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/inline_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/inline_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/inline_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/inline_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/inline_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/inline_positioner.cls.php b/library/IcingaVendor/dompdf/include/inline_positioner.cls.php similarity index 100% rename from library/vendor/dompdf/include/inline_positioner.cls.php rename to library/IcingaVendor/dompdf/include/inline_positioner.cls.php diff --git a/library/vendor/dompdf/include/inline_renderer.cls.php b/library/IcingaVendor/dompdf/include/inline_renderer.cls.php similarity index 100% rename from library/vendor/dompdf/include/inline_renderer.cls.php rename to library/IcingaVendor/dompdf/include/inline_renderer.cls.php diff --git a/library/vendor/dompdf/include/javascript_embedder.cls.php b/library/IcingaVendor/dompdf/include/javascript_embedder.cls.php similarity index 100% rename from library/vendor/dompdf/include/javascript_embedder.cls.php rename to library/IcingaVendor/dompdf/include/javascript_embedder.cls.php diff --git a/library/vendor/dompdf/include/line_box.cls.php b/library/IcingaVendor/dompdf/include/line_box.cls.php similarity index 100% rename from library/vendor/dompdf/include/line_box.cls.php rename to library/IcingaVendor/dompdf/include/line_box.cls.php diff --git a/library/vendor/dompdf/include/list_bullet_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/list_bullet_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/list_bullet_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/list_bullet_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/list_bullet_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/list_bullet_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/list_bullet_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/list_bullet_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/list_bullet_image_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/list_bullet_image_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/list_bullet_image_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/list_bullet_image_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/list_bullet_positioner.cls.php b/library/IcingaVendor/dompdf/include/list_bullet_positioner.cls.php similarity index 100% rename from library/vendor/dompdf/include/list_bullet_positioner.cls.php rename to library/IcingaVendor/dompdf/include/list_bullet_positioner.cls.php diff --git a/library/vendor/dompdf/include/list_bullet_renderer.cls.php b/library/IcingaVendor/dompdf/include/list_bullet_renderer.cls.php similarity index 100% rename from library/vendor/dompdf/include/list_bullet_renderer.cls.php rename to library/IcingaVendor/dompdf/include/list_bullet_renderer.cls.php diff --git a/library/vendor/dompdf/include/null_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/null_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/null_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/null_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/null_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/null_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/null_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/null_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/null_positioner.cls.php b/library/IcingaVendor/dompdf/include/null_positioner.cls.php similarity index 100% rename from library/vendor/dompdf/include/null_positioner.cls.php rename to library/IcingaVendor/dompdf/include/null_positioner.cls.php diff --git a/library/vendor/dompdf/include/page_cache.cls.php b/library/IcingaVendor/dompdf/include/page_cache.cls.php similarity index 100% rename from library/vendor/dompdf/include/page_cache.cls.php rename to library/IcingaVendor/dompdf/include/page_cache.cls.php diff --git a/library/vendor/dompdf/include/page_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/page_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/page_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/page_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/page_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/page_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/page_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/page_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/pdflib_adapter.cls.php b/library/IcingaVendor/dompdf/include/pdflib_adapter.cls.php similarity index 100% rename from library/vendor/dompdf/include/pdflib_adapter.cls.php rename to library/IcingaVendor/dompdf/include/pdflib_adapter.cls.php diff --git a/library/vendor/dompdf/include/php_evaluator.cls.php b/library/IcingaVendor/dompdf/include/php_evaluator.cls.php similarity index 100% rename from library/vendor/dompdf/include/php_evaluator.cls.php rename to library/IcingaVendor/dompdf/include/php_evaluator.cls.php diff --git a/library/vendor/dompdf/include/positioner.cls.php b/library/IcingaVendor/dompdf/include/positioner.cls.php similarity index 100% rename from library/vendor/dompdf/include/positioner.cls.php rename to library/IcingaVendor/dompdf/include/positioner.cls.php diff --git a/library/vendor/dompdf/include/renderer.cls.php b/library/IcingaVendor/dompdf/include/renderer.cls.php similarity index 100% rename from library/vendor/dompdf/include/renderer.cls.php rename to library/IcingaVendor/dompdf/include/renderer.cls.php diff --git a/library/vendor/dompdf/include/style.cls.php b/library/IcingaVendor/dompdf/include/style.cls.php similarity index 100% rename from library/vendor/dompdf/include/style.cls.php rename to library/IcingaVendor/dompdf/include/style.cls.php diff --git a/library/vendor/dompdf/include/stylesheet.cls.php b/library/IcingaVendor/dompdf/include/stylesheet.cls.php similarity index 100% rename from library/vendor/dompdf/include/stylesheet.cls.php rename to library/IcingaVendor/dompdf/include/stylesheet.cls.php diff --git a/library/vendor/dompdf/include/table_cell_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/table_cell_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_cell_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/table_cell_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/table_cell_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/table_cell_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_cell_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/table_cell_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/table_cell_positioner.cls.php b/library/IcingaVendor/dompdf/include/table_cell_positioner.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_cell_positioner.cls.php rename to library/IcingaVendor/dompdf/include/table_cell_positioner.cls.php diff --git a/library/vendor/dompdf/include/table_cell_renderer.cls.php b/library/IcingaVendor/dompdf/include/table_cell_renderer.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_cell_renderer.cls.php rename to library/IcingaVendor/dompdf/include/table_cell_renderer.cls.php diff --git a/library/vendor/dompdf/include/table_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/table_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/table_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/table_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/table_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/table_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/table_row_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/table_row_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_row_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/table_row_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/table_row_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/table_row_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_row_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/table_row_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/table_row_group_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/table_row_group_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_row_group_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/table_row_group_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/table_row_group_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/table_row_group_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_row_group_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/table_row_group_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/table_row_group_renderer.cls.php b/library/IcingaVendor/dompdf/include/table_row_group_renderer.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_row_group_renderer.cls.php rename to library/IcingaVendor/dompdf/include/table_row_group_renderer.cls.php diff --git a/library/vendor/dompdf/include/table_row_positioner.cls.php b/library/IcingaVendor/dompdf/include/table_row_positioner.cls.php similarity index 100% rename from library/vendor/dompdf/include/table_row_positioner.cls.php rename to library/IcingaVendor/dompdf/include/table_row_positioner.cls.php diff --git a/library/vendor/dompdf/include/tcpdf_adapter.cls.php b/library/IcingaVendor/dompdf/include/tcpdf_adapter.cls.php similarity index 100% rename from library/vendor/dompdf/include/tcpdf_adapter.cls.php rename to library/IcingaVendor/dompdf/include/tcpdf_adapter.cls.php diff --git a/library/vendor/dompdf/include/text_frame_decorator.cls.php b/library/IcingaVendor/dompdf/include/text_frame_decorator.cls.php similarity index 100% rename from library/vendor/dompdf/include/text_frame_decorator.cls.php rename to library/IcingaVendor/dompdf/include/text_frame_decorator.cls.php diff --git a/library/vendor/dompdf/include/text_frame_reflower.cls.php b/library/IcingaVendor/dompdf/include/text_frame_reflower.cls.php similarity index 100% rename from library/vendor/dompdf/include/text_frame_reflower.cls.php rename to library/IcingaVendor/dompdf/include/text_frame_reflower.cls.php diff --git a/library/vendor/dompdf/include/text_renderer.cls.php b/library/IcingaVendor/dompdf/include/text_renderer.cls.php similarity index 100% rename from library/vendor/dompdf/include/text_renderer.cls.php rename to library/IcingaVendor/dompdf/include/text_renderer.cls.php diff --git a/library/vendor/dompdf/index.php b/library/IcingaVendor/dompdf/index.php similarity index 100% rename from library/vendor/dompdf/index.php rename to library/IcingaVendor/dompdf/index.php diff --git a/library/vendor/dompdf/lib/class.pdf.php b/library/IcingaVendor/dompdf/lib/class.pdf.php similarity index 100% rename from library/vendor/dompdf/lib/class.pdf.php rename to library/IcingaVendor/dompdf/lib/class.pdf.php diff --git a/library/vendor/dompdf/lib/fonts/Courier-Bold.afm b/library/IcingaVendor/dompdf/lib/fonts/Courier-Bold.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Courier-Bold.afm rename to library/IcingaVendor/dompdf/lib/fonts/Courier-Bold.afm diff --git a/library/vendor/dompdf/lib/fonts/Courier-BoldOblique.afm b/library/IcingaVendor/dompdf/lib/fonts/Courier-BoldOblique.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Courier-BoldOblique.afm rename to library/IcingaVendor/dompdf/lib/fonts/Courier-BoldOblique.afm diff --git a/library/vendor/dompdf/lib/fonts/Courier-Oblique.afm b/library/IcingaVendor/dompdf/lib/fonts/Courier-Oblique.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Courier-Oblique.afm rename to library/IcingaVendor/dompdf/lib/fonts/Courier-Oblique.afm diff --git a/library/vendor/dompdf/lib/fonts/Courier.afm b/library/IcingaVendor/dompdf/lib/fonts/Courier.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Courier.afm rename to library/IcingaVendor/dompdf/lib/fonts/Courier.afm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans-Bold.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-Bold.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans-Bold.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-Bold.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans-Bold.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-Bold.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans-Bold.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-Bold.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-BoldOblique.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans-ExtraLight.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-ExtraLight.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans-ExtraLight.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-ExtraLight.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans-ExtraLight.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-ExtraLight.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans-ExtraLight.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-ExtraLight.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans-Oblique.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-Oblique.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans-Oblique.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-Oblique.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans-Oblique.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-Oblique.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans-Oblique.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans-Oblique.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSans.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSans.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSans.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSans.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-Bold.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-BoldOblique.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed-Oblique.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansCondensed.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansCondensed.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansCondensed.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansCondensed.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansCondensed.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-Bold.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-BoldOblique.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono-Oblique.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansMono.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansMono.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSansMono.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSansMono.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSansMono.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerif-Bold.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-Bold.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerif-Bold.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-Bold.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerif-Bold.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-Bold.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerif-Bold.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-Bold.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-BoldItalic.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerif-Italic.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-Italic.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerif-Italic.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-Italic.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerif-Italic.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-Italic.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerif-Italic.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif-Italic.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerif.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerif.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerif.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerif.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerif.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-Bold.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-BoldItalic.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed-Italic.ufm diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed.ttf b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed.ttf similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed.ttf rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed.ttf diff --git a/library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed.ufm b/library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed.ufm similarity index 100% rename from library/vendor/dompdf/lib/fonts/DejaVuSerifCondensed.ufm rename to library/IcingaVendor/dompdf/lib/fonts/DejaVuSerifCondensed.ufm diff --git a/library/vendor/dompdf/lib/fonts/Helvetica-Bold.afm b/library/IcingaVendor/dompdf/lib/fonts/Helvetica-Bold.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Helvetica-Bold.afm rename to library/IcingaVendor/dompdf/lib/fonts/Helvetica-Bold.afm diff --git a/library/vendor/dompdf/lib/fonts/Helvetica-Bold.afm.php b/library/IcingaVendor/dompdf/lib/fonts/Helvetica-Bold.afm.php similarity index 100% rename from library/vendor/dompdf/lib/fonts/Helvetica-Bold.afm.php rename to library/IcingaVendor/dompdf/lib/fonts/Helvetica-Bold.afm.php diff --git a/library/vendor/dompdf/lib/fonts/Helvetica-BoldOblique.afm b/library/IcingaVendor/dompdf/lib/fonts/Helvetica-BoldOblique.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Helvetica-BoldOblique.afm rename to library/IcingaVendor/dompdf/lib/fonts/Helvetica-BoldOblique.afm diff --git a/library/vendor/dompdf/lib/fonts/Helvetica-Oblique.afm b/library/IcingaVendor/dompdf/lib/fonts/Helvetica-Oblique.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Helvetica-Oblique.afm rename to library/IcingaVendor/dompdf/lib/fonts/Helvetica-Oblique.afm diff --git a/library/vendor/dompdf/lib/fonts/Helvetica.afm b/library/IcingaVendor/dompdf/lib/fonts/Helvetica.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Helvetica.afm rename to library/IcingaVendor/dompdf/lib/fonts/Helvetica.afm diff --git a/library/vendor/dompdf/lib/fonts/Helvetica.afm.php b/library/IcingaVendor/dompdf/lib/fonts/Helvetica.afm.php similarity index 100% rename from library/vendor/dompdf/lib/fonts/Helvetica.afm.php rename to library/IcingaVendor/dompdf/lib/fonts/Helvetica.afm.php diff --git a/library/vendor/dompdf/lib/fonts/Symbol.afm b/library/IcingaVendor/dompdf/lib/fonts/Symbol.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Symbol.afm rename to library/IcingaVendor/dompdf/lib/fonts/Symbol.afm diff --git a/library/vendor/dompdf/lib/fonts/Times-Bold.afm b/library/IcingaVendor/dompdf/lib/fonts/Times-Bold.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Times-Bold.afm rename to library/IcingaVendor/dompdf/lib/fonts/Times-Bold.afm diff --git a/library/vendor/dompdf/lib/fonts/Times-BoldItalic.afm b/library/IcingaVendor/dompdf/lib/fonts/Times-BoldItalic.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Times-BoldItalic.afm rename to library/IcingaVendor/dompdf/lib/fonts/Times-BoldItalic.afm diff --git a/library/vendor/dompdf/lib/fonts/Times-Italic.afm b/library/IcingaVendor/dompdf/lib/fonts/Times-Italic.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Times-Italic.afm rename to library/IcingaVendor/dompdf/lib/fonts/Times-Italic.afm diff --git a/library/vendor/dompdf/lib/fonts/Times-Roman.afm b/library/IcingaVendor/dompdf/lib/fonts/Times-Roman.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/Times-Roman.afm rename to library/IcingaVendor/dompdf/lib/fonts/Times-Roman.afm diff --git a/library/vendor/dompdf/lib/fonts/Times-Roman.afm.php b/library/IcingaVendor/dompdf/lib/fonts/Times-Roman.afm.php similarity index 100% rename from library/vendor/dompdf/lib/fonts/Times-Roman.afm.php rename to library/IcingaVendor/dompdf/lib/fonts/Times-Roman.afm.php diff --git a/library/vendor/dompdf/lib/fonts/ZapfDingbats.afm b/library/IcingaVendor/dompdf/lib/fonts/ZapfDingbats.afm similarity index 100% rename from library/vendor/dompdf/lib/fonts/ZapfDingbats.afm rename to library/IcingaVendor/dompdf/lib/fonts/ZapfDingbats.afm diff --git a/library/vendor/dompdf/lib/fonts/dompdf_font_family_cache.dist.php b/library/IcingaVendor/dompdf/lib/fonts/dompdf_font_family_cache.dist.php similarity index 100% rename from library/vendor/dompdf/lib/fonts/dompdf_font_family_cache.dist.php rename to library/IcingaVendor/dompdf/lib/fonts/dompdf_font_family_cache.dist.php diff --git a/library/vendor/dompdf/lib/fonts/log.htm b/library/IcingaVendor/dompdf/lib/fonts/log.htm similarity index 100% rename from library/vendor/dompdf/lib/fonts/log.htm rename to library/IcingaVendor/dompdf/lib/fonts/log.htm diff --git a/library/vendor/dompdf/lib/fonts/mustRead.html b/library/IcingaVendor/dompdf/lib/fonts/mustRead.html similarity index 100% rename from library/vendor/dompdf/lib/fonts/mustRead.html rename to library/IcingaVendor/dompdf/lib/fonts/mustRead.html diff --git a/library/vendor/dompdf/lib/html5lib/Data.php b/library/IcingaVendor/dompdf/lib/html5lib/Data.php similarity index 100% rename from library/vendor/dompdf/lib/html5lib/Data.php rename to library/IcingaVendor/dompdf/lib/html5lib/Data.php diff --git a/library/vendor/dompdf/lib/html5lib/InputStream.php b/library/IcingaVendor/dompdf/lib/html5lib/InputStream.php similarity index 100% rename from library/vendor/dompdf/lib/html5lib/InputStream.php rename to library/IcingaVendor/dompdf/lib/html5lib/InputStream.php diff --git a/library/vendor/dompdf/lib/html5lib/Parser.php b/library/IcingaVendor/dompdf/lib/html5lib/Parser.php similarity index 100% rename from library/vendor/dompdf/lib/html5lib/Parser.php rename to library/IcingaVendor/dompdf/lib/html5lib/Parser.php diff --git a/library/vendor/dompdf/lib/html5lib/Tokenizer.php b/library/IcingaVendor/dompdf/lib/html5lib/Tokenizer.php similarity index 100% rename from library/vendor/dompdf/lib/html5lib/Tokenizer.php rename to library/IcingaVendor/dompdf/lib/html5lib/Tokenizer.php diff --git a/library/vendor/dompdf/lib/html5lib/TreeBuilder.php b/library/IcingaVendor/dompdf/lib/html5lib/TreeBuilder.php similarity index 100% rename from library/vendor/dompdf/lib/html5lib/TreeBuilder.php rename to library/IcingaVendor/dompdf/lib/html5lib/TreeBuilder.php diff --git a/library/vendor/dompdf/lib/html5lib/named-character-references.ser b/library/IcingaVendor/dompdf/lib/html5lib/named-character-references.ser similarity index 100% rename from library/vendor/dompdf/lib/html5lib/named-character-references.ser rename to library/IcingaVendor/dompdf/lib/html5lib/named-character-references.ser diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/adobe_font_metrics.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/adobe_font_metrics.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/adobe_font_metrics.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/adobe_font_metrics.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/encoding_map.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/encoding_map.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/encoding_map.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/encoding_map.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_binary_stream.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_binary_stream.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_binary_stream.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_binary_stream.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_eot.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_eot.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_eot.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_eot.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_header.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_header.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_header.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_header.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_opentype.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_opentype.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_opentype.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_opentype.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_opentype_table_directory_entry.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_opentype_table_directory_entry.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_opentype_table_directory_entry.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_opentype_table_directory_entry.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_cmap.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_cmap.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_cmap.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_cmap.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_directory_entry.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_directory_entry.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_directory_entry.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_directory_entry.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_glyf.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_glyf.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_glyf.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_glyf.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_head.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_head.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_head.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_head.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_hhea.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_hhea.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_hhea.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_hhea.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_hmtx.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_hmtx.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_hmtx.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_hmtx.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_kern.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_kern.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_kern.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_kern.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_loca.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_loca.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_loca.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_loca.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_maxp.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_maxp.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_maxp.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_maxp.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_name.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_name.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_name.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_name.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_name_record.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_name_record.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_name_record.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_name_record.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_os2.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_os2.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_os2.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_os2.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_table_post.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_post.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_table_post.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_table_post.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_truetype.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_truetype.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_truetype.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_truetype.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_truetype_collection.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_truetype_collection.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_truetype_collection.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_truetype_collection.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_truetype_header.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_truetype_header.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_truetype_header.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_truetype_header.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_truetype_table_directory_entry.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_truetype_table_directory_entry.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_truetype_table_directory_entry.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_truetype_table_directory_entry.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_woff.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_woff.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_woff.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_woff.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_woff_header.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_woff_header.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_woff_header.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_woff_header.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/classes/font_woff_table_directory_entry.cls.php b/library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_woff_table_directory_entry.cls.php similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/classes/font_woff_table_directory_entry.cls.php rename to library/IcingaVendor/dompdf/lib/php-font-lib/classes/font_woff_table_directory_entry.cls.php diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/adobe-standard-encoding.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/adobe-standard-encoding.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/adobe-standard-encoding.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/adobe-standard-encoding.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/cp1250.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1250.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/cp1250.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1250.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/cp1251.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1251.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/cp1251.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1251.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/cp1252.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1252.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/cp1252.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1252.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/cp1253.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1253.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/cp1253.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1253.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/cp1254.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1254.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/cp1254.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1254.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/cp1255.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1255.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/cp1255.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1255.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/cp1257.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1257.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/cp1257.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1257.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/cp1258.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1258.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/cp1258.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp1258.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/cp874.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp874.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/cp874.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/cp874.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-1.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-1.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-1.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-1.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-11.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-11.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-11.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-11.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-15.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-15.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-15.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-15.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-16.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-16.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-16.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-16.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-2.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-2.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-2.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-2.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-4.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-4.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-4.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-4.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-5.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-5.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-5.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-5.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-7.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-7.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-7.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-7.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-9.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-9.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/iso-8859-9.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/iso-8859-9.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/koi8-r.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/koi8-r.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/koi8-r.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/koi8-r.map diff --git a/library/vendor/dompdf/lib/php-font-lib/maps/koi8-u.map b/library/IcingaVendor/dompdf/lib/php-font-lib/maps/koi8-u.map similarity index 100% rename from library/vendor/dompdf/lib/php-font-lib/maps/koi8-u.map rename to library/IcingaVendor/dompdf/lib/php-font-lib/maps/koi8-u.map diff --git a/library/vendor/dompdf/lib/res/broken_image.png b/library/IcingaVendor/dompdf/lib/res/broken_image.png similarity index 100% rename from library/vendor/dompdf/lib/res/broken_image.png rename to library/IcingaVendor/dompdf/lib/res/broken_image.png diff --git a/library/vendor/dompdf/lib/res/html.css b/library/IcingaVendor/dompdf/lib/res/html.css similarity index 100% rename from library/vendor/dompdf/lib/res/html.css rename to library/IcingaVendor/dompdf/lib/res/html.css diff --git a/library/vendor/dompdf/load_font.php b/library/IcingaVendor/dompdf/load_font.php similarity index 100% rename from library/vendor/dompdf/load_font.php rename to library/IcingaVendor/dompdf/load_font.php diff --git a/library/vendor/dompdf/readme.html b/library/IcingaVendor/dompdf/readme.html similarity index 100% rename from library/vendor/dompdf/readme.html rename to library/IcingaVendor/dompdf/readme.html diff --git a/library/vendor/dompdf/www/controller.php b/library/IcingaVendor/dompdf/www/controller.php similarity index 100% rename from library/vendor/dompdf/www/controller.php rename to library/IcingaVendor/dompdf/www/controller.php diff --git a/library/vendor/dompdf/www/cssSandpaper/css/reset.css b/library/IcingaVendor/dompdf/www/cssSandpaper/css/reset.css similarity index 100% rename from library/vendor/dompdf/www/cssSandpaper/css/reset.css rename to library/IcingaVendor/dompdf/www/cssSandpaper/css/reset.css diff --git a/library/vendor/dompdf/www/cssSandpaper/js/EventHelpers.js b/library/IcingaVendor/dompdf/www/cssSandpaper/js/EventHelpers.js similarity index 100% rename from library/vendor/dompdf/www/cssSandpaper/js/EventHelpers.js rename to library/IcingaVendor/dompdf/www/cssSandpaper/js/EventHelpers.js diff --git a/library/vendor/dompdf/www/cssSandpaper/js/cssQuery-p.js b/library/IcingaVendor/dompdf/www/cssSandpaper/js/cssQuery-p.js similarity index 100% rename from library/vendor/dompdf/www/cssSandpaper/js/cssQuery-p.js rename to library/IcingaVendor/dompdf/www/cssSandpaper/js/cssQuery-p.js diff --git a/library/vendor/dompdf/www/cssSandpaper/js/cssSandpaper.js b/library/IcingaVendor/dompdf/www/cssSandpaper/js/cssSandpaper.js similarity index 100% rename from library/vendor/dompdf/www/cssSandpaper/js/cssSandpaper.js rename to library/IcingaVendor/dompdf/www/cssSandpaper/js/cssSandpaper.js diff --git a/library/vendor/dompdf/www/cssSandpaper/js/jcoglan.com/sylvester.js b/library/IcingaVendor/dompdf/www/cssSandpaper/js/jcoglan.com/sylvester.js similarity index 100% rename from library/vendor/dompdf/www/cssSandpaper/js/jcoglan.com/sylvester.js rename to library/IcingaVendor/dompdf/www/cssSandpaper/js/jcoglan.com/sylvester.js diff --git a/library/vendor/dompdf/www/debugger.php b/library/IcingaVendor/dompdf/www/debugger.php similarity index 100% rename from library/vendor/dompdf/www/debugger.php rename to library/IcingaVendor/dompdf/www/debugger.php diff --git a/library/vendor/dompdf/www/demo.php b/library/IcingaVendor/dompdf/www/demo.php similarity index 100% rename from library/vendor/dompdf/www/demo.php rename to library/IcingaVendor/dompdf/www/demo.php diff --git a/library/vendor/dompdf/www/examples.php b/library/IcingaVendor/dompdf/www/examples.php similarity index 100% rename from library/vendor/dompdf/www/examples.php rename to library/IcingaVendor/dompdf/www/examples.php diff --git a/library/vendor/dompdf/www/fonts.php b/library/IcingaVendor/dompdf/www/fonts.php similarity index 100% rename from library/vendor/dompdf/www/fonts.php rename to library/IcingaVendor/dompdf/www/fonts.php diff --git a/library/vendor/dompdf/www/foot.inc b/library/IcingaVendor/dompdf/www/foot.inc similarity index 100% rename from library/vendor/dompdf/www/foot.inc rename to library/IcingaVendor/dompdf/www/foot.inc diff --git a/library/vendor/dompdf/www/functions.inc.php b/library/IcingaVendor/dompdf/www/functions.inc.php similarity index 100% rename from library/vendor/dompdf/www/functions.inc.php rename to library/IcingaVendor/dompdf/www/functions.inc.php diff --git a/library/vendor/dompdf/www/head.inc b/library/IcingaVendor/dompdf/www/head.inc similarity index 100% rename from library/vendor/dompdf/www/head.inc rename to library/IcingaVendor/dompdf/www/head.inc diff --git a/library/vendor/dompdf/www/images/arrow_01.gif b/library/IcingaVendor/dompdf/www/images/arrow_01.gif similarity index 100% rename from library/vendor/dompdf/www/images/arrow_01.gif rename to library/IcingaVendor/dompdf/www/images/arrow_01.gif diff --git a/library/vendor/dompdf/www/images/arrow_02.gif b/library/IcingaVendor/dompdf/www/images/arrow_02.gif similarity index 100% rename from library/vendor/dompdf/www/images/arrow_02.gif rename to library/IcingaVendor/dompdf/www/images/arrow_02.gif diff --git a/library/vendor/dompdf/www/images/arrow_03.gif b/library/IcingaVendor/dompdf/www/images/arrow_03.gif similarity index 100% rename from library/vendor/dompdf/www/images/arrow_03.gif rename to library/IcingaVendor/dompdf/www/images/arrow_03.gif diff --git a/library/vendor/dompdf/www/images/arrow_04.gif b/library/IcingaVendor/dompdf/www/images/arrow_04.gif similarity index 100% rename from library/vendor/dompdf/www/images/arrow_04.gif rename to library/IcingaVendor/dompdf/www/images/arrow_04.gif diff --git a/library/vendor/dompdf/www/images/arrow_05.gif b/library/IcingaVendor/dompdf/www/images/arrow_05.gif similarity index 100% rename from library/vendor/dompdf/www/images/arrow_05.gif rename to library/IcingaVendor/dompdf/www/images/arrow_05.gif diff --git a/library/vendor/dompdf/www/images/arrow_06.gif b/library/IcingaVendor/dompdf/www/images/arrow_06.gif similarity index 100% rename from library/vendor/dompdf/www/images/arrow_06.gif rename to library/IcingaVendor/dompdf/www/images/arrow_06.gif diff --git a/library/vendor/dompdf/www/images/css2.png b/library/IcingaVendor/dompdf/www/images/css2.png similarity index 100% rename from library/vendor/dompdf/www/images/css2.png rename to library/IcingaVendor/dompdf/www/images/css2.png diff --git a/library/vendor/dompdf/www/images/dompdf_simple.png b/library/IcingaVendor/dompdf/www/images/dompdf_simple.png similarity index 100% rename from library/vendor/dompdf/www/images/dompdf_simple.png rename to library/IcingaVendor/dompdf/www/images/dompdf_simple.png diff --git a/library/vendor/dompdf/www/images/favicon.ico b/library/IcingaVendor/dompdf/www/images/favicon.ico similarity index 100% rename from library/vendor/dompdf/www/images/favicon.ico rename to library/IcingaVendor/dompdf/www/images/favicon.ico diff --git a/library/vendor/dompdf/www/images/favicon.png b/library/IcingaVendor/dompdf/www/images/favicon.png similarity index 100% rename from library/vendor/dompdf/www/images/favicon.png rename to library/IcingaVendor/dompdf/www/images/favicon.png diff --git a/library/vendor/dompdf/www/images/h_bar.gif b/library/IcingaVendor/dompdf/www/images/h_bar.gif similarity index 100% rename from library/vendor/dompdf/www/images/h_bar.gif rename to library/IcingaVendor/dompdf/www/images/h_bar.gif diff --git a/library/vendor/dompdf/www/images/left_arrow.gif b/library/IcingaVendor/dompdf/www/images/left_arrow.gif similarity index 100% rename from library/vendor/dompdf/www/images/left_arrow.gif rename to library/IcingaVendor/dompdf/www/images/left_arrow.gif diff --git a/library/vendor/dompdf/www/images/logo.png b/library/IcingaVendor/dompdf/www/images/logo.png similarity index 100% rename from library/vendor/dompdf/www/images/logo.png rename to library/IcingaVendor/dompdf/www/images/logo.png diff --git a/library/vendor/dompdf/www/images/logo.xcf b/library/IcingaVendor/dompdf/www/images/logo.xcf similarity index 100% rename from library/vendor/dompdf/www/images/logo.xcf rename to library/IcingaVendor/dompdf/www/images/logo.xcf diff --git a/library/vendor/dompdf/www/images/php5-power-micro.png b/library/IcingaVendor/dompdf/www/images/php5-power-micro.png similarity index 100% rename from library/vendor/dompdf/www/images/php5-power-micro.png rename to library/IcingaVendor/dompdf/www/images/php5-power-micro.png diff --git a/library/vendor/dompdf/www/images/small_logo.png b/library/IcingaVendor/dompdf/www/images/small_logo.png similarity index 100% rename from library/vendor/dompdf/www/images/small_logo.png rename to library/IcingaVendor/dompdf/www/images/small_logo.png diff --git a/library/vendor/dompdf/www/images/star_01.gif b/library/IcingaVendor/dompdf/www/images/star_01.gif similarity index 100% rename from library/vendor/dompdf/www/images/star_01.gif rename to library/IcingaVendor/dompdf/www/images/star_01.gif diff --git a/library/vendor/dompdf/www/images/star_02.gif b/library/IcingaVendor/dompdf/www/images/star_02.gif similarity index 100% rename from library/vendor/dompdf/www/images/star_02.gif rename to library/IcingaVendor/dompdf/www/images/star_02.gif diff --git a/library/vendor/dompdf/www/images/star_03.gif b/library/IcingaVendor/dompdf/www/images/star_03.gif similarity index 100% rename from library/vendor/dompdf/www/images/star_03.gif rename to library/IcingaVendor/dompdf/www/images/star_03.gif diff --git a/library/vendor/dompdf/www/images/star_04.gif b/library/IcingaVendor/dompdf/www/images/star_04.gif similarity index 100% rename from library/vendor/dompdf/www/images/star_04.gif rename to library/IcingaVendor/dompdf/www/images/star_04.gif diff --git a/library/vendor/dompdf/www/images/star_05.gif b/library/IcingaVendor/dompdf/www/images/star_05.gif similarity index 100% rename from library/vendor/dompdf/www/images/star_05.gif rename to library/IcingaVendor/dompdf/www/images/star_05.gif diff --git a/library/vendor/dompdf/www/images/title.gif b/library/IcingaVendor/dompdf/www/images/title.gif similarity index 100% rename from library/vendor/dompdf/www/images/title.gif rename to library/IcingaVendor/dompdf/www/images/title.gif diff --git a/library/vendor/dompdf/www/images/v_bar.gif b/library/IcingaVendor/dompdf/www/images/v_bar.gif similarity index 100% rename from library/vendor/dompdf/www/images/v_bar.gif rename to library/IcingaVendor/dompdf/www/images/v_bar.gif diff --git a/library/vendor/dompdf/www/images/xhtml10.png b/library/IcingaVendor/dompdf/www/images/xhtml10.png similarity index 100% rename from library/vendor/dompdf/www/images/xhtml10.png rename to library/IcingaVendor/dompdf/www/images/xhtml10.png diff --git a/library/vendor/dompdf/www/index.php b/library/IcingaVendor/dompdf/www/index.php similarity index 100% rename from library/vendor/dompdf/www/index.php rename to library/IcingaVendor/dompdf/www/index.php diff --git a/library/vendor/dompdf/www/jquery-1.4.2.js b/library/IcingaVendor/dompdf/www/jquery-1.4.2.js similarity index 100% rename from library/vendor/dompdf/www/jquery-1.4.2.js rename to library/IcingaVendor/dompdf/www/jquery-1.4.2.js diff --git a/library/vendor/dompdf/www/setup.php b/library/IcingaVendor/dompdf/www/setup.php similarity index 100% rename from library/vendor/dompdf/www/setup.php rename to library/IcingaVendor/dompdf/www/setup.php diff --git a/library/vendor/dompdf/www/style.css b/library/IcingaVendor/dompdf/www/style.css similarity index 100% rename from library/vendor/dompdf/www/style.css rename to library/IcingaVendor/dompdf/www/style.css diff --git a/library/vendor/dompdf/www/test/backgroundcolor_fontdecoration_pageborder.html b/library/IcingaVendor/dompdf/www/test/backgroundcolor_fontdecoration_pageborder.html similarity index 100% rename from library/vendor/dompdf/www/test/backgroundcolor_fontdecoration_pageborder.html rename to library/IcingaVendor/dompdf/www/test/backgroundcolor_fontdecoration_pageborder.html diff --git a/library/vendor/dompdf/www/test/css/common.css b/library/IcingaVendor/dompdf/www/test/css/common.css similarity index 100% rename from library/vendor/dompdf/www/test/css/common.css rename to library/IcingaVendor/dompdf/www/test/css/common.css diff --git a/library/vendor/dompdf/www/test/css/importabs.css b/library/IcingaVendor/dompdf/www/test/css/importabs.css similarity index 100% rename from library/vendor/dompdf/www/test/css/importabs.css rename to library/IcingaVendor/dompdf/www/test/css/importabs.css diff --git a/library/vendor/dompdf/www/test/css/importall.css b/library/IcingaVendor/dompdf/www/test/css/importall.css similarity index 100% rename from library/vendor/dompdf/www/test/css/importall.css rename to library/IcingaVendor/dompdf/www/test/css/importall.css diff --git a/library/vendor/dompdf/www/test/css/importdisplay.css b/library/IcingaVendor/dompdf/www/test/css/importdisplay.css similarity index 100% rename from library/vendor/dompdf/www/test/css/importdisplay.css rename to library/IcingaVendor/dompdf/www/test/css/importdisplay.css diff --git a/library/vendor/dompdf/www/test/css/importprint.css b/library/IcingaVendor/dompdf/www/test/css/importprint.css similarity index 100% rename from library/vendor/dompdf/www/test/css/importprint.css rename to library/IcingaVendor/dompdf/www/test/css/importprint.css diff --git a/library/vendor/dompdf/www/test/css/importsub.css b/library/IcingaVendor/dompdf/www/test/css/importsub.css similarity index 100% rename from library/vendor/dompdf/www/test/css/importsub.css rename to library/IcingaVendor/dompdf/www/test/css/importsub.css diff --git a/library/vendor/dompdf/www/test/css/linkall.css b/library/IcingaVendor/dompdf/www/test/css/linkall.css similarity index 100% rename from library/vendor/dompdf/www/test/css/linkall.css rename to library/IcingaVendor/dompdf/www/test/css/linkall.css diff --git a/library/vendor/dompdf/www/test/css/linkdefault.css b/library/IcingaVendor/dompdf/www/test/css/linkdefault.css similarity index 100% rename from library/vendor/dompdf/www/test/css/linkdefault.css rename to library/IcingaVendor/dompdf/www/test/css/linkdefault.css diff --git a/library/vendor/dompdf/www/test/css/linkdisplay.css b/library/IcingaVendor/dompdf/www/test/css/linkdisplay.css similarity index 100% rename from library/vendor/dompdf/www/test/css/linkdisplay.css rename to library/IcingaVendor/dompdf/www/test/css/linkdisplay.css diff --git a/library/vendor/dompdf/www/test/css/linkprint.css b/library/IcingaVendor/dompdf/www/test/css/linkprint.css similarity index 100% rename from library/vendor/dompdf/www/test/css/linkprint.css rename to library/IcingaVendor/dompdf/www/test/css/linkprint.css diff --git a/library/vendor/dompdf/www/test/css/print_static.css b/library/IcingaVendor/dompdf/www/test/css/print_static.css similarity index 100% rename from library/vendor/dompdf/www/test/css/print_static.css rename to library/IcingaVendor/dompdf/www/test/css/print_static.css diff --git a/library/vendor/dompdf/www/test/css_2d_transforms.html b/library/IcingaVendor/dompdf/www/test/css_2d_transforms.html similarity index 100% rename from library/vendor/dompdf/www/test/css_2d_transforms.html rename to library/IcingaVendor/dompdf/www/test/css_2d_transforms.html diff --git a/library/vendor/dompdf/www/test/css_at_font_face.html b/library/IcingaVendor/dompdf/www/test/css_at_font_face.html similarity index 100% rename from library/vendor/dompdf/www/test/css_at_font_face.html rename to library/IcingaVendor/dompdf/www/test/css_at_font_face.html diff --git a/library/vendor/dompdf/www/test/css_baseline.html b/library/IcingaVendor/dompdf/www/test/css_baseline.html similarity index 100% rename from library/vendor/dompdf/www/test/css_baseline.html rename to library/IcingaVendor/dompdf/www/test/css_baseline.html diff --git a/library/vendor/dompdf/www/test/css_border.html b/library/IcingaVendor/dompdf/www/test/css_border.html similarity index 100% rename from library/vendor/dompdf/www/test/css_border.html rename to library/IcingaVendor/dompdf/www/test/css_border.html diff --git a/library/vendor/dompdf/www/test/css_color_cmyk.html b/library/IcingaVendor/dompdf/www/test/css_color_cmyk.html similarity index 100% rename from library/vendor/dompdf/www/test/css_color_cmyk.html rename to library/IcingaVendor/dompdf/www/test/css_color_cmyk.html diff --git a/library/vendor/dompdf/www/test/css_content.html b/library/IcingaVendor/dompdf/www/test/css_content.html similarity index 100% rename from library/vendor/dompdf/www/test/css_content.html rename to library/IcingaVendor/dompdf/www/test/css_content.html diff --git a/library/vendor/dompdf/www/test/css_float.html b/library/IcingaVendor/dompdf/www/test/css_float.html similarity index 100% rename from library/vendor/dompdf/www/test/css_float.html rename to library/IcingaVendor/dompdf/www/test/css_float.html diff --git a/library/vendor/dompdf/www/test/css_font_selection.html b/library/IcingaVendor/dompdf/www/test/css_font_selection.html similarity index 100% rename from library/vendor/dompdf/www/test/css_font_selection.html rename to library/IcingaVendor/dompdf/www/test/css_font_selection.html diff --git a/library/vendor/dompdf/www/test/css_important_flag.html b/library/IcingaVendor/dompdf/www/test/css_important_flag.html similarity index 100% rename from library/vendor/dompdf/www/test/css_important_flag.html rename to library/IcingaVendor/dompdf/www/test/css_important_flag.html diff --git a/library/vendor/dompdf/www/test/css_letter_spacing.html b/library/IcingaVendor/dompdf/www/test/css_letter_spacing.html similarity index 100% rename from library/vendor/dompdf/www/test/css_letter_spacing.html rename to library/IcingaVendor/dompdf/www/test/css_letter_spacing.html diff --git a/library/vendor/dompdf/www/test/css_line_height.html b/library/IcingaVendor/dompdf/www/test/css_line_height.html similarity index 100% rename from library/vendor/dompdf/www/test/css_line_height.html rename to library/IcingaVendor/dompdf/www/test/css_line_height.html diff --git a/library/vendor/dompdf/www/test/css_margin.html b/library/IcingaVendor/dompdf/www/test/css_margin.html similarity index 100% rename from library/vendor/dompdf/www/test/css_margin.html rename to library/IcingaVendor/dompdf/www/test/css_margin.html diff --git a/library/vendor/dompdf/www/test/css_media.html b/library/IcingaVendor/dompdf/www/test/css_media.html similarity index 100% rename from library/vendor/dompdf/www/test/css_media.html rename to library/IcingaVendor/dompdf/www/test/css_media.html diff --git a/library/vendor/dompdf/www/test/css_multiple_class.html b/library/IcingaVendor/dompdf/www/test/css_multiple_class.html similarity index 100% rename from library/vendor/dompdf/www/test/css_multiple_class.html rename to library/IcingaVendor/dompdf/www/test/css_multiple_class.html diff --git a/library/vendor/dompdf/www/test/css_nth_child.html b/library/IcingaVendor/dompdf/www/test/css_nth_child.html similarity index 100% rename from library/vendor/dompdf/www/test/css_nth_child.html rename to library/IcingaVendor/dompdf/www/test/css_nth_child.html diff --git a/library/vendor/dompdf/www/test/css_opacity.html b/library/IcingaVendor/dompdf/www/test/css_opacity.html similarity index 100% rename from library/vendor/dompdf/www/test/css_opacity.html rename to library/IcingaVendor/dompdf/www/test/css_opacity.html diff --git a/library/vendor/dompdf/www/test/css_outline.html b/library/IcingaVendor/dompdf/www/test/css_outline.html similarity index 100% rename from library/vendor/dompdf/www/test/css_outline.html rename to library/IcingaVendor/dompdf/www/test/css_outline.html diff --git a/library/vendor/dompdf/www/test/css_overflow_hidden.html b/library/IcingaVendor/dompdf/www/test/css_overflow_hidden.html similarity index 100% rename from library/vendor/dompdf/www/test/css_overflow_hidden.html rename to library/IcingaVendor/dompdf/www/test/css_overflow_hidden.html diff --git a/library/vendor/dompdf/www/test/css_position_absolute.html b/library/IcingaVendor/dompdf/www/test/css_position_absolute.html similarity index 100% rename from library/vendor/dompdf/www/test/css_position_absolute.html rename to library/IcingaVendor/dompdf/www/test/css_position_absolute.html diff --git a/library/vendor/dompdf/www/test/css_position_all.html b/library/IcingaVendor/dompdf/www/test/css_position_all.html similarity index 100% rename from library/vendor/dompdf/www/test/css_position_all.html rename to library/IcingaVendor/dompdf/www/test/css_position_all.html diff --git a/library/vendor/dompdf/www/test/css_position_fixed.html b/library/IcingaVendor/dompdf/www/test/css_position_fixed.html similarity index 100% rename from library/vendor/dompdf/www/test/css_position_fixed.html rename to library/IcingaVendor/dompdf/www/test/css_position_fixed.html diff --git a/library/vendor/dompdf/www/test/css_selectors.html b/library/IcingaVendor/dompdf/www/test/css_selectors.html similarity index 100% rename from library/vendor/dompdf/www/test/css_selectors.html rename to library/IcingaVendor/dompdf/www/test/css_selectors.html diff --git a/library/vendor/dompdf/www/test/css_table_height.html b/library/IcingaVendor/dompdf/www/test/css_table_height.html similarity index 100% rename from library/vendor/dompdf/www/test/css_table_height.html rename to library/IcingaVendor/dompdf/www/test/css_table_height.html diff --git a/library/vendor/dompdf/www/test/css_text_align.html b/library/IcingaVendor/dompdf/www/test/css_text_align.html similarity index 100% rename from library/vendor/dompdf/www/test/css_text_align.html rename to library/IcingaVendor/dompdf/www/test/css_text_align.html diff --git a/library/vendor/dompdf/www/test/css_vertical_align.html b/library/IcingaVendor/dompdf/www/test/css_vertical_align.html similarity index 100% rename from library/vendor/dompdf/www/test/css_vertical_align.html rename to library/IcingaVendor/dompdf/www/test/css_vertical_align.html diff --git a/library/vendor/dompdf/www/test/css_vertical_align_w3.html b/library/IcingaVendor/dompdf/www/test/css_vertical_align_w3.html similarity index 100% rename from library/vendor/dompdf/www/test/css_vertical_align_w3.html rename to library/IcingaVendor/dompdf/www/test/css_vertical_align_w3.html diff --git a/library/vendor/dompdf/www/test/css_whitespace.html b/library/IcingaVendor/dompdf/www/test/css_whitespace.html similarity index 100% rename from library/vendor/dompdf/www/test/css_whitespace.html rename to library/IcingaVendor/dompdf/www/test/css_whitespace.html diff --git a/library/vendor/dompdf/www/test/css_word_wrap.html b/library/IcingaVendor/dompdf/www/test/css_word_wrap.html similarity index 100% rename from library/vendor/dompdf/www/test/css_word_wrap.html rename to library/IcingaVendor/dompdf/www/test/css_word_wrap.html diff --git a/library/vendor/dompdf/www/test/css_z_index.html b/library/IcingaVendor/dompdf/www/test/css_z_index.html similarity index 100% rename from library/vendor/dompdf/www/test/css_z_index.html rename to library/IcingaVendor/dompdf/www/test/css_z_index.html diff --git a/library/vendor/dompdf/www/test/demo_01.html b/library/IcingaVendor/dompdf/www/test/demo_01.html similarity index 100% rename from library/vendor/dompdf/www/test/demo_01.html rename to library/IcingaVendor/dompdf/www/test/demo_01.html diff --git a/library/vendor/dompdf/www/test/dom_anchor_link.html b/library/IcingaVendor/dompdf/www/test/dom_anchor_link.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_anchor_link.html rename to library/IcingaVendor/dompdf/www/test/dom_anchor_link.html diff --git a/library/vendor/dompdf/www/test/dom_br.html b/library/IcingaVendor/dompdf/www/test/dom_br.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_br.html rename to library/IcingaVendor/dompdf/www/test/dom_br.html diff --git a/library/vendor/dompdf/www/test/dom_large_table.html b/library/IcingaVendor/dompdf/www/test/dom_large_table.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_large_table.html rename to library/IcingaVendor/dompdf/www/test/dom_large_table.html diff --git a/library/vendor/dompdf/www/test/dom_long_table.php b/library/IcingaVendor/dompdf/www/test/dom_long_table.php similarity index 100% rename from library/vendor/dompdf/www/test/dom_long_table.php rename to library/IcingaVendor/dompdf/www/test/dom_long_table.php diff --git a/library/vendor/dompdf/www/test/dom_nbsp.html b/library/IcingaVendor/dompdf/www/test/dom_nbsp.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_nbsp.html rename to library/IcingaVendor/dompdf/www/test/dom_nbsp.html diff --git a/library/vendor/dompdf/www/test/dom_nested_table.html b/library/IcingaVendor/dompdf/www/test/dom_nested_table.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_nested_table.html rename to library/IcingaVendor/dompdf/www/test/dom_nested_table.html diff --git a/library/vendor/dompdf/www/test/dom_ol.html b/library/IcingaVendor/dompdf/www/test/dom_ol.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_ol.html rename to library/IcingaVendor/dompdf/www/test/dom_ol.html diff --git a/library/vendor/dompdf/www/test/dom_simple_ul.html b/library/IcingaVendor/dompdf/www/test/dom_simple_ul.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_simple_ul.html rename to library/IcingaVendor/dompdf/www/test/dom_simple_ul.html diff --git a/library/vendor/dompdf/www/test/dom_table.html b/library/IcingaVendor/dompdf/www/test/dom_table.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_table.html rename to library/IcingaVendor/dompdf/www/test/dom_table.html diff --git a/library/vendor/dompdf/www/test/dom_table_image.html b/library/IcingaVendor/dompdf/www/test/dom_table_image.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_table_image.html rename to library/IcingaVendor/dompdf/www/test/dom_table_image.html diff --git a/library/vendor/dompdf/www/test/dom_ul.html b/library/IcingaVendor/dompdf/www/test/dom_ul.html similarity index 100% rename from library/vendor/dompdf/www/test/dom_ul.html rename to library/IcingaVendor/dompdf/www/test/dom_ul.html diff --git a/library/vendor/dompdf/www/test/encoding_entities.html b/library/IcingaVendor/dompdf/www/test/encoding_entities.html similarity index 100% rename from library/vendor/dompdf/www/test/encoding_entities.html rename to library/IcingaVendor/dompdf/www/test/encoding_entities.html diff --git a/library/vendor/dompdf/www/test/encoding_latin1.html b/library/IcingaVendor/dompdf/www/test/encoding_latin1.html similarity index 100% rename from library/vendor/dompdf/www/test/encoding_latin1.html rename to library/IcingaVendor/dompdf/www/test/encoding_latin1.html diff --git a/library/vendor/dompdf/www/test/encoding_special.html b/library/IcingaVendor/dompdf/www/test/encoding_special.html similarity index 100% rename from library/vendor/dompdf/www/test/encoding_special.html rename to library/IcingaVendor/dompdf/www/test/encoding_special.html diff --git a/library/vendor/dompdf/www/test/encoding_symbols.html b/library/IcingaVendor/dompdf/www/test/encoding_symbols.html similarity index 100% rename from library/vendor/dompdf/www/test/encoding_symbols.html rename to library/IcingaVendor/dompdf/www/test/encoding_symbols.html diff --git a/library/vendor/dompdf/www/test/encoding_unicode.html b/library/IcingaVendor/dompdf/www/test/encoding_unicode.html similarity index 100% rename from library/vendor/dompdf/www/test/encoding_unicode.html rename to library/IcingaVendor/dompdf/www/test/encoding_unicode.html diff --git a/library/vendor/dompdf/www/test/encoding_unicode_wrapping.html b/library/IcingaVendor/dompdf/www/test/encoding_unicode_wrapping.html similarity index 100% rename from library/vendor/dompdf/www/test/encoding_unicode_wrapping.html rename to library/IcingaVendor/dompdf/www/test/encoding_unicode_wrapping.html diff --git a/library/vendor/dompdf/www/test/encoding_utf-8.html b/library/IcingaVendor/dompdf/www/test/encoding_utf-8.html similarity index 100% rename from library/vendor/dompdf/www/test/encoding_utf-8.html rename to library/IcingaVendor/dompdf/www/test/encoding_utf-8.html diff --git a/library/vendor/dompdf/www/test/encoding_utf-8_all.html b/library/IcingaVendor/dompdf/www/test/encoding_utf-8_all.html similarity index 100% rename from library/vendor/dompdf/www/test/encoding_utf-8_all.html rename to library/IcingaVendor/dompdf/www/test/encoding_utf-8_all.html diff --git a/library/vendor/dompdf/www/test/encoding_utf-8_w3.html b/library/IcingaVendor/dompdf/www/test/encoding_utf-8_w3.html similarity index 100% rename from library/vendor/dompdf/www/test/encoding_utf-8_w3.html rename to library/IcingaVendor/dompdf/www/test/encoding_utf-8_w3.html diff --git a/library/vendor/dompdf/www/test/image_background.html b/library/IcingaVendor/dompdf/www/test/image_background.html similarity index 100% rename from library/vendor/dompdf/www/test/image_background.html rename to library/IcingaVendor/dompdf/www/test/image_background.html diff --git a/library/vendor/dompdf/www/test/image_basic.html b/library/IcingaVendor/dompdf/www/test/image_basic.html similarity index 100% rename from library/vendor/dompdf/www/test/image_basic.html rename to library/IcingaVendor/dompdf/www/test/image_basic.html diff --git a/library/vendor/dompdf/www/test/image_bmp.html b/library/IcingaVendor/dompdf/www/test/image_bmp.html similarity index 100% rename from library/vendor/dompdf/www/test/image_bmp.html rename to library/IcingaVendor/dompdf/www/test/image_bmp.html diff --git a/library/vendor/dompdf/www/test/image_datauri.html b/library/IcingaVendor/dompdf/www/test/image_datauri.html similarity index 100% rename from library/vendor/dompdf/www/test/image_datauri.html rename to library/IcingaVendor/dompdf/www/test/image_datauri.html diff --git a/library/vendor/dompdf/www/test/image_dimensions.html b/library/IcingaVendor/dompdf/www/test/image_dimensions.html similarity index 100% rename from library/vendor/dompdf/www/test/image_dimensions.html rename to library/IcingaVendor/dompdf/www/test/image_dimensions.html diff --git a/library/vendor/dompdf/www/test/image_gif.html b/library/IcingaVendor/dompdf/www/test/image_gif.html similarity index 100% rename from library/vendor/dompdf/www/test/image_gif.html rename to library/IcingaVendor/dompdf/www/test/image_gif.html diff --git a/library/vendor/dompdf/www/test/image_remote.html b/library/IcingaVendor/dompdf/www/test/image_remote.html similarity index 100% rename from library/vendor/dompdf/www/test/image_remote.html rename to library/IcingaVendor/dompdf/www/test/image_remote.html diff --git a/library/vendor/dompdf/www/test/image_transparent_gif.html b/library/IcingaVendor/dompdf/www/test/image_transparent_gif.html similarity index 100% rename from library/vendor/dompdf/www/test/image_transparent_gif.html rename to library/IcingaVendor/dompdf/www/test/image_transparent_gif.html diff --git a/library/vendor/dompdf/www/test/image_transparent_png.html b/library/IcingaVendor/dompdf/www/test/image_transparent_png.html similarity index 100% rename from library/vendor/dompdf/www/test/image_transparent_png.html rename to library/IcingaVendor/dompdf/www/test/image_transparent_png.html diff --git a/library/vendor/dompdf/www/test/image_variants.html b/library/IcingaVendor/dompdf/www/test/image_variants.html similarity index 100% rename from library/vendor/dompdf/www/test/image_variants.html rename to library/IcingaVendor/dompdf/www/test/image_variants.html diff --git a/library/vendor/dompdf/www/test/images/bmp/test1.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test1.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test1.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test1.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test1.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test1.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test1.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test1.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test16.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test16.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test16.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test16.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test16.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test16.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test16.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test16.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test16bf555.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test16bf555.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test16bf555.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test16bf555.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test16bf555.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test16bf555.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test16bf555.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test16bf555.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test16bf565.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test16bf565.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test16bf565.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test16bf565.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test16bf565.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test16bf565.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test16bf565.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test16bf565.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test24.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test24.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test24.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test24.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test24.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test24.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test24.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test24.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test32.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test32.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test32.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test32.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test32.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test32.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test32.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test32.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test32bf.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test32bf.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test32bf.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test32bf.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test32bf.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test32bf.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test32bf.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test32bf.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test32bfv4.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test32bfv4.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test32bfv4.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test32bfv4.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test32bfv4.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test32bfv4.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test32bfv4.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test32bfv4.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test32v5.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test32v5.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test32v5.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test32v5.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test32v5.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test32v5.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test32v5.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test32v5.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test4.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test4.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test4.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test4.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test4.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test4.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test4.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test4.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test4os2v2.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test4os2v2.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test4os2v2.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test4os2v2.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test4os2v2.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test4os2v2.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test4os2v2.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test4os2v2.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test8.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test8.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test8.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test8.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test8.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test8.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test8.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test8.png diff --git a/library/vendor/dompdf/www/test/images/bmp/test8os2.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/test8os2.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test8os2.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/test8os2.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/test8os2.png b/library/IcingaVendor/dompdf/www/test/images/bmp/test8os2.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/test8os2.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/test8os2.png diff --git a/library/vendor/dompdf/www/test/images/bmp/testcompress4.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/testcompress4.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/testcompress4.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/testcompress4.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/testcompress4.png b/library/IcingaVendor/dompdf/www/test/images/bmp/testcompress4.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/testcompress4.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/testcompress4.png diff --git a/library/vendor/dompdf/www/test/images/bmp/testcompress8.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/testcompress8.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/testcompress8.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/testcompress8.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/testcompress8.png b/library/IcingaVendor/dompdf/www/test/images/bmp/testcompress8.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/testcompress8.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/testcompress8.png diff --git a/library/vendor/dompdf/www/test/images/bmp/trans.bmp b/library/IcingaVendor/dompdf/www/test/images/bmp/trans.bmp similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/trans.bmp rename to library/IcingaVendor/dompdf/www/test/images/bmp/trans.bmp diff --git a/library/vendor/dompdf/www/test/images/bmp/trans.png b/library/IcingaVendor/dompdf/www/test/images/bmp/trans.png similarity index 100% rename from library/vendor/dompdf/www/test/images/bmp/trans.png rename to library/IcingaVendor/dompdf/www/test/images/bmp/trans.png diff --git a/library/vendor/dompdf/www/test/images/cmyk_test2.jpg b/library/IcingaVendor/dompdf/www/test/images/cmyk_test2.jpg similarity index 100% rename from library/vendor/dompdf/www/test/images/cmyk_test2.jpg rename to library/IcingaVendor/dompdf/www/test/images/cmyk_test2.jpg diff --git a/library/vendor/dompdf/www/test/images/dokuwiki-128.png b/library/IcingaVendor/dompdf/www/test/images/dokuwiki-128.png similarity index 100% rename from library/vendor/dompdf/www/test/images/dokuwiki-128.png rename to library/IcingaVendor/dompdf/www/test/images/dokuwiki-128.png diff --git a/library/vendor/dompdf/www/test/images/dompdf_simple.png b/library/IcingaVendor/dompdf/www/test/images/dompdf_simple.png similarity index 100% rename from library/vendor/dompdf/www/test/images/dompdf_simple.png rename to library/IcingaVendor/dompdf/www/test/images/dompdf_simple.png diff --git a/library/vendor/dompdf/www/test/images/goldengate.jpg b/library/IcingaVendor/dompdf/www/test/images/goldengate.jpg similarity index 100% rename from library/vendor/dompdf/www/test/images/goldengate.jpg rename to library/IcingaVendor/dompdf/www/test/images/goldengate.jpg diff --git a/library/vendor/dompdf/www/test/images/green.gif b/library/IcingaVendor/dompdf/www/test/images/green.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/green.gif rename to library/IcingaVendor/dompdf/www/test/images/green.gif diff --git a/library/vendor/dompdf/www/test/images/grid-36.gif b/library/IcingaVendor/dompdf/www/test/images/grid-36.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/grid-36.gif rename to library/IcingaVendor/dompdf/www/test/images/grid-36.gif diff --git a/library/vendor/dompdf/www/test/images/html.png b/library/IcingaVendor/dompdf/www/test/images/html.png similarity index 100% rename from library/vendor/dompdf/www/test/images/html.png rename to library/IcingaVendor/dompdf/www/test/images/html.png diff --git a/library/vendor/dompdf/www/test/images/no_extension b/library/IcingaVendor/dompdf/www/test/images/no_extension similarity index 100% rename from library/vendor/dompdf/www/test/images/no_extension rename to library/IcingaVendor/dompdf/www/test/images/no_extension diff --git a/library/vendor/dompdf/www/test/images/pdf.png b/library/IcingaVendor/dompdf/www/test/images/pdf.png similarity index 100% rename from library/vendor/dompdf/www/test/images/pdf.png rename to library/IcingaVendor/dompdf/www/test/images/pdf.png diff --git a/library/vendor/dompdf/www/test/images/php.gif b/library/IcingaVendor/dompdf/www/test/images/php.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/php.gif rename to library/IcingaVendor/dompdf/www/test/images/php.gif diff --git a/library/vendor/dompdf/www/test/images/png.png b/library/IcingaVendor/dompdf/www/test/images/png.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png.png rename to library/IcingaVendor/dompdf/www/test/images/png.png diff --git a/library/vendor/dompdf/www/test/images/png/gray16a.png b/library/IcingaVendor/dompdf/www/test/images/png/gray16a.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/gray16a.png rename to library/IcingaVendor/dompdf/www/test/images/png/gray16a.png diff --git a/library/vendor/dompdf/www/test/images/png/gray16a_bk.png b/library/IcingaVendor/dompdf/www/test/images/png/gray16a_bk.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/gray16a_bk.png rename to library/IcingaVendor/dompdf/www/test/images/png/gray16a_bk.png diff --git a/library/vendor/dompdf/www/test/images/png/gray16b.png b/library/IcingaVendor/dompdf/www/test/images/png/gray16b.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/gray16b.png rename to library/IcingaVendor/dompdf/www/test/images/png/gray16b.png diff --git a/library/vendor/dompdf/www/test/images/png/gray16b_bk.png b/library/IcingaVendor/dompdf/www/test/images/png/gray16b_bk.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/gray16b_bk.png rename to library/IcingaVendor/dompdf/www/test/images/png/gray16b_bk.png diff --git a/library/vendor/dompdf/www/test/images/png/gray8a.png b/library/IcingaVendor/dompdf/www/test/images/png/gray8a.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/gray8a.png rename to library/IcingaVendor/dompdf/www/test/images/png/gray8a.png diff --git a/library/vendor/dompdf/www/test/images/png/gray8a_bk.png b/library/IcingaVendor/dompdf/www/test/images/png/gray8a_bk.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/gray8a_bk.png rename to library/IcingaVendor/dompdf/www/test/images/png/gray8a_bk.png diff --git a/library/vendor/dompdf/www/test/images/png/gray8b.png b/library/IcingaVendor/dompdf/www/test/images/png/gray8b.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/gray8b.png rename to library/IcingaVendor/dompdf/www/test/images/png/gray8b.png diff --git a/library/vendor/dompdf/www/test/images/png/gray8b_bk.png b/library/IcingaVendor/dompdf/www/test/images/png/gray8b_bk.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/gray8b_bk.png rename to library/IcingaVendor/dompdf/www/test/images/png/gray8b_bk.png diff --git a/library/vendor/dompdf/www/test/images/png/pal.png b/library/IcingaVendor/dompdf/www/test/images/png/pal.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/pal.png rename to library/IcingaVendor/dompdf/www/test/images/png/pal.png diff --git a/library/vendor/dompdf/www/test/images/png/pal_bk.png b/library/IcingaVendor/dompdf/www/test/images/png/pal_bk.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/pal_bk.png rename to library/IcingaVendor/dompdf/www/test/images/png/pal_bk.png diff --git a/library/vendor/dompdf/www/test/images/png/pal_bk_notrns.png b/library/IcingaVendor/dompdf/www/test/images/png/pal_bk_notrns.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/pal_bk_notrns.png rename to library/IcingaVendor/dompdf/www/test/images/png/pal_bk_notrns.png diff --git a/library/vendor/dompdf/www/test/images/png/palb.png b/library/IcingaVendor/dompdf/www/test/images/png/palb.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/palb.png rename to library/IcingaVendor/dompdf/www/test/images/png/palb.png diff --git a/library/vendor/dompdf/www/test/images/png/result_16ns.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_16ns.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_16ns.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_16ns.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_1trns.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_1trns.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_1trns.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_1trns.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_bla.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_bla.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_bla.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_bla.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_dith.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_dith.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_dith.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_dith.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_gra.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_gra.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_gra.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_gra.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_mag.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_mag.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_mag.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_mag.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_magthr1.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_magthr1.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_magthr1.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_magthr1.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_no.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_no.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_no.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_no.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_nsbug.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_nsbug.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_nsbug.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_nsbug.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_ok.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_ok.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_ok.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_ok.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_oprbug.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_oprbug.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_oprbug.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_oprbug.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_thr1.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_thr1.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_thr1.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_thr1.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_thr128.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_thr128.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_thr128.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_thr128.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_thr255.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_thr255.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_thr255.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_thr255.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_whi.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_whi.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_whi.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_whi.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_yel.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_yel.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_yel.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_yel.gif diff --git a/library/vendor/dompdf/www/test/images/png/result_yelthr1.gif b/library/IcingaVendor/dompdf/www/test/images/png/result_yelthr1.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/result_yelthr1.gif rename to library/IcingaVendor/dompdf/www/test/images/png/result_yelthr1.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultb_bla.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultb_bla.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultb_bla.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultb_bla.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultb_bug.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultb_bug.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultb_bug.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultb_bug.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultb_mag.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultb_mag.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultb_mag.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultb_mag.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultb_moz2.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultb_moz2.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultb_moz2.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultb_moz2.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultb_no.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultb_no.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultb_no.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultb_no.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultb_ok.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultb_ok.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultb_ok.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultb_ok.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultb_whi.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultb_whi.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultb_whi.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultb_whi.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultb_yel.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultb_yel.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultb_yel.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultb_yel.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultg_bla.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultg_bla.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultg_bla.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultg_bla.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultg_dgr.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultg_dgr.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultg_dgr.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultg_dgr.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultg_lgr.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultg_lgr.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultg_lgr.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultg_lgr.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultg_no.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultg_no.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultg_no.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultg_no.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultga.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultga.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultga.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultga.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultgb.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultgb.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultgb.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultgb.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultgb_dgr.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultgb_dgr.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultgb_dgr.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultgb_dgr.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultgb_no.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultgb_no.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultgb_no.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultgb_no.gif diff --git a/library/vendor/dompdf/www/test/images/png/resultpb_no.gif b/library/IcingaVendor/dompdf/www/test/images/png/resultpb_no.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/resultpb_no.gif rename to library/IcingaVendor/dompdf/www/test/images/png/resultpb_no.gif diff --git a/library/vendor/dompdf/www/test/images/png/rgb16_t.png b/library/IcingaVendor/dompdf/www/test/images/png/rgb16_t.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/rgb16_t.png rename to library/IcingaVendor/dompdf/www/test/images/png/rgb16_t.png diff --git a/library/vendor/dompdf/www/test/images/png/rgb16_t_bk.png b/library/IcingaVendor/dompdf/www/test/images/png/rgb16_t_bk.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/rgb16_t_bk.png rename to library/IcingaVendor/dompdf/www/test/images/png/rgb16_t_bk.png diff --git a/library/vendor/dompdf/www/test/images/png/rgb8_t.png b/library/IcingaVendor/dompdf/www/test/images/png/rgb8_t.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/rgb8_t.png rename to library/IcingaVendor/dompdf/www/test/images/png/rgb8_t.png diff --git a/library/vendor/dompdf/www/test/images/png/rgb8_t_bk.png b/library/IcingaVendor/dompdf/www/test/images/png/rgb8_t_bk.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/rgb8_t_bk.png rename to library/IcingaVendor/dompdf/www/test/images/png/rgb8_t_bk.png diff --git a/library/vendor/dompdf/www/test/images/png/rgba16.png b/library/IcingaVendor/dompdf/www/test/images/png/rgba16.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/rgba16.png rename to library/IcingaVendor/dompdf/www/test/images/png/rgba16.png diff --git a/library/vendor/dompdf/www/test/images/png/rgba16_bk.png b/library/IcingaVendor/dompdf/www/test/images/png/rgba16_bk.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/rgba16_bk.png rename to library/IcingaVendor/dompdf/www/test/images/png/rgba16_bk.png diff --git a/library/vendor/dompdf/www/test/images/png/rgba8.png b/library/IcingaVendor/dompdf/www/test/images/png/rgba8.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/rgba8.png rename to library/IcingaVendor/dompdf/www/test/images/png/rgba8.png diff --git a/library/vendor/dompdf/www/test/images/png/rgba8_bk.png b/library/IcingaVendor/dompdf/www/test/images/png/rgba8_bk.png similarity index 100% rename from library/vendor/dompdf/www/test/images/png/rgba8_bk.png rename to library/IcingaVendor/dompdf/www/test/images/png/rgba8_bk.png diff --git a/library/vendor/dompdf/www/test/images/png/stripe.gif b/library/IcingaVendor/dompdf/www/test/images/png/stripe.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/png/stripe.gif rename to library/IcingaVendor/dompdf/www/test/images/png/stripe.gif diff --git a/library/vendor/dompdf/www/test/images/smiley.png b/library/IcingaVendor/dompdf/www/test/images/smiley.png similarity index 100% rename from library/vendor/dompdf/www/test/images/smiley.png rename to library/IcingaVendor/dompdf/www/test/images/smiley.png diff --git a/library/vendor/dompdf/www/test/images/unknown_extension.foo b/library/IcingaVendor/dompdf/www/test/images/unknown_extension.foo similarity index 100% rename from library/vendor/dompdf/www/test/images/unknown_extension.foo rename to library/IcingaVendor/dompdf/www/test/images/unknown_extension.foo diff --git a/library/vendor/dompdf/www/test/images/vblank.gif b/library/IcingaVendor/dompdf/www/test/images/vblank.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/vblank.gif rename to library/IcingaVendor/dompdf/www/test/images/vblank.gif diff --git a/library/vendor/dompdf/www/test/images/what_ordered.gif b/library/IcingaVendor/dompdf/www/test/images/what_ordered.gif similarity index 100% rename from library/vendor/dompdf/www/test/images/what_ordered.gif rename to library/IcingaVendor/dompdf/www/test/images/what_ordered.gif diff --git a/library/vendor/dompdf/www/test/page_pages.html b/library/IcingaVendor/dompdf/www/test/page_pages.html similarity index 100% rename from library/vendor/dompdf/www/test/page_pages.html rename to library/IcingaVendor/dompdf/www/test/page_pages.html diff --git a/library/vendor/dompdf/www/test/quirks_center_table.html b/library/IcingaVendor/dompdf/www/test/quirks_center_table.html similarity index 100% rename from library/vendor/dompdf/www/test/quirks_center_table.html rename to library/IcingaVendor/dompdf/www/test/quirks_center_table.html diff --git a/library/vendor/dompdf/www/test/quirks_font_tag.html b/library/IcingaVendor/dompdf/www/test/quirks_font_tag.html similarity index 100% rename from library/vendor/dompdf/www/test/quirks_font_tag.html rename to library/IcingaVendor/dompdf/www/test/quirks_font_tag.html diff --git a/library/vendor/dompdf/www/test/quirks_html_attributes.html b/library/IcingaVendor/dompdf/www/test/quirks_html_attributes.html similarity index 100% rename from library/vendor/dompdf/www/test/quirks_html_attributes.html rename to library/IcingaVendor/dompdf/www/test/quirks_html_attributes.html diff --git a/library/vendor/dompdf/www/test/script_javascript.html b/library/IcingaVendor/dompdf/www/test/script_javascript.html similarity index 100% rename from library/vendor/dompdf/www/test/script_javascript.html rename to library/IcingaVendor/dompdf/www/test/script_javascript.html diff --git a/library/vendor/dompdf/www/test/script_php.php b/library/IcingaVendor/dompdf/www/test/script_php.php similarity index 100% rename from library/vendor/dompdf/www/test/script_php.php rename to library/IcingaVendor/dompdf/www/test/script_php.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/CREDITS b/library/IcingaVendor/htmlpurifier-4.6.0-lite/CREDITS similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/CREDITS rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/CREDITS diff --git a/library/vendor/htmlpurifier-4.6.0-lite/INSTALL b/library/IcingaVendor/htmlpurifier-4.6.0-lite/INSTALL similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/INSTALL rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/INSTALL diff --git a/library/vendor/htmlpurifier-4.6.0-lite/LICENSE b/library/IcingaVendor/htmlpurifier-4.6.0-lite/LICENSE similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/LICENSE rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/LICENSE diff --git a/library/vendor/htmlpurifier-4.6.0-lite/NEWS b/library/IcingaVendor/htmlpurifier-4.6.0-lite/NEWS similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/NEWS rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/NEWS diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.auto.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.auto.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.auto.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.auto.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.autoload.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.autoload.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.autoload.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.autoload.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.composer.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.composer.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.composer.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.composer.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.func.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.func.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.func.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.func.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.includes.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.includes.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.includes.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.includes.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.kses.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.kses.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.kses.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.kses.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.path.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.path.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.path.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.path.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.safe-includes.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.safe-includes.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.safe-includes.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.safe-includes.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Arborize.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Arborize.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Arborize.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Arborize.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrCollections.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrCollections.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrCollections.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrCollections.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Background.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Background.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Background.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Background.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Border.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Border.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Border.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Border.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Color.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Color.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Color.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Color.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Composite.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Composite.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Composite.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Composite.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Filter.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Filter.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Filter.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Filter.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Font.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Font.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Font.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Font.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/FontFamily.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/FontFamily.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/FontFamily.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Ident.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Ident.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Ident.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Ident.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Length.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Length.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Length.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Length.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ListStyle.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ListStyle.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ListStyle.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/ListStyle.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Multiple.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Multiple.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Multiple.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Multiple.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Number.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Number.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Number.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Number.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Percentage.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Percentage.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Percentage.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/Percentage.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/URI.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/URI.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/URI.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/CSS/URI.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Clone.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Clone.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Clone.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Clone.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Enum.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Enum.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Enum.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Enum.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Bool.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Bool.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Bool.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Bool.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Class.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Class.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Class.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Class.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Color.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Color.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Color.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Color.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/ID.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/ID.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/ID.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/ID.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Length.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Length.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Length.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Length.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/MultiLength.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/MultiLength.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/MultiLength.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/MultiLength.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Pixels.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Pixels.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Pixels.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/HTML/Pixels.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Integer.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Integer.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Integer.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Integer.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Lang.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Lang.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Lang.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Lang.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Switch.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Switch.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Switch.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Switch.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Text.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Text.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Text.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/Text.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Host.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Host.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Host.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/Host.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv4.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv4.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv4.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv4.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv6.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv6.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv6.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrDef/URI/IPv6.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Background.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Background.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Background.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Background.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BdoDir.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BdoDir.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BdoDir.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BdoDir.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BgColor.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BgColor.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BgColor.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BgColor.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BoolToCSS.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BoolToCSS.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BoolToCSS.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/BoolToCSS.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Border.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Border.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Border.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Border.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/EnumToCSS.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/EnumToCSS.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/EnumToCSS.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/EnumToCSS.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgRequired.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgRequired.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgRequired.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgRequired.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgSpace.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgSpace.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgSpace.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ImgSpace.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Input.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Input.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Input.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Input.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Lang.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Lang.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Lang.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Lang.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Length.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Length.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Length.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Length.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Name.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Name.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Name.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Name.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/NameSync.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/NameSync.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/NameSync.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/NameSync.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Nofollow.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Nofollow.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Nofollow.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Nofollow.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeEmbed.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeEmbed.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeEmbed.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeEmbed.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeObject.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeObject.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeObject.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeObject.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeParam.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeParam.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeParam.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/SafeParam.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ScriptRequired.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ScriptRequired.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ScriptRequired.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/ScriptRequired.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/TargetBlank.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/TargetBlank.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/TargetBlank.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/TargetBlank.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Textarea.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Textarea.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Textarea.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTransform/Textarea.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTypes.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTypes.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTypes.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrTypes.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrValidator.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrValidator.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrValidator.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/AttrValidator.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Bootstrap.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Bootstrap.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Bootstrap.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Bootstrap.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/CSSDefinition.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/CSSDefinition.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/CSSDefinition.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/CSSDefinition.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Chameleon.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Chameleon.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Chameleon.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Chameleon.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Custom.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Custom.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Custom.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Custom.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Empty.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Empty.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Empty.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Empty.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/List.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/List.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/List.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/List.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Optional.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Optional.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Optional.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Optional.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Required.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Required.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Required.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Required.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/StrictBlockquote.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/StrictBlockquote.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/StrictBlockquote.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/StrictBlockquote.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Table.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Table.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Table.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ChildDef/Table.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Config.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Config.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Config.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Config.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/Xml.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/Xml.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/Xml.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Builder/Xml.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Exception.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Exception.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Exception.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Exception.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Id.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Id.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Id.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Interchange/Id.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Validator.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Validator.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Validator.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/Validator.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema.ser b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema.ser similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema.ser rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema.ser diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/info.ini b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/info.ini similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/info.ini rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ConfigSchema/schema/info.ini diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ContentSets.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ContentSets.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ContentSets.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ContentSets.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Context.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Context.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Context.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Context.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Definition.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Definition.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Definition.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Definition.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Null.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Null.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Null.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Null.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer/README b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer/README similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer/README rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCache/Serializer/README diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCacheFactory.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCacheFactory.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCacheFactory.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DefinitionCacheFactory.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Doctype.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Doctype.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Doctype.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Doctype.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DoctypeRegistry.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DoctypeRegistry.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DoctypeRegistry.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/DoctypeRegistry.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ElementDef.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ElementDef.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ElementDef.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ElementDef.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Encoder.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Encoder.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Encoder.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Encoder.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup/entities.ser b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup/entities.ser similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup/entities.ser rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityLookup/entities.ser diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityParser.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityParser.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityParser.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/EntityParser.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorCollector.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorCollector.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorCollector.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorCollector.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorStruct.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorStruct.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorStruct.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/ErrorStruct.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Exception.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Exception.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Exception.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Exception.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/ExtractStyleBlocks.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/ExtractStyleBlocks.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/ExtractStyleBlocks.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/ExtractStyleBlocks.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/YouTube.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/YouTube.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/YouTube.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Filter/YouTube.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Generator.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Generator.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Generator.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Generator.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLDefinition.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLDefinition.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLDefinition.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLDefinition.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Bdo.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Bdo.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Bdo.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Bdo.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/CommonAttributes.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/CommonAttributes.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/CommonAttributes.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Edit.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Edit.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Edit.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Edit.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Forms.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Forms.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Forms.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Forms.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Hypertext.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Hypertext.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Hypertext.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Hypertext.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Iframe.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Iframe.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Iframe.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Iframe.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Image.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Image.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Image.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Image.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Legacy.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Legacy.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Legacy.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Legacy.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/List.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/List.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/List.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/List.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Name.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Name.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Name.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Name.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Nofollow.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Nofollow.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Nofollow.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Nofollow.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Object.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Object.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Object.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Object.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Presentation.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Presentation.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Presentation.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Presentation.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Proprietary.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Proprietary.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Proprietary.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Proprietary.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Ruby.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Ruby.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Ruby.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Ruby.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeEmbed.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeEmbed.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeEmbed.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeEmbed.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeObject.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeObject.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeObject.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeObject.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeScripting.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeScripting.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeScripting.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/SafeScripting.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Scripting.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Scripting.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Scripting.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Scripting.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/StyleAttribute.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/StyleAttribute.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/StyleAttribute.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/StyleAttribute.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tables.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tables.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tables.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tables.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Target.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Target.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Target.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Target.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/TargetBlank.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/TargetBlank.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/TargetBlank.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/TargetBlank.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Text.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Text.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Text.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Text.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Name.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Name.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Name.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Name.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Strict.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Strict.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Strict.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Strict.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModuleManager.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModuleManager.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModuleManager.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/HTMLModuleManager.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/IDAccumulator.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/IDAccumulator.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/IDAccumulator.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/IDAccumulator.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/AutoParagraph.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/AutoParagraph.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/AutoParagraph.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/AutoParagraph.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/DisplayLinkURI.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/DisplayLinkURI.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/DisplayLinkURI.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/DisplayLinkURI.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/Linkify.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/Linkify.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/Linkify.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/Linkify.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/PurifierLinkify.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/PurifierLinkify.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/PurifierLinkify.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/PurifierLinkify.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveEmpty.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveEmpty.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveEmpty.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveEmpty.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/SafeObject.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/SafeObject.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/SafeObject.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Injector/SafeObject.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/classes/en-x-test.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/classes/en-x-test.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/classes/en-x-test.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/classes/en-x-test.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-test.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-test.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-test.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-test.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-testmini.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-testmini.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-testmini.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en-x-testmini.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Language/messages/en.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/LanguageFactory.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/LanguageFactory.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/LanguageFactory.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/LanguageFactory.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Length.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Length.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Length.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Length.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DOMLex.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DOMLex.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DOMLex.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DOMLex.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DirectLex.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DirectLex.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DirectLex.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/DirectLex.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/PH5P.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/PH5P.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/PH5P.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Lexer/PH5P.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Comment.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Comment.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Comment.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Comment.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Element.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Element.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Element.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Element.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Text.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Text.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Text.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Node/Text.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PercentEncoder.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PercentEncoder.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PercentEncoder.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PercentEncoder.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/CSSDefinition.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/CSSDefinition.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/CSSDefinition.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/CSSDefinition.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.css b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.css similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.css rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.css diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.js b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.js similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.js rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.js diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/ConfigForm.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/HTMLDefinition.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/HTMLDefinition.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/HTMLDefinition.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Printer/HTMLDefinition.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyList.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyList.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyList.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyList.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyListIterator.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyListIterator.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyListIterator.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/PropertyListIterator.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Queue.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Queue.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Queue.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Queue.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Composite.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Composite.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Composite.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Composite.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Core.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Core.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Core.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/Core.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/FixNesting.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/FixNesting.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/FixNesting.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/FixNesting.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/MakeWellFormed.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/MakeWellFormed.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/MakeWellFormed.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/MakeWellFormed.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/RemoveForeignElements.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/RemoveForeignElements.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/RemoveForeignElements.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/ValidateAttributes.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/ValidateAttributes.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/ValidateAttributes.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Strategy/ValidateAttributes.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHash.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHash.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHash.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHash.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHashParser.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHashParser.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHashParser.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/StringHashParser.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Font.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Font.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Font.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Font.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Simple.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Simple.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Simple.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TagTransform/Simple.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Comment.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Comment.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Comment.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Comment.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Empty.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Empty.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Empty.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Empty.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/End.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/End.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/End.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/End.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Start.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Start.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Start.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Start.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Tag.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Tag.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Tag.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Tag.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Text.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Text.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Text.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Token/Text.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TokenFactory.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TokenFactory.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TokenFactory.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/TokenFactory.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URI.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URI.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URI.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URI.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIDefinition.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIDefinition.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIDefinition.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIDefinition.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternal.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternal.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternal.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternal.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternalResources.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternalResources.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternalResources.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableExternalResources.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableResources.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableResources.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableResources.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/DisableResources.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/HostBlacklist.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/HostBlacklist.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/HostBlacklist.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/HostBlacklist.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/MakeAbsolute.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/MakeAbsolute.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/MakeAbsolute.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/MakeAbsolute.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/Munge.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/Munge.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/Munge.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/Munge.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/SafeIframe.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/SafeIframe.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/SafeIframe.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIFilter/SafeIframe.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIParser.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIParser.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIParser.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIParser.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/data.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/data.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/data.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/data.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/file.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/file.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/file.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/file.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/ftp.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/ftp.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/ftp.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/ftp.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/http.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/http.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/http.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/http.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/https.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/https.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/https.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/https.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/mailto.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/mailto.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/mailto.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/mailto.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/news.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/news.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/news.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/news.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/nntp.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/nntp.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/nntp.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URIScheme/nntp.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URISchemeRegistry.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URISchemeRegistry.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URISchemeRegistry.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/URISchemeRegistry.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/UnitConverter.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/UnitConverter.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/UnitConverter.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/UnitConverter.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Flexible.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Flexible.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Flexible.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Flexible.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Native.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Native.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Native.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParser/Native.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParserException.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParserException.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParserException.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/VarParserException.php diff --git a/library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Zipper.php b/library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Zipper.php similarity index 100% rename from library/vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Zipper.php rename to library/IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier/Zipper.php diff --git a/library/vendor/lessphp/.travis.yml b/library/IcingaVendor/lessphp/.travis.yml similarity index 100% rename from library/vendor/lessphp/.travis.yml rename to library/IcingaVendor/lessphp/.travis.yml diff --git a/library/vendor/lessphp/LICENSE b/library/IcingaVendor/lessphp/LICENSE similarity index 100% rename from library/vendor/lessphp/LICENSE rename to library/IcingaVendor/lessphp/LICENSE diff --git a/library/vendor/lessphp/SOURCE b/library/IcingaVendor/lessphp/SOURCE similarity index 100% rename from library/vendor/lessphp/SOURCE rename to library/IcingaVendor/lessphp/SOURCE diff --git a/library/vendor/lessphp/lessc.inc.php b/library/IcingaVendor/lessphp/lessc.inc.php similarity index 100% rename from library/vendor/lessphp/lessc.inc.php rename to library/IcingaVendor/lessphp/lessc.inc.php diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php index 945a96eea..0ea3ed6ff 100644 --- a/modules/doc/library/Doc/DocParser.php +++ b/modules/doc/library/Doc/DocParser.php @@ -11,7 +11,7 @@ use Icinga\Application\Icinga; use Icinga\Web\Menu; use Icinga\Web\Url; -require_once 'vendor/Parsedown/Parsedown.php'; +require_once 'IcingaVendor/Parsedown/Parsedown.php'; /** * Parser for documentation written in Markdown diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php index e53e71352..1b69b2c0e 100644 --- a/modules/monitoring/application/views/helpers/PluginOutput.php +++ b/modules/monitoring/application/views/helpers/PluginOutput.php @@ -70,7 +70,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract protected function getPurifier() { if (self::$purifier === null) { - require_once 'vendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.auto.php'; + require_once 'IcingaVendor/htmlpurifier-4.6.0-lite/library/HTMLPurifier.auto.php'; $config = HTMLPurifier_Config::createDefault(); $config->set('Core.EscapeNonASCIICharacters', true); $config->set('HTML.Allowed', 'p,br,b,a[href],i,table,tr,td[colspan],div[class]'); From 1ebab3e5c1153331cdceb694bec529599394e890 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 00:15:31 +0000 Subject: [PATCH 68/96] vendor/lessphp: we don't need travis.yml right now --- library/IcingaVendor/lessphp/.travis.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 library/IcingaVendor/lessphp/.travis.yml diff --git a/library/IcingaVendor/lessphp/.travis.yml b/library/IcingaVendor/lessphp/.travis.yml deleted file mode 100644 index d7b25e038..000000000 --- a/library/IcingaVendor/lessphp/.travis.yml +++ /dev/null @@ -1,5 +0,0 @@ -language: php -script: phpunit tests -php: - - 5.3 - - 5.4 From 6e6df999dde583fb173898a5f93125146df678c8 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 00:29:15 +0000 Subject: [PATCH 69/96] packaging: build debian packages Simple example configuration, quick & dirty but functional. Didn't care about a config, as that will be handled by the setup wizard. refs #6402 --- .gitignore | 4 +++ packages/debian/changelog | 2 +- packages/debian/control | 21 +++++++++++--- packages/debian/icingacli.install | 3 +- packages/debian/icingaweb.install | 6 +++- packages/debian/libicinga-common-php.dirs | 1 + packages/debian/libicinga-common-php.install | 2 ++ packages/debian/libicinga-php.install | 4 +-- packages/debian/libicinga-vendor-php.install | 1 + packages/debian/rules | 29 ++++++++++++++++++++ packages/files/bin/icingacli | 6 ++++ packages/files/icingaweb-apache2.conf | 19 +++++++++++++ packages/files/public/index.php | 4 +++ 13 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 packages/debian/libicinga-common-php.dirs create mode 100644 packages/debian/libicinga-common-php.install create mode 100644 packages/debian/libicinga-vendor-php.install create mode 100755 packages/files/bin/icingacli create mode 100644 packages/files/icingaweb-apache2.conf create mode 100644 packages/files/public/index.php diff --git a/.gitignore b/.gitignore index a243728f3..a7b2c6b1c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,7 @@ config/preferences/*.ini # Application logfiles var/log/*.log + +/debian + + diff --git a/packages/debian/changelog b/packages/debian/changelog index 880ad3418..983b26e3d 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -1,4 +1,4 @@ -icingaweb (2.0.0~beta1) unstable; urgency=low +icingaweb (2.0.0~alpha1) unstable; urgency=low * First beta release (Closes: #0000) diff --git a/packages/debian/control b/packages/debian/control index dbf270b2c..ab3162d46 100644 --- a/packages/debian/control +++ b/packages/debian/control @@ -1,5 +1,6 @@ Source: icingaweb -Section: main +Section: upstream +Maintainer: Icinga Development Team Priority: optional Build-Depends: debhelper (>=9) Standards-Version: 3.9.4 @@ -13,9 +14,21 @@ Suggests: php5-pgsql Description: Icinga PHP libraries PHP libraries +Package: libicinga-vendor-php +Architecture: any +Depends: libicinga-php +Description: Icinga PHP vendor libraries + PHP vendor libraries + +Package: libicinga-common-php +Architecture: any +Depends: libicinga-php, libicinga-vendor-php +Description: Icinga PHP common libraries + PHP common libraries, application and modules + Package: icingacli Architecture: any -Depends: libicingaweb-php (>= 2.0.0~beta1) +Depends: libicinga-common-php (>= 2.0.0~alpha1) Description: Icinga CLI tool The Icinga CLI allows one to access it's Icinga monitoring system from a terminal. @@ -24,8 +37,8 @@ Description: Icinga CLI tool Package: icingaweb Architecture: any -Depends: libicingaweb-php (>= 2.0.0~beta1) +Depends: libicinga-common-php (>= 2.0.0~alpha1), libapache2-mod-php5 Recommends: php5-gd, icingacli Suggests: php5-ldap Description: Icinga Web Frontend - Icinga Web is a modular web frontend designed + Icinga Web is a modular web frontend diff --git a/packages/debian/icingacli.install b/packages/debian/icingacli.install index 17bc6a999..de1bccf4c 100644 --- a/packages/debian/icingacli.install +++ b/packages/debian/icingacli.install @@ -1 +1,2 @@ -bin/icingacli /usr/bin/ +packages/files/bin/icingacli usr/bin +etc/bash_completion.d etc/bash_completion.d diff --git a/packages/debian/icingaweb.install b/packages/debian/icingaweb.install index 5afff2d42..8642199b1 100644 --- a/packages/debian/icingaweb.install +++ b/packages/debian/icingaweb.install @@ -1 +1,5 @@ -public /usr/share/icingaweb/ +public/css usr/share/icingaweb/public +public/img usr/share/icingaweb/public +public/js usr/share/icingaweb/public +packages/files/public/index.php usr/share/icingaweb/public +packages/files/icingaweb-apache2.conf etc/apache2/conf.d diff --git a/packages/debian/libicinga-common-php.dirs b/packages/debian/libicinga-common-php.dirs new file mode 100644 index 000000000..00ec00632 --- /dev/null +++ b/packages/debian/libicinga-common-php.dirs @@ -0,0 +1 @@ +etc/icingaweb diff --git a/packages/debian/libicinga-common-php.install b/packages/debian/libicinga-common-php.install new file mode 100644 index 000000000..65bd2f999 --- /dev/null +++ b/packages/debian/libicinga-common-php.install @@ -0,0 +1,2 @@ +application usr/share/icingaweb +modules usr/share/icingaweb diff --git a/packages/debian/libicinga-php.install b/packages/debian/libicinga-php.install index bfc528244..6cbd03f13 100644 --- a/packages/debian/libicinga-php.install +++ b/packages/debian/libicinga-php.install @@ -1,3 +1 @@ -library/Icinga /usr/share/php/ -application /usr/share/icingaweb/ -modules /usr/share/icingaweb/ +library/Icinga usr/share/php diff --git a/packages/debian/libicinga-vendor-php.install b/packages/debian/libicinga-vendor-php.install new file mode 100644 index 000000000..c2dd6e0e6 --- /dev/null +++ b/packages/debian/libicinga-vendor-php.install @@ -0,0 +1 @@ +library/IcingaVendor usr/share/php diff --git a/packages/debian/rules b/packages/debian/rules index 68e1e8c27..c91eb8230 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -4,3 +4,32 @@ %: dh $@ +clean: + dh_testdir + dh_clean + +build: + dh_testdir + +binary: + dh_testroot + dh_prep + dh_installdirs + dh_install + dh_installchangelogs + dh_installexamples + dh_installman + dh_installcron + dh_installdebconf + dh_installinfo + dh_installinit + dpkg-statoverride --force --add root www-data 2775 /etc/icingaweb + dh_compress + dh_fixperms + dh_strip + dh_shlibdeps + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + diff --git a/packages/files/bin/icingacli b/packages/files/bin/icingacli new file mode 100755 index 000000000..1e9b0ef12 --- /dev/null +++ b/packages/files/bin/icingacli @@ -0,0 +1,6 @@ +#!/usr/bin/php +dispatch(); diff --git a/packages/files/icingaweb-apache2.conf b/packages/files/icingaweb-apache2.conf new file mode 100644 index 000000000..cde9aeec3 --- /dev/null +++ b/packages/files/icingaweb-apache2.conf @@ -0,0 +1,19 @@ +Alias /icingaweb "/usr/share/icingaweb/public" + + + Options SymLinksIfOwnerMatch + AllowOverride None + Order allow,deny + Allow from all + + # SetEnv ICINGAWEB_CONFIGDIR /etc/icingaweb + + RewriteEngine on + RewriteBase /icingaweb/ + RewriteCond %{REQUEST_FILENAME} -s [OR] + RewriteCond %{REQUEST_FILENAME} -l [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule ^.*$ - [NC,L] + RewriteRule ^.*$ index.php [NC,L] + + diff --git a/packages/files/public/index.php b/packages/files/public/index.php new file mode 100644 index 000000000..77953b1b6 --- /dev/null +++ b/packages/files/public/index.php @@ -0,0 +1,4 @@ + Date: Thu, 5 Jun 2014 03:22:26 +0000 Subject: [PATCH 70/96] CSS: set default fore- and background Just to be on the safe side... --- public/css/icinga/defaults.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/css/icinga/defaults.less b/public/css/icinga/defaults.less index 727957c76..ce79911cf 100644 --- a/public/css/icinga/defaults.less +++ b/public/css/icinga/defaults.less @@ -8,6 +8,11 @@ html, body { height: 100%; } +html { + color: #000; + background: #fff; +} + img { border: none; } From 76d0b188b6f3549bd0d20c50e4d100755b2dafd6 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 03:24:30 +0000 Subject: [PATCH 71/96] CSS: Lighter lines, border fixes --- public/css/icinga/main-content.less | 3 +-- public/css/icinga/monitoring-colors.less | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less index afd97a478..a8f2a5e86 100644 --- a/public/css/icinga/main-content.less +++ b/public/css/icinga/main-content.less @@ -113,9 +113,8 @@ table.avp a:hover { /* Definitively monitoring-only: */ table.objectstate { margin: 1em; - width: 100%; border-collapse: separate; - border-spacing: 0.2em; + border-spacing: 1px; } table.objectstate td { diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less index 4099a4a31..ed89b8754 100644 --- a/public/css/icinga/monitoring-colors.less +++ b/public/css/icinga/monitoring-colors.less @@ -19,7 +19,7 @@ table.colors td { /* Action table */ table.action { border-collapse: separate; - border-spacing: 0.3em; + border-spacing: 1px; width: 100%; table-layout: fixed; margin: 0; @@ -37,7 +37,6 @@ table.action.wide td { table.action td { padding: 0.3em 0.5em 0.3em 0.5em; line-height: 1.5em; - border-bottom: 1px solid #dde; overflow: hidden; } @@ -498,7 +497,7 @@ div.pivot-pagination { table { table-layout: fixed; - border-spacing: 0.2em; + border-spacing: 1px; border-collapse: separate; border: 1px solid LightGrey; border-radius: 0.3em; From b3f65c8e37546f6d2df206fea74737725013f422 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 03:25:00 +0000 Subject: [PATCH 72/96] CSS: Try to make PDFs look better --- public/css/pdf/pdfprint.less | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/public/css/pdf/pdfprint.less b/public/css/pdf/pdfprint.less index 2f57380a3..bb560c1f7 100644 --- a/public/css/pdf/pdfprint.less +++ b/public/css/pdf/pdfprint.less @@ -6,6 +6,10 @@ margin: 2cm; } +.container * { + font-size: 7pt; +} + body > h1 { font-size: 1em; } @@ -70,6 +74,15 @@ hr { margin: 0; } +.dashboard > div.container { + width: 100%; + display: block; +} + +h1 form { + display: none; +} + body { margin: 1cm 1cm 1.5cm 1cm; } From 99aae5a0d9c4cf298aa1793ba00694d7d02be241 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 03:37:36 +0000 Subject: [PATCH 73/96] JS/XHR: get ready to get XHR redirect-aware These are just the first steps, there is more to come --- .../Icinga/Web/Controller/ActionController.php | 18 ++++++++++++------ public/js/icinga/loader.js | 11 ++++++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 3761cfa8a..c744fe0f8 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -370,13 +370,19 @@ class ActionController extends Zend_Controller_Action **/ public function redirectNow($url) { - if ($url instanceof Url) { - $url = $url->getRelativeUrl(); - } else { - $url = Url::fromPath($url)->getRelativeUrl(); + if (! $url instanceof Url) { + $url = Url::fromPath($url); } - $this->_helper->Redirector->gotoUrlAndExit(preg_replace('~&~', '&', $url)); - $this->isRedirect = true; + $url = preg_replace('~&~', '&', $url); + if ($this->_request->isXmlHttpRequest()) { + header('X-Icinga-Redirect: ' . rawurlencode($url)); + // $this->getResponse()->sendHeaders() ?? + // Session shutdown + exit; // Really? + } else { + $this->_helper->Redirector->gotoUrlAndExit($url); + } + $this->isRedirect = true; // pretty useless right now } /** diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index c659a91e7..39ed77b1e 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -244,6 +244,15 @@ this.icinga.logger.debug( 'Got response for ', req.$target, ', URL was ' + url ); + var redirect = req.getResponseHeader('X-Icinga-Redirect'); + if (redirect) { + this.icinga.logger.debug( + 'Got redirect for ', req.$target, ', URL was ' + redirect + ); + redirect = decodeURIComponent(redirect); + this.loadUrl(redirect, req.$target); + return; + } // div helps getting an XML tree var $resp = $('

    ' + req.responseText + '
    '); @@ -400,6 +409,7 @@ this.icinga.history.pushCurrentState(); } } + this.icinga.ui.initializeTriStates($resp); // Make multiselection-tables not selectable. @@ -459,7 +469,6 @@ ); } - if (active) { var focusedUrl = this.icinga.ui.getFocusedContainerDataUrl(); var oldSelectionData = this.icinga.ui.loadSelectionData(); From 11b4661b46e83eea2a7a34df7c7c999de0239093 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 03:40:43 +0000 Subject: [PATCH 74/96] js/history: fix history on initial page There is a workaround for a nasty Chrome missbehaviour, however I have no longer been able to reproduce it. Temporarily disabled the workaround, could you please try whether behaviour is better / correct like this? Please also check for requests firing twice on initial page load. refs #6277 --- public/js/icinga/history.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js index 326be38c7..3aac07347 100644 --- a/public/js/icinga/history.js +++ b/public/js/icinga/history.js @@ -110,7 +110,7 @@ // Chrome workaround: onload = !self.pushedSomething && location.href === self.initialUrl; self.pushedSomething = true; - if (onload) { return; } + // if (onload) { return; } // Temporarily disabled // End of Chrome workaround // We might find browsers showing strange behaviour, this log could help From 1b3bb6cadeb7c8b56fcb20040b70ce94b63572d1 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 03:44:12 +0000 Subject: [PATCH 75/96] Web\Url: add getQueryString() and without() --- library/Icinga/Web/Url.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php index e00fad03c..3aa388336 100644 --- a/library/Icinga/Web/Url.php +++ b/library/Icinga/Web/Url.php @@ -298,6 +298,11 @@ class Url return $this->path . '?' . http_build_query($params, '', '&') . $this->anchor; } + public function getQueryString() + { + return http_build_query($this->params, '', '&'); + } + /** * Return the absolute url with query parameters as a string * @@ -493,6 +498,11 @@ class Url * @return Url */ public function getUrlWithout($keyOrArrayOfKeys) + { + return $this->without($keyOrArrayOfKeys); + } + + public function without($keyOrArrayOfKeys) { $url = clone($this); $url->remove($keyOrArrayOfKeys); From 83faa661676a42eb087f6500ff4dff173f6056be Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 03:47:09 +0000 Subject: [PATCH 76/96] CSS: try to hover state rows with state color This should help your eye to recognize faster whether you hovered the desired row and helps to distinct hovered from active / selected rows --- public/css/icinga/monitoring-colors.less | 60 +++++++++++++++++++++++- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less index ed89b8754..d0bc87cc3 100644 --- a/public/css/icinga/monitoring-colors.less +++ b/public/css/icinga/monitoring-colors.less @@ -127,8 +127,7 @@ tr.state.handled td.state, tr.state.ok td.state, tr.state.up td.state, tr.state. color: black; background-color: transparent; } - -tr[href]:hover, tr[href].active { +tr[href].active { background-color: #ddd; color: black; } @@ -194,6 +193,63 @@ tr.state.handled td.state { background-color: transparent !important; } +/* HOVER colors */ + + +tr.state[href]:hover, tr.state[href]:hover td.state { + color: white; +} + +tr.state.ok:hover { + background-color: @colorOk; +} + +tr.state.handled[href]:hover, tr.state.handled[href]:hover td.state { + color: #121212 !important; +} + +tr.state.warning[href]:hover { + background-color: @colorWarning; +} + +tr.state.warning.handled[href]:hover { + background-color: @colorWarningHandled; +} + +tr.state.critical[href]:hover, tr.state.down[href]:hover { + background-color: @colorCritical; +} + +tr.state.critical.handled[href]:hover, tr.state.down.handled[href]:hover { + background-color: @colorCriticalHandled; + color: #333; +} + +tr.state.unknown[href]:hover { + background-color: @colorUnknown; +} + +tr.state.unknown.handled[href]:hover { + background-color: @colorUnknownHandled; +} + +tr.state.pending[href]:hover { + background-color: @colorPending; +} + +tr.state.invalid[href]:hover { + background-color: @colorInvalid; +} + +tr.state.unreachable[href]:hover { + background-color: @colorUnreachable; +} + +tr.state.unreachable.handled[href]:hover { + background-color: @colorUnreachableHandled; +} +/* END of HOVER colors */ + /* END of special tables and states */ From 151f058286261a82ab538ef322778f9801c05eea Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Thu, 5 Jun 2014 15:20:54 +0200 Subject: [PATCH 77/96] Dashboard: Display error message on failure When no (default) configuration is available for dashboards application dies not very gracefully. Display error message and guid the user to the solution is a better way. fixes #6412 --- .../controllers/DashboardController.php | 45 +++++++++++++------ .../views/scripts/dashboard/index.phtml | 20 +++++++-- library/Icinga/Web/Widget/Dashboard.php | 2 +- 3 files changed, 50 insertions(+), 17 deletions(-) diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php index 7b917e2e7..1f86fd2ce 100644 --- a/application/controllers/DashboardController.php +++ b/application/controllers/DashboardController.php @@ -46,6 +46,11 @@ use Icinga\Web\Controller\ActionController; */ class DashboardController extends ActionController { + /** + * Default configuration + */ + const DEFAULT_CONFIG = 'dashboard/dashboard'; + /** * Retrieve a dashboard from the provided config * @@ -53,14 +58,18 @@ class DashboardController extends ActionController * * @return \Icinga\Web\Widget\Dashboard */ - private function getDashboard($config = 'dashboard/dashboard') + private function getDashboard($config = self::DEFAULT_CONFIG) { $dashboard = new Dashboard(); try { $dashboardConfig = IcingaConfig::app($config); + if (count($dashboardConfig) === 0) { + return null; + } $dashboard->readConfig($dashboardConfig); } catch (NotReadableError $e) { Logger::error(new Exception('Cannot load dashboard configuration. An exception was thrown:', 0, $e)); + return null; } return $dashboard; } @@ -133,18 +142,28 @@ class DashboardController extends ActionController $pane = $this->_getParam('pane'); $dashboard->activate($pane); } - $this->view->title = $dashboard->getActivePane()->getTitle() . ' :: Dashboard'; - $this->view->tabs = $dashboard->getTabs(); - /* Temporarily removed - $this->view->tabs->add( - 'Add', - array( - 'title' => '+', - 'url' => Url::fromPath('dashboard/addurl') - ) - ); - */ - $this->view->dashboard = $dashboard; + + $this->view->configPath = IcingaConfig::$configDir . DIRECTORY_SEPARATOR . self::DEFAULT_CONFIG; + + if ($dashboard === null) { + $this->view->title = 'Dashboard'; + } else { + $this->view->title = $dashboard->getActivePane()->getTitle() . ' :: Dashboard'; + $this->view->tabs = $dashboard->getTabs(); + + /* Temporarily removed + $this->view->tabs->add( + 'Add', + array( + 'title' => '+', + 'url' => Url::fromPath('dashboard/addurl') + ) + ); + */ + + $this->view->dashboard = $dashboard; + + } } /** diff --git a/application/views/scripts/dashboard/index.phtml b/application/views/scripts/dashboard/index.phtml index 8ec851e11..92e8771e2 100644 --- a/application/views/scripts/dashboard/index.phtml +++ b/application/views/scripts/dashboard/index.phtml @@ -1,6 +1,20 @@
    tabs ?>
    -
    -dashboard ?> -
    +dashboard): ?> +
    + dashboard ?> +
    + +
    +

    No dashboard configuration found!

    +

    + We tried to load a dashboard configuration with no success. + Please have look that the configuration does exist: + + + configPath ?>.ini + +

    +
    + \ No newline at end of file diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php index 107e4c0a6..5e5180a9b 100644 --- a/library/Icinga/Web/Widget/Dashboard.php +++ b/library/Icinga/Web/Widget/Dashboard.php @@ -305,7 +305,7 @@ class Dashboard extends AbstractWidget $active = $this->setDefaultPane(); } } - return $this->panes[$active]; + return isset($this->panes[$active]) ? $this->panes[$active] : null; } /** From 20b43a92f13b9e63b6bfd28159b7ae877871881d Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Thu, 5 Jun 2014 16:07:40 +0200 Subject: [PATCH 78/96] Dashboard: Better implementation of handling errors refs #6412 --- application/controllers/DashboardController.php | 2 +- application/views/scripts/dashboard/index.phtml | 8 +++++--- library/Icinga/Web/Widget/Dashboard.php | 8 +++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php index 1f86fd2ce..a38a02561 100644 --- a/application/controllers/DashboardController.php +++ b/application/controllers/DashboardController.php @@ -143,7 +143,7 @@ class DashboardController extends ActionController $dashboard->activate($pane); } - $this->view->configPath = IcingaConfig::$configDir . DIRECTORY_SEPARATOR . self::DEFAULT_CONFIG; + $this->view->configPath = IcingaConfig::resolvePath(self::DEFAULT_CONFIG); if ($dashboard === null) { $this->view->title = 'Dashboard'; diff --git a/application/views/scripts/dashboard/index.phtml b/application/views/scripts/dashboard/index.phtml index 92e8771e2..3e721dc68 100644 --- a/application/views/scripts/dashboard/index.phtml +++ b/application/views/scripts/dashboard/index.phtml @@ -9,11 +9,13 @@

    No dashboard configuration found!

    - We tried to load a dashboard configuration with no success. - Please have look that the configuration does exist: + translate('We tried to load a dashboard configuration with no success.' + . ' Please have look that the configuration does exist:'); + ?> - configPath ?>.ini + escape($this->configPath) ?>.ini

    diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php index 5e5180a9b..c997ada87 100644 --- a/library/Icinga/Web/Widget/Dashboard.php +++ b/library/Icinga/Web/Widget/Dashboard.php @@ -31,6 +31,7 @@ namespace Icinga\Web\Widget; use Icinga\Application\Icinga; use Icinga\Application\Config as IcingaConfig; +use Icinga\Exception\ConfigurationError; use Icinga\Exception\ProgrammingError; use Icinga\Web\Widget\AbstractWidget; use Icinga\Web\Widget\Dashboard\Pane; @@ -305,7 +306,12 @@ class Dashboard extends AbstractWidget $active = $this->setDefaultPane(); } } - return isset($this->panes[$active]) ? $this->panes[$active] : null; + + if (isset($this->panes[$active])) { + return $this->panes[$active]; + } + + throw new ConfigurationError('Could not determine active pane'); } /** From 176588c87d9da28ea913b1a93293ac3b9ecfe66d Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 14:54:00 +0000 Subject: [PATCH 79/96] installation: get rid of .htaccess, less automake Trying to remove a bunch of autoconf and .htaccess-related stuff. This commit is the last one from a series now finally allowing to run icingaweb directly from a git checkout. refs #4075 --- .../files/etc/httpd/conf.d/icingaweb.conf | 19 +++++++++++++++---- .../files/var/www/html/icingaweb/.htaccess | 11 ----------- .vagrant-puppet/manifests/default.pp | 6 ------ configure | 3 +-- configure.ac | 1 - etc/apache/icingaweb.conf.in | 19 ++++++++++++++----- icingaweb2.spec | 5 +---- public/.gitignore | 2 -- public/.htaccess.in | 7 ------- public/{index.php.in => index.php} | 1 - 10 files changed, 31 insertions(+), 43 deletions(-) delete mode 100644 .vagrant-puppet/files/var/www/html/icingaweb/.htaccess delete mode 100644 public/.gitignore delete mode 100644 public/.htaccess.in rename public/{index.php.in => index.php} (57%) diff --git a/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf b/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf index 16dd5e9cb..93b187b87 100644 --- a/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf +++ b/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf @@ -1,10 +1,21 @@ - Options -Indexes - - AllowOverride All - + Options SymLinksIfOwnerMatch + AllowOverride None Order allow,deny Allow from all + # SetEnv ICINGAWEB_CONFIGDIR /etc/icingaweb + EnableSendfile Off + + RewriteEngine on + RewriteBase /icingaweb/ + RewriteCond %{REQUEST_FILENAME} -s [OR] + RewriteCond %{REQUEST_FILENAME} -l [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule ^.*$ - [NC,L] + RewriteRule ^.*$ index.php [NC,L] + + php_value xdebug.idekey PHPSTORM + diff --git a/.vagrant-puppet/files/var/www/html/icingaweb/.htaccess b/.vagrant-puppet/files/var/www/html/icingaweb/.htaccess deleted file mode 100644 index f5ea66435..000000000 --- a/.vagrant-puppet/files/var/www/html/icingaweb/.htaccess +++ /dev/null @@ -1,11 +0,0 @@ -RewriteEngine on -RewriteBase /icingaweb -RewriteCond %{REQUEST_FILENAME} -s [OR] -RewriteCond %{REQUEST_FILENAME} -l [OR] -RewriteCond %{REQUEST_FILENAME} -d -RewriteRule ^.*$ - [NC,L] -RewriteRule ^.*$ index.php [NC,L] - -php_flag short_open_tag on - -php_value xdebug.idekey PHPSTORM diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index fa85b48fd..040e5574b 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -767,12 +767,6 @@ file { '/var/www/html/icingaweb/css.php': ensure => absent, } -file { '/var/www/html/icingaweb/.htaccess': - source => 'puppet:////vagrant/.vagrant-puppet/files/var/www/html/icingaweb/.htaccess', - owner => 'apache', - group => 'apache', -} - file { '/etc/httpd/conf.d/icingaweb.conf': source => 'puppet:////vagrant/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf', require => Package['apache'], diff --git a/configure b/configure index 07073a2de..d1738226a 100755 --- a/configure +++ b/configure @@ -2950,7 +2950,7 @@ fi # # Create config files # -ac_config_files="$ac_config_files Makefile config/authentication.ini config/config.ini config/resources.ini config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf public/.htaccess public/index.php" +ac_config_files="$ac_config_files Makefile config/authentication.ini config/config.ini config/resources.ini config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf public/index.php" # @@ -3669,7 +3669,6 @@ do "config/modules/monitoring/backends.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/backends.ini" ;; "config/modules/monitoring/instances.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/instances.ini" ;; "etc/apache/icingaweb.conf") CONFIG_FILES="$CONFIG_FILES etc/apache/icingaweb.conf" ;; - "public/.htaccess") CONFIG_FILES="$CONFIG_FILES public/.htaccess" ;; "public/index.php") CONFIG_FILES="$CONFIG_FILES public/index.php" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.ac b/configure.ac index 42a37f3dc..3ae33025d 100644 --- a/configure.ac +++ b/configure.ac @@ -440,7 +440,6 @@ AC_CONFIG_FILES([ config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf - public/.htaccess public/index.php ]) diff --git a/etc/apache/icingaweb.conf.in b/etc/apache/icingaweb.conf.in index 7c87a2d11..69335368e 100644 --- a/etc/apache/icingaweb.conf.in +++ b/etc/apache/icingaweb.conf.in @@ -1,12 +1,21 @@ -Alias @web_path@ @prefix@/public +Alias @web_path@ "@prefix@/public" + - Options -Indexes - - AllowOverride All - + Options SymLinksIfOwnerMatch + AllowOverride None Order allow,deny Allow from all + SetEnv ICINGAWEB_CONFIGDIR @icingaweb_config_path@ + EnableSendfile Off + + RewriteEngine on + RewriteBase @web_path@/ + RewriteCond %{REQUEST_FILENAME} -s [OR] + RewriteCond %{REQUEST_FILENAME} -l [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule ^.*$ - [NC,L] + RewriteRule ^.*$ index.php [NC,L] diff --git a/icingaweb2.spec b/icingaweb2.spec index 385be86e6..b1cb3d2e5 100644 --- a/icingaweb2.spec +++ b/icingaweb2.spec @@ -164,9 +164,8 @@ install -D -m0644 packages/rhel/etc/httpd/conf.d/icingaweb.conf %{buildroot}/%{a %{__cp} -r application library modules public %{buildroot}/%{sharedir}/ -# install index.php, .htaccess +# install index.php install -m0644 packages/rhel/usr/share/icingaweb/public/index.php %{buildroot}/%{sharedir}/public/index.php -install -m0644 packages/rhel/usr/share/icingaweb/public/.htaccess %{buildroot}/%{sharedir}/public/.htaccess # use the vagrant config for configuration for now - TODO %{__cp} -r .vagrant-puppet/files/etc/icingaweb %{buildroot}/%{_sysconfdir}/ @@ -183,8 +182,6 @@ install -D -m0755 bin/icingacli %{buildroot}/usr/bin/icingacli # install sql schema files as example # delete all *.in files -rm -f %{buildroot}/%{_datadir}/%{name}/public/index.php.in -rm -f %{buildroot}/%{_datadir}/%{name}/public/.htaccess.in %pre # Add apacheuser in the icingacmd group diff --git a/public/.gitignore b/public/.gitignore deleted file mode 100644 index 4c3d24e81..000000000 --- a/public/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.htaccess -index.php diff --git a/public/.htaccess.in b/public/.htaccess.in deleted file mode 100644 index a575ad6d3..000000000 --- a/public/.htaccess.in +++ /dev/null @@ -1,7 +0,0 @@ -RewriteEngine on -RewriteBase @web_path@ -RewriteCond %{REQUEST_FILENAME} -s [OR] -RewriteCond %{REQUEST_FILENAME} -l [OR] -RewriteCond %{REQUEST_FILENAME} -d -RewriteRule ^.*$ - [NC,L] -RewriteRule ^.*$ index.php [NC,L] diff --git a/public/index.php.in b/public/index.php similarity index 57% rename from public/index.php.in rename to public/index.php index a8a4f26a3..69b3dfce8 100644 --- a/public/index.php.in +++ b/public/index.php @@ -1,4 +1,3 @@ Date: Thu, 5 Jun 2014 15:03:59 +0000 Subject: [PATCH 80/96] JS/CSS: Get IE8 working Just a bunch of JS and CSS improvements / fixes refs #6417 --- application/layouts/scripts/layout.phtml | 2 +- modules/monitoring/public/js/module.js | 2 +- public/css/icinga/menu.less | 1 + public/js/icinga/events.js | 13 +++++++------ public/js/icinga/ui.js | 4 ++-- public/js/icinga/utils.js | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index 5c91b4b48..16a245a15 100644 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -53,7 +53,7 @@ $isIframe = isset($_GET['_render']) && $_GET['_render'] === 'iframe'; diff --git a/modules/monitoring/public/js/module.js b/modules/monitoring/public/js/module.js index 2d04785b5..ea31f18d8 100644 --- a/modules/monitoring/public/js/module.js +++ b/modules/monitoring/public/js/module.js @@ -76,7 +76,7 @@ } } - }, + }; Icinga.availableModules.monitoring = Monitoring; diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less index aa5c26ec8..bdad995fd 100644 --- a/public/css/icinga/menu.less +++ b/public/css/icinga/menu.less @@ -213,6 +213,7 @@ border: none; width: 100%; border-radius: 0; + line-height: 2.5em; height: 2.5em; display: block; outline: none; diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 2142a7c6b..1009a3cbb 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -51,8 +51,8 @@ } }); - var moduleName; - if (moduleName = el.data('icingaModule')) { + var moduleName = el.data('icingaModule'); + if (moduleName) { if (icinga.hasModule(moduleName)) { var module = icinga.module(moduleName); // NOT YET, the applyOnloadDings: module.applyEventHandlers(mod); @@ -99,7 +99,7 @@ $( window ).on('beforeunload', { self: this }, this.onUnload); // We catch scroll events in our containers - $('.container').on('scroll', this.icinga.events.onContainerScroll); + $('.container').on('scroll', { self: this }, this.icinga.events.onContainerScroll); // We want to catch each link click $(document).on('click', 'a', { self: this }, this.linkClicked); @@ -259,6 +259,7 @@ }, clickTriState: function (event) { + var self = event.data.self; var $tristate = $(this); var triState = parseInt($tristate.data('icinga-tristate'), 10); @@ -348,7 +349,7 @@ // combined with target="_blank" or target="_self" // window.open is used as return true; didn't work reliable if (linkTarget === '_blank' || linkTarget === '_self') { - window.open(href, linkTarget); + window.open($node.attr('href'), linkTarget); return true; } return false; @@ -543,7 +544,7 @@ } else if (targetId === '_main') { targetId = 'col1'; $target = $('#' + targetId); - icinga.ui.layout1col(); + self.icinga.ui.layout1col(); } else { $target = $('#' + targetId); } @@ -552,7 +553,7 @@ // Hardcoded layout switch unless columns are dynamic if ($target.attr('id') === 'col2') { - icinga.ui.layout2col(); + this.icinga.ui.layout2col(); } return $target; diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js index ed68a2dd4..152c3058c 100644 --- a/public/js/icinga/ui.js +++ b/public/js/icinga/ui.js @@ -215,7 +215,7 @@ layout1col: function () { if (! $('#layout').hasClass('twocols')) { return; } var $col2 = $('#col2'); - icinga.logger.debug('Switching to single col'); + this.icinga.logger.debug('Switching to single col'); $('#layout').removeClass('twocols'); $col2.removeData('icingaUrl'); $col2.removeData('icingaRefresh'); @@ -228,7 +228,7 @@ layout2col: function () { if ($('#layout').hasClass('twocols')) { return; } - icinga.logger.debug('Switching to double col'); + this.icinga.logger.debug('Switching to double col'); $('#layout').addClass('twocols'); this.fixControls(); }, diff --git a/public/js/icinga/utils.js b/public/js/icinga/utils.js index bf081d016..1e037aafe 100644 --- a/public/js/icinga/utils.js +++ b/public/js/icinga/utils.js @@ -73,8 +73,8 @@ var elemTop = $element.offset().top; var elemBottom = elemTop + $element.height(); - return ((elemBottom >= docViewTop) && (elemTop <= docViewBottom) - && (elemBottom <= docViewBottom) && (elemTop >= docViewTop)); + return ((elemBottom >= docViewTop) && (elemTop <= docViewBottom) && + (elemBottom <= docViewBottom) && (elemTop >= docViewTop)); }, getUrlHelper: function () { From 72a2ec41badabe614099363a83a81d9c5fd04844 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 15:07:41 +0000 Subject: [PATCH 81/96] Vagrant: FollowSymlinks instead of ...IfOwnerMatch Dirty like the rest of that setup :p --- .vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf b/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf index 93b187b87..462689ce9 100644 --- a/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf +++ b/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf @@ -1,5 +1,5 @@ - Options SymLinksIfOwnerMatch + Options FollowSymLinks AllowOverride None Order allow,deny Allow from all From ca6b373be2534b9e362cb0c332d26f3974040c22 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 15:16:03 +0000 Subject: [PATCH 82/96] JS: fix multiselect burning resources Especially on browsers with slow JS like IE8 iterating again and again over all rows used to harm response rendering. Immagine a dasboard with a total of a few hundred rows refreshing every 10 seconds while taking 3 secs to render one dashlet... it's far better right now. refs #6417 --- public/css/icinga/widgets.less | 8 ++++++++ public/js/icinga/events.js | 1 - public/js/icinga/loader.js | 3 --- public/js/icinga/ui.js | 13 ------------- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less index 6203c969c..9813bb60b 100644 --- a/public/css/icinga/widgets.less +++ b/public/css/icinga/widgets.less @@ -38,3 +38,11 @@ table.historycolorgrid a { table.historycolorgrid a:hover { text-decoration: none; } + +table.multiselect tr[href] td { + user-select: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; +} + diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 1009a3cbb..745441741 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -28,7 +28,6 @@ this.applyGlobalDefaults(); this.applyHandlers($('#layout')); this.icinga.ui.prepareContainers(); - this.icinga.ui.prepareMultiselectTables($(document)); }, // TODO: What's this? diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index 39ed77b1e..b701d16e1 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -412,9 +412,6 @@ this.icinga.ui.initializeTriStates($resp); - // Make multiselection-tables not selectable. - this.icinga.ui.prepareMultiselectTables($resp); - // Replace images with sparklines. $resp.find('img.inlinepie').each(function(){ self.icinga.ui.initializeSparklines($(this)); diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js index 152c3058c..e76e2dba8 100644 --- a/public/js/icinga/ui.js +++ b/public/js/icinga/ui.js @@ -276,19 +276,6 @@ */ }, - /** - * Prepare all multiselectable tables for multi-selection by - * removing the regular text selection. - */ - prepareMultiselectTables: function () { - var $rows = $('table.multiselect tr[href]'); - $rows.find('td').attr('unselectable', 'on') - .css('user-select', 'none') - .css('-webkit-user-select', 'none') - .css('-moz-user-select', 'none') - .css('-ms-user-select', 'none'); - }, - /** * Add the given table-row to the selection of the closest * table and deselect all other rows of the closest table. From 0d9f8786f9f52eabb5c1c2515c4b710d21071509 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 15:35:38 +0000 Subject: [PATCH 83/96] JS for IE8: failsafe console handling & others It's quite tricky to get this working. Still not perfect, but works as expected. Also added Function.bind and Array.indexOf - absence of both used to cause JS errors. refs #6417 --- public/js/helpers.js | 50 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/public/js/helpers.js b/public/js/helpers.js index 1b6fdb8d6..849df2b63 100644 --- a/public/js/helpers.js +++ b/public/js/helpers.js @@ -16,7 +16,28 @@ })(Object); -(function (console) { +(function (Array) { + + 'use strict'; + if (!Array.prototype.indexOf) { + Array.prototype.indexOf = function(elt) { + var len = this.length >>> 0; + + var from = Number(arguments[1]) || 0; + from = (from < 0) ? Math.ceil(from) : Math.floor(from); + if (from < 0) from += len; + + for (; from < len; from++) { + if (from in this && this[from] === elt) { + return from; + } + } + return -1; + }; + } +})(Array); + +if ('undefined' !== typeof console) { (function (console) { 'use strict'; @@ -40,7 +61,32 @@ console[method] = this.call(console[method], console); }, Function.prototype.bind); } -})(console); +})(console); } + +/* I intentionally moved this here, AFTER console handling */ +/* Could be switched, but please take care when doing so */ +if (!Function.prototype.bind) { + Function.prototype.bind = function (oThis) { + if (typeof this !== 'function') { + throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable'); + } + + var aArgs = Array.prototype.slice.call(arguments, 1), + fToBind = this, + fNOP = function () {}, + fBound = function () { + return fToBind.apply(this instanceof fNOP && oThis + ? this + : oThis, + aArgs.concat(Array.prototype.slice.call(arguments))); + }; + + fNOP.prototype = this.prototype; + fBound.prototype = new fNOP(); + + return fBound; + }; +} /* jQuery Plugins */ (function ($) { From 2d228ce83d4e18f48df0ab6275981879c4197212 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 18:11:19 +0000 Subject: [PATCH 84/96] JS for IE8: even more JS fixes refs #6417 --- public/js/icinga/events.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 745441741..e8bfdcfc6 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -120,10 +120,10 @@ $(document).on('mouseenter', '.historycolorgrid td', this.historycolorgridHover); $(document).on('mouseleave', '.historycolorgrid td', this.historycolorgidUnhover); $(document).on('mouseenter', 'li.dropdown', this.dropdownHover); - $(document).on('mouseleave', 'li.dropdown', this.dropdownLeave); + $(document).on('mouseleave', 'li.dropdown', {self: this}, this.dropdownLeave); - $(document).on('mouseenter', '#menu > ul > li', this.menuTitleHovered); - $(document).on('mouseleave', '#sidebar', this.leaveSidebar); + $(document).on('mouseenter', '#menu > ul > li', { self: this }, this.menuTitleHovered); + $(document).on('mouseleave', '#sidebar', { self: this }, this.leaveSidebar); $(document).on('click', '.tree .handle', { self: this }, this.treeNodeToggle); // Toggle all triStateButtons @@ -135,9 +135,10 @@ // $(document).on('change', 'form.auto select', this.submitForm); }, - menuTitleHovered: function () { + menuTitleHovered: function (event) { var $li = $(this), - delay = 800; + delay = 800, + self = event.data.self; if ($li.hasClass('active')) { $li.siblings().removeClass('hover'); @@ -177,9 +178,10 @@ }, delay); }, - leaveSidebar: function () { - var $sidebar = $(this); - var $li = $sidebar.find('li.hover'); + leaveSidebar: function (event) { + var $sidebar = $(this), + $li = $sidebar.find('li.hover'), + self = event.data.self; if (! $li.length) { $('#layout').removeClass('hoveredmenu'); return; @@ -198,8 +200,9 @@ $(this).addClass('hover'); }, - dropdownLeave: function () { - var $li = $(this); + dropdownLeave: function (event) { + var $li = $(this), + self = event.data.self; setTimeout(function () { // TODO: make this behave well together with keyboard navigation if (! $li.is('li:hover') /*&& ! $li.find('a:focus')*/) { From 4646b74fbc2c473c9f732485b284175d539585fd Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 18:46:11 +0000 Subject: [PATCH 85/96] JS/cleanup: start to clean up response handling First step: get rid of the messy workaround for the problem that notifications got lost once the whole body is re-rendered. This should be solved either on server side or by detaching and re- attaching existing notifications in such scenario. --- public/js/icinga/loader.js | 46 +++++++++----------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index b701d16e1..72d2ae51c 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -220,6 +220,14 @@ this.autorefreshEnabled = true; }, + processNotificationHeader: function(req) { + var header = req.getResponseHeader('X-Icinga-Notification'); + if (typeof header === 'undefined' || ! header) return false; + var parts = decodeURIComponent(header).split(' '); + this.createNotice(parts.shift(), parts.join(' ')); + return true; + }, + /** * Handle successful XHR response */ @@ -244,6 +252,8 @@ this.icinga.logger.debug( 'Got response for ', req.$target, ', URL was ' + url ); + this.processNotificationHeader(req); + var redirect = req.getResponseHeader('X-Icinga-Redirect'); if (redirect) { this.icinga.logger.debug( @@ -295,20 +305,11 @@ active = $('[href].active', req.$target).attr('href'); } - var notifications = req.getResponseHeader('X-Icinga-Notification'); - if (notifications) { - notifications = decodeURIComponent(notifications); - } var target = req.getResponseHeader('X-Icinga-Container'); var newBody = false; if (target) { if (target === 'ignore') { - var parts = notifications.split(' '); - this.createNotice( - parts.shift(), - parts.join(' ') - ); return; } // If we change the target, oncomplete will fail to clean up @@ -319,14 +320,6 @@ newBody = true; } - if (! newBody && notifications) { - var parts = notifications.split(' '); - this.createNotice( - parts.shift(), - parts.join(' ') - ); - } - var moduleName = req.getResponseHeader('X-Icinga-Module'); classes = $.grep(req.$target.classes(), function (el) { if (el === 'icinga-module' || el.match(/^module\-/)) { @@ -438,17 +431,7 @@ }); */ - if (rendered) { - - if (newBody && notifications) { - var parts = notifications.split(' '); - this.createNotice( - parts.shift(), - parts.join(' ') - ); - } - return; - } + if (rendered) return; // .html() removes outer div we added above this.renderContentToContainer($resp.html(), req.$target, req.action); @@ -458,13 +441,6 @@ if (newBody) { this.icinga.ui.fixDebugVisibility().triggerWindowResize(); } - if (newBody && notifications) { - var parts = notifications.split(' '); - this.createNotice( - parts.shift(), - parts.join(' ') - ); - } if (active) { var focusedUrl = this.icinga.ui.getFocusedContainerDataUrl(); From 2bf58b034b0d245542471152376a3d707c5148da Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 5 Jun 2014 19:37:12 +0000 Subject: [PATCH 86/96] JS/cleanup: separate redirect header handling --- public/js/icinga/loader.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index 72d2ae51c..3b92e5b2f 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -222,12 +222,23 @@ processNotificationHeader: function(req) { var header = req.getResponseHeader('X-Icinga-Notification'); - if (typeof header === 'undefined' || ! header) return false; + if (! header) return false; var parts = decodeURIComponent(header).split(' '); this.createNotice(parts.shift(), parts.join(' ')); return true; }, + processRedirectHeader: function(req) { + var redirect = req.getResponseHeader('X-Icinga-Redirect'); + if (! redirect) return false; + this.icinga.logger.debug( + 'Got redirect for ', req.$target, ', URL was ' + redirect + ); + redirect = decodeURIComponent(redirect); + this.loadUrl(redirect, req.$target); + return true; + }, + /** * Handle successful XHR response */ @@ -255,14 +266,7 @@ this.processNotificationHeader(req); var redirect = req.getResponseHeader('X-Icinga-Redirect'); - if (redirect) { - this.icinga.logger.debug( - 'Got redirect for ', req.$target, ', URL was ' + redirect - ); - redirect = decodeURIComponent(redirect); - this.loadUrl(redirect, req.$target); - return; - } + if (this.processRedirectHeader(req)) return; // div helps getting an XML tree var $resp = $('
    ' + req.responseText + '
    '); From ba87cc5c4a667a2d7f6244cae1eda97ca1db0799 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 6 Jun 2014 05:23:57 +0000 Subject: [PATCH 87/96] IE8/JS: some more console logging fixes refs #6417 --- public/js/icinga/logger.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/public/js/icinga/logger.js b/public/js/icinga/logger.js index 6cd9ad047..706f57adc 100644 --- a/public/js/icinga/logger.js +++ b/public/js/icinga/logger.js @@ -81,8 +81,18 @@ // We want our log messages to carry precise timestamps args.unshift(this.icinga.utils.timeWithMs()); - if (this.hasConsole() && this.hasLogLevel(level) && typeof console[level].apply === 'function') { - console[level].apply(console, args); + if (this.hasConsole() && this.hasLogLevel(level)) { + if (typeof console[level] !== 'undefined') { + if (typeof console[level].apply === 'function') { + console[level].apply(console, args); + } else { + args.unshift('[' + level + ']'); + console[level](args.join(' ')); + } + } else if ('undefined' !== typeof console.log) { + args.unshift('[' + level + ']'); + console.log(args.join(' ')); + } } return this; }, From defa02a609d74169c5d8c86cde4004d23ad3d47e Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 6 Jun 2014 09:28:06 +0200 Subject: [PATCH 88/96] Debug: Remove garbage statement for debug purposes --- modules/monitoring/application/controllers/ListController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 34854ba32..a5ec02066 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -288,8 +288,6 @@ class Monitoring_ListController extends Controller )->getQuery(); $this->view->contacts = $query->paginate(); - file_put_contents('/tmp/query.txt', (string) $query); - $this->setupSortControl(array( 'contact_name' => 'Name', 'contact_alias' => 'Alias', From a5e9d6cf0d3d48035ddabf8c71e85b448f228c7b Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 6 Jun 2014 09:33:29 +0200 Subject: [PATCH 89/96] auth: increase backends tried counter AFTER skipping autologin backends --- application/controllers/AuthenticationController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php index b2e5294e3..f50987de7 100644 --- a/application/controllers/AuthenticationController.php +++ b/application/controllers/AuthenticationController.php @@ -111,12 +111,10 @@ class AuthenticationController extends ActionController $backendsWithError = 0; foreach ($chain as $backend) { - ++$backendsTried; - if ($backend instanceof AutoLoginBackend) { continue; } - + ++$backendsTried; try { $authenticated = $backend->authenticate($user, $password); } catch (AuthenticationException $e) { From e01629fe0b3d09554ca98eef67d6247e66ad6fe1 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 6 Jun 2014 08:31:00 +0000 Subject: [PATCH 90/96] ActionController: fix initial redirect refs #6419 --- library/Icinga/Web/Controller/ActionController.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index c744fe0f8..870078e96 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -370,17 +370,14 @@ class ActionController extends Zend_Controller_Action **/ public function redirectNow($url) { - if (! $url instanceof Url) { - $url = Url::fromPath($url); - } - $url = preg_replace('~&~', '&', $url); + $url = Url::fromPath(preg_replace('~&~', '&', $url)); if ($this->_request->isXmlHttpRequest()) { header('X-Icinga-Redirect: ' . rawurlencode($url)); // $this->getResponse()->sendHeaders() ?? // Session shutdown exit; // Really? } else { - $this->_helper->Redirector->gotoUrlAndExit($url); + $this->_helper->Redirector->gotoUrlAndExit($url->getRelativeUrl()); } $this->isRedirect = true; // pretty useless right now } From 58b509b8eec0efde5016e2441777aaf88195b917 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 6 Jun 2014 10:48:22 +0200 Subject: [PATCH 91/96] Puppet: Use /vagrant directory to deliver web files Apache uses now /vagrant/public instead of /var/www/html symlinks. fixes #6421 --- .../files/etc/httpd/conf.d/icingaweb.conf | 4 +- .vagrant-puppet/manifests/default.pp | 47 ------------------- 2 files changed, 3 insertions(+), 48 deletions(-) diff --git a/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf b/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf index 462689ce9..0b45bea1f 100644 --- a/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf +++ b/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf @@ -1,4 +1,6 @@ - +Alias /icingaweb /vagrant/public + + Options FollowSymLinks AllowOverride None Order allow,deny diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index 040e5574b..dcfbad7a3 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -716,54 +716,7 @@ exec { 'populate-icinga_web-mysql-db': require => [ Exec['create-mysql-icinga_web-db'], Cmmi['icinga-web'] ] } -# -# Development environment (Feature #5554) -# file { '/var/www/html/icingaweb': - ensure => 'directory', - owner => 'apache', - group => 'apache' -} - -file { '/var/www/html/icingaweb/css': - ensure => 'link', - target => '/vagrant/public/css', - owner => 'apache', - group => 'apache', -} - -file { '/var/www/html/icingaweb/svg': - ensure => 'link', - target => '/vagrant/public/svg', - owner => 'apache', - group => 'apache', -} - -file { '/var/www/html/icingaweb/img': - ensure => 'link', - target => '/vagrant/public/img', - owner => 'apache', - group => 'apache', -} - -file { '/var/www/html/icingaweb/js': - ensure => 'link', - target => '/vagrant/public/js', - owner => 'apache', - group => 'apache', -} - -file { '/var/www/html/icingaweb/index.php': - source => 'puppet:////vagrant/.vagrant-puppet/files/var/www/html/icingaweb/index.php', - owner => 'apache', - group => 'apache', -} - -file { '/var/www/html/icingaweb/js.php': - ensure => absent, -} - -file { '/var/www/html/icingaweb/css.php': ensure => absent, } From e3cd50ef16be34fbe7d48ccb14f0df53c61c603c Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 6 Jun 2014 10:50:58 +0200 Subject: [PATCH 92/96] Puppet: Remove stuff from manifest we do not need again --- .vagrant-puppet/manifests/default.pp | 30 ---------------------------- 1 file changed, 30 deletions(-) diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index dcfbad7a3..4358b2898 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -479,36 +479,6 @@ service { 'icinga2': ] } -# cmmi { 'icinga2': -# url => "https://github.com/Icinga/icinga2/releases/download/v${icinga2Version}/icinga2-${icinga2Version}.tar.gz", -# output => "icinga2-${icinga2Version}.tar.gz", -# configure_command => 'mkdir build &> /dev/null || true && cd build && sudo cmake ..', -# creates => '/usr/local/sbin/icinga2', -# make => 'true && cd build/ && make && make install', -# require => Package[ ['cmake', 'boost-devel', 'bison', 'flex'] ], -# make_timeout => 900 -# } - -#configure { 'icingaweb': -# path => '/vagrant', -# flags => '--prefix=/vagrant \ -# --with-icinga-commandpipe="/usr/local/icinga-mysql/var/rw/icinga.cmd" \ -# --with-statusdat-file="/usr/local/icinga-mysql/var/status.dat" \ -# --with-objects-cache-file=/usr/local/icinga-mysql/var/objects.cache \ -# --with-icinga-backend=ido \ -# --with-httpd-config-path="/etc/httpd/conf.d" \ -# --with-ldap-authentication \ -# --with-internal-authentication \ -# --with-livestatus-socket="/usr/local/icinga-mysql/var/rw/live"', -# require => Exec['install php-ZendFramework'] -#} - -#file { 'icingaweb-public': -# ensure => '/vagrant/public', -# path => '/var/www/html/icingaweb', -# require => Class['apache'] -#} - exec { 'install php-ZendFramework-Db-Adapter-Pdo-Mysql': command => 'yum -d 0 -e 0 -y --enablerepo=epel install php-ZendFramework-Db-Adapter-Pdo-Mysql', unless => 'rpm -qa | grep php-ZendFramework-Db-Adapter-Pdo-Mysql', From 89ae3713cd81b57d656b8b49809ad04747d1fa00 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 6 Jun 2014 11:01:20 +0200 Subject: [PATCH 93/96] Vagrant/finalize: Do not remount /vagrant/var/log If you do multiple provisioning calls mount point /vagrant/var/log is mounted multiple times. --- .vagrant-puppet/manifests/finalize.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.vagrant-puppet/manifests/finalize.sh b/.vagrant-puppet/manifests/finalize.sh index 02bee09a0..3b1418575 100644 --- a/.vagrant-puppet/manifests/finalize.sh +++ b/.vagrant-puppet/manifests/finalize.sh @@ -17,8 +17,13 @@ startServicesWithNonLSBCompliantExitStatusCodes () { } mountIcinga2webVarLog () { - # Remount /vagrant/var/log/ with appropriate permissions since the group apache is missing initially - mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=664 /vagrant/var/log/ /vagrant/var/log/ + if ! $(/bin/mount | /bin/grep -q "/vagrant/var/log"); then + # Remount /vagrant/var/log/ with appropriate permissions since the group apache is missing initially + /bin/mount -t vboxsf -o \ + uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=664 \ + /vagrant/var/log/ \ + /vagrant/var/log/ + fi } installJquery From 140f307e0adf769854c3376f2885a70e0dbea74b Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 6 Jun 2014 13:48:58 +0200 Subject: [PATCH 94/96] Fix failing configure run due to removed index.php refs #4075 --- configure | 3 +-- configure.ac | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configure b/configure index d1738226a..a48f71506 100755 --- a/configure +++ b/configure @@ -2950,7 +2950,7 @@ fi # # Create config files # -ac_config_files="$ac_config_files Makefile config/authentication.ini config/config.ini config/resources.ini config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf public/index.php" +ac_config_files="$ac_config_files Makefile config/authentication.ini config/config.ini config/resources.ini config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf" # @@ -3669,7 +3669,6 @@ do "config/modules/monitoring/backends.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/backends.ini" ;; "config/modules/monitoring/instances.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/instances.ini" ;; "etc/apache/icingaweb.conf") CONFIG_FILES="$CONFIG_FILES etc/apache/icingaweb.conf" ;; - "public/index.php") CONFIG_FILES="$CONFIG_FILES public/index.php" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 3ae33025d..065c81a8f 100644 --- a/configure.ac +++ b/configure.ac @@ -440,7 +440,6 @@ AC_CONFIG_FILES([ config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf - public/index.php ]) # From a75796c64d397d37f1d41ae3d7e6bdf119b340d9 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 6 Jun 2014 13:52:45 +0200 Subject: [PATCH 95/96] Ui/Sparklines: Remove img src before putting it into DOM SVG chart was fetched although we removed image tags from DOM. This happens when text is converted into browser DOM model to use with javascript. Small regex remove img source attribute to avoid using network bandwidth for unknown resources. fixes #6124 --- public/js/icinga/loader.js | 2 +- public/js/icinga/ui.js | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index 3b92e5b2f..338629136 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -269,7 +269,7 @@ if (this.processRedirectHeader(req)) return; // div helps getting an XML tree - var $resp = $('
    ' + req.responseText + '
    '); + var $resp = $('
    ' + icinga.ui.removeImageSourceFromSparklines(req.responseText) + '
    '); var active = false; var rendered = false; var classes; diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js index e76e2dba8..6902953ca 100644 --- a/public/js/icinga/ui.js +++ b/public/js/icinga/ui.js @@ -657,6 +657,22 @@ ); }, + /** + * Find all svg charts and removes src attributes for sparklines + * + * @param {string} text + * @returns {string} + */ + removeImageSourceFromSparklines: function(text) { + var match, sourceMatch; + var re = new RegExp(/(src=".+chart.php[^"]+")/g); + var reSource = new RegExp(/src="([^"]+)"/); + while ((match = re.exec(text))) { + text = text.replace(match[0], ''); + } + return text; + }, + initializeControls: function (parent) { var self = this; From 856e9fb3981e32128039674b2d025ad5ca72b82c Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 6 Jun 2014 13:59:56 +0200 Subject: [PATCH 96/96] Do not install removed .htaccess file refs #4075 --- Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 78a97cf74..a8fc908cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,7 +51,6 @@ clean: # Installs/copies all static files (executables, scripts, html, etc) # install-static-files: install-application copy-web-files-public copy-web-files-modules - $(INSTALL) -m 644 $(INSTALL_OPTS) "./public/.htaccess" $(DESTDIR)$(prefix)/public/.htaccess; # # Installs all configuration files