From e4f549fd573f926deb2d31ec0a93d22947bf449b Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Fri, 29 Apr 2011 10:54:10 +0200
Subject: [PATCH] Fixes anchors in emails/redirect.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 include/emails.inc.php        | 6 ++++++
 templates/emails/redirect.tpl | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/emails.inc.php b/include/emails.inc.php
index db35a5d..9776d80 100644
--- a/include/emails.inc.php
+++ b/include/emails.inc.php
@@ -469,6 +469,7 @@ class Email
 
     // Basic email properties; $sufficient indicates if the email can be used as
     // an unique redirection; $redirect contains the delivery email address.
+    public $id;
     public $type;
     public $sufficient;
     public $email;
@@ -510,6 +511,11 @@ class Email
         }
         $this->sufficient = ($this->type == 'smtp' || $this->type == 'googleapps');
         $this->filter_level = ($this->type == 'imap') ? null : array_search($this->action, Bogo::$states);
+        if (array_key_exists($this->type , self::$storage_domains)) {
+            $this->id = $this->type;
+        } else {
+            $this->id = str_replace('@', '_at_', $this->email);
+        }
         $this->user = &$user;
     }
 
diff --git a/templates/emails/redirect.tpl b/templates/emails/redirect.tpl
index fe168b3..4c691b4 100644
--- a/templates/emails/redirect.tpl
+++ b/templates/emails/redirect.tpl
@@ -136,7 +136,7 @@
         <th>&nbsp;</th>
       </tr>
       {foreach from=$emails item=e name=redirect}
-      <tr class="{cycle values="pair,impair"}" id="line_{$e->email|replace:'@':'_at_'}">
+      <tr class="{cycle values="pair,impair"}" id="line_{$e->id}">
         <td>
           <strong>
             {if $e->broken}<span class="erreur">{assign var="error" value="1"}{/if}
@@ -171,7 +171,7 @@
           </a>
           {else}
           {if $e->sufficient}<span class="remove_email"><span style="display:none">&nbsp;</span></span>{/if}
-          <a href="emails/redirect#{$e->email}">{icon name=information title="Plus d'informations"}</a>
+          <a href="emails/redirect#{$e->type}">{icon name=information title="Plus d'informations"}</a>
           {/if}
         </td>
       </tr>
-- 
2.1.4