From 3c47ba11eb4b8cdda80f55a83a36b263432e5d27 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 09:39:39 +0200
Subject: [PATCH] monitoring/show/contact: Require `contact_name' instead of
 `contact'

refs #8613
---
 modules/monitoring/application/controllers/ShowController.php | 4 ++--
 .../application/views/scripts/list/contactgroups.phtml        | 2 +-
 .../monitoring/application/views/scripts/list/contacts.phtml  | 2 +-
 .../application/views/scripts/list/notifications.phtml        | 2 +-
 .../application/views/scripts/show/components/contacts.phtml  | 2 +-
 .../monitoring/application/views/scripts/show/history.phtml   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index b5ffc0535..f41811297 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -112,11 +112,11 @@ class Monitoring_ShowController extends Controller
 
     public function contactAction()
     {
-        $contactName = $this->getParam('contact');
+        $contactName = $this->getParam('contact_name');
 
         if (! $contactName) {
             throw new Zend_Controller_Action_Exception(
-                $this->translate('The parameter `contact\' is required'),
+                $this->translate('The parameter `contact_name\' is required'),
                 404
             );
         }
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index a44b388b7..09083a387 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -24,7 +24,7 @@ foreach ($groupData as $groupName => $groupInfo): ?>
                     <?= $this->qlink(
                         $c->contact_alias,
                         'monitoring/show/contact',
-                        array('contact' => $c->contact_name),
+                        array('contact_name' => $c->contact_name),
                         array('title' => sprintf(
                             $this->translate('Show detailed information about %s'),
                             $c->contact_alias
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 8fba674c0..80405f7c6 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -18,7 +18,7 @@
             <strong><?= $this->qlink(
                 $contact->contact_name,
                 'monitoring/show/contact',
-                array('contact' => $contact->contact_name),
+                array('contact_name' => $contact->contact_name),
                 array('title' => sprintf(
                     $this->translate('Show detailed information about %s'),
                     $contact->contact_alias
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 9cc5f724b..cd2c46538 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -63,7 +63,7 @@ use Icinga\Module\Monitoring\Object\Service;
                             $this->qlink(
                                 $notification->notification_contact,
                                 'monitoring/show/contact',
-                                array('contact' => $notification->notification_contact)
+                                array('contact_name' => $notification->notification_contact)
                             )
                         ) ?>
                     </small>
diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index c00714e9c..6767a252e 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -7,7 +7,7 @@ if (! empty($object->contacts)) {
         $list[] = $this->qlink(
             $contact->contact_alias,
             'monitoring/show/contact',
-            array('contact' => $contact->contact_name),
+            array('contact_name' => $contact->contact_name),
             array('title' => sprintf($this->translate('Show detailed information about %s'), $contact->contact_alias))
         );
     }
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index 149eb0ecc..b148888e1 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -32,7 +32,7 @@ function contactsLink($match, $view) {
         $links[] = $view->qlink(
             $contact,
             'monitoring/show/contact',
-            array('contact' => $contact),
+            array('contact_name' => $contact),
             array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
         );
     }