@@ 521-526 (lines=6) @@ | ||
518 | $activationKey = base64_encode(implode('||', $act)); |
|
519 | $xoopsMailer->assign('ACTLINK', XOOPS_URL . "/modules/xnewsletter/{$currentFile}?actkey={$activationKey}"); |
|
520 | $xoopsMailer->setSubject(_MA_XNEWSLETTER_SUBSCRIPTIONSUBJECT . $GLOBALS['xoopsConfig']['sitename']); |
|
521 | if (!$xoopsMailer->send()) { |
|
522 | $actionProts_error[] = _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_SENDACTKEY . '<br>' . $xoopsMailer->getErrors(); |
|
523 | redirect_header($currentFile, 3, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_SENDACTKEY . '<br>' . $xoopsMailer->getErrors()); |
|
524 | } else { |
|
525 | $actionProts_ok[] = str_replace('%subscr_email', $subscr_email, _MA_XNEWSLETTER_SENDMAIL_REG_OK); |
|
526 | } |
|
527 | } else { |
|
528 | // activation key EXISTS |
|
529 | // check confirmation email |
|
@@ 702-708 (lines=7) @@ | ||
699 | $xoopsMailer->assign('USERNAME', $xoopsUser->name()); |
|
700 | $subject = _MA_XNEWSLETTER_SUBSCRIPTION_SUBJECT_CHANGE . $GLOBALS['xoopsConfig']['sitename']; |
|
701 | $xoopsMailer->setSubject($subject); |
|
702 | if (!$xoopsMailer->send()) { |
|
703 | $count_err++; |
|
704 | $actionProts_error[] = _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_SENDACTKEY . '<br>' . $xoopsMailer->getErrors(); |
|
705 | redirect_header($currentFile, 3, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR_SENDACTKEY . '<br>' . $xoopsMailer->getErrors()); |
|
706 | } else { |
|
707 | $actionProts_ok[] = str_replace('%e', $subscr_email, _MA_XNEWSLETTER_SUBSCRIPTION_PROT_SENT_INFO); |
|
708 | } |
|
709 | } |
|
710 | if (0 == $count_err) { |
|
711 | if ('addnew' === $saveType) { |