-rw-r--r-- | ui-shared.c | 79 |
1 files changed, 55 insertions, 24 deletions
diff --git a/ui-shared.c b/ui-shared.c index 40060ba..07d5dd4 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -36,20 +36,19 @@ void cgit_print_error(char *msg) | |||
36 | 36 | ||
37 | char *cgit_hosturl() | 37 | char *cgit_httpscheme() |
38 | { | 38 | { |
39 | char *host, *port; | 39 | if (ctx.env.https && !strcmp(ctx.env.https, "on")) |
40 | 40 | return "https://"; | |
41 | host = getenv("HTTP_HOST"); | ||
42 | if (host) { | ||
43 | host = xstrdup(host); | ||
44 | } else { | ||
45 | host = getenv("SERVER_NAME"); | ||
46 | if (!host) | ||
47 | return NULL; | ||
48 | port = getenv("SERVER_PORT"); | ||
49 | if (port && atoi(port) != 80) | ||
50 | host = xstrdup(fmt("%s:%d", host, atoi(port))); | ||
51 | else | 41 | else |
52 | host = xstrdup(host); | 42 | return "http://"; |
53 | } | 43 | } |
54 | return host; | 44 | |
45 | char *cgit_hosturl() | ||
46 | { | ||
47 | if (ctx.env.http_host) | ||
48 | return ctx.env.http_host; | ||
49 | if (!ctx.env.server_name) | ||
50 | return NULL; | ||
51 | if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80) | ||
52 | return ctx.env.server_name; | ||
53 | return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); | ||
55 | } | 54 | } |
@@ -458,2 +457,7 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
458 | { | 457 | { |
458 | if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) | ||
459 | return; | ||
460 | |||
461 | if (ctx->page.status) | ||
462 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); | ||
459 | if (ctx->page.mimetype && ctx->page.charset) | 463 | if (ctx->page.mimetype && ctx->page.charset) |
@@ -470,3 +474,7 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
470 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 474 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
475 | if (ctx->page.etag) | ||
476 | htmlf("ETag: \"%s\"\n", ctx->page.etag); | ||
471 | html("\n"); | 477 | html("\n"); |
478 | if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) | ||
479 | exit(0); | ||
472 | } | 480 | } |
@@ -475,2 +483,8 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
475 | { | 483 | { |
484 | if (ctx->cfg.embedded) { | ||
485 | if (ctx->cfg.header) | ||
486 | html_include(ctx->cfg.header); | ||
487 | return; | ||
488 | } | ||
489 | |||
476 | char *host = cgit_hosturl(); | 490 | char *host = cgit_hosturl(); |
@@ -494,3 +508,4 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
494 | if (host && ctx->repo) { | 508 | if (host && ctx->repo) { |
495 | html("<link rel='alternate' title='Atom feed' href='http://"); | 509 | html("<link rel='alternate' title='Atom feed' href='"); |
510 | html(cgit_httpscheme()); | ||
496 | html_attr(cgit_hosturl()); | 511 | html_attr(cgit_hosturl()); |
@@ -498,4 +513,6 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
498 | fmt("h=%s", ctx->qry.head))); | 513 | fmt("h=%s", ctx->qry.head))); |
499 | html("' type='application/atom+xml'/>"); | 514 | html("' type='application/atom+xml'/>\n"); |
500 | } | 515 | } |
516 | if (ctx->cfg.head_include) | ||
517 | html_include(ctx->cfg.head_include); | ||
501 | html("</head>\n"); | 518 | html("</head>\n"); |
@@ -508,3 +525,9 @@ void cgit_print_docend() | |||
508 | { | 525 | { |
509 | html("</div>"); | 526 | html("</div> <!-- class=content -->\n"); |
527 | if (ctx.cfg.embedded) { | ||
528 | html("</div> <!-- id=cgit -->\n"); | ||
529 | if (ctx.cfg.footer) | ||
530 | html_include(ctx.cfg.footer); | ||
531 | return; | ||
532 | } | ||
510 | if (ctx.cfg.footer) | 533 | if (ctx.cfg.footer) |
@@ -517,2 +540,3 @@ void cgit_print_docend() | |||
517 | } | 540 | } |
541 | html("</div> <!-- id=cgit -->\n"); | ||
518 | html("</body>\n</html>\n"); | 542 | html("</body>\n</html>\n"); |
@@ -604,9 +628,4 @@ char *hc(struct cgit_cmd *cmd, const char *page) | |||
604 | 628 | ||
605 | void cgit_print_pageheader(struct cgit_context *ctx) | 629 | static void print_header(struct cgit_context *ctx) |
606 | { | 630 | { |
607 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | ||
608 | |||
609 | if (!cmd && ctx->repo) | ||
610 | fallback_cmd = "summary"; | ||
611 | |||
612 | html("<table id='header'>\n"); | 631 | html("<table id='header'>\n"); |
@@ -654,2 +673,14 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
654 | html("</td></tr></table>\n"); | 673 | html("</td></tr></table>\n"); |
674 | } | ||
675 | |||
676 | void cgit_print_pageheader(struct cgit_context *ctx) | ||
677 | { | ||
678 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | ||
679 | |||
680 | if (!cmd && ctx->repo) | ||
681 | fallback_cmd = "summary"; | ||
682 | |||
683 | html("<div id='cgit'>"); | ||
684 | if (!ctx->cfg.noheader) | ||
685 | print_header(ctx); | ||
655 | 686 | ||