diff options
author | Hugues Hiegel <root@paranoid> | 2014-08-05 16:44:07 +0200 |
---|---|---|
committer | Hugues Hiegel <root@paranoid> | 2014-08-05 16:44:07 +0200 |
commit | f91f8533678c388b879d9e999a6bcc9e22ad7e19 (patch) | |
tree | c0099e25a932399d6cd1066607a42e7fe220b977 /plugins/new_user_identity | |
parent | ec116d33c22b371328c8557158736e3d2ee479a8 (diff) |
lot of stuff
Diffstat (limited to 'plugins/new_user_identity')
-rw-r--r-- | plugins/new_user_identity/new_user_identity.php | 11 | ||||
-rw-r--r-- | plugins/new_user_identity/package.xml | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php index 3943134b2..200d9accd 100644 --- a/plugins/new_user_identity/new_user_identity.php +++ b/plugins/new_user_identity/new_user_identity.php @@ -8,18 +8,17 @@ * * @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'; + * // string, which refers to the $rcmail_config['ldap_public'] array.) + * $rcmail_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'; + * $rcmail_config['new_user_identity_match'] = 'uid'; */ class new_user_identity extends rcube_plugin { @@ -34,6 +33,8 @@ class new_user_identity extends rcube_plugin function lookup_user_name($args) { + $rcmail = rcmail::get_instance(); + if ($this->init_ldap($args['host'])) { $results = $this->ldap->search('*', $args['user'], true); if (count($results->records) == 1) { @@ -42,7 +43,7 @@ class new_user_identity extends rcube_plugin $args['user_name'] = $user_name; if (!$args['user_email'] && strpos($user_email, '@')) { - $args['user_email'] = rcube_utils::idn_to_ascii($user_email); + $args['user_email'] = rcube_idn_to_ascii($user_email); } } } diff --git a/plugins/new_user_identity/package.xml b/plugins/new_user_identity/package.xml index 45a3c4c8d..e50cd9255 100644 --- a/plugins/new_user_identity/package.xml +++ b/plugins/new_user_identity/package.xml @@ -24,7 +24,7 @@ <release>stable</release> <api>stable</api> </stability> - <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license> + <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> <notes>-</notes> <contents> <dir baseinstalldir="/" name="/"> |