Index: trunk/kernel/units/email_events/email_events_event_handler.php =================================================================== diff -u -N -r2106 -r2136 --- trunk/kernel/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 2106) +++ trunk/kernel/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 2136) @@ -92,12 +92,12 @@ $to_user_id = $from_user_id; $from_user_id = -1; } - + /* if (!($to_user_id > 0) && !$direct_send_params){ // if we can not determine recepient we will not send email return; } - + */ //Parse Message Template $message_object->Load(array('EventId' => $event_id, 'LanguageId' => $this->Application->GetVar('m_lang'))); $message_type = $message_object->GetDBField('MessageType'); @@ -129,6 +129,8 @@ $from_user_name = ($direct_send_params['from_name']?$direct_send_params['from_name']:$from_user_name); $message_body_additional = $direct_send_params['message']; } + + $to_user_email = $to_user_email?$to_user_email:$this->Application->ConfigValue('Smtp_AdminMailFrom'); $this->Application->makeClass('Template'); Index: trunk/kernel/units/users/users_event_handler.php =================================================================== diff -u -N -r2106 -r2136 --- trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2106) +++ trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2136) @@ -280,6 +280,7 @@ $user_id = $this->Application->GetVar('u_id'); $email_event = &$this->Application->EmailEventUser('SITE.SUGGEST', $user_id, $send_params); + if ($email_event->status == erSUCCESS){ $event->redirect_params = array('opener' => 's', 'pass' => 'all'); $event->redirect = $this->Application->GetVar('template_success'); Index: trunk/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -N -r2106 -r2136 --- trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 2106) +++ trunk/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 2136) @@ -92,12 +92,12 @@ $to_user_id = $from_user_id; $from_user_id = -1; } - + /* if (!($to_user_id > 0) && !$direct_send_params){ // if we can not determine recepient we will not send email return; } - + */ //Parse Message Template $message_object->Load(array('EventId' => $event_id, 'LanguageId' => $this->Application->GetVar('m_lang'))); $message_type = $message_object->GetDBField('MessageType'); @@ -129,6 +129,8 @@ $from_user_name = ($direct_send_params['from_name']?$direct_send_params['from_name']:$from_user_name); $message_body_additional = $direct_send_params['message']; } + + $to_user_email = $to_user_email?$to_user_email:$this->Application->ConfigValue('Smtp_AdminMailFrom'); $this->Application->makeClass('Template'); Index: trunk/core/units/users/users_event_handler.php =================================================================== diff -u -N -r2106 -r2136 --- trunk/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2106) +++ trunk/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 2136) @@ -280,6 +280,7 @@ $user_id = $this->Application->GetVar('u_id'); $email_event = &$this->Application->EmailEventUser('SITE.SUGGEST', $user_id, $send_params); + if ($email_event->status == erSUCCESS){ $event->redirect_params = array('opener' => 's', 'pass' => 'all'); $event->redirect = $this->Application->GetVar('template_success');