Index: trunk/kernel/units/email_events/email_events_event_handler.php =================================================================== diff -u -N -r2444 -r2979 --- trunk/kernel/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 2444) +++ trunk/kernel/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 2979) @@ -191,6 +191,19 @@ $event->status=erFAIL; } } + + if ($event->status == erSUCCESS){ + if (!$from_user_name) { + $from_user_name = $this->Application->ConfigValue('Site_Name'); + } + $sql = 'INSERT INTO '.TABLE_PREFIX.'EmailLog SET + fromuser = '.$this->Conn->qstr($from_user_name.' ('.$from_user_email.')').', + addressto = '.$this->Conn->qstr($to_user_name.' ('.$to_user_email.')').', + subject = '.$this->Conn->qstr($email_object->Subject.')').', + timestamp = UNIX_TIMESTAMP(), + event = '.$this->Conn->qstr($email_event); + $this->Conn->Query($sql); + } return $event; } Index: trunk/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -N -r2444 -r2979 --- trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 2444) +++ trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 2979) @@ -191,6 +191,19 @@ $event->status=erFAIL; } } + + if ($event->status == erSUCCESS){ + if (!$from_user_name) { + $from_user_name = $this->Application->ConfigValue('Site_Name'); + } + $sql = 'INSERT INTO '.TABLE_PREFIX.'EmailLog SET + fromuser = '.$this->Conn->qstr($from_user_name.' ('.$from_user_email.')').', + addressto = '.$this->Conn->qstr($to_user_name.' ('.$to_user_email.')').', + subject = '.$this->Conn->qstr($email_object->Subject.')').', + timestamp = UNIX_TIMESTAMP(), + event = '.$this->Conn->qstr($email_event); + $this->Conn->Query($sql); + } return $event; } Index: trunk/core/kernel/utility/email.php =================================================================== diff -u -N -r2444 -r2979 --- trunk/core/kernel/utility/email.php (.../email.php) (revision 2444) +++ trunk/core/kernel/utility/email.php (.../email.php) (revision 2979) @@ -8,7 +8,7 @@ var $BodyText; var $BodyHtml; var $Body; -// var $Subject; + var $Subject; // var $From; // var $To; // var $ReplyTo; @@ -54,6 +54,7 @@ list($header_field, $header_value) = explode(':', $line, 2); $header_value = trim($header_value); $this->setHeader($header_field, $header_value); + if ($header_field == 'Subject') $this->Subject = $header_value; } }