Fix message preview formatting

* Import some code from banana (list_header_decode)
* rpc do not remove 0x0A (\n) anymore

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@689 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 2497918..7befda6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@ New:
 
     * Lists:
         - Switch to the new URI scheme.                                     -MC
+        - Do not remove line breaks in message moderation preview          -FRU
 
     * Marketing:
         - Switch to the new URI scheme.                                     -MC

diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index ade8a0e..5003ad3 100755 (executable)
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -64,7 +64,6 @@ def get_config(sec, val, default=None):
         else:
             return default
 
-BASEURL        = get_config('Core', 'baseurl')
 MYSQL_USER     = get_config('Core', 'dbuser')
 MYSQL_PASS     = get_config('Core', 'dbpwd')
 
@@ -171,8 +170,8 @@ def quote(s, is_header=False):
         h = Utils.oneline(s, 'iso-8859-1')
     else:
         h = s
-    h = str('').join(re.split('[\x00-\x1f]+', s))
-    return Utils.uquote(h.replace('&', '&amp;').replace('>', '&gt;').replace('<', '&lt;'))
+    h = str('').join(re.split('[\x00-\x09\x0B\x1f]+', s))
+    return Utils.uquote(h.replace('&', '&amp;').replace('>', '&gt;').replace('<', '&lt;')) 
 
 def to_forlife(email):
     try:

diff --git a/modules/lists.php b/modules/lists.php
index 871a1ec..f8b9aa0 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -310,6 +310,7 @@ class ListsModule extends PLModule
         $page->changeTpl('listes/moderate.tpl');
 
         $page->register_modifier('qpd', 'quoted_printable_decode');
+        $page->register_modifier('hdc', 'list_header_decode');
 
         if (Env::has('sadd')) { /* 4 = SUBSCRIBE */
             $this->client->handle_request($liste,Env::v('sadd'),4,'');

diff --git a/templates/listes/moderate.tpl b/templates/listes/moderate.tpl
index 612a111..a7ffe24 100644 (file)
--- a/templates/listes/moderate.tpl
+++ b/templates/listes/moderate.tpl
@@ -85,7 +85,7 @@
   {foreach from=$mails item=m}
   <tr class='{cycle values="pair,impair"}'>
     <td>{$m.sender}</td>
-    <td>{$m.subj|default:"[pas de sujet]"}</td>
+    <td>{$m.subj|hdc|default:"[pas de sujet]"}</td>
     <td class='right'>{$m.size}o</td>
     <td class='right'>{$m.stamp|date_format:"%X<br />%x"}</td>
     <td class='action'>

diff --git a/templates/listes/moderate_mail.tpl b/templates/listes/moderate_mail.tpl
index c72e312..e0ea4b7 100644 (file)
--- a/templates/listes/moderate_mail.tpl
+++ b/templates/listes/moderate_mail.tpl
@@ -28,11 +28,11 @@
 <table class='tinybicol' cellpadding='0' cellspacing='0'>
   <tr>
     <td class='titre'>émetteur</td>
-    <td>{$mail.sender}</td>
+    <td>{mailto address=$mail.sender}</td>
   </tr>
   <tr>
     <td class='titre'>sujet</td>
-    <td>{$mail.subj}</td>
+    <td>{$mail.subj|hdc}</td>
   </tr>
   <tr>
     <td class='titre'>taille</td>