Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F804106
D179.id458.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Wed, Feb 26, 9:06 AM
Size
4 KB
Mime Type
text/x-diff
Expires
Thu, Feb 27, 9:06 AM (4 h, 40 m)
Engine
blob
Format
Raw Data
Handle
576820
Attached To
D179: INP-1523 - Populate user info, when sending membership expiration e-mails
D179.id458.diff
View Options
Index: branches/5.3.x/core/install/english.lang
===================================================================
--- branches/5.3.x/core/install/english.lang
+++ branches/5.3.x/core/install/english.lang
@@ -1882,16 +1882,16 @@
<HTMLBODY>WW91ciBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZSB3aWxsIHNvb24gZXhwaXJlLg==</HTMLBODY>
</EVENT>
<EVENT Event="USER.MEMBERSHIP.EXPIRATION.NOTICE" Type="1">
- <SUBJECT>TWVtYmVyc2hpcCBFeHBpcmF0aW9uIE5vdGljZSBmb3IgIjxpbnAyOnVfRmllbGQgbmFtZT0iVXNlcm5hbWUiLz4iIFNlbnQ=</SUBJECT>
- <HTMLBODY>VXNlciA8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+IG1lbWJlcnNoaXAgd2lsbCBleHBpcmUgc29vbi4=</HTMLBODY>
+ <SUBJECT>TWVtYmVyc2hpcCBFeHBpcmF0aW9uIE5vdGljZSBmb3IgIjxpbnAyOkZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+IiBTZW50</SUBJECT>
+ <HTMLBODY>VXNlciA8aW5wMjpGaWVsZCBuYW1lPSJVc2VybmFtZSIvPiBtZW1iZXJzaGlwIHdpbGwgZXhwaXJlIHNvb24u</HTMLBODY>
</EVENT>
<EVENT Event="USER.MEMBERSHIP.EXPIRED" Type="0">
<SUBJECT>WW91ciBNZW1iZXJzaGlwIEV4cGlyZWQ=</SUBJECT>
<HTMLBODY>WW91ciBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZSBoYXMgZXhwaXJlZC4=</HTMLBODY>
</EVENT>
<EVENT Event="USER.MEMBERSHIP.EXPIRED" Type="1">
- <SUBJECT>VXNlcidzIE1lbWJlcnNoaXAgRXhwaXJlZCAgKCA8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+KQ==</SUBJECT>
- <HTMLBODY>VXNlcidzICg8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+KSBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZSBoYXMgZXhwaXJlZC4=</HTMLBODY>
+ <SUBJECT>VXNlcidzIE1lbWJlcnNoaXAgRXhwaXJlZCAgKCA8aW5wMjpGaWVsZCBuYW1lPSJVc2VybmFtZSIvPik=</SUBJECT>
+ <HTMLBODY>VXNlcidzICg8aW5wMjpGaWVsZCBuYW1lPSJVc2VybmFtZSIvPikgbWVtYmVyc2hpcCBvbiA8aW5wMjptX0xpbmsgdGVtcGxhdGU9ImluZGV4Ii8+IHdlYnNpdGUgaGFzIGV4cGlyZWQu</HTMLBODY>
</EVENT>
<EVENT Event="USER.NEW.PASSWORD" Type="0">
<SUBJECT>TmV3IHBhc3N3b3JkIGdlbmVyYXRlZA==</SUBJECT>
Index: branches/5.3.x/core/install/upgrades.sql
===================================================================
--- branches/5.3.x/core/install/upgrades.sql
+++ branches/5.3.x/core/install/upgrades.sql
@@ -3026,3 +3026,10 @@
UPDATE Modules
SET ClassNamespace = 'InPortal\\Core'
WHERE `Name` IN ('Core', 'In-Portal');
+
+UPDATE EmailTemplates
+SET
+ l1_Subject = REPLACE(l1_Subject, '<inp2:u_', '<inp2:'),
+ l1_HtmlBody = REPLACE(l1_HtmlBody, '<inp2:u_', '<inp2:'),
+ l1_PlainTextBody = REPLACE(l1_PlainTextBody, '<inp2:u_', '<inp2:')
+WHERE TemplateName LIKE 'USER.MEMBERSHIP%';
Index: branches/5.3.x/core/units/users/users_event_handler.php
===================================================================
--- branches/5.3.x/core/units/users/users_event_handler.php
+++ branches/5.3.x/core/units/users/users_event_handler.php
@@ -1035,12 +1035,19 @@
$records = $this->Conn->Query($sql);
if ($records) {
$conditions = Array();
- $send_params = Array ('PrefixSpecial' => 'u');
+
+ /** @var UsersItem $user */
+ $user = $this->Application->recallObject('u', null, array('skip_autoload' => true));
foreach ($records as $record) {
- $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);
+ $user->Load($record['PortalUserId']);
+
+ $this->Application->emailUser(
+ 'USER.MEMBERSHIP.EXPIRATION.NOTICE',
+ $record['PortalUserId'],
+ $user->getEmailParams()
+ );
+ $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE', null, $user->getEmailParams());
$conditions[] = '(PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'].')';
}
@@ -1057,12 +1064,14 @@
WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.time().')';
$user_ids = $this->Conn->GetCol($sql);
if ($user_ids) {
- $send_params = Array ('PrefixSpecial' => 'u');
+ /** @var UsersItem $user */
+ $user = $this->Application->recallObject('u', null, array('skip_autoload' => true));
foreach ($user_ids as $id) {
- $send_params['item_id'] = $id;
- $this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id, $send_params);
- $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED', null, $send_params);
+ $user->Load($id);
+
+ $this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id, $user->getEmailParams());
+ $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED', null, $user->getEmailParams());
}
}
$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroupRelations
Event Timeline
Log In to Comment