From 20b09d3bda2584b85ba0a99fd6d95b3e40097b4f Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Wed, 8 Apr 2015 15:08:14 +0200
Subject: [PATCH] Inherit from Icinga\Web\Controller rather than from
 Icinga\Web\Controller\ModuleActionController

---
 modules/doc/library/Doc/DocController.php                     | 4 ++--
 .../monitoring/application/controllers/ConfigController.php   | 4 ++--
 modules/monitoring/library/Monitoring/Controller.php          | 4 ++--
 modules/setup/application/controllers/IndexController.php     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/doc/library/Doc/DocController.php b/modules/doc/library/Doc/DocController.php
index de02a3bae..36abe6b10 100644
--- a/modules/doc/library/Doc/DocController.php
+++ b/modules/doc/library/Doc/DocController.php
@@ -5,9 +5,9 @@ namespace Icinga\Module\Doc;
 
 use Icinga\Module\Doc\Renderer\DocSectionRenderer;
 use Icinga\Module\Doc\Renderer\DocTocRenderer;
-use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Controller;
 
-class DocController extends ModuleActionController
+class DocController extends Controller
 {
     /**
      * Render a chapter
diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php
index 2571b071e..33bf142f3 100644
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@@ -4,7 +4,7 @@
 use Icinga\Web\Notification;
 use Icinga\Data\ResourceFactory;
 use Icinga\Forms\ConfirmRemovalForm;
-use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Controller;
 use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm;
 use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm;
 use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm;
@@ -12,7 +12,7 @@ use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm;
 /**
  * Configuration controller for editing monitoring resources
  */
-class Monitoring_ConfigController extends ModuleActionController
+class Monitoring_ConfigController extends Controller
 {
     /**
      * Display a list of available backends and instances
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index 3aa893502..bf69182d7 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -6,13 +6,13 @@ namespace Icinga\Module\Monitoring;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filterable;
 use Icinga\File\Csv;
-use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Controller as IcingaWebController;
 use Icinga\Web\Url;
 
 /**
  * Base class for all monitoring action controller
  */
-class Controller extends ModuleActionController
+class Controller extends IcingaWebController
 {
     /**
      * The backend used for this controller
diff --git a/modules/setup/application/controllers/IndexController.php b/modules/setup/application/controllers/IndexController.php
index b83c9f94e..eec43a737 100644
--- a/modules/setup/application/controllers/IndexController.php
+++ b/modules/setup/application/controllers/IndexController.php
@@ -1,10 +1,10 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Controller;
 use Icinga\Module\Setup\WebWizard;
 
-class Setup_IndexController extends ModuleActionController
+class Setup_IndexController extends Controller
 {
     /**
      * Whether the controller requires the user to be authenticated