Use a hardcoded path where to look for modules

refs #7163
Icinga · Oct 29, 2014 · 47d9426 · 47d9426
1 parent 2f05ed3
commit 47d9426
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/application/forms/Setup/GeneralConfigPage.php b/application/forms/Setup/GeneralConfigPage.php
@@ -41,7 +41,6 @@ public function createElements(array $formData)
         // TODO: This is splitted as not all elements are required (as of d201cff)
         $appForm = new ApplicationConfigForm();
         $appForm->createElements($formData);
-        $this->addElement($appForm->getElement('global_modulePath'));
         $this->addElement($appForm->getElement('global_filemode'));
 
         $loggingForm = new LoggingConfigForm();

diff --git a/application/forms/Setup/ModulePage.php b/application/forms/Setup/ModulePage.php
@@ -20,6 +20,8 @@ class ModulePage extends Form
 
     protected $pageData;
 
+    protected $modulePaths;
+
     /**
      * Initialize this page
      */
@@ -28,6 +30,11 @@ public function init()
         $this->setName('setup_modules');
         $this->setViewScript('form/setup-modules.phtml');
         $this->session = Session::getSession()->getNamespace(get_class($this));
+
+        $this->modulePaths = array();
+        if (($appModulePath = realpath(Icinga::app()->getApplicationDir() . '/../modules')) !== false) {
+            $this->modulePaths[] = $appModulePath;
+        }
     }
 
     public function setPageData(array $pageData)
@@ -115,9 +122,7 @@ public function getModules()
         }
 
         $moduleManager = Icinga::app()->getModuleManager();
-        $moduleManager->detectInstalledModules(
-            explode(':', $this->pageData['setup_general_config']['global_modulePath'])
-        );
+        $moduleManager->detectInstalledModules($this->modulePaths);
         foreach ($moduleManager->listInstalledModules() as $moduleName) {
             $this->modules[] = $moduleManager->loadModule($moduleName)->getModule($moduleName);
         }

diff --git a/library/Icinga/Application/WebSetup.php b/library/Icinga/Application/WebSetup.php
@@ -144,12 +144,6 @@ public function setupPage(Form $page, Request $request)
         } elseif ($page->getName() === 'setup_modules') {
             $page->setPageData($this->getPageData());
             $page->handleRequest($request);
-        } elseif ($page->getName() === 'setup_general_config' && $this->getDirection() === static::FORWARD) {
-            $configData = $this->getPageData($page->getName());
-            if ($configData !== null && $request->getPost('global_modulePath') !== $configData['global_modulePath']) {
-                // Drop the ModulePage's session and all associated wizard sessions once the module path changes
-                $this->getPage('setup_modules')->clearSession();
-            }
         }
     }
 

diff --git a/library/Icinga/Installation/AuthenticationStep.php b/library/Icinga/Installation/AuthenticationStep.php
@@ -133,10 +133,10 @@ public function getSummary()
             . '</table>';
 
         $adminHtml = '<p>' . (isset($this->data['adminAccountData']['resourceConfig']) ? sprintf(
-            t('Administrative rights will initially be granted to an existing account called "%s".'),
+            t('Administrative rights will initially be granted to a new account called "%s".'),
             $this->data['adminAccountData']['username']
         ) : sprintf(
-            t('Administrative rights will initially be granted to a new account called "%s".'),
+            t('Administrative rights will initially be granted to an existing account called "%s".'),
             $this->data['adminAccountData']['username']
         )) . '</p>';
 

diff --git a/library/Icinga/Installation/GeneralConfigStep.php b/library/Icinga/Installation/GeneralConfigStep.php
@@ -59,10 +59,6 @@ public function getSummary()
 
         $generalHtml = ''
             . '<ul>'
-            . '<li>' . sprintf(
-                t('Icinga Web 2 will look for modules at: %s'),
-                $this->data['generalConfig']['global_modulePath']
-            ) . '</li>'
             . '<li>' . sprintf(
                 t('Icinga Web 2 will save new configuration files using the mode "%s".'),
                 $this->data['generalConfig']['global_filemode']

diff --git a/library/Icinga/Web/Setup/EnableModuleStep.php b/library/Icinga/Web/Setup/EnableModuleStep.php
@@ -9,23 +9,27 @@
 
 class EnableModuleStep extends Step
 {
-    protected $availableDirs;
+    protected $modulePaths;
 
     protected $moduleName;
 
     protected $error;
 
-    public function __construct($availableDirs, $moduleName)
+    public function __construct($moduleName)
     {
-        $this->availableDirs = $availableDirs;
         $this->moduleName = $moduleName;
+
+        $this->modulePaths = array();
+        if (($appModulePath = realpath(Icinga::app()->getApplicationDir() . '/../modules')) !== false) {
+            $this->modulePaths[] = $appModulePath;
+        }
     }
 
     public function apply()
     {
         try {
             $moduleManager = Icinga::app()->getModuleManager();
-            $moduleManager->detectInstalledModules($this->availableDirs);
+            $moduleManager->detectInstalledModules($this->modulePaths);
             $moduleManager->enableModule($this->moduleName);
         } catch (Exception $e) {
             $this->error = $e;