Merge branch 'master' into bugfix/rebuild-form-builder-5525

Icinga · Sep 9, 2014 · 83772c6 · 83772c6
2 parents e7c0218 + 7d45384
commit 83772c6
Show file tree

Hide file tree

Showing 51 changed files with 862 additions and 639 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,8 @@
 
 build/
 
+development/
+
 # ./configure output
 config.log
 autom4te.cache

diff --git a/application/controllers/LayoutController.php b/application/controllers/LayoutController.php
@@ -18,10 +18,12 @@ class LayoutController extends ActionController
      */
     public function menuAction()
     {
+        $this->setAutorefreshInterval(15);
         $this->_helper->layout()->disableLayout();
-        $this->view->menuRenderer = new MenuRenderer(
-            Menu::load(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()
-        );
+
+        $url = Url::fromRequest();
+        $menu = new MenuRenderer(Menu::load(), $url->getRelativeUrl());
+        $this->view->menuRenderer = $menu->useCustomRenderer();
     }
 
     /**

diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php
@@ -59,13 +59,12 @@ public function gravatarAction()
     public function imgAction()
     {
         $module = $this->_getParam('module_name');
-        // TODO: This is more than dangerous, must be fixed!!
         $file   = $this->_getParam('file');
-
         $basedir = Icinga::app()->getModuleManager()->getModule($module)->getBaseDir();
 
-        $filePath = $basedir . '/public/img/' . $file;
-        if (! file_exists($filePath)) {
+        $filePath = realpath($basedir . '/public/img/' . $file);
+
+        if (! $filePath || strpos($filePath, $basedir) !== 0) {
             throw new ActionException(sprintf(
                 '%s does not exist',
                 $filePath

diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
@@ -11,11 +11,15 @@ if (! $this->auth()->isAuthenticated()) {
 }
 
 ?>
-<div id="menu" data-base-target="_main">
+<div
+    id="menu" data-last-update="<?= (time() - 14) ?>000" data-base-target="_main" class="container" data-icinga-url="<?=$this->href('layout/menu');?>"
+    data-icinga-refresh="15"
+>
   <? if (SearchDashboard::search('dummy')->getPane('search')->hasComponents()): ?>
-  <form action="<?= $this->href('search') ?>" method="get" role="search">
-    <input type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
-  </form>
+      <form action="<?= $this->href('search') ?>" method="get" role="search">
+        <input type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>"
+               autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
+      </form>
   <? endif; ?>
-<?= new MenuRenderer(Menu::load(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()); ?>
+  <?= new MenuRenderer(Menu::load(), Url::fromRequest()->without('renderLayout')->getRelativeUrl()); ?>
 </div>
diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Zend_View_Helper_FormElement;
+use \Zend_View_Helper_FormElement;
 
 /**
  * Helper to generate a "datetime" element

diff --git a/application/views/scripts/layout/menu.phtml b/application/views/scripts/layout/menu.phtml
@@ -1 +1,13 @@
-<?= $menuRenderer; ?>
+<?php
+use Icinga\Web\Widget\SearchDashboard;
+?>
+
+<? if (SearchDashboard::search('dummy')->getPane('search')->hasComponents()): ?>
+    <form action="<?= $this->href('search') ?>" method="get" role="search">
+        <input
+            type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>"
+            autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+        />
+    </form>
+<? endif; ?>
+<?= $menuRenderer; ?>
diff --git a/doc/components.md b/doc/components.md
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
@@ -8,6 +8,7 @@
 use Zend_Config;
 use Zend_Controller_Router_Route_Abstract;
 use Zend_Controller_Router_Route as Route;
+use Zend_Controller_Router_Route_Regex as RegexRoute;
 use Icinga\Application\ApplicationBootstrap;
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
@@ -821,12 +822,15 @@ protected function registerRoutes()
         );
         $router->addRoute(
             $this->name . '_img',
-            new Route(
-                'img/' . $this->name . '/:file',
+            new RegexRoute(
+                'img/' . $this->name . '/(.+)',
                 array(
                     'controller'    => 'static',
                     'action'        => 'img',
                     'module_name'   => $this->name
+                ),
+                array(
+                    1 => 'file'
                 )
             )
         );

diff --git a/library/Icinga/Chart/Graph/Tooltip.php b/library/Icinga/Chart/Graph/Tooltip.php
@@ -67,7 +67,7 @@ class Tooltip
      */
     public function __construct (
         $data = array(),
-        $format = '<b>{title}</b></b><br> {value} of {sum} {label}'
+        $format = '<b>{title}</b></b><br/> {value} of {sum} {label}'
     ) {
         $this->data = array_merge($this->data, $data);
         $this->defaultFormat = $format;

diff --git a/library/Icinga/Web/Hook.php b/library/Icinga/Web/Hook.php
@@ -123,7 +123,7 @@ public static function createInstance($name, $key)
      */
     private static function assertValidHook($instance, $name)
     {
-        $base_class = self::$BASE_NS . ucfirst($name);
+        $base_class = self::$BASE_NS . ucfirst($name) . 'Hook';
 
         if (strpos($base_class, self::$classSuffix) === false) {
             $base_class .= self::$classSuffix;