From a4fc9bbe8cc86da6c8fedfcc3651bf9ab3285beb Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 14 Aug 2013 16:38:25 +0200
Subject: [PATCH 1/5] LDAP: right align labels on settings page

---
 apps/user_ldap/css/settings.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 185952e14bb..514e28f3aff 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -3,7 +3,9 @@
 	max-width: 200px;
 	display: inline-block;
 	vertical-align: top;
+	text-align: right;
 	padding-top: 9px;
+	padding-right: 5px;
 }
 
 #ldap fieldset input, #ldap fieldset textarea {
@@ -11,6 +13,10 @@
 	display: inline-block;
 }
 
+#ldap fieldset p input[type=checkbox] {
+	vertical-align: bottom;
+}
+
 .ldapIndent {
 	margin-left: 50px;
 }

From 7b17fd2f172af24e0769ee6a601dd26aeb65ed48 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 14 Aug 2013 16:51:38 +0200
Subject: [PATCH 2/5] LDAP: move small info text strings into tooltips

---
 apps/user_ldap/templates/settings.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 95aa592594b..c051ea5cfe1 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -51,18 +51,15 @@
 		<p><label for="ldap_login_filter"><?php p($l->t('User Login Filter'));?></label>
 		<input type="text" id="ldap_login_filter" name="ldap_login_filter"
 			data-default="<?php p($_['ldap_login_filter_default']); ?>"
-			title="<?php p($l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.'));?>" />
-				<br /><small><?php p($l->t('use %%uid placeholder, e.g. "uid=%%uid"'));?></small></p>
+			title="<?php p($l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: "uid=%%uid"'));?>" /></p>
 		<p><label for="ldap_userlist_filter"><?php p($l->t('User List Filter'));?></label>
 		<input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
 			data-default="<?php p($_['ldap_userlist_filter_default']); ?>"
-			title="<?php p($l->t('Defines the filter to apply, when retrieving users.'));?>" />
-			<br /><small><?php p($l->t('without any placeholder, e.g. "objectClass=person".'));?></small></p>
+			title="<?php p($l->t('Defines the filter to apply, when retrieving users (no placeholders). Example: "objectClass=person"'));?>" /></p>
 		<p><label for="ldap_group_filter"><?php p($l->t('Group Filter'));?></label>
 		<input type="text" id="ldap_group_filter" name="ldap_group_filter"
 			data-default="<?php p($_['ldap_group_filter_default']); ?>"
-			title="<?php p($l->t('Defines the filter to apply, when retrieving groups.'));?>" />
-			<br /><small><?php p($l->t('without any placeholder, e.g. "objectClass=posixGroup".'));?></small></p>
+			title="<?php p($l->t('Defines the filter to apply, when retrieving groups (no placeholders). Example: "objectClass=posixGroup"'));?>" /></p>
 	</fieldset>
 	<fieldset id="ldapSettings-2">
 		<div id="ldapAdvancedAccordion">
@@ -75,7 +72,7 @@
 				<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>"  title="<?php p($l->t('Only connect to the replica server.'));?>" /></p>
 				<p><label for="ldap_tls"><?php p($l->t('Use TLS'));?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1" data-default="<?php p($_['ldap_tls_default']); ?>" title="<?php p($l->t('Do not use it additionally for LDAPS connections, it will fail.'));?>" /></p>
 				<p><label for="ldap_nocase"><?php p($l->t('Case insensitve LDAP server (Windows)'));?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php p($_['ldap_nocase_default']); ?>"  value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) p(' checked'); ?>></p>
-				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', $theme->getName() ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/><small><?php p($l->t('Not recommended, use for testing only.'));?></small></p>
+				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', $theme->getName() ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
 				<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
 			</div>
 			<h3><?php p($l->t('Directory Settings'));?></h3>

From cbfee81068d47d246deac9902f12bf63258a03e0 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 15 Aug 2013 12:45:37 +0200
Subject: [PATCH 3/5] LDAP: slightly smaller input fields

