JK: lot of enhancements, markup changes, and minor bug fixes done

at W3C by Fumi, Daigo, and myself. See Changelog for details

Author: Jose Kahan

Changelog

@@ -1,5 +1,32 @@
 Version Changes for Hypermail
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Jose Kahan (Oct 23, 2009)
+  Various fixes / enhancements developed at W3C by Fumihiro Kato,
+  Daigo Matsubara and myself:
+  - Markup changes for deleted messages that are kept.
+  - New directive: htmlmessage_deleted for setting a custom HTML
+    message for the body of deleted messages.
+  - New directives: delete_incremental to disable deleting of existing
+    messages in the archive when doing an incremental add of a new
+    message. In some setups, if this feature is enabled, replies to
+    deleted messages will cause uncontrolled markup escape and
+    expansion. Feature is enabled by default.
+  - Updated list of known protocol uris that hypermail will convert
+    into links.
+  - Bug fix: setup.c:MakeConfig() CFG_SWITCH was using long instead of
+    int.
+  - New directive: fragment_prefix for customizing the prefix that is
+    put before each URI fragment in a message. Default value is "msg",
+    the previous hard-coded value.
+  - New directive: email_address_obfuscation foro enablingemail
+    address obfuscation using numeric character reference.
+  - New directive: inline_addlink to add in-line links to content that
+    is stored in the attachments subdirectory. 'inline_types" must
+    also be enabled.
+  - New directive: inreplyto_command, gives a URI template to a script
+    that hypermail will link to if it's unable to find a corresponding
+    Message-Id in the archive's messages.
+	            
  Peter McCluskey (May 13, 2008)
   Change from Fumihiro Kato to fix bug that sometimes caused a charset
    problem when Content-Type is us-ascii but message headers

src/hypermail.c

@@ -623,7 +623,11 @@ int main(int argc, char **argv)
 
 	writearticles(amount_old, max_msgnum + 1);
 
-	if (deletedlist)
+	/* JK: in function of other hypermail configuration options, 
+	   delete_incremental will continuous escape and add more markup
+	   to non-deleted messages that are replies to deleted messages.
+	   Thus, a setup option to disable it */
+	if (set_delete_incremental && deletedlist)
 	    update_deletions(amount_old);
 
 	if (set_show_msg_links) {

src/lang.h

@@ -226,7 +226,7 @@ struct language_entry {
 #define MSG_TO                                   161
 #define MSG_FROM_TITLE                           162
 #define MSG_ON_TITLE                             163
-
+#define MSG_UNKNOWN_IN_REPLY_TO                  164
 #ifdef MAIN_FILE
 
 /*
@@ -414,6 +414,7 @@ char *de[] = {       /* German */
   " bis ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                              /* End Of Message Table - NOWHERE*/
 };
 
@@ -588,6 +589,7 @@ char *pl[] = {                      /* English */
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                              /* End Of Message Table      - NOWHERE*/
 };
 
@@ -763,6 +765,7 @@ char *en[] = {       /* English */
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                         /* End Of Message Table      - NOWHERE*/
 };
 
@@ -948,6 +951,7 @@ char *es[] = {       /* Espanol/Spanish */
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                               /* End Of Message Table */
 };
 
@@ -1125,6 +1129,7 @@ char *pt[] = {                     /* Brazilian Portuguese */
   "por anexo",                         /* by attachment - HTML */
   "período",                           /* period - HTML */
   " para ",                            /* to - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                                /* End Of Message Table      - NOWHERE*/
 };
 
@@ -1298,6 +1303,7 @@ char *fi[] = {       /* Finnish */
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                              /* End Of Message Table      - NOWHERE*/
 };
 
@@ -1474,6 +1480,7 @@ char *it[] = {       /* Italian */
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                          /* End Of Message Table      - NOWHERE*/
 };
 
@@ -1649,6 +1656,7 @@ char *fr[] = {       /* French */
   " &eagrave; ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                                    /* End Of Message Table  - NOWHERE*/
 };
 
@@ -1826,6 +1834,7 @@ char *is[] = {       /* Icelandic */
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                               /* End Of Message Table      - NOWHERE*/
 };
 
@@ -2006,6 +2015,7 @@ char *sv[] = {
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                             /* End Of Message Table    - NOWHERE*/
 };
 
@@ -2186,6 +2196,7 @@ char *no[] = {
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                             /* End Of Message Table    - NOWHERE*/
 };
 
@@ -2367,6 +2378,7 @@ char *gr[] = {       /* Greek */
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                           	/* End Of Message Table - NOWHERE*/
 };
 
@@ -2540,6 +2552,7 @@ char *ru[] = {     /* Russian */
   " to ", /* to - HTML */
   "from", /* from - HTML */
   "on", /* on - HTML */
+  "message archived in another list or period", /* unknown in reply to - HTML */
   NULL,                          /* End Of Message Table      - NOWHERE*/
 };
 

src/parse.c

@@ -2629,15 +2629,31 @@ msgid);
 					inlinecontent(type)) {
 					/* if we know our browsers can show this type of context
 					   as-is, we make a <img> tag instead of <a href>! */
-
+ 				      if(set_inline_addlink){
+ 					char *created_link =
+					  createlink(set_attachmentlink,
+						     &att_dir[strlen(dir)
+							      + 1],
+						     file, num, type);
+ 					trio_snprintf(buffer, sizeof(buffer),
+						      "<p><img src=\"%s%s%c%s\" alt=\"%s\" />\n<br />\n(%s %s: <a href=\"%s%s\">%s</a>)</p>\n",
+						      subdir ? subdir->rel_path_to_top : "",
+						      &att_dir[strlen(dir) + 1],
+						      PATH_SEPARATOR, file,
+						      desc, type,
+						      lang[MSG_ATTACHMENT],
+						      subdir ? subdir->rel_path_to_top : "",
+						      created_link, file);
+ 					free(created_link);
+ 				      }else {
 					trio_snprintf(buffer, sizeof(buffer),
 						 "<img src=\"%s%s%c%s\" alt=\"%s\" />\n",
 						 subdir ? subdir->rel_path_to_top : "",
 						 &att_dir[strlen(dir) + 1],
 						 PATH_SEPARATOR, file,
 						 desc);
-				    }
-				    else {
+				      }
+				    } else {
 					char *created_link =
 					    createlink(set_attachmentlink,
 						       &att_dir[strlen(dir)
@@ -3003,7 +3019,7 @@ int parse_old_html(int num, struct emailinfo *ep, int parse_body,
 		else if (!strcasecmp(command, "name"))
 		    name = getvalue(line);
 		else if (!strcasecmp(command, "email"))
-		    email = getvalue(line);
+		    email = unobfuscate_email_address(getvalue(line));
 		else if (!strcasecmp(command, "subject")) {
 		    valp = getvalue(line);
 		    {