Merge branch 'master' into bugfix/broken-user-and-group-management-10367

Conflicts:
	library/Icinga/Authentication/User/LdapUserBackend.php
	library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php

.puppet/profiles/icingaweb2_dev/manifests/init.pp

@@ -88,6 +88,7 @@ class icingaweb2_dev (
 
   icingaweb2::config::general { 'authentication':
     source => $name,
+    replace => false,
   }
 
   icingaweb2::config::general { [ 'config', 'resources', 'roles' ]:

application/forms/Authentication/LoginForm.php

@@ -71,7 +71,7 @@ class LoginForm extends Form
         if ($this->created) {
             $redirect = $this->getElement('redirect')->getValue();
         }
-        if (empty($redirect) || strpos($redirect, 'authentication/logout') !== 0) {
+        if (empty($redirect) || strpos($redirect, 'authentication/logout') !== false) {
             $redirect = static::REDIRECT_URL;
         }
         return Url::fromPath($redirect);

doc/installation.md

@@ -495,6 +495,6 @@ The first release candidate of Icinga Web 2 introduces the following non-backwar
   the file remains unchanged.
 
 * The location of a user's preferences has been changed from
-  **<config-dir>/preferences/<username>.ini** to
+  **config-dir/preferences/username.ini** to
-  **<config-dir>/preferences/<username>/config.ini**.
+  **config-dir/preferences/username/config.ini**.
   The content of the file remains unchanged.

library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php

@@ -663,7 +663,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
 
         return $this
             ->setGroupBaseDn($config->base_dn)
-            ->setUserBaseDn($config->get('user_base_dn', $this->getGroupBaseDn()))
+            ->setUserBaseDn($config->get('user_base_dn', $defaults->get('user_base_dn', $this->getGroupBaseDn())))
             ->setGroupClass($config->get('group_class', $defaults->group_class))
             ->setUserClass($config->get('user_class', $defaults->user_class))
             ->setGroupNameAttribute($config->get('group_name_attribute', $defaults->group_name_attribute))

library/Icinga/Data/Db/DbConnection.php

@@ -130,6 +130,7 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
             'username'          => $this->config->username,
             'password'          => $this->config->password,
             'dbname'            => $this->config->dbname,
+            'charset'           => $this->config->charset,
             'persistent'        => (bool) $this->config->get('persistent', false),
             'options'           => & $genericAdapterOptions,
             'driver_options'    => & $driverOptions

modules/monitoring/application/views/scripts/list/components/hostssummary.phtml

@@ -73,8 +73,8 @@ $stateBadges
             'host_state'    => 2,
             'host_handled'  => 1
         ),
-        'List %u host that is currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
+        'List %u host that is currently in state UNREACHABLE (Acknowledged)',
-        'List %u hosts which are currently in state UNREACHABLE (Acknowledged) in the host group "%s"',
+        'List %u hosts which are currently in state UNREACHABLE (Acknowledged)',
         array($stats->hosts_unreachable_handled)
     )
     ->add(
@@ -83,8 +83,8 @@ $stateBadges
         array(
             'host_state' => 99
         ),
-        'List %u host that is currently in state UNREACHABLE (Acknowledged)',
+        'List %u host that is currently in state PENDING',
-        'List %u hosts which are currently in state UNREACHABLE (Acknowledged)',
+        'List %u hosts which are currently in state PENDING',
         array($stats->hosts_pending)
     );
 echo $stateBadges->render();