---
 apps/user_ldap/css/settings.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 514e28f3aff..4e0ee31c7c4 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -9,7 +9,7 @@
 }
 
 #ldap fieldset input, #ldap fieldset textarea {
-	width: 70%;
+	width: 60%;
 	display: inline-block;
 }
 

From 479f893f6ddef6a102b8f4ff3f68fc0b64838710 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 15 Aug 2013 15:55:06 +0200
Subject: [PATCH 4/5] LDAP: Show Host name in configuration drop down

---
 apps/user_ldap/lib/helper.php         | 28 +++++++++++++++++++++++++++
 apps/user_ldap/settings.php           |  2 ++
 apps/user_ldap/templates/settings.php |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index f65f466789f..4c9dd07a12c 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -70,6 +70,34 @@ class Helper {
 		return $prefixes;
 	}
 
+	/**
+	 *
+	 * @brief determines the host for every configured connection
+	 * @return an array with configprefix as keys
+	 *
+	 */
+	static public function getServerConfigurationHosts() {
+		$referenceConfigkey = 'ldap_host';
+
+		$query = '
+			SELECT DISTINCT `configkey`, `configvalue`
+			FROM `*PREFIX*appconfig`
+			WHERE `appid` = \'user_ldap\'
+				AND `configkey` LIKE ?
+		';
+		$query = \OCP\DB::prepare($query);
+		$configHosts = $query->execute(array('%'.$referenceConfigkey))->fetchAll();
+		$result = array();
+
+		foreach($configHosts as $configHost) {
+			$len = strlen($configHost['configkey']) - strlen($referenceConfigkey);
+			$prefix = substr($configHost['configkey'], 0, $len);
+			$result[$prefix] = $configHost['configvalue'];
+		}
+
+		return $result;
+	}
+
 	/**
 	 * @brief deletes a given saved LDAP/AD server configuration.
 	 * @param string the configuration prefix of the config to delete
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 22e2dac6d26..7169192a18e 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -44,7 +44,9 @@ OCP\Util::addstyle('user_ldap', 'settings');
 $tmpl = new OCP\Template('user_ldap', 'settings');
 
 $prefixes = \OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes();
+$hosts = \OCA\user_ldap\lib\Helper::getServerConfigurationHosts();
 $tmpl->assign('serverConfigurationPrefixes', $prefixes);
+$tmpl->assign('serverConfigurationHosts', $hosts);
 
 // assign default values
 if(!isset($ldap)) {
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index c051ea5cfe1..e214d57fb1d 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -24,7 +24,7 @@
 			$sel = ' selected';
 			foreach($_['serverConfigurationPrefixes'] as $prefix) {
 				?>
-				<option value="<?php p($prefix); ?>"<?php p($sel); ?>><?php p($i++); ?>. Server</option>
+				<option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($i++); ?>. Server: <?php p($_['serverConfigurationHosts'][$prefix]); ?></option>
 				<?php
 			}
 		}

From 42fc2295e4be7551846e342f9bd3f1909ff435a1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 15 Aug 2013 16:10:49 +0200
Subject: [PATCH 5/5] LDAP: Update Host in configuration chooser on Save

---
 apps/user_ldap/js/settings.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 52d5dbc48d9..b86aac6da67 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -176,6 +176,13 @@ $(document).ready(function() {
 					$('#ldap_submit').effect('highlight', {'color':'#A8FA87'}, 5000, function() {
 						$('#ldap_submit').css('background', bgcolor);
 					});
+					//update the Label in the config chooser
+					caption = $('#ldap_serverconfig_chooser option:selected:first').text();
+					pretext = '. Server: ';
+					caption = caption.slice(0, caption.indexOf(pretext) + pretext.length);
+					caption = caption + $('#ldap_host').val();
+					$('#ldap_serverconfig_chooser option:selected:first').text(caption);
+
 				} else {
 					$('#ldap_submit').css('background', '#fff');
 					$('#ldap_submit').effect('highlight', {'color':'#E97'}, 5000, function() {