Run a module's configuration script only in case it has been registered

fixes #8601

application/controllers/ConfigController.php

@@ -135,22 +135,23 @@ class ConfigController extends ActionController
 
     public function moduleAction()
     {
-        $name = $this->getParam('name');
         $app = Icinga::app();
         $manager = $app->getModuleManager();
+        $name = $this->getParam('name');
         if ($manager->hasInstalled($name)) {
-            $this->view->moduleData = Icinga::app()
+            $this->view->moduleData = $manager->select()->from('modules')->where('name', $name)->fetchRow();
-                ->getModuleManager()
+            if ($manager->hasLoaded($name)) {
-                ->select()
+                $module = $manager->getModule($name);
-                ->from('modules')
+            } else {
-                ->where('name', $name)
-                ->fetchRow();
                 $module = new Module($app, $name, $manager->getModuleDir($name));
+            }
+
             $this->view->module = $module;
+            $this->view->tabs = $module->getConfigTabs()->activate('info');
         } else {
             $this->view->module = false;
+            $this->view->tabs = null;
         }
-        $this->view->tabs = $module->getConfigTabs()->activate('info');
     }
 
     /**

library/Icinga/Application/Modules/Module.php

@@ -113,6 +113,13 @@ class Module
      */
     private $triedToLaunchConfigScript = false;
 
+    /**
+     * Whether this module has been registered
+     *
+     * @var bool
+     */
+    private $registered = false;
+
     /**
      * Provided permissions
      *
@@ -279,6 +286,10 @@ class Module
      */
     public function register()
     {
+        if ($this->registered) {
+            return true;
+        }
+
         $this->registerAutoloader();
         try {
             $this->launchRunScript();
@@ -291,10 +302,22 @@ class Module
             );
             return false;
         }
+
         $this->registerWebIntegration();
+        $this->registered = true;
         return true;
     }
 
+    /**
+     * Return whether this module has been registered
+     *
+     * @return  bool
+     */
+    public function isRegistered()
+    {
+        return $this->registered;
+    }
+
     /**
      * Test for an enabled module by name
      *
@@ -913,7 +936,7 @@ class Module
      */
     protected function launchConfigScript()
     {
-        if ($this->triedToLaunchConfigScript) {
+        if ($this->triedToLaunchConfigScript || !$this->registered) {
             return;
         }
         $this->triedToLaunchConfigScript = true;