changes from Vincent McIntyre to date-range column of index of folders, whitespace changes

Author: Peter McCluskey

src/hypermail.c

@@ -98,7 +98,7 @@ static char *expand_contents(char *variable)
     return return_value;
 }
 
-static char *setindex(char *dfltindex, char *indextype, char *suffix)
+char *setindex(char *dfltindex, char *indextype, char *suffix)
 {
     char *p, *rp;
 
@@ -469,10 +469,10 @@ int main(int argc, char **argv)
      * Which index file will be called "index.html"?
      */
 
-	index_name[1][DATE_INDEX] = setindex(set_defaultindex, "date", set_htmlsuffix);
-	index_name[1][THREAD_INDEX] = setindex(set_defaultindex, "thread", set_htmlsuffix);
-	index_name[1][SUBJECT_INDEX] = setindex(set_defaultindex, "subject", set_htmlsuffix);
-	index_name[1][AUTHOR_INDEX] = setindex(set_defaultindex, "author", set_htmlsuffix);
+    index_name[1][DATE_INDEX] = setindex(set_defaultindex, "date", set_htmlsuffix);
+    index_name[1][THREAD_INDEX] = setindex(set_defaultindex, "thread", set_htmlsuffix);
+    index_name[1][SUBJECT_INDEX] = setindex(set_defaultindex, "subject", set_htmlsuffix);
+    index_name[1][AUTHOR_INDEX] = setindex(set_defaultindex, "author", set_htmlsuffix);
     if (set_attachmentsindex) {
 	index_name[1][ATTACHMENT_INDEX]
 	    = setindex(set_defaultindex, "attachment", set_htmlsuffix);
@@ -494,7 +494,9 @@ int main(int argc, char **argv)
 	index_name[0][SUBJECT_INDEX] = index_name[1][SUBJECT_INDEX];
 	index_name[0][ATTACHMENT_INDEX] = index_name[1][ATTACHMENT_INDEX];
     }
+
     init_index_names();
+
     if (set_msgsperfolder && set_folder_by_date) {
 	progerr("msgsperfolder and folder_by_date may not be used at the same time!");
     }

src/print.c

@@ -2917,7 +2917,7 @@ void write_summary_indices(int amount_new)
 
 void write_toplevel_indices(int amountmsgs)
 {
-    int i, j, newfile;
+    int i, j, newfile, offset, k;
     bool first = TRUE;
     struct emailsubdir *sd;
     char *subject = lang[MSG_FOLDERS_INDEX];
@@ -2930,6 +2930,8 @@ void write_toplevel_indices(int amountmsgs)
     char *abbr_dateformat = "%e %b %Y";
     char *verbose_dateformat = "%A, %e %B %Y";
 
+    char *tmpstr;
+
     FILE *fp;
 
     filename = htmlfilename(index_name[0][FOLDERS_INDEX], NULL, "");
@@ -2949,6 +2951,19 @@ void write_toplevel_indices(int amountmsgs)
       print_index_header_links(fp, FOLDERS_INDEX, firstdatenum, lastdatenum, amountmsgs, NULL);
       fprintf (fp, "</div>\n");
       fprintf(fp, "<table>\n");
+
+      /* find which element of index_name is the default index */
+      offset = 0;
+      if (set_defaultindex) {
+	tmpstr = setindex(INDEXNAME, INDEXNAME, set_htmlsuffix);
+	for (j = 0; j <= ATTACHMENT_INDEX; ++j) {
+	  if (0 == strcmp(tmpstr, index_name[1][j])) {
+	    offset = j;
+	    break;
+	  }
+	}
+      }
+
       for (i = 0, j = 0; j <= ATTACHMENT_INDEX; ++j) {
 	if (show_index[1][j])
 	  i++;
@@ -2957,10 +2972,10 @@ void write_toplevel_indices(int amountmsgs)
 	 with all configurations. */
       if (i > 0)
 	i--;
-      fprintf(fp, "<thead><tr>\n"
-	      "<th>%s</th><th colspan=\"%d\">%s</th>\n"
-	      "<th align=\"right\">%s</th>\n"
-	      "</tr></thead>\n"
+      fprintf(fp, "<thead>\n  <tr>\n"
+	      "    <th>%s</th>\n    <th colspan=\"%d\">%s</th>\n"
+	      "    <th align=\"right\" class=\"count\">%s</th>\n"
+	      "  </tr>\n</thead>\n"
 	      "<tbody>\n", lang[MSG_PERIOD], i, lang[MSG_RESORTED], 
 	      lang[MSG_ARTICLES]);
     }
@@ -2974,10 +2989,12 @@ void write_toplevel_indices(int amountmsgs)
 	if (!datelist->data)
 	    continue;
 	for (j = 0; j <= ATTACHMENT_INDEX; ++j) {
-	    if (!show_index[1][j])
+            /* apply offset so the period column's href points to index.html */
+	    k = (j + offset) % (ATTACHMENT_INDEX + 1);
+	    if (!show_index[1][k])
 		continue;
 	    set_dateformat = saved_set_dateformat;
-	    switch (j) {
+	    switch (k) {
 		case DATE_INDEX:
 		    writedates(sd->count, sd->first_email);
 		    index_title = lang[MSG_LTITLE_LISTED_BY_DATE];
@@ -3029,37 +3046,37 @@ void write_toplevel_indices(int amountmsgs)
 		strcat (verbose_period_name, lang[MSG_TO]);
 		strcat (verbose_period_name, end_date);
 	      }
-	      fprintf(fp, "<tr%s><th scope=\"row\" align=\"left\">%s",
+	      fprintf(fp, "  <tr%s>\n    <td scope=\"row\" class=\"period\" align=\"left\">%s",
 		      (first) ? " class=\"first\"" : "",
 		      (first) ? "<a name=\"first\" id=\"first\"></a>" : "");
 	      /* only add a link to the index if it is not empty */
 	      if (sd->count > 0)
 		fprintf (fp, "<a title=\"%s %s\" href=\"%s%s\">",
 			 verbose_period_name, index_title, 
-			 sd->subdir, index_name[1][j]);
+			 sd->subdir, index_name[1][k]);
 	      fprintf (fp, "%s", abbr_period_name);
 	      if (sd->count > 0)
 		fprintf (fp, "</a>");
-	      fprintf (fp, "</th>");
+	      fprintf (fp, "</td>\n");
 	      if (first)
 		first = FALSE;
 	      started_line = 1;
 	    } 
 	    else {
-	      fprintf(fp, "<td>");
+	      fprintf(fp, "    <td>");
 	      /* only add a link to the index if it is not empty */
 	      if (sd->count > 0)
 		fprintf (fp, "<a title=\"%s %s\" href=\"%s%s\">",
 			 verbose_period_name, index_title, 
-			 sd->subdir, index_name[1][j]);
-	      fprintf (fp, "%s", indextypename[j]);
+			 sd->subdir, index_name[1][k]);
+	      fprintf (fp, "%s", indextypename[k]);
 	      if (sd->count > 0)
 		fprintf (fp, "</a>");
-	      fprintf (fp, "</td>");
+	      fprintf (fp, "</td>\n");
 	    }
 	}
 	if (started_line && fp)
-	    fprintf(fp, "<td align=\"center\">%d</td></tr>\n", sd->count);
+	    fprintf(fp, "    <td align=\"center\" class=\"count\">%d</td>\n  </tr>\n", sd->count);
     }
     set_dateformat = saved_set_dateformat;
 

src/printfile.c

@@ -333,6 +333,7 @@ void print_main_header(FILE *fp, bool index_header, char *label, char *name,
       fprintf(fp, ".quotelev2 {color : #ff7700}\n");
       fprintf(fp, ".quotelev3 {color : #007799}\n");
       fprintf(fp, ".quotelev4 {color : #95c500}\n");
+      fprintf (fp, ".period {font-weight: bold}\n");
       fprintf (fp, "</style>\n");
     }
 

src/proto.h

@@ -65,6 +65,7 @@ void version(void);
 void progerr(char *);
 void cmderr(char *);
 void usage(void);
+char *setindex(char *dfltindex, char *indextype, char *suffix);
 
 /*
 ** lang.c function

src/setup.c

@@ -149,11 +149,11 @@ int set_delete_level;
 
 struct Config cfg[] = {
     {"antispam_at", &set_antispam_at, ANTISPAM_AT, CFG_STRING,
-     "# replace any @ sign with this string, if spam flags enabled\n", FALSE},
+     "# replace any @ sign with this string, if spam flags enabled.\n", FALSE},
 
     {"language", &set_language, LANGUAGE, CFG_STRING,
      "# A two-letter string specifying the language to use!\n"
-     "# For example 'en' for English\n", FALSE},
+     "# For example 'en' for English.\n", FALSE},
 
     {"htmlsuffix", &set_htmlsuffix, HTMLSUFFIX, CFG_STRING,
      "# Use this to specify the html file suffix to be used\n"
@@ -638,7 +638,7 @@ struct Config cfg[] = {
      "# a symbolic link by this name to the most recently created\n"
      "# subdirectory. Note that many web servers are configured to\n"
      "# not follow symbolic links for security reasons. The link will\n"
-     "# be created in the directory specified by the 'dir' or '-d' option.",
+     "# be created in the directory specified by the 'dir' or '-d' option.\n",
      FALSE},
 
     {"base_url", &set_base_url, NULL, CFG_STRING,
@@ -744,7 +744,7 @@ struct Config cfg[] = {
     {"href_detection", &set_href_detection, BTRUE, CFG_SWITCH,
      "# Set this to On to assume that any string on the body of the message\n"
      "# that says <A HREF=\" ... </A> is a URL, together with its markup\n"
-     "# and treat it as such.", TRUE},
+     "# and treat it as such.\n", TRUE},
 
     {"mbox_shortened", &set_mbox_shortened, BFALSE, CFG_SWITCH,
      "# Set this to On to enable use of mbox that has had some of its\n"