Merge branch 'master' into twigifiedorigin/twigified

1 files changed, 43 insertions, 40 deletions

diff --git a/modules/ldap/lib/Auth/Source/LDAP.php b/modules/ldap/lib/Auth/Source/LDAP.php
index 83b35fa..7bf979a 100644
--- a/modules/ldap/lib/Auth/Source/LDAP.php
+++ b/modules/ldap/lib/Auth/Source/LDAP.php
@@ -10,45 +10,48 @@
  *
  * @package SimpleSAMLphp
  */
-class sspmod_ldap_Auth_Source_LDAP extends sspmod_core_Auth_UserPassBase {
-
-	/**
-	 * A LDAP configuration object.
-	 */
-	private $ldapConfig;
-
-
-	/**
-	 * Constructor for this authentication source.
-	 *
-	 * @param array $info  Information about this authentication source.
-	 * @param array $config  Configuration.
-	 */
-	public function __construct($info, $config) {
-		assert('is_array($info)');
-		assert('is_array($config)');
-
-		// Call the parent constructor first, as required by the interface
-		parent::__construct($info, $config);
-
-		$this->ldapConfig = new sspmod_ldap_ConfigHelper($config,
-			'Authentication source ' . var_export($this->authId, TRUE));
-	}
-
-
-	/**
-	 * Attempt to log in using the given username and password.
-	 *
-	 * @param string $username  The username the user wrote.
-	 * @param string $password  The password the user wrote.
-	 * param array $sasl_arg  Associative array of SASL options
-	 * @return array  Associative array with the users attributes.
-	 */
-	protected function login($username, $password, array $sasl_args = NULL) {
-		assert('is_string($username)');
-		assert('is_string($password)');
-
-		return $this->ldapConfig->login($username, $password, $sasl_args);
-	}
+class sspmod_ldap_Auth_Source_LDAP extends sspmod_core_Auth_UserPassBase
+{
+
+    /**
+     * A LDAP configuration object.
+     */
+    private $ldapConfig;
+
+
+    /**
+     * Constructor for this authentication source.
+     *
+     * @param array $info  Information about this authentication source.
+     * @param array $config  Configuration.
+     */
+    public function __construct($info, $config)
+    {
+        assert('is_array($info)');
+        assert('is_array($config)');
+
+        // Call the parent constructor first, as required by the interface
+        parent::__construct($info, $config);
+
+        $this->ldapConfig = new sspmod_ldap_ConfigHelper($config,
+            'Authentication source ' . var_export($this->authId, true));
+    }
+
+
+    /**
+     * Attempt to log in using the given username and password.
+     *
+     * @param string $username  The username the user wrote.
+     * @param string $password  The password the user wrote.
+     * param array $sasl_arg  Associative array of SASL options
+     * @return array  Associative array with the users attributes.
+     */
+    protected function login($username, $password, array $sasl_args = null)
+    {
+        assert('is_string($username)');
+        assert('is_string($password)');
+
+        return $this->ldapConfig->login($username, $password, $sasl_args);
+    }
 
 }