From fc1fb60b01f93e9fd0575c0a89c3bea016d24417 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <Alexander.Klimov@netways.de>
Date: Fri, 24 Jan 2014 12:20:13 +0100
Subject: [PATCH] Re-add benchmark helper

Enable benchmark via user preferences

resolves #5508
---
 application/controllers/IndexController.php       |  4 ++--
 application/forms/Preference/GeneralForm.php      | 12 +++++++++++-
 application/layouts/scripts/layout.phtml          |  2 +-
 .../Icinga/Web/Controller/ActionController.php    | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 88a2d26cc..141cb36ce 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -30,8 +30,8 @@
 
 # namespace Icinga\Application\Controllers;
 
-use \Icinga\Web\Controller\ActionController;
-use \Icinga\Application\Icinga;
+use Icinga\Web\Controller\ActionController;
+use Icinga\Application\Benchmark;
 
 /**
  * Application wide index controller
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index c4d5fa9cd..f91a5f504 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -214,6 +214,15 @@ class GeneralForm extends Form
         $this->addDateFormatSettings($global);
 
         $this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
+
+        $this->addElement(
+            'checkbox',
+            'showBenchmark',
+            array(
+                'label' => 'Use benchmark',
+                'value' => $this->getUserPreferences()->get('app.showBenchmark')
+            )
+        );
     }
 
     /**
@@ -227,7 +236,8 @@ class GeneralForm extends Form
         return array(
             'app.timezone'      => $values['timezone'],
             'app.dateFormat'    => $values['date_format'],
-            'app.timeFormat'    => $values['time_format']
+            'app.timeFormat'    => $values['time_format'],
+            'app.showBenchmark' => $values['showBenchmark'] === '1' ? true : false
         );
     }
 }
diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index 903cd84ff..8141acf68 100755
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -40,6 +40,6 @@
   <?= $this->render('body.phtml') ?>
   <script data-main="<?php echo $this->baseUrl('js/main.js')?>"
           src="<?php echo $this->baseUrl('js/vendor/require.js') ?>"></script>
-
+  <?= $this->layout()->benchmark ?>
 </body>
 </html>
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index cb0b0c951..25e65cdd8 100755
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -229,6 +229,21 @@ class ActionController extends Zend_Controller_Action
             }
             $this->_helper->layout()->setLayout($target);
         }
+        $userPreferences = $this->getRequest()->getUser()->getPreferences();
+        if ($userPreferences->get('app.showBenchmark') === true) {
+            Benchmark::measure('Response ready');
+            $this->_helper->layout()->benchmark = $this->renderBenchmark();
+        }
+    }
+
+    /**
+     * Render the benchmark
+     *
+     * @return string Benchmark HTML
+     */
+    protected function renderBenchmark()
+    {
+        return Benchmark::renderToHtml();
     }
 
     /**