Merge pull request #230 from bytesatwork-xx/master

Aleksander Machniak

2014-10-18 ced34cb15e095836767971aa4d27b141fb1d7ec9

 plugins/new_user_identity/new_user_identity.php

@@ -8,21 +8,18 @@
 *
 * @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 $rcmail_config['ldap_public'] array.)
 *  $rcmail_config['new_user_identity_addressbook'] = 'People';
 *  // 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.
 *  $rcmail_config['new_user_identity_match'] = 'uid';
 *
 *  // Use this field (from fieldmap configuration) to fill alias col of
 *  // the new user record.
 *  $rcmail_config['new_user_identity_alias'] = 'alias';
 *  $config['new_user_identity_match'] = 'uid';
 */
class new_user_identity extends rcube_plugin
{
@@ -37,17 +34,15 @@

    function lookup_user_name($args)
    {
        $rcmail = rcmail::get_instance();
        
        if ($this->init_ldap($args['host'])) {
            $results = $this->ldap->search('*', $args['user'], TRUE);
            $results = $this->ldap->search('*', $args['user'], true);
            if (count($results->records) == 1) {
                $args['user_name'] = $results->records[0]['name'];
                if (!$args['user_email'] && strpos($results->records[0]['email'], '@')) {
                    $args['user_email'] = rcube_idn_to_ascii($results->records[0]['email']);
                }
                if (($alias_col = $rcmail->config->get('new_user_identity_alias')) && $results->records[0][$alias_col]) {
                  $args['alias'] = $results->records[0][$alias_col];
                $user_name  = is_array($results->records[0]['name']) ? $results->records[0]['name'][0] : $results->records[0]['name'];
                $user_email = is_array($results->records[0]['email']) ? $results->records[0]['email'][0] : $results->records[0]['email'];

                $args['user_name'] = $user_name;
                if (!$args['user_email'] && strpos($user_email, '@')) {
                    $args['user_email'] = rcube_utils::idn_to_ascii($user_email);
                }
            }
        }
@@ -56,8 +51,9 @@

    private function init_ldap($host)
    {
        if ($this->ldap)
        if ($this->ldap) {
            return $this->ldap->ready;
        }

        $rcmail = rcmail::get_instance();