gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-01 22:47:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-08-10 17:49:56 +02:00
commit 002684e840
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conf/settings.xml.template
View File

@ -145,8 +145,8 @@
- URIs are supported, e.g.: ldaps://ldap.host.com - URIs are supported, e.g.: ldaps://ldap.host.com
- port: port of the authentification server - port: port of the authentification server
- baseDN: top level of the LDAP directory tree - baseDN: top level of the LDAP directory tree
- bindDN: XXX - bindDN: use this dn for a first step bind, leave empty for annonymous bind
- bindPw: XXX - bindPw: use this password for a first step bind
- filter: Additional filters which are to be checked - filter: Additional filters which are to be checked
--> -->
<connector <connector
@ -165,9 +165,10 @@
- host: hostname of the authentification server - host: hostname of the authentification server
- port: port of the authentification server - port: port of the authentification server
- baseDN: top level of the LDAP directory tree - baseDN: top level of the LDAP directory tree
- bindDN: use this dn for a first step bind, leave empty for annonymous bind
- bindPw: use this password for a first step bind
- filter: Additional filters which are to be checked
- accountDomainName: sample: example.com - accountDomainName: sample: example.com
- bindDN: XXX
- bindPw: XXX
--> -->
<connector <connector
enable = "false" enable = "false"

18
inc/inc.ClassSettings.php
View File

@ -227,14 +227,24 @@ class Settings { /* {{{ */
var $_smtpUser = null; var $_smtpUser = null;
// SMTP : password // SMTP : password
var $_smtpPassword = null; var $_smtpPassword = null;
// LDAP // LDAP Host, URIs are supported, e.g.: ldaps://ldap.host.com
var $_ldapHost = ""; // URIs are supported, e.g.: ldaps://ldap.host.com var $_ldapHost = "";
var $_ldapPort = 389; // Optional. // Port of ldap server, optional.
var $_ldapPort = 389;
// Base dn for searching users, if set the user will be search below base dn
var $_ldapBaseDN = ""; var $_ldapBaseDN = "";
// Use this dn for an initial bind for searching the user
var $_ldapBindDN = ""; var $_ldapBindDN = "";
// Use this password for an initial bind for searching the user
var $_ldapBindPw = ""; var $_ldapBindPw = "";
// Used only by AD <username>@_ldapAccountDomainName will be used for a bind
// when the user is validated
var $_ldapAccountDomainName = ""; var $_ldapAccountDomainName = "";
var $_ldapType = 1; // 0 = ldap; 1 = AD // Type of Ldap server: 0 = ldap; 1 = AD
var $_ldapType = 1;
// Additional filter when searching for the user. If not set, the user will be searched
// below basedn and the search term 'uid=<username>' or 'sAMAccountName=<username>'
// if set the search will be (&(cn=<username>)<filter>)
var $_ldapFilter = ""; var $_ldapFilter = "";
var $_converters = array(); // list of commands used to convert files to text for Indexer var $_converters = array(); // list of commands used to convert files to text for Indexer
var $_extensions = array(); // configuration for extensions var $_extensions = array(); // configuration for extensions