X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/542f6a433034935a1aa895f7ef3273968915a5d1..6445a3ad0987ba66eef555c9caa3fc378f99ee22:/ui-shared.c diff --git a/ui-shared.c b/ui-shared.c index 66d5b82..07d5dd4 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -36,10 +36,7 @@ void cgit_print_error(char *msg) char *cgit_httpscheme() { - char *https; - - https = getenv("HTTPS"); - if (https != NULL && strcmp(https, "on") == 0) + if (ctx.env.https && !strcmp(ctx.env.https, "on")) return "https://"; else return "http://"; @@ -47,22 +44,13 @@ char *cgit_httpscheme() char *cgit_hosturl() { - char *host, *port; - - host = getenv("HTTP_HOST"); - if (host) { - host = xstrdup(host); - } else { - host = getenv("SERVER_NAME"); - if (!host) - return NULL; - port = getenv("SERVER_PORT"); - if (port && atoi(port) != 80) - host = xstrdup(fmt("%s:%d", host, atoi(port))); - else - host = xstrdup(host); - } - return host; + if (ctx.env.http_host) + return ctx.env.http_host; + if (!ctx.env.server_name) + return NULL; + if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80) + return ctx.env.server_name; + return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); } char *cgit_rooturl() @@ -467,7 +455,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) void cgit_print_http_headers(struct cgit_context *ctx) { - const char *method = getenv("REQUEST_METHOD"); + if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) + return; if (ctx->page.status) htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); @@ -486,12 +475,18 @@ void cgit_print_http_headers(struct cgit_context *ctx) if (ctx->page.etag) htmlf("ETag: \"%s\"\n", ctx->page.etag); html("\n"); - if (method && !strcmp(method, "HEAD")) + if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) exit(0); } void cgit_print_docstart(struct cgit_context *ctx) { + if (ctx->cfg.embedded) { + if (ctx->cfg.header) + html_include(ctx->cfg.header); + return; + } + char *host = cgit_hosturl(); html(cgit_doctype); html("\n"); @@ -528,7 +523,13 @@ void cgit_print_docstart(struct cgit_context *ctx) void cgit_print_docend() { - html(""); + html(" \n"); + if (ctx.cfg.embedded) { + html(" \n"); + if (ctx.cfg.footer) + html_include(ctx.cfg.footer); + return; + } if (ctx.cfg.footer) html_include(ctx.cfg.footer); else { @@ -537,6 +538,7 @@ void cgit_print_docend() cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); html("\n"); } + html(" \n"); html("\n\n"); } @@ -624,23 +626,21 @@ char *hc(struct cgit_cmd *cmd, const char *page) return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); } -void cgit_print_pageheader(struct cgit_context *ctx) +static void print_header(struct cgit_context *ctx) { - struct cgit_cmd *cmd = cgit_get_cmd(ctx); - - if (!cmd && ctx->repo) - fallback_cmd = "summary"; - html("\n"); html("\n"); - html("\n"); + + if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { + html("\n"); + } html("\n"); +} + +void cgit_print_pageheader(struct cgit_context *ctx) +{ + struct cgit_cmd *cmd = cgit_get_cmd(ctx); + + if (!cmd && ctx->repo) + fallback_cmd = "summary"; + + html("

"); + if (!ctx->cfg.noheader) + print_header(ctx); html("

\n"); if (ctx->repo) {