From 8a8ce49f7315317114a5557b11ea91a7503fd82f Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 6 Oct 2014 17:07:37 +0200
Subject: [PATCH] monitoring: Call `hasBetterUrl()' in every list action

fixes #6679
---
 .../controllers/ListController.php            | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index d3427e6a4..9648145b7 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -265,6 +265,9 @@ class Monitoring_ListController extends Controller
      */
     public function downtimesAction()
     {
+        if ($url = $this->hasBetterUrl()) {
+            return $this->redirectNow($url);
+        }
         $this->addTitleTab('downtimes');
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('downtime', array(
@@ -309,6 +312,9 @@ class Monitoring_ListController extends Controller
      */
     public function notificationsAction()
     {
+        if ($url = $this->hasBetterUrl()) {
+            return $this->redirectNow($url);
+        }
         $this->addTitleTab('notifications');
         $this->setAutorefreshInterval(15);
         $query = $this->backend->select()->from('notification', array(
@@ -328,6 +334,9 @@ class Monitoring_ListController extends Controller
 
     public function contactsAction()
     {
+        if ($url = $this->hasBetterUrl()) {
+            return $this->redirectNow($url);
+        }
         $this->addTitleTab('contacts');
         $query = $this->backend->select()->from('contact', array(
             'contact_name',
@@ -364,6 +373,9 @@ class Monitoring_ListController extends Controller
 
     public function statehistorysummaryAction()
     {
+        if ($url = $this->hasBetterUrl()) {
+            return $this->redirectNow($url);
+        }
         $this->addTitleTab('statehistorysummary', 'State Summary');
 
         $form = new StatehistoryForm();
@@ -401,6 +413,9 @@ class Monitoring_ListController extends Controller
 
     public function contactgroupsAction()
     {
+        if ($url = $this->hasBetterUrl()) {
+            return $this->redirectNow($url);
+        }
         $this->addTitleTab('contactgroups');
         $query = $this->backend->select()->from('contactgroup', array(
             'contactgroup_name',
@@ -430,6 +445,9 @@ class Monitoring_ListController extends Controller
 
     public function commentsAction()
     {
+        if ($url = $this->hasBetterUrl()) {
+            return $this->redirectNow($url);
+        }
         $this->addTitleTab('comments');
         $this->setAutorefreshInterval(12);
         $query = $this->backend->select()->from('comment', array(
@@ -550,6 +568,9 @@ class Monitoring_ListController extends Controller
 
     public function servicematrixAction()
     {
+        if ($url = $this->hasBetterUrl()) {
+            return $this->redirectNow($url);
+        }
         $this->addTitleTab('servicematrix');
         $this->setAutorefreshInterval(15);
         $query = $this->backend->select()->from('serviceStatus', array(