Menu
▾
▴
[Tikiwiki-cvs] tiki tiki-send_newsletters.php,1.16.2.22,1.16.2.23
|
From: <lfa...@us...> - 2005-07-08 02:19:24
|
Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1942 Modified Files: Tag: BRANCH-1-9 tiki-send_newsletters.php Log Message: [FIX] double line break in newsletter content. it was being parsed twice [FIX] content template in newsletter couldn't be modified, content must come from template only if template has changed since last request. Index: tiki-send_newsletters.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-send_newsletters.php,v retrieving revision 1.16.2.22 retrieving revision 1.16.2.23 diff -u -d -r1.16.2.22 -r1.16.2.23 --- tiki-send_newsletters.php 2 May 2005 21:42:22 -0000 1.16.2.22 +++ tiki-send_newsletters.php 8 Jul 2005 02:19:10 -0000 1.16.2.23 @@ -61,7 +61,7 @@ } } -if (isset($_REQUEST["templateId"]) && $_REQUEST["templateId"] > 0) { +if (isset($_REQUEST["templateId"]) && $_REQUEST["templateId"] > 0 && (!isset($_REQUEST['previousTemplateId']) || $_REQUEST['previousTemplateId'] != $_REQUEST['templateId'])) { $template_data = $tikilib->get_template($_REQUEST["templateId"]); $_REQUEST["data"] = $template_data["content"]; $_REQUEST["preview"] = 1; @@ -89,9 +89,12 @@ $smarty->assign('dataparsed', $tikilib->parse_data($info["data"])); $smarty->assign('subject', $info["subject"]); $info["dataparsed"] = $smarty->fetch("newsletters/".$_REQUEST["usedTpl"]); + if (stristr($info['dataparsed'], "<body>") === false) { + $info['dataparsed'] = "<html><body>".$info['dataparsed']."</body></html>"; + } $smarty->assign("usedTpl", $_REQUEST["usedTpl"]); } else { - $info["dataparsed"] = $tikilib->parse_data($info["data"]); + $info["dataparsed"] = "<html><body>".$tikilib->parse_data($info["data"])."</body></html>"; } $smarty->assign('info', $info); } @@ -106,13 +109,19 @@ $subscribers = $nllib->get_all_subscribers($_REQUEST["nlId"], ""); $smarty->assign('nlId', $_REQUEST["nlId"]); $smarty->assign('data', $_REQUEST["data"]); + $parsed = ''; if (!empty($_REQUEST["usedTpl"])) { $smarty->assign('dataparsed', $tikilib->parse_data($_REQUEST["data"])); $smarty->assign('subject', $_REQUEST["subject"]); - $smarty->assign('dataparsed', $smarty->fetch("newsletters/".$_REQUEST["usedTpl"])); + $parsed = $smarty->fetch("newsletters/".$_REQUEST["usedTpl"]); } else { - $smarty->assign('dataparsed', $tikilib->parse_data($_REQUEST["data"])); + $parsed = $tikilib->parse_data($_REQUEST["data"]); + } + if (stristr($parsed, "<body>") === false) { + $parsed = "<html><body>$parsed</body></html>"; } + $smarty->assign('dataparsed',$parsed); + $smarty->assign('subject', $_REQUEST["subject"]); $cant = count($subscribers); $smarty->assign('subscribers', $cant); |