From 2a543bb5ae5f5430131894fe3dd7098192977c08 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 16:03:29 +0100
Subject: [PATCH 1/4] Rename the preference setting `type' to `store'

refs #8234
---
 application/forms/Config/General/ApplicationConfigForm.php | 6 ++----
 library/Icinga/User/Preferences/PreferencesStore.php       | 6 +++---
 modules/setup/application/forms/PreferencesPage.php        | 2 +-
 modules/setup/library/Setup/Steps/GeneralConfigStep.php    | 6 +++---
 modules/setup/library/Setup/WebWizard.php                  | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 8f718ccdf..f59454ff3 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -4,10 +4,8 @@
 
 namespace Icinga\Forms\Config\General;
 
-use DateTimeZone;
 use Icinga\Application\Icinga;
 use Icinga\Data\ResourceFactory;
-use Icinga\Util\Translator;
 use Icinga\Web\Form;
 
 
@@ -46,7 +44,7 @@ class ApplicationConfigForm extends Form
 
         $this->addElement(
             'select',
-            'preferences_type',
+            'preferences_store',
             array(
                 'required'      => true,
                 'autosubmit'    => true,
@@ -58,7 +56,7 @@ class ApplicationConfigForm extends Form
                 )
             )
         );
-        if (isset($formData['preferences_type']) && $formData['preferences_type'] === 'db') {
+        if (isset($formData['preferences_store']) && $formData['preferences_store'] === 'db') {
             $backends = array();
             foreach (ResourceFactory::getResourceConfigs()->toArray() as $name => $resource) {
                 if ($resource['type'] === 'db') {
diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php
index c2cba0c41..a9d9ec033 100644
--- a/library/Icinga/User/Preferences/PreferencesStore.php
+++ b/library/Icinga/User/Preferences/PreferencesStore.php
@@ -26,7 +26,7 @@ use Icinga\Data\Db\DbConnection;
  * // Create a INI store
  * $store = PreferencesStore::create(
  *     new ConfigObject(
- *         'type'        => 'ini',
+ *         'store'       => 'ini',
  *         'config_path' => '/path/to/preferences'
  *     ),
  *     $user // Instance of \Icinga\User
@@ -117,9 +117,9 @@ abstract class PreferencesStore
      */
     public static function create(ConfigObject $config, User $user)
     {
-        if (($type = $config->type) === null) {
+        if (($type = $config->store) === null) {
             throw new ConfigurationError(
-                'Preferences configuration is missing the type directive'
+                'Preferences configuration is missing the store directive'
             );
         }
 
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 07e011ee1..83f036498 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -70,7 +70,7 @@ class PreferencesPage extends Form
 
         $this->addElement(
             'select',
-            'type',
+            'store',
             array(
                 'required'      => true,
                 'label'         => $this->translate('User Preference Storage Type'),
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index ee9e2c581..39c160628 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -29,7 +29,7 @@ class GeneralConfigStep extends Step
             $config[$section][$property] = $value;
         }
 
-        $config['preferences']['type'] = $this->data['preferencesType'];
+        $config['preferences']['store'] = $this->data['preferencesStore'];
         if (isset($this->data['preferencesResource'])) {
             $config['preferences']['resource'] = $this->data['preferencesResource'];
         }
@@ -58,11 +58,11 @@ class GeneralConfigStep extends Step
         $generalHtml = ''
             . '<ul>'
             . '<li>' . sprintf(
-                $this->data['preferencesType'] === 'ini' ? sprintf(
+                $this->data['preferencesStore'] === 'ini' ? sprintf(
                     t('Preferences will be stored per user account in INI files at: %s'),
                     Config::resolvePath('preferences')
                 ) : (
-                    $this->data['preferencesType'] === 'db' ? t('Preferences will be stored using a database.') : (
+                    $this->data['preferencesStore'] === 'db' ? t('Preferences will be stored using a database.') : (
                         t('Preferences will not be persisted across browser sessions.')
                     )
                 )
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 58c7c6259..d6874ed36 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -293,7 +293,7 @@ class WebWizard extends Wizard implements SetupWizard
         $setup->addStep(
             new GeneralConfigStep(array(
                 'generalConfig'         => $pageData['setup_general_config'],
-                'preferencesType'       => $pageData['setup_preferences_type']['type'],
+                'preferencesStore'       => $pageData['setup_preferences_type']['store'],
                 'preferencesResource'   => isset($pageData['setup_db_resource']['name'])
                     ? $pageData['setup_db_resource']['name']
                     : null

From 359336243c4f2aa3b1dceaee91ce723edec6472e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 16:04:45 +0100
Subject: [PATCH 2/4] Save "none" instead of "null" when choosing to not to
 store preferences

refs #8234
---
 application/forms/Config/General/ApplicationConfigForm.php | 2 +-
 modules/setup/application/forms/PreferencesPage.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index f59454ff3..29b7b512e 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -52,7 +52,7 @@ class ApplicationConfigForm extends Form
                 'multiOptions'  => array(
                     'ini'   => $this->translate('File System (INI Files)'),
                     'db'    => $this->translate('Database'),
-                    'null'  => $this->translate('Don\'t Store Preferences')
+                    'none'  => $this->translate('Don\'t Store Preferences')
                 )
             )
         );
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 83f036498..211d16fac 100644
--- a/modules/setup/application/forms/PreferencesPage.php
+++ b/modules/setup/application/forms/PreferencesPage.php
@@ -66,7 +66,7 @@ class PreferencesPage extends Form
         if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
             $storageTypes['db'] = $this->translate('Database');
         }
-        $storageTypes['null'] = $this->translate('Don\'t Store Preferences');
+        $storageTypes['none'] = $this->translate('Don\'t Store Preferences');
 
         $this->addElement(
             'select',

From d452f3218d9a74b38f958d24f7e30bf5295fbfaf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 16:07:38 +0100
Subject: [PATCH 3/4] Use "ini" as preferences store in case preferences are
 not configured

refs #8234
---
 application/controllers/PreferenceController.php     | 4 ----
 library/Icinga/Authentication/Manager.php            | 2 +-
 library/Icinga/User/Preferences/PreferencesStore.php | 8 +-------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index 7acab7c25..c45344fbf 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -7,7 +7,6 @@ use Icinga\Web\Url;
 use Icinga\Web\Widget\Tab;
 use Icinga\Application\Config;
 use Icinga\Forms\PreferenceForm;
-use Icinga\Exception\ConfigurationError;
 use Icinga\User\Preferences\PreferencesStore;
 
 /**
@@ -40,9 +39,6 @@ class PreferenceController extends BasePreferenceController
     public function indexAction()
     {
         $storeConfig = Config::app()->getSection('preferences');
-        if ($storeConfig->isEmpty()) {
-            throw new ConfigurationError(t('You need to configure how to store preferences first.'));
-        }
 
         $user = $this->getRequest()->getUser();
         $form = new PreferenceForm();
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 12269d98e..8aee93c0e 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -63,7 +63,7 @@ class Manager
             );
             $config = new Config();
         }
-        if ($config->hasSection('preferences')) {
+        if ($config->get('preferences', 'store', 'ini') !== 'none') {
             $preferencesConfig = $config->getSection('preferences');
             try {
                 $preferencesStore = PreferencesStore::create(
diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php
index a9d9ec033..11454a2f8 100644
--- a/library/Icinga/User/Preferences/PreferencesStore.php
+++ b/library/Icinga/User/Preferences/PreferencesStore.php
@@ -117,13 +117,7 @@ abstract class PreferencesStore
      */
     public static function create(ConfigObject $config, User $user)
     {
-        if (($type = $config->store) === null) {
-            throw new ConfigurationError(
-                'Preferences configuration is missing the store directive'
-            );
-        }
-
-        $type = ucfirst(strtolower($type));
+        $type = ucfirst(strtolower($config->get('store', 'ini')));
         $storeClass = 'Icinga\\User\\Preferences\\Store\\' . $type . 'Store';
         if (!class_exists($storeClass)) {
             throw new ConfigurationError(

From 55c20abddc078156d1f6f95893f880f5fb2ca1f6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 23 Jan 2015 16:19:39 +0100
Subject: [PATCH 4/4] Only show the "save to session" button in case
 preferences store = none

refs #8234
---
 .../controllers/PreferenceController.php      |  4 ++-
 application/forms/PreferenceForm.php          | 28 ++++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index c45344fbf..832f57644 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -43,7 +43,9 @@ class PreferenceController extends BasePreferenceController
         $user = $this->getRequest()->getUser();
         $form = new PreferenceForm();
         $form->setPreferences($user->getPreferences());
-        $form->setStore(PreferencesStore::create($storeConfig, $user));
+        if ($storeConfig->get('store', 'ini') !== 'none') {
+            $form->setStore(PreferencesStore::create($storeConfig, $user));
+        }
         $form->handleRequest();
 
         $this->view->form = $form;
diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 9b5a3ecf8..ed20c58cd 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -86,7 +86,7 @@ class PreferenceForm extends Form
      */
     public function onSuccess()
     {
-        $this->preferences = new Preferences($this->store->load());
+        $this->preferences = new Preferences($this->store ? $this->store->load() : array());
 
         $webPreferences = $this->preferences->get('icingaweb', array());
         foreach ($this->getValues() as $key => $value) {
@@ -103,7 +103,7 @@ class PreferenceForm extends Form
         Session::getSession()->user->setPreferences($this->preferences);
 
         try {
-            if ($this->getElement('btn_submit_preferences')->isChecked()) {
+            if ($this->store && $this->getElement('btn_submit_preferences')->isChecked()) {
                 $this->save();
                 Notification::success($this->translate('Preferences successfully saved'));
             } else {
@@ -186,18 +186,20 @@ class PreferenceForm extends Form
             )
         );
 
-        $this->addElement(
-            'submit',
-            'btn_submit_preferences',
-            array(
-                'ignore'        => true,
-                'label'         => $this->translate('Save to the Preferences'),
-                'decorators'    => array(
-                    'ViewHelper',
-                    array('HtmlTag', array('tag' => 'div'))
+        if ($this->store) {
+            $this->addElement(
+                'submit',
+                'btn_submit_preferences',
+                array(
+                    'ignore'        => true,
+                    'label'         => $this->translate('Save to the Preferences'),
+                    'decorators'    => array(
+                        'ViewHelper',
+                        array('HtmlTag', array('tag' => 'div'))
+                    )
                 )
-            )
-        );
+            );
+        }
 
         $this->addElement(
             'submit',