From ac255eeda077345051aed1d1d27145800895df40 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 6 Oct 2014 13:52:32 +0200
Subject: [PATCH] Change form name of GeneralConfigPage to
 "setup_general_config"

Used to be "setup_application_config".

refs #7163
---
 application/forms/Setup/GeneralConfigPage.php |  2 +-
 library/Icinga/Application/WebInstaller.php   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/forms/Setup/GeneralConfigPage.php b/application/forms/Setup/GeneralConfigPage.php
index 689b393f1..c92be1091 100644
--- a/application/forms/Setup/GeneralConfigPage.php
+++ b/application/forms/Setup/GeneralConfigPage.php
@@ -19,7 +19,7 @@ class GeneralConfigPage extends Form
      */
     public function init()
     {
-        $this->setName('setup_application_config');
+        $this->setName('setup_general_config');
     }
 
     /**
diff --git a/library/Icinga/Application/WebInstaller.php b/library/Icinga/Application/WebInstaller.php
index 16dab45b6..34ddce248 100644
--- a/library/Icinga/Application/WebInstaller.php
+++ b/library/Icinga/Application/WebInstaller.php
@@ -132,13 +132,13 @@ class WebInstaller implements Installer
                 )
         );
 
-        $loggingLevel = $this->pageData['setup_application_config']['logging_level'];
-        $loggingType = $this->pageData['setup_application_config']['logging_type'];
+        $loggingLevel = $this->pageData['setup_general_config']['logging_level'];
+        $loggingType = $this->pageData['setup_general_config']['logging_type'];
         $summary[t('Application Configuration')] = array(
             t('General', 'app.config') => array(
                 sprintf(
                     t('Icinga Web 2 will look for modules at: %s'),
-                    $this->pageData['setup_application_config']['global_modulePath']
+                    $this->pageData['setup_general_config']['global_modulePath']
                 ),
                 sprintf(
                     $prefType === 'ini' ? sprintf(
@@ -170,19 +170,19 @@ class WebInstaller implements Installer
                         $loggingType === 'syslog' ? 'Syslog' : t('File', 'app.config.logging.type')
                     )
                 ),
-                $this->pageData['setup_application_config']['logging_type'] === 'syslog' ? array(
+                $this->pageData['setup_general_config']['logging_type'] === 'syslog' ? array(
                     sprintf(
                         t('Application Prefix: %s'),
-                        $this->pageData['setup_application_config']['logging_application']
+                        $this->pageData['setup_general_config']['logging_application']
                     ),
                     sprintf(
                         t('Facility: %s'),
-                        $this->pageData['setup_application_config']['logging_facility']
+                        $this->pageData['setup_general_config']['logging_facility']
                     )
                 ) : array(
                     sprintf(
                         t('Filepath: %s'),
-                        $this->pageData['setup_application_config']['logging_target']
+                        $this->pageData['setup_general_config']['logging_target']
                     )
                 )
             )