summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-09-07 12:44:29 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-09-07 12:44:29 +0100
commit639fa02f952574c515ce4d071d33a31ac18419e5 (patch)
tree3096160bb379d8aef1143f772d4dda82006ec997 /share
parent0b3c16cae2c6adef3f928cb7e29cfdc11a18f877 (diff)
downloadpykolab-639fa02f952574c515ce4d071d33a31ac18419e5.tar.gz
Include $_SERVER["HTTP_HOST"] specific configuration if it is available.
Diffstat (limited to 'share')
-rw-r--r--share/templates/roundcubemail/acl.inc.php.tpl5
-rw-r--r--share/templates/roundcubemail/calendar.inc.php.tpl5
-rw-r--r--share/templates/roundcubemail/compose_addressbook.inc.php.tpl4
-rw-r--r--share/templates/roundcubemail/db.inc.php.tpl4
-rw-r--r--share/templates/roundcubemail/kolab.inc.php.tpl10
-rw-r--r--share/templates/roundcubemail/kolab_auth.inc.php.tpl110
-rw-r--r--share/templates/roundcubemail/kolab_folders.inc.php.tpl5
-rw-r--r--share/templates/roundcubemail/main.inc.php.tpl11
-rw-r--r--share/templates/roundcubemail/managesieve.inc.php.tpl5
-rw-r--r--share/templates/roundcubemail/owncloud.inc.php.tpl7
-rw-r--r--share/templates/roundcubemail/password.inc.php.tpl298
-rw-r--r--share/templates/roundcubemail/terms.inc.php.tpl24
12 files changed, 261 insertions, 227 deletions
diff --git a/share/templates/roundcubemail/acl.inc.php.tpl b/share/templates/roundcubemail/acl.inc.php.tpl
index 0e26cd2..12cdc51 100644
--- a/share/templates/roundcubemail/acl.inc.php.tpl
+++ b/share/templates/roundcubemail/acl.inc.php.tpl
@@ -3,4 +3,9 @@
\$rcmail_config['acl_users_source'] = 'kolab_addressbook';
\$rcmail_config['acl_users_field'] = 'mail';
\$rcmail_config['acl_users_filter'] = 'objectClass=kolabInetOrgPerson';
+
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
+
?>
diff --git a/share/templates/roundcubemail/calendar.inc.php.tpl b/share/templates/roundcubemail/calendar.inc.php.tpl
index bc871ce..b7b668f 100644
--- a/share/templates/roundcubemail/calendar.inc.php.tpl
+++ b/share/templates/roundcubemail/calendar.inc.php.tpl
@@ -7,4 +7,9 @@
\$rcmail_config['calendar_work_start'] = 6;
\$rcmail_config['calendar_work_end'] = 18;
\$rcmail_config['calendar_event_coloring'] = 0;
+
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
+
?>
diff --git a/share/templates/roundcubemail/compose_addressbook.inc.php.tpl b/share/templates/roundcubemail/compose_addressbook.inc.php.tpl
deleted file mode 100644
index 31702ac..0000000
--- a/share/templates/roundcubemail/compose_addressbook.inc.php.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
- \$rcmail_config['compose_addressbooks'] = \$rcmail_config['autocomplete_addressbooks'];
- \$rcmail_config['compose_addressbook_mode'] = 'full';
-?>
diff --git a/share/templates/roundcubemail/db.inc.php.tpl b/share/templates/roundcubemail/db.inc.php.tpl
index 8b8db48..caec957 100644
--- a/share/templates/roundcubemail/db.inc.php.tpl
+++ b/share/templates/roundcubemail/db.inc.php.tpl
@@ -4,6 +4,10 @@
\$rcmail_config['db_dsnw'] = '$mysql_uri';
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
+
\$rcmail_config['db_max_length'] = 512000;
\$rcmail_config['db_persistent'] = TRUE;
\$rcmail_config['db_table_users'] = 'users';
diff --git a/share/templates/roundcubemail/kolab.inc.php.tpl b/share/templates/roundcubemail/kolab.inc.php.tpl
index b0801d8..f6fc5f4 100644
--- a/share/templates/roundcubemail/kolab.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab.inc.php.tpl
@@ -1,9 +1,13 @@
<?php
-\$rcmail_config['kolab_freebusy_server'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/freebusy';
+ \$rcmail_config['kolab_freebusy_server'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/freebusy';
-\$rcmail_config['kolab_cache'] = true;
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
-\$rcmail_config['kolab_ssl_verify_peer'] = false;
+ \$rcmail_config['kolab_cache'] = true;
+
+ \$rcmail_config['kolab_ssl_verify_peer'] = false;
?>
diff --git a/share/templates/roundcubemail/kolab_auth.inc.php.tpl b/share/templates/roundcubemail/kolab_auth.inc.php.tpl
index 41e0bc8..5568c0a 100644
--- a/share/templates/roundcubemail/kolab_auth.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_auth.inc.php.tpl
@@ -1,66 +1,70 @@
<?php
-// The id of the LDAP address book (which refers to the rcmail_config['ldap_public'])
-// or complete addressbook definition array.
-\$rcmail_config['kolab_auth_addressbook'] = Array(
- 'name' => 'Kolab Auth',
- 'hosts' => Array('localhost'),
- 'port' => 389,
- 'use_tls' => false,
- 'user_specific' => false,
- 'base_dn' => '$ldap_user_base_dn',
- 'bind_dn' => '$ldap_service_bind_dn',
- 'bind_pass' => '$ldap_service_bind_pw',
- 'writable' => false,
- 'ldap_version' => 3, // using LDAPv3
- 'fieldmap' => Array(
- 'name' => 'displayname',
- 'email' => 'mail',
- 'email:alias' => 'alias',
- 'role' => 'nsroledn',
- ),
- 'sort' => 'displayname',
- 'scope' => 'sub',
- 'filter' => '(objectClass=*)',
- 'fuzzy_search' => true,
- 'sizelimit' => '0',
- 'timelimit' => '0',
- 'groups' => Array(
- 'base_dn' => '$ldap_group_base_dn',
- 'filter' => '$ldap_group_filter',
- 'object_classes' => Array('top', 'groupOfUniqueNames'),
- 'member_attr' => 'uniqueMember',
- ),
-);
+ // The id of the LDAP address book (which refers to the rcmail_config['ldap_public'])
+ // or complete addressbook definition array.
+ \$rcmail_config['kolab_auth_addressbook'] = Array(
+ 'name' => 'Kolab Auth',
+ 'hosts' => Array('localhost'),
+ 'port' => 389,
+ 'use_tls' => false,
+ 'user_specific' => false,
+ 'base_dn' => '$ldap_user_base_dn',
+ 'bind_dn' => '$ldap_service_bind_dn',
+ 'bind_pass' => '$ldap_service_bind_pw',
+ 'writable' => false,
+ 'ldap_version' => 3, // using LDAPv3
+ 'fieldmap' => Array(
+ 'name' => 'displayname',
+ 'email' => 'mail',
+ 'email:alias' => 'alias',
+ 'role' => 'nsroledn',
+ ),
+ 'sort' => 'displayname',
+ 'scope' => 'sub',
+ 'filter' => '(objectClass=*)',
+ 'fuzzy_search' => true,
+ 'sizelimit' => '0',
+ 'timelimit' => '0',
+ 'groups' => Array(
+ 'base_dn' => '$ldap_group_base_dn',
+ 'filter' => '$ldap_group_filter',
+ 'object_classes' => Array('top', 'groupOfUniqueNames'),
+ 'member_attr' => 'uniqueMember',
+ ),
+ );
-// This will overwrite defined filter
-\$rcmail_config['kolab_auth_filter'] = '(&' . '$ldap_user_filter' . '(|(uid=%u)(mail=%fu)(alias=%fu)))';
+ // This will overwrite defined filter
+ \$rcmail_config['kolab_auth_filter'] = '(&' . '$ldap_user_filter' . '(|(uid=%u)(mail=%fu)(alias=%fu)))';
-// Use this fields (from fieldmap configuration) to get authentication ID
-\$rcmail_config['kolab_auth_login'] = 'email';
+ // Use this fields (from fieldmap configuration) to get authentication ID
+ \$rcmail_config['kolab_auth_login'] = 'email';
-// Use this fields (from fieldmap configuration) for default identity
-\$rcmail_config['kolab_auth_name'] = 'name';
-\$rcmail_config['kolab_auth_alias'] = 'alias';
-\$rcmail_config['kolab_auth_email'] = 'email';
+ // Use this fields (from fieldmap configuration) for default identity
+ \$rcmail_config['kolab_auth_name'] = 'name';
+ \$rcmail_config['kolab_auth_alias'] = 'alias';
+ \$rcmail_config['kolab_auth_email'] = 'email';
-if (preg_match('/\/helpdesk-login\//', \$_SERVER["REQUEST_URI"]) ) {
+ if (preg_match('/\/helpdesk-login\//', \$_SERVER["REQUEST_URI"]) ) {
- // Login and password of the admin user. Enables "Login As" feature.
- \$rcmail_config['kolab_auth_admin_login'] = '$imap_admin_login';
- \$rcmail_config['kolab_auth_admin_password'] = '$imap_admin_password';
+ // Login and password of the admin user. Enables "Login As" feature.
+ \$rcmail_config['kolab_auth_admin_login'] = '$imap_admin_login';
+ \$rcmail_config['kolab_auth_admin_password'] = '$imap_admin_password';
- \$rcmail_config['kolab_auth_auditlog'] = true;
-}
+ \$rcmail_config['kolab_auth_auditlog'] = true;
+ }
-// Administrative role field (from fieldmap configuration) which must be filled with
-// specified value which adds privilege to login as another user.
-\$rcmail_config['kolab_auth_role'] = 'role';
-\$rcmail_config['kolab_auth_role_value'] = 'cn=kolab-admin,$ldap_base_dn';
+ // Administrative role field (from fieldmap configuration) which must be filled with
+ // specified value which adds privilege to login as another user.
+ \$rcmail_config['kolab_auth_role'] = 'role';
+ \$rcmail_config['kolab_auth_role_value'] = 'cn=kolab-admin,$ldap_base_dn';
-// Administrative group name to which user must be assigned to
-// which adds privilege to login as another user.
-\$rcmail_config['kolab_auth_group'] = 'Kolab Helpdesk';
+ // Administrative group name to which user must be assigned to
+ // which adds privilege to login as another user.
+ \$rcmail_config['kolab_auth_group'] = 'Kolab Helpdesk';
+
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
?>
diff --git a/share/templates/roundcubemail/kolab_folders.inc.php.tpl b/share/templates/roundcubemail/kolab_folders.inc.php.tpl
index b0c7ea1..7f0598d 100644
--- a/share/templates/roundcubemail/kolab_folders.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_folders.inc.php.tpl
@@ -11,4 +11,9 @@
\$rcmail_config['kolab_folders_mail_junkemail'] = 'Trash';
\$rcmail_config['kolab_folders_mail_outbox'] = '';
\$rcmail_config['kolab_folders_mail_wastebasket'] = '';
+
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
+
?>
diff --git a/share/templates/roundcubemail/main.inc.php.tpl b/share/templates/roundcubemail/main.inc.php.tpl
index 9049e2e..ba6c1e9 100644
--- a/share/templates/roundcubemail/main.inc.php.tpl
+++ b/share/templates/roundcubemail/main.inc.php.tpl
@@ -110,9 +110,8 @@
'contextmenu',
);
-
- if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/main.inc.php')) {
- include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/main.inc.php');
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
}
// Re-apply mandatory settings here.
@@ -133,7 +132,6 @@
\$rcmail_config['smtp_debug'] = true;
\$rcmail_config['product_name'] = 'Kolab Groupware';
-
\$rcmail_config['skin'] = 'larry';
\$rcmail_config['skin_logo'] = 'skins/kolab/images/kolab_logo.png';
\$rcmail_config['skin_include_php'] = false;
@@ -263,9 +261,4 @@
\$rcmail_config['autocomplete_single'] = true;
\$rcmail_config['htmleditor'] = 0;
-
- include_once("/etc/roundcubemail/kolab_auth.inc.php");
-
- \$rcmail_config['kolab_cache'] = true;
-
?>
diff --git a/share/templates/roundcubemail/managesieve.inc.php.tpl b/share/templates/roundcubemail/managesieve.inc.php.tpl
index c1a9fa3..48fa544 100644
--- a/share/templates/roundcubemail/managesieve.inc.php.tpl
+++ b/share/templates/roundcubemail/managesieve.inc.php.tpl
@@ -10,4 +10,9 @@
\$rcmail_config['managesieve_replace_delimiter'] = '';
\$rcmail_config['managesieve_disabled_extensions'] = array();
\$rcmail_config['managesieve_debug'] = true;
+
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
+
?>
diff --git a/share/templates/roundcubemail/owncloud.inc.php.tpl b/share/templates/roundcubemail/owncloud.inc.php.tpl
index 7410a53..f5268fa 100644
--- a/share/templates/roundcubemail/owncloud.inc.php.tpl
+++ b/share/templates/roundcubemail/owncloud.inc.php.tpl
@@ -1,4 +1,9 @@
<?php
// ownCloud URL
- \$rcmail_config['owncloud_url'] = 'http://webmail.klab.cc/owncloud';
+ \$rcmail_config['owncloud_url'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/owncloud';
+
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
+
?> \ No newline at end of file
diff --git a/share/templates/roundcubemail/password.inc.php.tpl b/share/templates/roundcubemail/password.inc.php.tpl
index 992ccc6..9fd28d3 100644
--- a/share/templates/roundcubemail/password.inc.php.tpl
+++ b/share/templates/roundcubemail/password.inc.php.tpl
@@ -1,151 +1,155 @@
<?php
-// Password Plugin options
-// -----------------------
-// A driver to use for password change. Default: "sql".
-// See README file for list of supported driver names.
-\$rcmail_config['password_driver'] = 'ldap';
-
-// Determine whether current password is required to change password.
-// Default: false.
-\$rcmail_config['password_confirm_current'] = true;
-
-// Require the new password to be a certain length.
-// set to blank to allow passwords of any length
-\$rcmail_config['password_minimum_length'] = 6;
-
-// Require the new password to contain a letter and punctuation character
-// Change to false to remove this check.
-\$rcmail_config['password_require_nonalpha'] = false;
-
-// Enables logging of password changes into logs/password
-\$rcmail_config['password_log'] = true;
-
-
-// LDAP and LDAP_SIMPLE Driver options
-// -----------------------------------
-// LDAP server name to connect to.
-// You can provide one or several hosts in an array in which case the hosts are tried from left to right.
-// Exemple: array('ldap1.exemple.com', 'ldap2.exemple.com');
-// Default: 'localhost'
-\$rcmail_config['password_ldap_host'] = 'localhost';
-
-// LDAP server port to connect to
-// Default: '389'
-\$rcmail_config['password_ldap_port'] = '389';
-
-// TLS is started after connecting
-// Using TLS for password modification is recommended.
-// Default: false
-\$rcmail_config['password_ldap_starttls'] = false;
-
-// LDAP version
-// Default: '3'
-\$rcmail_config['password_ldap_version'] = '3';
-
-// LDAP base name (root directory)
-// Exemple: 'dc=exemple,dc=com'
-\$rcmail_config['password_ldap_basedn'] = '$ldap_user_base_dn';
-
-// LDAP connection method
-// There is two connection method for changing a user's LDAP password.
-// 'user': use user credential (recommanded, require password_confirm_current=true)
-// 'admin': use admin credential (this mode require password_ldap_adminDN and password_ldap_adminPW)
-// Default: 'user'
-\$rcmail_config['password_ldap_method'] = 'user';
-
-// LDAP Admin DN
-// Used only in admin connection mode
-// Default: null
-\$rcmail_config['password_ldap_adminDN'] = null;
-
-// LDAP Admin Password
-// Used only in admin connection mode
-// Default: null
-\$rcmail_config['password_ldap_adminPW'] = null;
-
-// LDAP user DN mask
-// The user's DN is mandatory and as we only have his login,
-// we need to re-create his DN using a mask
-// '%login' will be replaced by the current roundcube user's login
-// '%name' will be replaced by the current roundcube user's name part
-// '%domain' will be replaced by the current roundcube user's domain part
-// '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
-// Exemple: 'uid=%login,ou=people,dc=exemple,dc=com'
-// \$rcmail_config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com';
-
-// LDAP search DN
-// The DN roundcube should bind with to find out user's DN
-// based on his login. Note that you should comment out the default
-// password_ldap_userDN_mask setting for this to take effect.
-// Use this if you cannot specify a general template for user DN with
-// password_ldap_userDN_mask. You need to perform a search based on
-// users login to find his DN instead. A common reason might be that
-// your users are placed under different ou's like engineering or
-// sales which cannot be derived from their login only.
-\$rcmail_config['password_ldap_searchDN'] = '$ldap_service_bind_dn';
-
-// LDAP search password
-// If password_ldap_searchDN is set, the password to use for
-// binding to search for user's DN. Note that you should comment out the default
-// password_ldap_userDN_mask setting for this to take effect.
-// Warning: Be sure to set approperiate permissions on this file so this password
-// is only accesible to roundcube and don't forget to restrict roundcube's access to
-// your directory as much as possible using ACLs. Should this password be compromised
-// you want to minimize the damage.
-\$rcmail_config['password_ldap_searchPW'] = '$ldap_service_bind_pw';
-
-// LDAP search base
-// If password_ldap_searchDN is set, the base to search in using the filter below.
-// Note that you should comment out the default password_ldap_userDN_mask setting
-// for this to take effect.
-\$rcmail_config['password_ldap_search_base'] = '$ldap_user_base_dn';
-
-// LDAP search filter
-// If password_ldap_searchDN is set, the filter to use when
-// searching for user's DN. Note that you should comment out the default
-// password_ldap_userDN_mask setting for this to take effect.
-// '%login' will be replaced by the current roundcube user's login
-// '%name' will be replaced by the current roundcube user's name part
-// '%domain' will be replaced by the current roundcube user's domain part
-// '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
-// Example: '(uid=%login)'
-// Example: '(&(objectClass=posixAccount)(uid=%login))'
-\$rcmail_config['password_ldap_search_filter'] = '(&(|(uid=%login)(mail=%login)(mailAlternateAddress=%login)(alias=%login))(objectclass=kolabinetorgperson))';
-
-// LDAP password hash type
-// Standard LDAP encryption type which must be one of: crypt,
-// ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
-// Please note that most encodage types require external libraries
-// to be included in your PHP installation, see function hashPassword in drivers/ldap.php for more info.
-// Default: 'crypt'
-\$rcmail_config['password_ldap_encodage'] = 'clear';
-
-// LDAP password attribute
-// Name of the ldap's attribute used for storing user password
-// Default: 'userPassword'
-\$rcmail_config['password_ldap_pwattr'] = 'userPassword';
-
-// LDAP password force replace
-// Force LDAP replace in cases where ACL allows only replace not read
-// See http://pear.php.net/package/Net_LDAP2/docs/latest/Net_LDAP2/Net_LDAP2_Entry.html#methodreplace
-// Default: true
-\$rcmail_config['password_ldap_force_replace'] = true;
-
-// LDAP Password Last Change Date
-// Some places use an attribute to store the date of the last password change
-// The date is meassured in "days since epoch" (an integer value)
-// Whenever the password is changed, the attribute will be updated if set (e.g. shadowLastChange)
-\$rcmail_config['password_ldap_lchattr'] = '';
-
-// LDAP Samba password attribute, e.g. sambaNTPassword
-// Name of the LDAP's Samba attribute used for storing user password
-\$rcmail_config['password_ldap_samba_pwattr'] = '';
-
-// LDAP Samba Password Last Change Date attribute, e.g. sambaPwdLastSet
-// Some places use an attribute to store the date of the last password change
-// The date is meassured in "seconds since epoch" (an integer value)
-// Whenever the password is changed, the attribute will be updated if set
-\$rcmail_config['password_ldap_samba_lchattr'] = '';
+ // Password Plugin options
+ // -----------------------
+ // A driver to use for password change. Default: "sql".
+ // See README file for list of supported driver names.
+ \$rcmail_config['password_driver'] = 'ldap';
+
+ // Determine whether current password is required to change password.
+ // Default: false.
+ \$rcmail_config['password_confirm_current'] = true;
+
+ // Require the new password to be a certain length.
+ // set to blank to allow passwords of any length
+ \$rcmail_config['password_minimum_length'] = 6;
+
+ // Require the new password to contain a letter and punctuation character
+ // Change to false to remove this check.
+ \$rcmail_config['password_require_nonalpha'] = false;
+
+ // Enables logging of password changes into logs/password
+ \$rcmail_config['password_log'] = true;
+
+
+ // LDAP and LDAP_SIMPLE Driver options
+ // -----------------------------------
+ // LDAP server name to connect to.
+ // You can provide one or several hosts in an array in which case the hosts are tried from left to right.
+ // Exemple: array('ldap1.exemple.com', 'ldap2.exemple.com');
+ // Default: 'localhost'
+ \$rcmail_config['password_ldap_host'] = 'localhost';
+
+ // LDAP server port to connect to
+ // Default: '389'
+ \$rcmail_config['password_ldap_port'] = '389';
+
+ // TLS is started after connecting
+ // Using TLS for password modification is recommended.
+ // Default: false
+ \$rcmail_config['password_ldap_starttls'] = false;
+
+ // LDAP version
+ // Default: '3'
+ \$rcmail_config['password_ldap_version'] = '3';
+
+ // LDAP base name (root directory)
+ // Exemple: 'dc=exemple,dc=com'
+ \$rcmail_config['password_ldap_basedn'] = '$ldap_user_base_dn';
+
+ // LDAP connection method
+ // There is two connection method for changing a user's LDAP password.
+ // 'user': use user credential (recommanded, require password_confirm_current=true)
+ // 'admin': use admin credential (this mode require password_ldap_adminDN and password_ldap_adminPW)
+ // Default: 'user'
+ \$rcmail_config['password_ldap_method'] = 'user';
+
+ // LDAP Admin DN
+ // Used only in admin connection mode
+ // Default: null
+ \$rcmail_config['password_ldap_adminDN'] = null;
+
+ // LDAP Admin Password
+ // Used only in admin connection mode
+ // Default: null
+ \$rcmail_config['password_ldap_adminPW'] = null;
+
+ // LDAP user DN mask
+ // The user's DN is mandatory and as we only have his login,
+ // we need to re-create his DN using a mask
+ // '%login' will be replaced by the current roundcube user's login
+ // '%name' will be replaced by the current roundcube user's name part
+ // '%domain' will be replaced by the current roundcube user's domain part
+ // '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
+ // Exemple: 'uid=%login,ou=people,dc=exemple,dc=com'
+ // \$rcmail_config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com';
+
+ // LDAP search DN
+ // The DN roundcube should bind with to find out user's DN
+ // based on his login. Note that you should comment out the default
+ // password_ldap_userDN_mask setting for this to take effect.
+ // Use this if you cannot specify a general template for user DN with
+ // password_ldap_userDN_mask. You need to perform a search based on
+ // users login to find his DN instead. A common reason might be that
+ // your users are placed under different ou's like engineering or
+ // sales which cannot be derived from their login only.
+ \$rcmail_config['password_ldap_searchDN'] = '$ldap_service_bind_dn';
+
+ // LDAP search password
+ // If password_ldap_searchDN is set, the password to use for
+ // binding to search for user's DN. Note that you should comment out the default
+ // password_ldap_userDN_mask setting for this to take effect.
+ // Warning: Be sure to set approperiate permissions on this file so this password
+ // is only accesible to roundcube and don't forget to restrict roundcube's access to
+ // your directory as much as possible using ACLs. Should this password be compromised
+ // you want to minimize the damage.
+ \$rcmail_config['password_ldap_searchPW'] = '$ldap_service_bind_pw';
+
+ // LDAP search base
+ // If password_ldap_searchDN is set, the base to search in using the filter below.
+ // Note that you should comment out the default password_ldap_userDN_mask setting
+ // for this to take effect.
+ \$rcmail_config['password_ldap_search_base'] = '$ldap_user_base_dn';
+
+ // LDAP search filter
+ // If password_ldap_searchDN is set, the filter to use when
+ // searching for user's DN. Note that you should comment out the default
+ // password_ldap_userDN_mask setting for this to take effect.
+ // '%login' will be replaced by the current roundcube user's login
+ // '%name' will be replaced by the current roundcube user's name part
+ // '%domain' will be replaced by the current roundcube user's domain part
+ // '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
+ // Example: '(uid=%login)'
+ // Example: '(&(objectClass=posixAccount)(uid=%login))'
+ \$rcmail_config['password_ldap_search_filter'] = '(&(|(uid=%login)(mail=%login)(mailAlternateAddress=%login)(alias=%login))(objectclass=kolabinetorgperson))';
+
+ // LDAP password hash type
+ // Standard LDAP encryption type which must be one of: crypt,
+ // ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
+ // Please note that most encodage types require external libraries
+ // to be included in your PHP installation, see function hashPassword in drivers/ldap.php for more info.
+ // Default: 'crypt'
+ \$rcmail_config['password_ldap_encodage'] = 'clear';
+
+ // LDAP password attribute
+ // Name of the ldap's attribute used for storing user password
+ // Default: 'userPassword'
+ \$rcmail_config['password_ldap_pwattr'] = 'userPassword';
+
+ // LDAP password force replace
+ // Force LDAP replace in cases where ACL allows only replace not read
+ // See http://pear.php.net/package/Net_LDAP2/docs/latest/Net_LDAP2/Net_LDAP2_Entry.html#methodreplace
+ // Default: true
+ \$rcmail_config['password_ldap_force_replace'] = true;
+
+ // LDAP Password Last Change Date
+ // Some places use an attribute to store the date of the last password change
+ // The date is meassured in "days since epoch" (an integer value)
+ // Whenever the password is changed, the attribute will be updated if set (e.g. shadowLastChange)
+ \$rcmail_config['password_ldap_lchattr'] = '';
+
+ // LDAP Samba password attribute, e.g. sambaNTPassword
+ // Name of the LDAP's Samba attribute used for storing user password
+ \$rcmail_config['password_ldap_samba_pwattr'] = '';
+
+ // LDAP Samba Password Last Change Date attribute, e.g. sambaPwdLastSet
+ // Some places use an attribute to store the date of the last password change
+ // The date is meassured in "seconds since epoch" (an integer value)
+ // Whenever the password is changed, the attribute will be updated if set
+ \$rcmail_config['password_ldap_samba_lchattr'] = '';
+
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
?>
diff --git a/share/templates/roundcubemail/terms.inc.php.tpl b/share/templates/roundcubemail/terms.inc.php.tpl
index 5faa888..a5292f2 100644
--- a/share/templates/roundcubemail/terms.inc.php.tpl
+++ b/share/templates/roundcubemail/terms.inc.php.tpl
@@ -1,18 +1,22 @@
<?php
-/* terms plugin */
+ /* terms plugin */
-// log accepted terms
-\$rcmail_config['terms_log'] = true;
+ // log accepted terms
+ \$rcmail_config['terms_log'] = true;
-// renew agreement if older than YYYY-MM-DD HH:MM:SS
-// NOTICE: Must be in past and set accordingly to server Timezone!!!
-\$rcmail_config['terms_date'] = '2011-02-24 00:00:00';
+ // renew agreement if older than YYYY-MM-DD HH:MM:SS
+ // NOTICE: Must be in past and set accordingly to server Timezone!!!
+ \$rcmail_config['terms_date'] = '2011-02-24 00:00:00';
-// renew agreement automatically afer x days
-\$rcmail_config['terms_renew'] = 28; // 0 = never
+ // renew agreement automatically afer x days
+ \$rcmail_config['terms_renew'] = 28; // 0 = never
-// always request terms agreement after login
-\$rcmail_config['terms_always'] = false;
+ // always request terms agreement after login
+ \$rcmail_config['terms_always'] = false;
+
+ if (file_exists(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__)) {
+ include_once(RCMAIL_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
?>