From ec01712a998b35d48be3daaf272779fdbc63cd74 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 24 Oct 2008 03:57:21 -0400
Subject: [PATCH] - Added option 'identities_level', removed 'multiple_identities' - Allow deleting identities when multiple_identities=false (#1485435)
---
program/steps/settings/func.inc | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 1b28d3b..6f378fd 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -401,7 +401,24 @@
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(
--
Gitblit v1.9.1