-rw-r--r-- | ui-shared.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c index cd98387..8a00099 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -414,68 +414,74 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
414 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 414 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
415 | ctx->page.charset); | 415 | ctx->page.charset); |
416 | else if (ctx->page.mimetype) | 416 | else if (ctx->page.mimetype) |
417 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 417 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
418 | if (ctx->page.filename) | 418 | if (ctx->page.filename) |
419 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 419 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
420 | ctx->page.filename); | 420 | ctx->page.filename); |
421 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 421 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
422 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 422 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
423 | html("\n"); | 423 | html("\n"); |
424 | } | 424 | } |
425 | 425 | ||
426 | void cgit_print_docstart(struct cgit_context *ctx) | 426 | void cgit_print_docstart(struct cgit_context *ctx) |
427 | { | 427 | { |
428 | html(cgit_doctype); | 428 | html(cgit_doctype); |
429 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 429 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
430 | html("<head>\n"); | 430 | html("<head>\n"); |
431 | html("<title>"); | 431 | html("<title>"); |
432 | html_txt(ctx->page.title); | 432 | html_txt(ctx->page.title); |
433 | html("</title>\n"); | 433 | html("</title>\n"); |
434 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 434 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
435 | if (ctx->cfg.robots && *ctx->cfg.robots) | 435 | if (ctx->cfg.robots && *ctx->cfg.robots) |
436 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 436 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
437 | html("<link rel='stylesheet' type='text/css' href='"); | 437 | html("<link rel='stylesheet' type='text/css' href='"); |
438 | html_attr(ctx->cfg.css); | 438 | html_attr(ctx->cfg.css); |
439 | html("'/>\n"); | 439 | html("'/>\n"); |
440 | html("</head>\n"); | 440 | html("</head>\n"); |
441 | html("<body>\n"); | 441 | html("<body>\n"); |
442 | } | 442 | } |
443 | 443 | ||
444 | void cgit_print_docend() | 444 | void cgit_print_docend() |
445 | { | 445 | { |
446 | html("</div><div class='footer'>generated "); | 446 | html("</div>"); |
447 | cgit_print_date(time(NULL), FMT_LONGDATE); | 447 | if (ctx.cfg.footer) |
448 | htmlf(" by cgit %s", cgit_version); | 448 | html_include(ctx.cfg.footer); |
449 | html("</div>\n</body>\n</html>\n"); | 449 | else { |
450 | html("<div class='footer'>generated "); | ||
451 | cgit_print_date(time(NULL), FMT_LONGDATE); | ||
452 | htmlf(" by cgit %s", cgit_version); | ||
453 | html("</div>\n"); | ||
454 | } | ||
455 | html("</body>\n</html>\n"); | ||
450 | } | 456 | } |
451 | 457 | ||
452 | int print_branch_option(const char *refname, const unsigned char *sha1, | 458 | int print_branch_option(const char *refname, const unsigned char *sha1, |
453 | int flags, void *cb_data) | 459 | int flags, void *cb_data) |
454 | { | 460 | { |
455 | char *name = (char *)refname; | 461 | char *name = (char *)refname; |
456 | html_option(name, name, ctx.qry.head); | 462 | html_option(name, name, ctx.qry.head); |
457 | return 0; | 463 | return 0; |
458 | } | 464 | } |
459 | 465 | ||
460 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 466 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
461 | int flags, void *cb_data) | 467 | int flags, void *cb_data) |
462 | { | 468 | { |
463 | struct tag *tag; | 469 | struct tag *tag; |
464 | struct taginfo *info; | 470 | struct taginfo *info; |
465 | struct object *obj; | 471 | struct object *obj; |
466 | char buf[256], *url; | 472 | char buf[256], *url; |
467 | unsigned char fileid[20]; | 473 | unsigned char fileid[20]; |
468 | int *header = (int *)cb_data; | 474 | int *header = (int *)cb_data; |
469 | 475 | ||
470 | if (prefixcmp(refname, "refs/archives")) | 476 | if (prefixcmp(refname, "refs/archives")) |
471 | return 0; | 477 | return 0; |
472 | strncpy(buf, refname+14, sizeof(buf)); | 478 | strncpy(buf, refname+14, sizeof(buf)); |
473 | obj = parse_object(sha1); | 479 | obj = parse_object(sha1); |
474 | if (!obj) | 480 | if (!obj) |
475 | return 1; | 481 | return 1; |
476 | if (obj->type == OBJ_TAG) { | 482 | if (obj->type == OBJ_TAG) { |
477 | tag = lookup_tag(sha1); | 483 | tag = lookup_tag(sha1); |
478 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 484 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
479 | return 0; | 485 | return 0; |
480 | hashcpy(fileid, tag->tagged->sha1); | 486 | hashcpy(fileid, tag->tagged->sha1); |
481 | } else if (obj->type != OBJ_BLOB) { | 487 | } else if (obj->type != OBJ_BLOB) { |