Use more IConfig and add unit tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

1 files changed, 25 insertions, 21 deletions

diff --git a/apps/user_ldap/lib/Helper.php b/apps/user_ldap/lib/Helper.php
index 933aee382df..b48b4001f9d 100644
--- a/apps/user_ldap/lib/Helper.php
+++ b/apps/user_ldap/lib/Helper.php
@@ -69,19 +69,16 @@ class Helper {
 	public function getServerConfigurationPrefixes($activeConfigurations = false) {
 		$referenceConfigkey = 'ldap_configuration_active';
 
-		$config = \OC::$server->getConfig();
+		$keys = $this->getServersConfig($referenceConfigkey);
 
-		$keys = $config->getAppKeys('user_ldap');
 		$prefixes = [];
 		foreach ($keys as $key) {
-			if (preg_match('/ldap_configuration_active$/S', $key) === 1) {
-				if ($activeConfigurations && $config->getAppValue('user_ldap', $key, '0') !== '1') {
-					continue;
-				}
-
-				$len = strlen($key) - strlen($referenceConfigkey);
-				$prefixes[] = substr($key, 0, $len);
+			if ($activeConfigurations && $this->config->getAppValue('user_ldap', $key, '0') !== '1') {
+				continue;
 			}
+
+			$len = strlen($key) - strlen($referenceConfigkey);
+			$prefixes[] = substr($key, 0, $len);
 		}
 
 		return $prefixes;
@@ -96,20 +93,27 @@ class Helper {
 	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();
+		$keys = $this->getServersConfig($referenceConfigkey);
+
 		$result = array();
+		foreach($keys as $key) {
+			$len = strlen($key) - strlen($referenceConfigkey);
+			$prefix = substr($key, 0, $len);
+			$result[$prefix] = $this->config->getAppValue('user_ldap', $key);
+		}
 
-		foreach($configHosts as $configHost) {
-			$len = strlen($configHost['configkey']) - strlen($referenceConfigkey);
-			$prefix = substr($configHost['configkey'], 0, $len);
-			$result[$prefix] = $configHost['configvalue'];
+		return $result;
+	}
+
+	private function getServersConfig($value) {
+		$regex = '/' . $value . '$/S';
+
+		$keys = $this->config->getAppKeys('user_ldap');
+		$result = [];
+		foreach ($keys as $key) {
+			if (preg_match($regex, $key) === 1) {
+				$result[] = $key;
+			}
 		}
 
 		return $result;