mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Fix for {MAILREF} in bulk email preview.

Browse Source
This commit is contained in:
Cameron
2016-05-12 09:36:12 -07:00
parent a29e242ca5
commit 34ef4a1ae2
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
e107_admin/mailout.php
View File

@@ -789,20 +789,27 @@ class mailout_main_ui extends e_admin_ui
$mailData = e107::getDb()->retrieve('mail_content','*','mail_source_id='.intval($id)." LIMIT 1"); $mailData = e107::getDb()->retrieve('mail_content','*','mail_source_id='.intval($id)." LIMIT 1");
$shortcodes = array( $shortcodes = array(
'USERNAME'=>'John Example', 'USERNAME' => 'John Example',
'DISPLAYNAME'=> 'John Example', 'DISPLAYNAME' => 'John Example',
'USERID'=>'555', 'MAILREF'=>$_GET['id'], 'USERID' => '555',
'LOGINNAME' => 'johnE', 'LOGINNAME' => 'johnE',
'ACTIVATION_LINK' => SITEURL.'signup.php?testing-activation', 'ACTIVATION_LINK' => SITEURL.'signup.php?testing-activation',
'PASSWORD' => 'MyPass123', 'PASSWORD' => 'MyPass123',
'NEWSLETTER'=>SITEURL."newsletter/?id=example1234567", 'NEWSLETTER' => SITEURL."newsletter/?id=example1234567",
'UNSUBSCRIBE'=>SITEURL."unsubscribe/?id=example1234567"); 'UNSUBSCRIBE' => SITEURL."unsubscribe/?id=example1234567"
);
if(!empty($user)) if(!empty($user))
{ {
$userData = e107::getDb()->retrieve('mail_recipients','*', 'mail_detail_id = '.intval($id).' AND mail_recipient_id = '.intval($user).' LIMIT 1'); $userData = e107::getDb()->retrieve('mail_recipients','*', 'mail_detail_id = '.intval($id).' AND mail_recipient_id = '.intval($user).' LIMIT 1');
$shortcodes = e107::unserialize(stripslashes($userData['mail_target_info'])); $shortcodes = e107::unserialize(stripslashes($userData['mail_target_info']));
} }
if(!isset($shortcodes['MAILREF']))
{
$shortcodes['MAILREF'] = intval($_GET['id']);
}
$data = $this->mailAdmin->dbToMail($mailData); $data = $this->mailAdmin->dbToMail($mailData);
@@ -839,7 +846,7 @@ class mailout_main_ui extends e_admin_ui
} }
return e107::getEmail()->preview($eml); return e107::getEmail()->preview($eml);
exit;
} }