nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-30 03:24:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try and get rid of warnings.

Browse Source
This commit is contained in:
Andrew McMillan 2009-05-12 13:01:51 +12:00
parent a39518ef4b
commit f4c3292b62
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
inc/drivers_ldap.php
View File

@ -84,25 +84,25 @@ class ldapDrivers
} }
} }
//Set the search scope to be used, default to subtree. //Set the search scope to be used, default to subtree. This sets the functions to be called later.
if (!isset($config['scope'])) $config['scope'] = 'subtree'; if (!isset($config['scope'])) $config['scope'] = 'subtree';
switch (strtolower($config['scope'])) { switch (strtolower($config['scope'])) {
case "base": case "base":
$this->ldap_query_one = ldap_read; $this->ldap_query_one = 'ldap_read';
$this->ldap_query_all = ldap_read; $this->ldap_query_all = 'ldap_read';
break; break;
case "onelevel": case "onelevel":
$this->ldap_query_one = ldap_list; $this->ldap_query_one = 'ldap_list';
$this->ldap_query_all = ldap_search; $this->ldap_query_all = 'ldap_search';
break; break;
default: default:
$this->ldap_query_one = ldap_search; $this->ldap_query_one = 'ldap_search';
$this->ldap_query_all = ldap_search; $this->ldap_query_all = 'ldap_search';
break; break;
} }
//connect as root //connect as root
if (!ldap_bind($this->connect,$config['bindDN'],$config['passDN'])){ if (!ldap_bind($this->connect, (isset($config['bindDN']) ? $config['bindDN'] : null), (isset($config['passDN']) ? $config['passDN'] : null) ) ){
$bindDN = isset($config['bindDN']) ? $config['bindDN'] : 'anonymous'; $bindDN = isset($config['bindDN']) ? $config['bindDN'] : 'anonymous';
$passDN = isset($config['passDN']) ? $config['passDN'] : 'anonymous'; $passDN = isset($config['passDN']) ? $config['passDN'] : 'anonymous';
dbg_error_log( "LDAP", i18n('drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s'), $host, $port, $bindDN ); dbg_error_log( "LDAP", i18n('drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s'), $host, $port, $bindDN );
@ -113,9 +113,9 @@ class ldapDrivers
$this->valid = true; $this->valid = true;
//root to start search //root to start search
$this->baseDNUsers = is_string($config['baseDNUsers']) ? array($config['baseDNUsers']) : $config['baseDNUsers']; $this->baseDNUsers = is_string($config['baseDNUsers']) ? array($config['baseDNUsers']) : $config['baseDNUsers'];
$this->filterUsers = $config['filterUsers']; $this->filterUsers = (isset($config['filterUsers']) ? $config['filterUsers'] : null);
$this->baseDNGroups = $config['baseDNGroups']; $this->baseDNGroups = (isset($config['baseDNGroups']) ? $config['baseDNGroups'] : null);
$this->filterGroups = $config['filterGroups']; $this->filterGroups = (isset($config['filterGroups']) ? $config['filterGroups'] : null);
} }
/** /**