|
@@ 620-625 (lines=6) @@
|
| 617 |
|
$activationKey = base64_encode(implode('||', $act)); |
| 618 |
|
$xoopsMailer->assign('ACTLINK', XOOPS_URL . "/modules/xnewsletter/{$currentFile}?actkey={$activationKey}"); |
| 619 |
|
$xoopsMailer->setSubject(_MA_XNEWSLETTER_SUBSCRIPTIONSUBJECT . $GLOBALS['xoopsConfig']['sitename']); |
| 620 |
|
if (!$xoopsMailer->send()) { |
| 621 |
|
$actionProts_error[] = _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_SENDACTKEY . '<br>' . $xoopsMailer->getErrors(); |
| 622 |
|
redirect_header($currentFile, 3, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_SENDACTKEY . '<br>' . $xoopsMailer->getErrors()); |
| 623 |
|
} else { |
| 624 |
|
$actionProts_ok[] = str_replace('%subscr_email', $subscr_email, _MA_XNEWSLETTER_SENDMAIL_REG_OK); |
| 625 |
|
} |
| 626 |
|
} else { |
| 627 |
|
// activation key EXISTS |
| 628 |
|
// check confirmation email |
|
@@ 827-833 (lines=7) @@
|
| 824 |
|
$xoopsMailer->assign('USERNAME', $xoopsUser->name()); |
| 825 |
|
$subject = _MA_XNEWSLETTER_SUBSCRIPTION_SUBJECT_CHANGE . $GLOBALS['xoopsConfig']['sitename']; |
| 826 |
|
$xoopsMailer->setSubject($subject); |
| 827 |
|
if (!$xoopsMailer->send()) { |
| 828 |
|
$count_err++; |
| 829 |
|
$actionProts_error[] = _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_SENDACTKEY . '<br>' . $xoopsMailer->getErrors(); |
| 830 |
|
redirect_header($currentFile, 3, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_SENDACTKEY . '<br>' . $xoopsMailer->getErrors()); |
| 831 |
|
} else { |
| 832 |
|
$actionProts_ok[] = str_replace('%e', $subscr_email, _MA_XNEWSLETTER_SUBSCRIPTION_PROT_SENT_INFO); |
| 833 |
|
} |
| 834 |
|
} |
| 835 |
|
if (0 == $count_err) { |
| 836 |
|
if ('addnew' === $saveType) { |
XoopsModules25x /
xnewsletter
