Merge pull request #222 from bnogas/master

Support for multiple email addresses in new_user_identity plugin

1 files changed, 26 insertions, 0 deletions

diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index 3943134b2..bc0658a4b 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -44,6 +44,32 @@ class new_user_identity extends rcube_plugin
                 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;