- some improvements + added splitter in Identities

git-svn-id: https://svn.roundcube.net/trunk@3734 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 10 insertions, 4 deletions

diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc
index 1516b9810..f22cad8ef 100644
--- a/roundcubemail/program/steps/settings/func.inc
+++ b/roundcubemail/program/steps/settings/func.inc
@@ -69,14 +69,20 @@ function rcmail_identities_list($attrib)
   if (!strlen($attrib['id']))
     $attrib['id'] = 'rcmIdentitiesList';
 
+  // get identities list and define 'mail' column
+  $list = $USER->list_identities();
+  foreach ($list as $idx => $row)
+    $list[$idx]['mail'] = trim($row['name'] . ' <' . $row['email'] .'>');
+
   // get all identites from DB and define list of cols to be displayed
   $plugin = $RCMAIL->plugins->exec_hook('list_identities', array(
-    'list' => $USER->list_identities(),
-    'cols' => array('name', 'email')));
+    'list' => $list,
+    'cols' => array('mail')));
 
-  // create XHTML table  
+  // @TODO: use <UL> instead of <TABLE> for identities list
+  // create XHTML table
   $out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'identity_id');
-  
+
   // set client env
   $OUTPUT->add_gui_object('identitieslist', $attrib['id']);