[LDAP] The WebUI Wizard also should not assign empty config IDs

With 689df9a843dd0505088143de039af775a3f92612 the behaviour to assign only
non-empty config IDs was introduced. Only, this was only effective for CLI
and OCS API.

Related to #3270.

The web UI creates now also a full configuration on first load. This fixes
#5094.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

1 files changed, 11 insertions, 1 deletions

diff --git a/apps/user_ldap/lib/Settings/Admin.php b/apps/user_ldap/lib/Settings/Admin.php
index 33a86ad72d2..bf5bbef2f90 100644
--- a/apps/user_ldap/lib/Settings/Admin.php
+++ b/apps/user_ldap/lib/Settings/Admin.php
@@ -49,6 +49,14 @@ class Admin implements ISettings {
 	public function getForm() {
 		$helper = new Helper(\OC::$server->getConfig());
 		$prefixes = $helper->getServerConfigurationPrefixes();
+		if(count($prefixes) === 0) {
+			$newPrefix = $helper->getNextServerConfigurationPrefix();
+			$config = new Configuration($newPrefix, false);
+			$config->setConfiguration($config->getDefaults());
+			$config->saveConfiguration();
+			$prefixes[] = $newPrefix;
+		}
+
 		$hosts = $helper->getServerConfigurationHosts();
 
 		$wControls = new Template('user_ldap', 'part.wizardcontrols');
@@ -62,7 +70,9 @@ class Admin implements ISettings {
 		$parameters['wizardControls'] = $wControls;
 
 		// assign default values
-		$config = new Configuration('', false);
+		if(!isset($config)) {
+			$config = new Configuration('', false);
+		}
 		$defaults = $config->getDefaults();
 		foreach($defaults as $key => $default) {
 			$parameters[$key.'_default'] = $default;