revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-13 09:06:14 +01:00
Code Issues Releases Wiki Activity

Revert "Fix PHP 8.3 "Usage of ldap_connect with two arguments is deprecated" exception"

Browse source 
Summary:
Revert commit 700090917a per T15963.

Fixes T15963
Opens T15724

Test Plan: N/A.

Reviewers: O1 Blessed Committers, valerio.bozzolan

Reviewed By: O1 Blessed Committers, valerio.bozzolan

Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Maniphest Tasks: T15963, T15724

Differential Revision: https://we.phorge.it/D25842
This commit is contained in:
Andre Klapper 2024-12-02 01:25:22 +01:00
parent a68b8daafd
commit 0bfdcaa005
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/applications/auth/adapter/PhutilLDAPAuthAdapter.php
View file

@ -305,12 +305,7 @@ final class PhutilLDAPAuthAdapter extends PhutilAuthAdapter {
'port' => $this->port, 'port' => $this->port,
)); ));
if ($this->ldapStartTLS) { $conn = @ldap_connect($host, $this->port);
$ldap_server_uri = 'ldaps://'.$host.':'.$this->port;
} else {
$ldap_server_uri = 'ldap://'.$host.':'.$this->port;
}
$conn = @ldap_connect($ldap_server_uri);
$profiler->endServiceCall( $profiler->endServiceCall(
$call_id, $call_id,
@ -320,7 +315,7 @@ final class PhutilLDAPAuthAdapter extends PhutilAuthAdapter {
if (!$conn) { if (!$conn) {
throw new Exception( throw new Exception(
pht('Unable to connect to LDAP server (%s).', $ldap_server_uri)); pht('Unable to connect to LDAP server (%s:%d).', $host, $port));
} }
$options = array( $options = array(