X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/e211f313704d3a0a00d8d358bd49eb310f9531c5..refs/pull/806/head:/app/Services/Ldap.php

diff --git a/app/Services/Ldap.php b/app/Services/Ldap.php
index ed85357cf..29270daf5 100644
--- a/app/Services/Ldap.php
+++ b/app/Services/Ldap.php
@@ -1,6 +1,5 @@
 <?php namespace BookStack\Services;
 
-
 /**
  * Class Ldap
  * An object-orientated thin abstraction wrapper for common PHP LDAP functions.
@@ -18,24 +17,6 @@ class Ldap
      */
     public function connect($hostName, $port)
     {
-        /*
-        * LDAPS is not working because even if port 363 is specified, 
-        * BookStack tries to open a LDAP connection on the LDAPS channel.
-        * The if-clause below fixed this, although it would be better to
-        * change the settings in .env from
-        *   LDAP_SERVER=servername:port
-        * to
-        *   LDAP_SERVER=ldap://servername:389
-        *   LDAP_SERVER=ldaps://servername:363
-        * in order to be compatible with non-standard setups. Currently, 
-        * specifying ldap:// or ldaps:// results in an error because BookStack
-        * splits at ":" and takes the seconds chunk (in this case "//servername"
-        * as the port value.
-        */
-        if ($port == 363)
-        {
-                $hostName = "ldaps://".$hostName;
-        }
         return ldap_connect($hostName, $port);
     }
 
@@ -111,5 +92,4 @@ class Ldap
     {
         return ldap_bind($ldapConnection, $bindRdn, $bindPassword);
     }
-
 }