|
|
@ -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
|
|
|
|
// register UI objects
|
|
|
|
$OUTPUT->add_handlers(array(
|
|
|
|
$OUTPUT->add_handlers(array(
|
|
|
|
'userprefs' => 'rcmail_user_prefs_form',
|
|
|
|
'userprefs' => 'rcmail_user_prefs_form',
|
|
|
@ -494,5 +476,4 @@ $OUTPUT->add_handlers(array(
|
|
|
|
'itentitieslist' => 'rcmail_identities_list' // keep this for backward compatibility
|
|
|
|
'itentitieslist' => 'rcmail_identities_list' // keep this for backward compatibility
|
|
|
|
));
|
|
|
|
));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
?>
|
|
|
|
?>
|
|
|
|