b04a39a028980ea32b2ac62950bdff0a67de16d0 galt Wed Jul 18 14:48:19 2018 -0700 Add missing CSP header to pages not handled automatically by library functions. refs #21729. diff --git src/tabFile/tabToHtml/tabToHtml.c src/tabFile/tabToHtml/tabToHtml.c index 5c3bed1..ccd217b 100644 --- src/tabFile/tabToHtml/tabToHtml.c +++ src/tabFile/tabToHtml/tabToHtml.c @@ -1,20 +1,21 @@ /* tabToHtml - Convert tab-separated-file to an HTML file that is a table and not much else.. */ #include "common.h" #include "linefile.h" #include "hash.h" #include "options.h" +#include "htmshell.h" #include "fieldedTable.h" char *clTitle = NULL; // Title from command line boolean clEmbed; // If true we embed in another page void usage() /* Explain usage and exit. */ { errAbort( "tabToHtml - Convert tab-separated-file to an HTML file that is a table and not much else.\n" "usage:\n" " tabToHtml in.tsv out.html\n" "options:\n" " -embed - don't write beginning and end of page, just controls and tree.\n" @@ -23,36 +24,37 @@ ); } /* Command line validation table. */ static struct optionSpec options[] = { {"embed", OPTION_BOOLEAN}, {"title", OPTION_STRING}, {NULL, 0}, }; void writeHtml(struct fieldedTable *table, FILE *f) /* Write HTML version of table */ { if (!clEmbed) { - fputs( + fprintf(f, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n" "<HTML>\n" "<HEAD>\n" + "%s" " <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html;CHARSET=iso-8859-1\">\n" - , f); + , getCspMetaHeader()); if (clTitle) fprintf(f, " <TITLE>%s</TITLE>\n", clTitle); else fprintf(f, " <TITLE>table %s</TITLE>\n", table->name); fputs( "</HEAD>\n" "<BODY>\n" , f); fprintf(f, "<style>table, th, td " "{ border: 1px solid black; " " border-collapse: collapse; " " padding: 3px;" "}</style>"); if (clTitle)