diff options
| author | thomascube <thomas@roundcube.net> | 2009-05-15 10:22:29 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2009-05-15 10:22:29 +0000 |
| commit | 51ede06434097ef8d0697ee204fa998d6445d194 (patch) | |
| tree | 76d6362bca66010776af8e8fbb971ba848cc3215 /program/steps/settings/func.inc | |
| parent | 9bee4437b889f4e36e37116ebf1fc24765eecad6 (diff) | |
Apply changes from r2348 to r2400 for 0.2.2 release
Diffstat (limited to 'program/steps/settings/func.inc')
| -rw-r--r-- | program/steps/settings/func.inc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index d0a3ae69c..3f0357717 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -469,24 +469,6 @@ function rcmail_get_skins() } -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( 'userprefs' => 'rcmail_user_prefs_form', @@ -494,5 +476,4 @@ $OUTPUT->add_handlers(array( 'itentitieslist' => 'rcmail_identities_list' // keep this for backward compatibility )); - ?> |