From 08c8c3dbb96f203f72ff7222d14833b48eb63086 Mon Sep 17 00:00:00 2001 From: thomascube Date: Wed, 1 Jul 2009 14:39:00 +0000 Subject: [PATCH] Move 'login' field to the right level + codestyle --- program/include/rcube_user.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php index fb44cb0e0..737937c30 100644 --- a/program/include/rcube_user.php +++ b/program/include/rcube_user.php @@ -405,21 +405,24 @@ class rcube_user // create new identities records $standard = 1; foreach ($email_list as $row) { - if (is_array($row)) { $email = $row[0]; $name = $row[1] ? $row[1] : $user_name; - } else { - $email = $row; - $name = $user_name; - } + } + else { + $email = $row; + $name = $user_name; + } - $plugin = $rcmail->plugins->exec_hook('create_identity', array('record' => array( + $plugin = $rcmail->plugins->exec_hook('create_identity', array( 'login' => true, - 'user_id' => $user_id, - 'name' => strip_newlines($name), - 'email' => $email, - 'standard' => $standard))); + 'record' => array( + 'user_id' => $user_id, + 'name' => strip_newlines($name), + 'email' => $email, + 'standard' => $standard, + ), + )); if (!$plugin['abort'] && $plugin['record']['email']) { $dbh->query(