Merge pull request #222 from bnogas/master

Aleksander Machniak

2014-10-18 111af7f077d50bff1ae95185a0d486c852f54b88

 plugins/new_user_identity/new_user_identity.php

@@ -14,12 +14,12 @@
 *
 *  // 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';
 *  $config['new_user_identity_match'] = 'uid';
 */
class new_user_identity extends rcube_plugin
{
@@ -44,6 +44,32 @@
                if (!$args['user_email'] && strpos($user_email, '@')) {
                    $args['user_email'] = rcube_utils::idn_to_ascii($user_email);
                }

                $args['email_list'] = array();
                $i=0;
                $keys = array_keys( $results[0] );

                foreach ( $keys as $key ) {
                    if (!preg_match( '/^email($|:)/', $key )) {
                        continue;
                    }

                    if (is_array($results->records[0][$key])) {
                        foreach($results->records[0][$key] as $alias) {
                            if(strpos($alias, '@')) {
                                $args['email_list'][$i++] = rcube_idn_to_ascii($alias);
                            }
                        }
                    }
                    else {
                        $alias = $results->records[0][$key];
                        if (strpos($alias, '@')) {
                            $args['email_list'][$i++] = rcube_idn_to_ascii($alias);
                        }

                   }
                }

            }
        }
        return $args;