From aca8bd2bd602769ce54daa1211dabec92870da92 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 26 Oct 2014 06:31:53 -0400
Subject: [PATCH] Merge pull request #235 from bnogas/master-p2
---
plugins/new_user_identity/new_user_identity.php | 12 +-----------
plugins/new_user_identity/config.inc.php.dist | 10 ++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/plugins/new_user_identity/config.inc.php.dist b/plugins/new_user_identity/config.inc.php.dist
new file mode 100644
index 0000000..b2fd764
--- /dev/null
+++ b/plugins/new_user_identity/config.inc.php.dist
@@ -0,0 +1,10 @@
+<?php
+
+// The id of the address book to use to automatically set a new
+// user's full name in their new identity. (This should be an
+// string, which refers to the $config['ldap_public'] array.)
+$config['new_user_identity_addressbook'] = 'People';
+
+// When automatically setting a new users's full name in their
+// new identity, match the user's login name against this field.
+$config['new_user_identity_match'] = 'uid';
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index 4dbca3a..d1d1d9f 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -9,17 +9,6 @@
* @version @package_version@
* @author Kris Steinhoff
* @license GNU GPLv3+
- *
- * Example configuration:
- *
- * // The id of the address book to use to automatically set a new
- * // user's full name in their new identity. (This should be an
- * // string, which refers to the $config['ldap_public'] array.)
- * $config['new_user_identity_addressbook'] = 'People';
- *
- * // When automatically setting a new users's full name in their
- * // new identity, match the user's login name against this field.
- * $config['new_user_identity_match'] = 'uid';
*/
class new_user_identity extends rcube_plugin
{
@@ -73,6 +62,7 @@
}
$rcmail = rcmail::get_instance();
+ $this->load_config();
$addressbook = $rcmail->config->get('new_user_identity_addressbook');
$ldap_config = (array)$rcmail->config->get('ldap_public');
--
Gitblit v1.9.1