changes from Rick van der Zwet about spamify, dates, alignment

Author: Peter McCluskey

src/Makefile.in

@@ -61,7 +61,7 @@ MAILOBJS=	mail.o ../libcgi/libcgi.a
 all:    pcre/.libs/libpcre.a @FNV_DEP@ hypermail$(SUFFIX) mail$(SUFFIX) lang$(SUFFIX)
 
 pcre/.libs/libpcre.a:
-	@cd pcre; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" ; rm .libs/lib*.so*
+	@cd pcre; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" ; rm -f .libs/lib*.so*
 
 fnv/libfnv.a:
 	@cd fnv; $(MAKE) libfnv.a CC="$(CC)" CFLAGS="$(CFLAGS)"

src/date.c

@@ -210,7 +210,7 @@ char *getdateindexdatestr(time_t yearsecs)
 
   /* store the previous dateformat */
   previous_dateformat = set_dateformat;
-  set_dateformat = "%A, %e %B";
+  set_dateformat = "%A, %e %B %Y";
   date = getdatestr (yearsecs);
   /* restore the previous dateformat */
   set_dateformat = previous_dateformat;

src/getname.c

@@ -15,6 +15,16 @@ static int blankstring(char *str)
 }
 
 char *spamify(char *input)
+{
+    if (set_antispamdomain) {
+        return spamify_replacedomain(input, set_antispamdomain);
+    }
+    else {
+        return spamify_small(input);
+    }
+}
+
+char *spamify_small(char *input)
 {
     int insertlen = strlen(set_antispam_at);
     /* we should replace the @-letter in the email address */

src/getname.h

@@ -1,3 +1,4 @@
 void getname(char *, char **, char **);
 char *spamify(char *input);
+char *spamify_small(char *input);
 char *spamify_replacedomain(char *input, char *antispamdomain);

src/parse.c

@@ -417,7 +417,7 @@ void crossindexthread2(int num)
     for (rp = ep->replylist; rp != NULL; rp = rp->next) {
 	if (!(rp->data->flags & USED_THREAD)) {
 	    rp->data->flags |= USED_THREAD;
-	    if (0) printf("add thread.b %d %d %d\n", num, rp->data->msgnum, rp->msgnum);
+	    if (0) fprintf(stderr, "add thread.b %d %d %d\n", num, rp->data->msgnum, rp->msgnum);
 	    threadlist = addreply(threadlist, num, rp->data, 0,
 				  &threadlist_end);
 	    printedlist = markasprinted(printedthreadlist, rp->msgnum);
@@ -1500,18 +1500,11 @@ int parsemail(char *mbox,	/* file name */
 		    else if (!strncasecmp(head->line, "From:", 5)) {
 			getname(head->line, &namep, &emailp);
 			head->parsedheader = TRUE;
-                        if (set_spamprotect) {
-			  if (set_antispamdomain) {
-			    emailp=spamify_replacedomain(emailp,set_antispamdomain);
-			    /* we need to "fix" the name as well, as sometimes
-			       the email ends up in the name part */
-			    namep=spamify_replacedomain(namep,set_antispamdomain);
-			  } else {
+            if (set_spamprotect) {
 			    emailp=spamify(emailp);
 			    /* we need to "fix" the name as well, as sometimes
 			       the email ends up in the name part */
 			    namep=spamify(namep);
-			  }
                         }
 		    }
 		    else if (!strncasecmp(head->line, "Message-Id:", 11)) {

src/print.c

@@ -2265,6 +2265,8 @@ void writearticles(int startnum, int maxnum)
 	    if (hashnumlookup(num, &e3)) {
 #ifdef FASTREPLYCODE
 	      hashnumlookup(get_new_reply_to(), &e4);
+	      if(0)
+		fprintf(stderr, "update reply %2d %2d \n", get_new_reply_to(), num);
 	      replylist = addreply2(replylist, e4, e3, 0, &replylist_end);
 #else
 	      replylist = addreply(replylist, get_new_reply_to(), e3, 0, &replylist_end);
@@ -3152,7 +3154,7 @@ void write_toplevel_indices(int amountmsgs)
     char *index_title;
     char *filename;
     char *saved_set_dateformat;
-    char *abbr_dateformat = "%e %b %Y";
+    char *abbr_dateformat = "%d %b %Y";
     char *verbose_dateformat = "%A, %e %B %Y";
 
     char *tmpstr;
@@ -3301,7 +3303,7 @@ void write_toplevel_indices(int amountmsgs)
 	    }
 	}
 	if (started_line && fp)
-	    fprintf(fp, "    <td align=\"center\" class=\"count\">%d</td>\n  </tr>\n", sd->count);
+	    fprintf(fp, "    <td align=\"right\" class=\"count\">%d</td>\n  </tr>\n", sd->count);
     }
     set_dateformat = saved_set_dateformat;
 

src/struct.c

@@ -29,6 +29,7 @@ int rbs_bigtime = 0;
 #include "setup.h"
 #include "struct.h"
 #include "parse.h"
+#include "getname.h"
 
 #define HAVE_PCRE
 #ifdef HAVE_PCRE
@@ -728,7 +729,7 @@ struct body *addbody(struct body *bp, struct body **lp,	/* points to the last po
     if (!(flags & BODY_CONTINUE)) {
 	newnode = (struct body *)emalloc(sizeof(struct body));
 	memset(newnode, 0, sizeof(struct body));
-	newnode->line = strsav(line);
+	newnode->line = spamify(strsav(line));
 	newnode->html = (flags & BODY_HTMLIZED) ? 1 : 0;
 	newnode->header = (flags & BODY_HEADER) ? 1 : 0;
 	newnode->attached = (flags & BODY_ATTACHED) ? 1 : 0;