Clean up functions that are useless after changes introduced by the r…

…ebase refs #6141
Icinga · May 28, 2014 · 9c74136 · 9c74136
1 parent 9272915
commit 9c74136
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 41 deletions.
diff --git a/application/controllers/InstallController.php b/application/controllers/InstallController.php
@@ -44,7 +44,6 @@ public function indexAction()
                 $this->storeConfiguration($wizard->getConfig());
             }
         }
-
         $this->view->wizard = $wizard;
     }
 
@@ -61,27 +60,17 @@ protected function createWizard()
         $wizard->setConfiguration($this->loadConfiguration());
         $wizard->addPages(
             array(
-                array('welcome', t('Welcome'), 'Icinga\Form\Install\WelcomePage'),
+                //array('welcome', t('Welcome'), 'Icinga\Form\Install\WelcomePage'),
                 array('requirements', t('Requirements'), 'Icinga\Form\Install\RequirementsPage'),
-                array('authentication', t('Authentication'), 'Icinga\Form\Install\AuthenticationPage'),
+                array('authentication',
+                    t('Authentication Method'), 'Icinga\Form\Install\AuthenticationMethod',
+                    t('Authentication Resource'), 'Icinga\Form\Install\AuthenticationPage'
+                ),
                 array('user_prefs', t('Preferences'), 'Icinga\Form\Install\PreferencesPage'),
                 array('db_setup', t('Database Setup'), 'Icinga\Form\Install\DatabaseSetupPage'),
                 array('logging', t('Logging'), 'Icinga\Form\Install\LoggingPage'),
                 array('admin', t('Administration'), 'Icinga\Form\Install\AdministrationPage'),
                 array('summary', t('Summary'), 'Icinga\Form\Install\SummaryPage')
-/*
-//                t('Welcome') => 'Icinga\Form\Install\WelcomePage',
-//                t('Requirements') => 'Icinga\Form\Install\RequirementsPage',
-                'my_title' => array(
-                    t('Authentication Method')   => 'Icinga\Form\Install\AuthenticationMethod',
-                    t('Authentication Resource') => 'Icinga\Form\Install\AuthenticationPage'
-                ),
-                t('Administration') => 'Icinga\Form\Install\AdministrationPage',
-//                t('Preferences') => 'Icinga\Form\Install\PreferencesPage',
-                t('Logging') => 'Icinga\Form\Install\LoggingPage',
-//                t('Database Setup') => 'Icinga\Form\Install\DatabasePage',
-//                t('Summary') => 'Icinga\Form\Install\SummaryPage'
-*/
             )
         );
 

diff --git a/application/forms/Install/AuthenticationMethod.php b/application/forms/Install/AuthenticationMethod.php
@@ -63,27 +63,6 @@ class AuthenticationMethod extends Page
      */
     const AUTHENTICATION_MODE_EXTERNAL = 'external';
 
-    /**
-     * The sub form used to configure the resource.
-     *
-     * @var ResourceBaseForm
-     */
-    private $resourceForm = null;
-
-    /**
-     * The sub form used to configure the authentication backend.
-     *
-     * @var BaseBackendForm
-     */
-    private $authForm = null;
-
-    /**
-     * The sub form used to configure the authentication backend.
-     *
-     * @var Zend_Form
-     */
-    private $backendForm = null;
-
     /**
      * @return null|string
      */
@@ -159,7 +138,6 @@ public function create()
                     . ' You will be able to specify vendor and connection credentials in the next wizard steps.',
                     null
                 );
-                //$this->setResourceSubForm(new DbResourceForm());
                 break;
 
             case self::AUTHENTICATION_MODE_LDAP:

diff --git a/application/forms/Install/RequirementsPage.php b/application/forms/Install/RequirementsPage.php
@@ -205,7 +205,7 @@ protected function getInfo()
             $this->info = array();
             $this->info['os'] = Platform::getOperatingSystemName();
             $this->info['php_version'] = Platform::getPhpVersion();
-            $this->info['php_mod_posix_found'] = Platform::phpHasModule('posidx');
+            $this->info['php_mod_posix_found'] = Platform::phpHasModule('posix');
             $this->info['php_mod_json_found'] = Platform::phpHasModule('json');
             $this->info['php_mod_pdo_found'] = Platform::phpHasModule('pdo');
             $this->info['zend_db_mysql_found'] = Platform::zendClassExists('Zend_Db_Adapter_Pdo_Mysql');

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
@@ -383,7 +383,7 @@ public function addNote($message, $headingType = null)
      * Enable automatic form submission on the given elements
      *
      * Enables automatic submission of this form once the user edits specific elements
-     *
+     *#
      * @param   array   $triggerElements    The element names which should auto-submit the form
      *
      * @throws  ProgrammingError            When an element is found which does not yet exist

diff --git a/public/css/icinga/install.less b/public/css/icinga/install.less
@@ -87,7 +87,7 @@ div.wizard {
 
   div.panel {
     padding: 1em;
-    //position: fixed;
+    position: fixed;
     top: 3.6em;
     left: 13em;
     right: 0;