From: Stéphane Jacob Date: Thu, 21 Jul 2011 07:43:57 +0000 (+0200) Subject: Fixes storing issue number on nl unsubscription. X-Git-Tag: xorg/1.1.3~42 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4eb1f02cfc1deb1ea0cca4841c1d4645eb28b653;p=platal.git Fixes storing issue number on nl unsubscription. Signed-off-by: Stéphane Jacob --- diff --git a/modules/axletter.php b/modules/axletter.php index 0f3eace..d6a63be 100644 --- a/modules/axletter.php +++ b/modules/axletter.php @@ -45,14 +45,14 @@ class AXLetterModule extends NewsletterModule return NewsLetter::forGroup(NewsLetter::GROUP_AX); } - function handler_out($page, $hash = null) + function handler_out($page, $hash = null, $issue_id = null) { if (!$hash) { if (!S::logged()) { return PL_DO_AUTH; } } - return $this->handler_nl($page, 'out', $hash); + return $this->handler_nl($page, 'out', $hash, $issue_id); } } diff --git a/modules/epletter.php b/modules/epletter.php index f8e8dad..b914893 100644 --- a/modules/epletter.php +++ b/modules/epletter.php @@ -45,14 +45,14 @@ class EPLetterModule extends NewsletterModule return NewsLetter::forGroup(NewsLetter::GROUP_EP); } - function handler_out($page, $hash = null) + function handler_out($page, $hash = null, $issue_id = null) { if (!$hash) { if (!S::logged()) { return PL_DO_AUTH; } } - return $this->handler_nl($page, 'out', $hash); + return $this->handler_nl($page, 'out', $hash, $issue_id); } } diff --git a/templates/newsletter/nl.AX.mail.tpl b/templates/newsletter/nl.AX.mail.tpl index 9898404..158a168 100644 --- a/templates/newsletter/nl.AX.mail.tpl +++ b/templates/newsletter/nl.AX.mail.tpl @@ -43,10 +43,10 @@ Cette lettre est envoyée par l'AX grâce aux outils de Polytechnique.org. {if $is_mail} archives : -ne plus recevoir : id}> +ne plus recevoir : id}> {else} archives : <https://www.polytechnique.org/ax> -ne plus recevoir : <https://www.polytechnique.org/ax/out/{if $hash}{$hash}{else}nohash{/if}/issue/{$issue->id}> +ne plus recevoir : <https://www.polytechnique.org/ax/out/{if $hash}{$hash}{else}nohash{/if}/{$issue->id}> {/if} {if !$is_mail}