From cd319f8c7d9e43017f8f48a31f21c8928ffdf852 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 22 Sep 2015 18:21:25 +0200
Subject: [PATCH 1/6] Let the error page look like the login page when a
 non-authenticated user requests a non-existent page

refs #10009
---
 application/controllers/ErrorController.php | 16 +++++++---
 application/views/scripts/error/error.phtml | 35 +++++++++++++++------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 62198ec0c..670c64339 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -29,6 +29,7 @@ class ErrorController extends ActionController
      */
     public function errorAction()
     {
+        $this->view->noAuthPageNotFound = false;
         $error      = $this->_getParam('error_handler');
         $exception  = $error->exception;
         /** @var \Exception $exception */
@@ -45,11 +46,16 @@ class ErrorController extends ActionController
                 $path = array_shift($path);
                 $this->getResponse()->setHttpResponseCode(404);
                 $this->view->message = $this->translate('Page not found.');
-                if ($this->Auth()->isAuthenticated() && $modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
-                    $this->view->message .= ' ' . sprintf(
-                        $this->translate('Enabling the "%s" module might help!'),
-                        $path
-                    );
+                if ($this->Auth()->isAuthenticated()) {
+                    if ($modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
+                        $this->view->message .= ' ' . sprintf(
+                            $this->translate('Enabling the "%s" module might help!'),
+                            $path
+                        );
+                    }
+                } else {
+                    $this->innerLayout = 'inline';
+                    $this->view->noAuthPageNotFound = true;
                 }
 
                 break;
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index 5b3480922..b7927983f 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,10 +1,25 @@
-<div class="controls">
-<?= $this->tabs->showOnlyCloseButton() ?>
-</div>
-<div class="content">
-  <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
-<?php if (isset($stackTrace)) : ?>
-  <hr />
-  <pre><?= $this->escape($stackTrace) ?></pre>
-<?php endif ?>
-</div>
+<?php if ($noAuthPageNotFound) { ?>
+ <div id="login">
+  <div class="logo">
+   <div class="image">
+    <img aria-hidden="true" class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
+   </div>
+  </div>
+  <div class="form" data-base-target="layout">
+    <div class="content">
+      <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
+    </div>
+  </div>
+ </div>
+<?php } else { ?>
+  <div class="controls">
+  <?= $this->tabs->showOnlyCloseButton() ?>
+  </div>
+  <div class="content">
+    <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
+  <?php if (isset($stackTrace)) : ?>
+    <hr />
+    <pre><?= $this->escape($stackTrace) ?></pre>
+  <?php endif ?>
+  </div>
+<?php } ?>

From ed935696ac864e5e97698ad8e9b9fa36bdaea0c1 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 22 Sep 2015 18:21:25 +0200
Subject: [PATCH 2/6] CSS: outsource .logo related rules into a new .less file
 `logo.less'

refs #10009
---
 library/Icinga/Web/StyleSheet.php       |  1 +
 public/css/icinga/layout-structure.less |  3 ---
 public/css/icinga/login.less            | 26 -------------------
 public/css/icinga/logo.less             | 33 +++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100644 public/css/icinga/logo.less

diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index f22e66d33..dd45743fd 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -28,6 +28,7 @@ class StyleSheet
         'css/icinga/pagination.less',
         'css/icinga/selection-toolbar.less',
         'css/icinga/login.less',
+        'css/icinga/logo.less',
         'css/icinga/controls.less'
     );
 
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 47adbca7c..fcb5ff390 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -280,9 +280,6 @@ html {
   }
 
   #login {
-    .logo .image img {
-      width: 70%;
-    }
     .form {
       width: 100%;
       margin: auto;
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index a24265e88..1ffdebd40 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -4,37 +4,11 @@
   width: 100%;
   height: 100%;
 
-  .logo {
-    background-color: @colorPetrol;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 60%;
-    border-bottom: 1px solid #d9d9d9d;
-    text-align: center;
-    -webkit-box-shadow: 0 3px 7px -3px #000;
-    -moz-box-shadow: 0 3px 7px -3px #000;
-    box-shadow: 0 3px 7px -3px #000;
-  }
-
-  .image {
-    position: absolute;
-    bottom: 1em;
-    left: 0px;
-    right: 0px;
-    text-align: center;
-  }
-
   .error {
     margin-left:auto;
     margin-right:auto;
   }
 
-  .image img {
-    width: 375px;
-  }
-
   .form {
     position: absolute;
     font-size: 0.9em;
diff --git a/public/css/icinga/logo.less b/public/css/icinga/logo.less
new file mode 100644
index 000000000..25860b112
--- /dev/null
+++ b/public/css/icinga/logo.less
@@ -0,0 +1,33 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+.logo {
+  background-color: @colorPetrol;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 60%;
+  border-bottom: 1px solid #d9d9d9d;
+  text-align: center;
+  -webkit-box-shadow: 0 3px 7px -3px #000;
+  -moz-box-shadow: 0 3px 7px -3px #000;
+  box-shadow: 0 3px 7px -3px #000;
+
+  .image {
+    position: absolute;
+    bottom: 1em;
+    left: 0px;
+    right: 0px;
+    text-align: center;
+
+    img {
+      width: 375px;
+    }
+  }
+}
+
+#layout.minimal-layout {
+  .logo .image img {
+    width: 70%;
+  }
+}

From 426f64e32a7b3989ecf1e23edf8135a730de52e0 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 22 Sep 2015 18:21:25 +0200
Subject: [PATCH 3/6] CSS: rename .form to .below-logo

refs #10009
---
 .../views/scripts/authentication/login.phtml      |  2 +-
 application/views/scripts/error/error.phtml       |  2 +-
 public/css/icinga/layout-structure.less           |  6 +-----
 public/css/icinga/login.less                      | 15 +++------------
 public/css/icinga/logo.less                       | 14 ++++++++++++++
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 34a631778..7ae88584b 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -4,7 +4,7 @@
     <img aria-hidden="true" class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
    </div>
   </div>
-  <div class="form" data-base-target="layout">
+  <div class="below-logo" data-base-target="layout">
     <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
     <?php if ($requiresSetup): ?>
     <p class="config-note"><?= sprintf(
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index b7927983f..c23397a91 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -5,7 +5,7 @@
     <img aria-hidden="true" class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
    </div>
   </div>
-  <div class="form" data-base-target="layout">
+  <div class="below-logo" data-base-target="layout">
     <div class="content">
       <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
     </div>
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index fcb5ff390..ee23b5bfc 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -280,11 +280,7 @@ html {
   }
 
   #login {
-    .form {
-      width: 100%;
-      margin: auto;
-    }
-    .form label {
+    .below-logo label {
       width: 100%;
       margin: 0;
       text-align: center;
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index 1ffdebd40..aa69ba549 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -9,16 +9,7 @@
     margin-right:auto;
   }
 
-  .form {
-    position: absolute;
-    font-size: 0.9em;
-    top: 45%;
-    left: 0;
-    bottom: 0;
-    right: 0;
-  }
-
-  .form h1 {
+  .below-logo h1 {
     text-align: center;
     font-size: 1.5em;
     margin-left: 2.3em;
@@ -27,7 +18,7 @@
     font-variant: unset;
   }
 
-  .form div.element {
+  .below-logo div.element {
     margin: 0;
 
     ul.errors {
@@ -35,7 +26,7 @@
     }
   }
 
-  .form label {
+  .below-logo label {
     font-weight: normal;
     display: inline-block;
     line-height: 2.5em;
diff --git a/public/css/icinga/logo.less b/public/css/icinga/logo.less
index 25860b112..68fb81619 100644
--- a/public/css/icinga/logo.less
+++ b/public/css/icinga/logo.less
@@ -26,8 +26,22 @@
   }
 }
 
+.below-logo {
+  position: absolute;
+  font-size: 0.9em;
+  top: 45%;
+  left: 0;
+  bottom: 0;
+  right: 0;
+}
+
 #layout.minimal-layout {
   .logo .image img {
     width: 70%;
   }
+
+  .below-logo {
+    width: 100%;
+    margin: auto;
+  }
 }

From 8e29fe92a57feb183ece979a33ebd39d97bd870e Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Tue, 22 Sep 2015 18:21:25 +0200
Subject: [PATCH 4/6] Use a login-like layout for error messages displayed to
 non-authenticated users

refs #10009
---
 application/controllers/ErrorController.php | 11 ++++----
 application/layouts/scripts/error.phtml     |  8 ++++++
 application/views/scripts/error/error.phtml | 31 ++++++---------------
 3 files changed, 23 insertions(+), 27 deletions(-)
 create mode 100644 application/layouts/scripts/error.phtml

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 670c64339..ed35c3162 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -29,13 +29,16 @@ class ErrorController extends ActionController
      */
     public function errorAction()
     {
-        $this->view->noAuthPageNotFound = false;
         $error      = $this->_getParam('error_handler');
         $exception  = $error->exception;
         /** @var \Exception $exception */
         Logger::error($exception);
         Logger::error('Stacktrace: %s', $exception->getTraceAsString());
 
+        if (! ($isAuthenticated = $this->Auth()->isAuthenticated())) {
+            $this->innerLayout = 'error';
+        }
+
         switch ($error->type) {
             case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE:
             case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER:
@@ -46,16 +49,13 @@ class ErrorController extends ActionController
                 $path = array_shift($path);
                 $this->getResponse()->setHttpResponseCode(404);
                 $this->view->message = $this->translate('Page not found.');
-                if ($this->Auth()->isAuthenticated()) {
+                if ($isAuthenticated) {
                     if ($modules->hasInstalled($path) && ! $modules->hasEnabled($path)) {
                         $this->view->message .= ' ' . sprintf(
                             $this->translate('Enabling the "%s" module might help!'),
                             $path
                         );
                     }
-                } else {
-                    $this->innerLayout = 'inline';
-                    $this->view->noAuthPageNotFound = true;
                 }
 
                 break;
@@ -99,5 +99,6 @@ class ErrorController extends ActionController
         }
 
         $this->view->request = $error->request;
+        $this->view->hideControls = ! $isAuthenticated;
     }
 }
diff --git a/application/layouts/scripts/error.phtml b/application/layouts/scripts/error.phtml
new file mode 100644
index 000000000..0464b0ea9
--- /dev/null
+++ b/application/layouts/scripts/error.phtml
@@ -0,0 +1,8 @@
+<div class="logo">
+ <div class="image">
+  <img aria-hidden="true" class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
+ </div>
+</div>
+<div class="below-logo">
+  <?= $this->render('inline.phtml') ?>
+</div>
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index c23397a91..430f9fd97 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,25 +1,12 @@
-<?php if ($noAuthPageNotFound) { ?>
- <div id="login">
-  <div class="logo">
-   <div class="image">
-    <img aria-hidden="true" class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
-   </div>
-  </div>
-  <div class="below-logo" data-base-target="layout">
-    <div class="content">
-      <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
-    </div>
-  </div>
- </div>
-<?php } else { ?>
+<?php if (! $hideControls) { ?>
   <div class="controls">
-  <?= $this->tabs->showOnlyCloseButton() ?>
-  </div>
-  <div class="content">
-    <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
-  <?php if (isset($stackTrace)) : ?>
-    <hr />
-    <pre><?= $this->escape($stackTrace) ?></pre>
-  <?php endif ?>
+    <?= $this->tabs->showOnlyCloseButton() ?>
   </div>
 <?php } ?>
+<div class="content">
+  <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
+<?php if (isset($stackTrace)) : ?>
+  <hr />
+  <pre><?= $this->escape($stackTrace) ?></pre>
+<?php endif ?>
+</div>

From d627f419ef1115a14e12121170dbd4b2a72762af Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 28 Sep 2015 09:05:17 +0200
Subject: [PATCH 5/6] Fix that an object's notes and action url label is
 escaped twice

fixes #10218
---
 .../Renderer/NavigationItemRenderer.php       | 34 ++++++++++++++++++-
 .../scripts/show/components/actions.phtml     |  6 +++-
 .../views/scripts/show/components/notes.phtml |  6 +++-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/library/Icinga/Web/Navigation/Renderer/NavigationItemRenderer.php b/library/Icinga/Web/Navigation/Renderer/NavigationItemRenderer.php
index 7e7a0fd55..2d5563167 100644
--- a/library/Icinga/Web/Navigation/Renderer/NavigationItemRenderer.php
+++ b/library/Icinga/Web/Navigation/Renderer/NavigationItemRenderer.php
@@ -36,6 +36,13 @@ class NavigationItemRenderer
      */
     protected $internalLinkTargets;
 
+    /**
+     * Whether to escape the label
+     *
+     * @var bool
+     */
+    protected $escapeLabel;
+
     /**
      * Create a new NavigationItemRenderer
      *
@@ -126,6 +133,29 @@ class NavigationItemRenderer
         return $this->item;
     }
 
+    /**
+     * Set whether to escape the label
+     *
+     * @param   bool    $state
+     *
+     * @return  $this
+     */
+    public function setEscapeLabel($state = true)
+    {
+        $this->escapeLabel = (bool) $state;
+        return $this;
+    }
+
+    /**
+     * Return whether to escape the label
+     *
+     * @return  bool
+     */
+    public function getEscapeLabel()
+    {
+        return $this->escapeLabel !== null ? $this->escapeLabel : true;
+    }
+
     /**
      * Render the given navigation item as HTML anchor
      *
@@ -144,7 +174,9 @@ class NavigationItemRenderer
             );
         }
 
-        $label = $this->view()->escape($item->getLabel());
+        $label = $this->getEscapeLabel()
+            ? $this->view()->escape($item->getLabel())
+            : $item->getLabel();
         if (($icon = $item->getIcon()) !== null) {
             $label = $this->view()->icon($icon) . $label;
         }
diff --git a/modules/monitoring/application/views/scripts/show/components/actions.phtml b/modules/monitoring/application/views/scripts/show/components/actions.phtml
index 2e55db68c..bffd949dd 100644
--- a/modules/monitoring/application/views/scripts/show/components/actions.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/actions.phtml
@@ -16,7 +16,11 @@ foreach ($object->getActionUrls() as $i => $link) {
         'Action ' . ($i + 1) . $newTabInfo,
         array(
             'url'       => $link,
-            'target'    => '_blank'
+            'target'    => '_blank',
+            'renderer'  => array(
+                'NavigationItemRenderer',
+                'escape_label' => false
+            )
         )
     );
 }
diff --git a/modules/monitoring/application/views/scripts/show/components/notes.phtml b/modules/monitoring/application/views/scripts/show/components/notes.phtml
index 1b3dafc52..eb8bf2205 100644
--- a/modules/monitoring/application/views/scripts/show/components/notes.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/notes.phtml
@@ -26,7 +26,11 @@ if (! empty($links)) {
             $this->escape($link) . $newTabInfo,
             array(
                 'url'       => $link,
-                'target'    => '_blank'
+                'target'    => '_blank',
+                'renderer'  => array(
+                    'NavigationItemRenderer',
+                    'escape_label' => false
+                )
             )
         );
     }

From 4889e63e95b3097f49f3d39ebb926553e66da4f4 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 28 Sep 2015 09:53:38 +0200
Subject: [PATCH 6/6] Do not fade-in the logo for error pages and fix some
 coding style issues

refs #10009
---
 application/layouts/scripts/error.phtml     |  2 +-
 application/views/scripts/error/error.phtml | 22 ++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/layouts/scripts/error.phtml b/application/layouts/scripts/error.phtml
index 0464b0ea9..c0ffd3394 100644
--- a/application/layouts/scripts/error.phtml
+++ b/application/layouts/scripts/error.phtml
@@ -1,6 +1,6 @@
 <div class="logo">
  <div class="image">
-  <img aria-hidden="true" class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
+  <img aria-hidden="true" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
  </div>
 </div>
 <div class="below-logo">
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index 430f9fd97..67429573c 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,12 +1,12 @@
-<?php if (! $hideControls) { ?>
-  <div class="controls">
-    <?= $this->tabs->showOnlyCloseButton() ?>
-  </div>
-<?php } ?>
-<div class="content">
-  <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
-<?php if (isset($stackTrace)) : ?>
-  <hr />
-  <pre><?= $this->escape($stackTrace) ?></pre>
-<?php endif ?>
+<?php if (! $hideControls): ?>
+<div class="controls">
+    <?= $tabs->showOnlyCloseButton(); ?>
 </div>
+<?php endif ?>
+<div class="content">
+    <p><strong><?= nl2br($this->escape($message)); ?></strong></p>
+    <?php if (isset($stackTrace)): ?>
+        <hr />
+        <pre><?= $this->escape($stackTrace) ?></pre>
+    <?php endif ?>
+</div>
\ No newline at end of file