- Added option 'identities_level', removed 'multiple_identities'

- Allow deleting identities when multiple_identities=false (#1485435)


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

1 files changed, 18 insertions, 1 deletions

diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc
index 1b28d3b17..6f378fd0e 100644
--- a/roundcubemail/program/steps/settings/func.inc
+++ b/roundcubemail/program/steps/settings/func.inc
@@ -401,7 +401,24 @@ function rcmail_get_skins()
   return $skins;
   }
 
-$OUTPUT->set_env('multiple_identities', $RCMAIL->config->get('multiple_identities', true));
+
+function rcmail_get_email()
+  {
+  global $RCMAIL;
+  
+  if (strpos($RCMAIL->user->data['username'], '@'))
+    return $RCMAIL->user->data['username'];
+  else {
+    if ($RCMAIL->config->get('virtuser_file'))
+      $user_email = rcube_user::user2email($RCMAIL->user->data['username']);
+
+    if ($user_email == '')
+      $user_email = sprintf('%s@%s', $RCMAIL->user->data['username'], 
+    	    $RCMAIL->config->mail_domain($_SESSION['imap_host']));
+
+    return $user_email;
+    }		      
+  }
 
 // register UI objects
 $OUTPUT->add_handlers(array(