From 195fe6f04b7935f2afadf12add6c7804662914ba Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 12 Mar 2015 14:53:20 +0100
Subject: [PATCH] Security: Rename system/config/modules to config/modules

Module config permission and application config permission have to be separeted.
Application config related permissions were added beneath config/application and module
related config permissions will be config/modules for now.

refs #8720
---
 application/controllers/ConfigController.php | 4 ++--
 application/forms/Security/RoleForm.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 9bc26f726..1942826bb 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -159,7 +159,7 @@ class ConfigController extends ActionController
      */
     public function moduleenableAction()
     {
-        $this->assertPermission('system/config/modules');
+        $this->assertPermission('config/modules');
         $module = $this->getParam('name');
         $manager = Icinga::app()->getModuleManager();
         try {
@@ -179,7 +179,7 @@ class ConfigController extends ActionController
      */
     public function moduledisableAction()
     {
-        $this->assertPermission('system/config/modules');
+        $this->assertPermission('config/modules');
         $module = $this->getParam('name');
         $manager = Icinga::app()->getModuleManager();
         try {
diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php
index 9f951deb2..671f7738f 100644
--- a/application/forms/Security/RoleForm.php
+++ b/application/forms/Security/RoleForm.php
@@ -25,9 +25,9 @@ class RoleForm extends ConfigForm
         'system/config/*'                   => 'system/config/*',
         'config/application/general'        => 'config/application/general',
         'config/application/authentication' => 'config/application/authentication',
-        'system/config/modules'             => 'system/config/modules',
         'config/application/resources'      => 'config/application/resources',
-        'config/application/roles'          => 'config/application/roles'
+        'config/application/roles'          => 'config/application/roles',
+        'config/modules'                    => 'config/modules'
     );
 
     /**