From 5fd2eb639ae4aa2a446fac3561ced7dd1d18ce32 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 23 Jun 2015 14:08:50 +0200 Subject: [PATCH] LdapResourceForm: Display exact error messages to the user --- application/forms/Config/Resource/LdapResourceForm.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php index 6d9bf74d4..0fa0cb47b 100644 --- a/application/forms/Config/Resource/LdapResourceForm.php +++ b/application/forms/Config/Resource/LdapResourceForm.php @@ -156,13 +156,8 @@ class LdapResourceForm extends Form { try { $resource = ResourceFactory::createResource(new ConfigObject($form->getValues())); - if (false === $resource->testCredentials( - $form->getElement('bind_dn')->getValue(), - $form->getElement('bind_pw')->getValue() - ) - ) { - throw new Exception(); // TODO: Get the exact error message - } + $resource->connect(); + $resource->bind(); } catch (Exception $e) { $msg = $form->translate('Connectivity validation failed, connection to the given resource not possible.'); if (($error = $e->getMessage())) {