Commit 86dc416f authored by Richard Mansfield's avatar Richard Mansfield
Browse files

My plans: Fix some double-escaping, remove unnecessary auto_escape blocks


Signed-off-by: default avatarRichard Mansfield <richardm@catalyst.net.nz>
parent 0a197241
......@@ -55,7 +55,7 @@ $form = pieform($deleteform);
$smarty = smarty();
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc($todelete->get('title')));
$smarty->assign('PAGEHEADING', $todelete->get('title'));
$smarty->assign('subheading', get_string('deletethisplan','artefact.plans',$todelete->get('title')));
$smarty->assign('message', get_string('deleteplanconfirm','artefact.plans'));
$smarty->display('artefact:plans:delete.tpl');
......
......@@ -55,7 +55,7 @@ $form = pieform($deleteform);
$smarty = smarty();
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', hsc($todelete->get('title')));
$smarty->assign('PAGEHEADING', $todelete->get('title'));
$smarty->assign('subheading', get_string('deletethistask','artefact.plans',$todelete->get('title')));
$smarty->assign('message', get_string('deletetaskconfirm','artefact.plans'));
$smarty->display('artefact:plans:delete.tpl');
......
......@@ -61,7 +61,7 @@ $smarty->assign_by_ref('plan', $id);
$smarty->assign('strnotasksaddone',
get_string('notasksaddone', 'artefact.plans',
'<a href="' . get_config('wwwroot') . 'artefact/plans/new.php?id='.$plan->get('id').'">', '</a>'));
$smarty->assign('PAGEHEADING', hsc(get_string("planstasks", "artefact.plans",$plan->get('title'))));
$smarty->assign('PAGEHEADING', get_string("planstasks", "artefact.plans",$plan->get('title')));
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->display('artefact:plans:plan.tpl');
......
{auto_escape on}
{include file="header.tpl"}
<div id="planswrap">
<div class="rbuttons">
......@@ -16,4 +15,3 @@
{/if}
</div>
{include file="footer.tpl"}
{/auto_escape}
{auto_escape on}
{include file="header.tpl"}
<div id="planswrap">
<div class="rbuttons">
......@@ -27,4 +26,3 @@
{/if}
</div>
{include file="footer.tpl"}
{/auto_escape}
{auto_escape on}
{foreach from=$plans.data item=plan}
<tr class="{cycle values='r0,r1'}">
<td>
<div class="fr">
<ul class="groupuserstatus">
<li><a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id|escape}" class="btn-edit">{str tag="edit"}</a></li>
<li><a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id|escape}" class="btn-del">{str tag="delete"}</a></li>
<li><a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" class="btn-edit">{str tag="edit"}</a></li>
<li><a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" class="btn-del">{str tag="delete"}</a></li>
</ul>
</div>
<h3><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id|escape}">{$plan->title|escape}</a></h3>
<h3><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{$plan->title}</a></h3>
<div class="codesc">{$plan->description}</div>
<div class="fl">
<ul class="planslist">
<li><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id|escape}">{str tag="managetasks" section="artefact.plans"}</a></li>
<li><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{str tag="managetasks" section="artefact.plans"}</a></li>
</ul>
</td>
</div>
</tr>
{/foreach}
{/auto_escape}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment