Merge pull request #40 from pajavyskocil/ldap_fixed

Fixed bugs with LDAP

Author: vyskocilpavel

CHANGELOG.md

@@ -18,6 +18,10 @@ All notable changes to this project will be documented in this file.
  - Function unauthorize in PerunIdentity is now public
  - Changed the login and registration process
 
+ [Fixed]
+ - Fixed the problem with access to non-secured LDAP
+ - Fixed the bad call of function 'searchForEntity(...)' in function getVoById() in AdapterLdap.php  
+ 
  ## [v1.0.0]
 
  [Unreleased]: https://github.com/CESNET/perun-simplesamlphp-module/tree/master

lib/AdapterLdap.php

@@ -35,8 +35,8 @@ public function __construct ($configFileName = null)
 		$conf = SimpleSAML_Configuration::getConfig($configFileName);
 
 		$this->ldapHostname = $conf->getString(self::LDAP_HOSTNAME);
-		$this->ldapUser = $conf->getString(self::LDAP_USER);
-		$this->ldapPassword = $conf->getString(self::LDAP_PASSWORD);
+		$this->ldapUser = $conf->getString(self::LDAP_USER, null);
+		$this->ldapPassword = $conf->getString(self::LDAP_PASSWORD, null);
 		$this->ldapBase = $conf->getString(self::LDAP_BASE);
 
 
@@ -155,7 +155,7 @@ public function getVoByShortName($voShortName)
 
 	public function getVoById($id)
 	{
-		$vo = sspmod_perun_LdapConnector::searchForEntity($this->ldapBase,
+		$vo = $this->connector->searchForEntity($this->ldapBase,
 			"(&(objectClass=perunVo)(perunVoId=$id))",
 			array("o", "description")
 		);