Index: branches/5.3.x/core/units/users/users_event_handler.php =================================================================== diff -u -r15928 -r15938 --- branches/5.3.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15928) +++ branches/5.3.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15938) @@ -1,6 +1,6 @@ Application->RecallVar('user_id'); - $email_sent = $this->Application->emailUser('USER.SUGGEST', $user_id, $send_params); - $this->Application->emailAdmin('USER.SUGGEST'); + $email_sent = $this->Application->emailUser('USER.SUGGEST', $user_id, $object->getEmailParams($send_params)); + $this->Application->emailAdmin('USER.SUGGEST', null, $object->getEmailParams()); if ( $email_sent ) { $event->SetRedirectParam('pass', 'all'); @@ -816,8 +816,9 @@ $this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroupRelations'); } - $this->Application->emailAdmin('USER.SUBSCRIBE'); - $this->Application->emailUser('USER.SUBSCRIBE', $object->GetID()); + $send_params = $object->getEmailParams(); + $this->Application->emailUser('USER.SUBSCRIBE', $object->GetID(), $send_params); + $this->Application->emailAdmin('USER.SUBSCRIBE', null, $send_params); } /** @@ -833,8 +834,13 @@ WHERE PortalUserId = ' . $user_id . ' AND GroupId = ' . $group_id; $this->Conn->Query($sql); - $this->Application->emailAdmin('USER.UNSUBSCRIBE'); - $this->Application->emailUser('USER.UNSUBSCRIBE', $user_id); + $send_params = Array ( + 'PrefixSpecial' => 'u', + 'item_id' => $user_id + ); + + $this->Application->emailUser('USER.UNSUBSCRIBE', $user_id, $send_params); + $this->Application->emailAdmin('USER.UNSUBSCRIBE', null, $send_params); } /** @@ -877,7 +883,7 @@ } if ($found && $allow_reset) { - $this->Application->emailUser('USER.PSWDC', $user->GetID()); + $this->Application->emailUser('USER.PSWDC', $user->GetID(), $user->getEmailParams()); $event->redirect = $this->Application->GetVar('template_success'); return ; @@ -1038,11 +1044,15 @@ $records = $this->Conn->Query($sql); if ($records) { $conditions = Array(); + $send_params = Array ('PrefixSpecial' => 'u'); + foreach ($records as $record) { - $this->Application->emailUser('USER.MEMBERSHIP.EXPIRATION.NOTICE', $record['PortalUserId']); - $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE'); + $send_params['item_id'] = $record['PortalUserId']; + $this->Application->emailUser('USER.MEMBERSHIP.EXPIRATION.NOTICE', $record['PortalUserId'], $send_params); + $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE', null, $send_params); $conditions[] = '(PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'].')'; } + $sql = 'UPDATE '.TABLE_PREFIX.'UserGroupRelations SET ExpirationReminderSent = 1 WHERE '.implode(' OR ', $conditions); @@ -1056,9 +1066,12 @@ WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.time().')'; $user_ids = $this->Conn->GetCol($sql); if ($user_ids) { + $send_params = Array ('PrefixSpecial' => 'u'); + foreach ($user_ids as $id) { - $this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id); - $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED'); + $send_params['item_id'] = $id; + $this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id, $send_params); + $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED', null, $send_params); } } $sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroupRelations @@ -1384,7 +1397,7 @@ $object->SetField('Password', $email_passwords[$temp_id]); $object->SetField('VerifyPassword', $email_passwords[$temp_id]); - $this->Application->emailUser($temp_id > 0 ? 'USER.NEW.PASSWORD': 'USER.ADD.BYADMIN', $object->GetID()); + $this->Application->emailUser($temp_id > 0 ? 'USER.NEW.PASSWORD': 'USER.ADD.BYADMIN', $object->GetID(), $object->getEmailParams()); unset($email_passwords[$temp_id]); $this->Application->StoreVar('email_passwords', serialize($email_passwords)); @@ -1433,8 +1446,14 @@ $email_event = isset($status_events[$new_status]) ? $status_events[$new_status] : false; if (($prev_status != $new_status) && $email_event) { - $this->Application->emailUser($email_event, $user_id); - $this->Application->emailAdmin($email_event); + + $send_params = Array ( + 'PrefixSpecial' => 'u', + 'item_id' => $user_id, + ); + + $this->Application->emailUser($email_event, $user_id, $send_params); + $this->Application->emailAdmin($email_event, null, $send_params); } // deletes sessions from users, that are no longer active @@ -1488,11 +1507,11 @@ 'to_name' => trim($object->GetDBField('FirstName') . ' ' . $object->GetDBField('LastName')), ); - $this->Application->emailUser('USER.EMAIL.CHANGE.UNDO', null, $send_params); + $this->Application->emailUser('USER.EMAIL.CHANGE.UNDO', null, $object->getEmailParams($send_params)); } if ( $new_email ) { - $this->Application->emailUser('USER.EMAIL.CHANGE.VERIFY', $user_id); + $this->Application->emailUser('USER.EMAIL.CHANGE.VERIFY', $user_id, $object->getEmailParams()); } // direct DB update, since USER.EMAIL.CHANGE.VERIFY puts verification code in user record, that we don't want to loose Index: branches/5.3.x/core/kernel/utility/email.php =================================================================== diff -u -r15918 -r15938 --- branches/5.3.x/core/kernel/utility/email.php (.../email.php) (revision 15918) +++ branches/5.3.x/core/kernel/utility/email.php (.../email.php) (revision 15938) @@ -1,6 +1,6 @@ params; - $send_keys = Array ('from_email', 'from_name', 'to_email', 'to_name', 'overwrite_to_email', 'language_id', 'use_custom_design', 'delivery'); + $send_keys = Array ( + 'from_email', 'from_name', 'to_email', 'to_name', + 'overwrite_to_email', 'language_id', 'use_custom_design', 'delivery', + 'PrefixSpecial', 'item_id', + ); foreach ($send_keys as $send_key) { unset($ret[$send_key]); @@ -257,6 +261,9 @@ 'TemplateName' => $this->emailTemplate->GetDBField('TemplateName'), 'EventType' => $this->emailTemplate->GetDBField('Type'), 'EventParams' => serialize($this->_getCustomParams()), + 'ToUserId' => $this->recipientUserId, + 'ItemPrefix' => $this->getItemPrefix(), + 'ItemId' => isset($this->params['item_id']) ? $this->params['item_id'] : null, ); $this->params['email_access_key'] = $this->_generateAccessKey($log_fields_hash); @@ -303,6 +310,24 @@ } /** + * Extracts prefix from a given PrefixSpecial parameter. + * + * @return string + */ + protected function getItemPrefix() + { + $prefix_special = isset($this->params['PrefixSpecial']) ? $this->params['PrefixSpecial'] : ''; + + if ( !$prefix_special ) { + return ''; + } + + $prefix_info = $this->Application->processPrefix($prefix_special); + + return $prefix_info['prefix']; + } + + /** * Determines whatever we should keep e-mail log or not * * @return bool Index: branches/5.3.x/core/units/reviews/reviews_event_handler.php =================================================================== diff -u -r15698 -r15938 --- branches/5.3.x/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 15698) +++ branches/5.3.x/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 15938) @@ -1,6 +1,6 @@ GetDBField('Status'); if ( $review_status == STATUS_ACTIVE || $review_status == STATUS_PENDING ) { + $send_params = $object->getEmailParams(); $email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'ADD' : 'ADD.PENDING'); - $this->Application->emailUser($email_event, $object->GetDBField('CreatedById')); - $this->Application->emailAdmin($email_event); + + $this->Application->emailUser($email_event, $object->GetDBField('CreatedById'), $send_params); + $this->Application->emailAdmin($email_event, null, $send_params); } } } @@ -395,7 +397,7 @@ $this->_loadMainObject($event); $email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'APPROVE' : 'DENY'); - $this->Application->emailUser($email_event, $object->GetDBField('CreatedById')); + $this->Application->emailUser($email_event, $object->GetDBField('CreatedById'), $object->getEmailParams()); } } } Index: branches/5.3.x/core/install/install_schema.sql =================================================================== diff -u -r15902 -r15938 --- branches/5.3.x/core/install/install_schema.sql (.../install_schema.sql) (revision 15902) +++ branches/5.3.x/core/install/install_schema.sql (.../install_schema.sql) (revision 15938) @@ -432,6 +432,9 @@ EventType tinyint(4) DEFAULT NULL, EventParams text, AccessKey varchar(32) NOT NULL DEFAULT '', + ToUserId int(11) DEFAULT NULL, + ItemPrefix varchar(50) NOT NULL DEFAULT '', + ItemId int(11) DEFAULT NULL, PRIMARY KEY (EmailLogId), KEY `timestamp` (SentOn) ); Index: branches/5.3.x/core/kernel/db/dbitem.php =================================================================== diff -u -r15928 -r15938 --- branches/5.3.x/core/kernel/db/dbitem.php (.../dbitem.php) (revision 15928) +++ branches/5.3.x/core/kernel/db/dbitem.php (.../dbitem.php) (revision 15938) @@ -1,6 +1,6 @@ Loaded = $is_loaded; } + + /** + * Returns parser parameters, used to identify this object in the e-mail template. + * + * @param array $merge_with Original send params to merge with. + * + * @return array + */ + public function getEmailParams(array $merge_with = array()) + { + $merge_with['item_id'] = $this->GetID(); + $merge_with['PrefixSpecial'] = $this->getPrefixSpecial(); + + return $merge_with; + } } \ No newline at end of file Index: branches/5.3.x/core/units/users/users_item.php =================================================================== diff -u -r15928 -r15938 --- branches/5.3.x/core/units/users/users_item.php (.../users_item.php) (revision 15928) +++ branches/5.3.x/core/units/users/users_item.php (.../users_item.php) (revision 15938) @@ -1,6 +1,6 @@ getEmailParams(); + switch ( $this->GetDBField('Status') ) { case STATUS_ACTIVE: $event_name = $this->Application->ConfigValue('User_Password_Auto') ? 'USER.VALIDATE' : 'USER.ADD'; - $this->Application->emailAdmin($event_name); - $this->Application->emailUser($event_name, $this->GetID()); + $this->Application->emailUser($event_name, $this->GetID(), $send_params); + $this->Application->emailAdmin($event_name, null, $send_params); break; case STATUS_PENDING: - $this->Application->emailAdmin('USER.ADD.PENDING'); - $this->Application->emailUser('USER.ADD.PENDING', $this->GetID()); + $this->Application->emailUser('USER.ADD.PENDING', $this->GetID(), $send_params); + $this->Application->emailAdmin('USER.ADD.PENDING', null, $send_params); break; } } Index: branches/5.3.x/core/units/logs/email_logs/email_logs_config.php =================================================================== diff -u -r15677 -r15938 --- branches/5.3.x/core/units/logs/email_logs/email_logs_config.php (.../email_logs_config.php) (revision 15677) +++ branches/5.3.x/core/units/logs/email_logs/email_logs_config.php (.../email_logs_config.php) (revision 15938) @@ -1,6 +1,6 @@ Array ( '' => ' SELECT %1$s.* %2$s - FROM %1$s', + FROM %1$s + LEFT JOIN ' . TABLE_PREFIX . 'Users to_user ON %1$s.ToUserId = to_user.PortalUserId', ), + 'CalculatedFields' => Array ( + '' => Array ( + 'ToUser' => 'IF (ISNULL(to_user.Username), IF (%1$s.ToUserId = ' . USER_ROOT . ', "root", IF (%1$s.ToUserId = ' . USER_GUEST . ', "Guest", "n/a")), IF(to_user.Username = "", to_user.Email, to_user.Username))', + ), + ), + 'ListSortings' => Array ( '' => Array ( 'Sorting' => Array ('SentOn' => 'desc'), @@ -91,19 +98,36 @@ ), 'EventParams' => Array ('type' => 'string', 'default' => NULL), 'AccessKey' => Array ('type' => 'string', 'max_len' => 20, 'not_null' => 1, 'default' => ''), + 'ToUserId' => Array('type' => 'int', 'default' => NULL), + 'ItemPrefix' => Array( + 'type' => 'string', 'max_len' => 50, + 'formatter' => 'kOptionsFormatter', + 'options_sql' => 'SELECT DISTINCT %s FROM ' . TABLE_PREFIX . 'EmailLog ORDER BY Phrase', + 'option_key_field' => 'ItemPrefix', 'option_title_field' => 'CONCAT("la_prefix_", ItemPrefix) AS Phrase', + 'use_phrases' => 1, + 'not_null' => 1, 'default' => '' + ), + 'ItemId' => Array('type' => 'int', 'default' => NULL), ), + 'VirtualFields' => array( + 'ToUser' => array('type' => 'string', 'default' => ''), + ), + 'Grids' => Array ( 'Default' => Array ( 'Fields' => Array ( 'EmailLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 80), 'From' => Array ('title' => 'column:la_fld_Sender', 'filter_block' => 'grid_like_filter', 'width' => 200), 'To' => Array ('title' => 'column:la_fld_Recipient', 'filter_block' => 'grid_like_filter', 'width' => 200), + 'ToUser' => Array ('title' => 'column:la_fld_RecipientUser', 'filter_block' => 'grid_like_filter', 'width' => 120), 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200), 'TemplateName' => Array ('filter_block' => 'grid_like_filter', 'width' => 170), 'EventType' => Array ('title' => 'column:la_fld_Type', 'filter_block' => 'grid_options_filter', 'width' => 60), 'SentOn' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145), // 'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter'), + 'ItemPrefix' => Array('filter_block' => 'grid_options_filter'), + 'ItemId' => Array('filter_block' => 'grid_range_filter', 'width' => 80), ), ), ), Index: branches/5.3.x/core/units/forms/forms/forms_eh.php =================================================================== diff -u -r15928 -r15938 --- branches/5.3.x/core/units/forms/forms/forms_eh.php (.../forms_eh.php) (revision 15928) +++ branches/5.3.x/core/units/forms/forms/forms_eh.php (.../forms_eh.php) (revision 15938) @@ -1,6 +1,6 @@ Validate() ) { $event->redirect = $this->Application->GetVar('success_template'); - $this->Application->emailAdmin($this->Application->GetVar('email_event')); - $send_params = Array ( + $this->Application->emailAdmin($this->Application->GetVar('email_event'), null, $object->getEmailParams()); + + $send_params = $object->getEmailParams(Array ( 'to_email' => $field_values[$this->Application->GetVar('email_field')], 'to_name' => $field_values[$this->Application->GetVar('name_field')] - ); - + )); $this->Application->emailUser($this->Application->GetVar('email_event'), null, $send_params); if ( $field_values['MailingList'] ) { Index: branches/5.3.x/core/units/forms/submission_log/submission_log_eh.php =================================================================== diff -u -r15928 -r15938 --- branches/5.3.x/core/units/forms/submission_log/submission_log_eh.php (.../submission_log_eh.php) (revision 15928) +++ branches/5.3.x/core/units/forms/submission_log/submission_log_eh.php (.../submission_log_eh.php) (revision 15938) @@ -1,6 +1,6 @@ Application->emailAdmin('FORM.SUBMISSION.REPLY.TO.USER', null, $send_params); + $this->Application->emailAdmin('FORM.SUBMISSION.REPLY.TO.USER', null, $object->getEmailParams($send_params)); // mark as sent after sending is finished $object->SetDBField('SentStatus', SUBMISSION_LOG_SENT); @@ -437,7 +437,7 @@ if ( $this->Application->GetVar('client_mode') ) { // new reply from client received -> send notification about it - $this->Application->emailAdmin('FORM.SUBMISSION.REPLY.FROM.USER'); + $this->Application->emailAdmin('FORM.SUBMISSION.REPLY.FROM.USER', null, $object->getEmailParams()); } } @@ -487,7 +487,7 @@ $sent_status = $object->GetDBField('SentStatus'); if ( $object->GetOriginalField('SentStatus') != $sent_status && $sent_status == SUBMISSION_LOG_BOUNCE ) { - $this->Application->emailAdmin('FORM.SUBMISSION.REPLY.FROM.USER.BOUNCED'); + $this->Application->emailAdmin('FORM.SUBMISSION.REPLY.FROM.USER.BOUNCED', null, $object->getEmailParams()); } } Index: branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php =================================================================== diff -u -r15902 -r15938 --- branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php (.../form_submissions_eh.php) (revision 15902) +++ branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php (.../form_submissions_eh.php) (revision 15938) @@ -1,6 +1,6 @@ GetDBField('SubmitNotifyEmail'); if ( $notify_email ) { - $send_params = Array ( + $send_params = $object->getEmailParams(Array ( 'to_name' => $notify_email, 'to_email' => $notify_email, - ); + )); $this->Application->emailAdmin('FORM.SUBMITTED', null, $send_params); } else { - $this->Application->emailAdmin('FORM.SUBMITTED'); + $this->Application->emailAdmin('FORM.SUBMITTED', null, $object->getEmailParams()); } // $this->Application->emailUser('FORM.SUBMITTED', null, Array ('to_email' => '')); Index: branches/5.3.x/core/units/categories/categories_event_handler.php =================================================================== diff -u -r15928 -r15938 --- branches/5.3.x/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 15928) +++ branches/5.3.x/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 15938) @@ -1,6 +1,6 @@ Load($category_id); $email_event = $new_status == STATUS_ACTIVE ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY'; - $this->Application->emailUser($email_event, $object->GetDBField('CreatedById')); + $this->Application->emailUser($email_event, $object->GetDBField('CreatedById'), $object->getEmailParams()); } } } @@ -1509,11 +1509,12 @@ $event->SetRedirectParam('opener', 's'); // send email events + $send_params = $object->getEmailParams(); + $event_suffix = $is_active ? 'ADD' : 'ADD.PENDING'; $perm_prefix = $event->getUnitConfig()->getPermItemPrefix(); - $event_suffix = $is_active ? 'ADD' : 'ADD.PENDING'; - $this->Application->emailAdmin($perm_prefix . '.' . $event_suffix); - $this->Application->emailUser($perm_prefix . '.' . $event_suffix, $object->GetDBField('CreatedById')); + $this->Application->emailUser($perm_prefix . '.' . $event_suffix, $object->GetDBField('CreatedById'), $send_params); + $this->Application->emailAdmin($perm_prefix . '.' . $event_suffix, null, $send_params); } /** @@ -1607,7 +1608,7 @@ $event->status = kEvent::erSUCCESS; $email_event = $event->Name == 'OnMassApprove' ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY'; - $this->Application->emailUser($email_event, $object->GetDBField('CreatedById')); + $this->Application->emailUser($email_event, $object->GetDBField('CreatedById'), $object->getEmailParams()); } else { $event->status = kEvent::erFAIL; Index: branches/5.3.x/core/install/english.lang =================================================================== diff -u -r15916 -r15938 --- branches/5.3.x/core/install/english.lang (.../english.lang) (revision 15916) +++ branches/5.3.x/core/install/english.lang (.../english.lang) (revision 15938) @@ -624,6 +624,7 @@ UmVjaXBpZW50J3MgTmFtZQ== UmVjaXBpZW50cw== UmVjaXBpZW50IFR5cGU= + UmVjaXBpZW50IFVzZXI= Rm9yY2UgUmVkaXJlY3QgKHdoZW4gdXNlcidzIElQIG1hdGNoZXMp UmVmZXJyZXIgVVJM S2V5d29yZA== Index: branches/5.3.x/core/kernel/db/cat_dbitem.php =================================================================== diff -u -r15698 -r15938 --- branches/5.3.x/core/kernel/db/cat_dbitem.php (.../cat_dbitem.php) (revision 15698) +++ branches/5.3.x/core/kernel/db/cat_dbitem.php (.../cat_dbitem.php) (revision 15938) @@ -1,6 +1,6 @@ Application->emailUser($event_name, $this->GetDBField($owner_field)); + $this->Application->emailUser($event_name, $this->GetDBField($owner_field), $this->getEmailParams()); } /** Index: branches/5.3.x/core/kernel/db/cat_event_handler.php =================================================================== diff -u -r15928 -r15938 --- branches/5.3.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 15928) +++ branches/5.3.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 15938) @@ -1,6 +1,6 @@ getUnitConfig()->getPermItemPrefix(); $owner_field = $this->getOwnerField($event->Prefix); $owner_id = $object->GetDBField($owner_field); + $send_params = $object->getEmailParams(); switch ( $event->Name ) { case 'OnCreate': $event_suffix = $is_active ? 'ADD' : 'ADD.PENDING'; - $this->Application->emailAdmin($perm_prefix . '.' . $event_suffix); // there are no ADD.PENDING event for admin :( - $this->Application->emailUser($perm_prefix . '.' . $event_suffix, $owner_id); + $this->Application->emailUser($perm_prefix . '.' . $event_suffix, $owner_id, $send_params); + $this->Application->emailAdmin($perm_prefix . '.' . $event_suffix, null, $send_params); // there are no ADD.PENDING event for admin :( break; case 'OnUpdate': $event_suffix = $is_active ? 'MODIFY' : 'MODIFY.PENDING'; $user_id = is_numeric($object->GetDBField('ModifiedById')) ? $object->GetDBField('ModifiedById') : $owner_id; - $this->Application->emailAdmin($perm_prefix . '.' . $event_suffix); // there are no ADD.PENDING event for admin :( - $this->Application->emailUser($perm_prefix . '.' . $event_suffix, $user_id); + $this->Application->emailUser($perm_prefix . '.' . $event_suffix, $user_id, $send_params); + $this->Application->emailAdmin($perm_prefix . '.' . $event_suffix, null, $send_params); // there are no ADD.PENDING event for admin :( break; } } Index: branches/5.3.x/core/units/spam_reports/spam_report_eh.php =================================================================== diff -u -r15810 -r15938 --- branches/5.3.x/core/units/spam_reports/spam_report_eh.php (.../spam_report_eh.php) (revision 15810) +++ branches/5.3.x/core/units/spam_reports/spam_report_eh.php (.../spam_report_eh.php) (revision 15938) @@ -1,6 +1,6 @@ SetDBField('ItemName', $item->GetDBField('ReviewText')); } - $this->Application->emailAdmin('SPAM.REPORT'); + $this->Application->emailAdmin('SPAM.REPORT', null, $object->getEmailParams()); } /** Index: branches/5.3.x/core/install/upgrades.sql =================================================================== diff -u -r15917 -r15938 --- branches/5.3.x/core/install/upgrades.sql (.../upgrades.sql) (revision 15917) +++ branches/5.3.x/core/install/upgrades.sql (.../upgrades.sql) (revision 15938) @@ -2948,3 +2948,10 @@ INSERT INTO SystemSettings VALUES(DEFAULT, 'EmailDelivery', '2', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_EmailDelivery', 'radio', NULL, '1=la_opt_EmailDeliveryQueue||2=la_opt_EmailDeliveryImmediate', 50.11, 0, 1, NULL); DELETE FROM UserPersistentSessionData WHERE VariableName = 'email-queue[Default]columns_.'; + +ALTER TABLE EmailLog + ADD ToUserId INT(11) DEFAULT NULL, + ADD ItemPrefix VARCHAR(50) NOT NULL DEFAULT '', + ADD ItemId INT(11) DEFAULT NULL; + +DELETE FROM UserPersistentSessionData WHERE VariableName = 'email-log[Default]columns_.'; Index: branches/5.3.x/core/admin_templates/logs/email_logs/email_log_edit.tpl =================================================================== diff -u -r15677 -r15938 --- branches/5.3.x/core/admin_templates/logs/email_logs/email_log_edit.tpl (.../email_log_edit.tpl) (revision 15677) +++ branches/5.3.x/core/admin_templates/logs/email_logs/email_log_edit.tpl (.../email_log_edit.tpl) (revision 15938) @@ -90,7 +90,13 @@ + + + + + +