Ok everyone - this is the resolution I came up with. It was my first time ever touching PHP, so a bit hackish, but it works.
DIFF:
Index: program/steps/mail/sendmail.inc
===================================================================
--- program/steps/mail/sendmail.inc (revision 6556)
+++ program/steps/mail/sendmail.inc (working copy)
@@ -41,26 +41,11 @@
{
global $DB, $OUTPUT;
- // get identity record
- $sql_result = $DB->query("SELECT *, email AS mailto
- FROM ".get_table_name('identities')."
- WHERE identity_id=?
- AND user_id=?
- AND del<>1",
- $id,$_SESSION['user_id']);
-
- if ($DB->num_rows($sql_result))
- {
- $sql_arr = $DB->fetch_assoc($sql_result);
- $out = $sql_arr;
- $name = strpos($sql_arr['name'], ",") ? '"'.$sql_arr['name'].'"' : $sql_arr['name'];
- $out['string'] = sprintf('%s <%s>',
- rcube_charset_convert($name, RCMAIL_CHARSET, $OUTPUT->get_charset()),
- $sql_arr['mailto']);
- return $out;
- }
-
- return FALSE;
+ $out['string'] = sprintf('%s <%s>',
+ $_SESSION['username'],
+ $_SESSION['username']);
+ return $out;
+
}
/**
@@ -159,7 +144,7 @@
$to_address_arr = $IMAP->decode_address_list($mailto);
$identity_arr = rcmail_get_identity(get_input_value('_from', RCUBE_INPUT_POST));
-$from = $identity_arr['mailto'];
+$from = $_SESSION['username'];
$first_to = is_array($to_address_arr[0]) ? $to_address_arr[0]['mailto'] : $mailto;
if (empty($identity_arr['string']))