Commit 20a11cf2 authored by sikeda's avatar sikeda
Browse files

[-bug] When the single message for moderation or bounce management was...

[-bug] When the single message for moderation or bounce management was converted, useless link was shown in the bottom of formatted messsage.
New mhonarc variable $with_tslice$ to enable TSLICE elements and $with_powered_by$ to enable "Archive powered by" section are introduced: they are disabled by convert_single_message().


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@12107 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent e1a2e204
...@@ -81,10 +81,12 @@ $PRINTABLE_MONTH$ ...@@ -81,10 +81,12 @@ $PRINTABLE_MONTH$
<DefineVar> <DefineVar>
POWERED_BY POWERED_BY
($tag$% IF '$with_powered_by$' -%$tag$)
<hr size="1" noshade> <hr size="1" noshade>
<p><font size="-1"> <p><font size="-1">
($tag$%|loc%$tag$)Archive powered by($tag$%END%$tag$) <a href="$DOCURL$">MHonArc $VERSION$</a>. ($tag$%|loc%$tag$)Archive powered by($tag$%END%$tag$) <a href="$DOCURL$">MHonArc $VERSION$</a>.
</font></p> </font></p>
($tag$%- END %$tag$)
</DefineVar> </DefineVar>
<!-- ============================================================== --> <!-- ============================================================== -->
...@@ -423,9 +425,11 @@ MSGPGEND ...@@ -423,9 +425,11 @@ MSGPGEND
</HEADBODYSEP> </HEADBODYSEP>
<MSGBODYEND> <MSGBODYEND>
($tag$% IF '$with_tslice$' -%$tag$)
<br clear="all" /> <br clear="all" />
<hr size="1" noshade> <hr size="1" noshade>
$TSLICE(10;10;1)$ $TSLICE(10;10;1)$
($tag$%- END %$tag$)
</MSGBODYEND> </MSGBODYEND>
<BOTLINKS> <BOTLINKS>
......
...@@ -413,7 +413,7 @@ sub store_html { ...@@ -413,7 +413,7 @@ sub store_html {
'-rcfile' => $mhonarc_ressources, '-rcfile' => $mhonarc_ressources,
'-outdir' => $self->{arc_directory}, '-outdir' => $self->{arc_directory},
'-definevars' => sprintf( '-definevars' => sprintf(
"listname='%s' hostname=%s yyyy=%s mois=%s yyyymm=%s-%s wdir=%s base=%s/arc tag=%s", "listname='%s' hostname=%s yyyy=%s mois=%s yyyymm=%s-%s wdir=%s base=%s/arc tag=%s with_tslice=1 with_powered_by=1",
$list->{'name'}, $list->{'name'},
$list->{'domain'}, $list->{'domain'},
$yyyy, $yyyy,
...@@ -615,7 +615,7 @@ sub rebuild_html { ...@@ -615,7 +615,7 @@ sub rebuild_html {
'-rcfile' => $mhonarc_ressources, '-rcfile' => $mhonarc_ressources,
'-outdir' => $arc_directory, '-outdir' => $arc_directory,
'-definevars' => sprintf( '-definevars' => sprintf(
"listname='%s' hostname=%s yyyy=%s mois=%s yyyymm=%s-%s wdir=%s base=%s/arc tag=%s", "listname='%s' hostname=%s yyyy=%s mois=%s yyyymm=%s-%s wdir=%s base=%s/arc tag=%s with_tslice=1 with_powered_by=1",
$listname, $listname,
$robot_id, $robot_id,
$yyyy, $yyyy,
...@@ -884,7 +884,7 @@ sub convert_single_message { ...@@ -884,7 +884,7 @@ sub convert_single_message {
'-single', '-single',
'-rcfile' => $mhonarc_ressources, '-rcfile' => $mhonarc_ressources,
'-definevars' => sprintf( '-definevars' => sprintf(
"listname='%s' hostname=%s yyyy='' mois='' tag=%s", "listname='%s' hostname=%s yyyy='' mois='' tag=%s with_tslice='' with_powered_by=''",
$listname, $hostname, $tag $listname, $hostname, $tag
), ),
'-outdir' => $destination_dir, '-outdir' => $destination_dir,
......
Supports Markdown
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