changed the preg_split to explode per fox. fixed the template to

have a block for note and only include if there is a note
remotes/origin/jsonfeed-test-branch
justauser 10 years ago
parent 7aab5617b6
commit ed7dd4bf6c
  1. 8
      plugins/mail/init.php
  2. 4
      templates/email_article_template.txt

@ -70,8 +70,12 @@ class Mail extends Plugin {
$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
$tnote = strip_tags($line["note"]);
if( $tnote != ''){
$tpl->setVariable('ARTICLE_NOTE', $tnote, true);
$tpl->addBlock('note');
}
$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
$tpl->setVariable('ARTICLE_NOTE', strip_tags($line["note"]));
$tpl->addBlock('article');
}
@ -138,7 +142,7 @@ class Mail extends Plugin {
$mail->From = strip_tags($_REQUEST['from_email']);
$mail->FromName = strip_tags($_REQUEST['from_name']);
//$mail->AddAddress($_REQUEST['destination']);
$addresses = preg_split('/;/', $_REQUEST['destination'],-1,PREG_SPLIT_NO_EMPTY);
$addresses = explode(';', $_REQUEST['destination']);
foreach($addresses as $nextaddr)
$mail->AddAddress($nextaddr);

@ -5,9 +5,9 @@ Thought I'd share the following with you:
<!-- $BeginBlock article -->
* ${ARTICLE_TITLE}
<!-- $BeginBlock note -->
${ARTICLE_NOTE}
<!-- $EndBlock note -->
${ARTICLE_URL}
<!-- $EndBlock article -->

Loading…
Cancel
Save