Merge pull request #235 from bnogas/master-p2

Move plugin configuration to config.inc.php.dist

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 000000000..b2fd76408
--- /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 4dbca3aab..d1d1d9f24 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 @@ class new_user_identity extends rcube_plugin
         }
 
         $rcmail = rcmail::get_instance();
+        $this->load_config();
 
         $addressbook = $rcmail->config->get('new_user_identity_addressbook');
         $ldap_config = (array)$rcmail->config->get('ldap_public');