Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix PHP Warning: Missing argument 2 for kolab_auth_ldap::get_user_record() (Bifrost#T44190)

Browse source
This commit is contained in:
Aleksander Machniak 2017-10-09 08:26:18 +02:00
parent 02d3759724
commit 7422273f89
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/kolab_auth/kolab_auth.php
View file

@ -97,7 +97,7 @@ class kolab_auth extends rcube_plugin
if (!$uniqueid) { if (!$uniqueid) {
// Find user record in LDAP // Find user record in LDAP
if (($ldap = self::ldap()) && $ldap->ready) { if (($ldap = self::ldap()) && $ldap->ready) {
if ($record = $ldap->get_user_record($rcmail->get_user_name())) { if ($record = $ldap->get_user_record($rcmail->get_user_name(), $_SESSION['kolab_host'])) {
$uniqueid = $record['uniqueid']; $uniqueid = $record['uniqueid'];
} }
} }
@ -630,6 +630,9 @@ class kolab_auth extends rcube_plugin
// Store user unique identifier for freebusy_session_auth feature // Store user unique identifier for freebusy_session_auth feature
$_SESSION['kolab_auth_uniqueid'] = is_array($record['uniqueid']) ? $record['uniqueid'][0] : $record['uniqueid']; $_SESSION['kolab_auth_uniqueid'] = is_array($record['uniqueid']) ? $record['uniqueid'][0] : $record['uniqueid'];
// Store also host as we need it for get_user_reacod() in 'ready' hook handler
$_SESSION['kolab_host'] = $host;
// Set user login // Set user login
if ($login_attr) { if ($login_attr) {
$this->data['user_login'] = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr]; $this->data['user_login'] = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];