From: Lars Hjemli Date: Tue, 18 Aug 2009 11:14:11 +0000 (+0200) Subject: Merge branch 'stable' X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/73b54f7d7e21fbb15c50e21eafe1737df96b2073?hp=-c Merge branch 'stable' --- 73b54f7d7e21fbb15c50e21eafe1737df96b2073 diff --combined ui-shared.c index cf06511,40060ba..07d5dd4 --- a/ui-shared.c +++ b/ui-shared.c @@@ -34,23 -34,24 +34,23 @@@ void cgit_print_error(char *msg html("\n"); } -char *cgit_hosturl() +char *cgit_httpscheme() { - char *host, *port; + if (ctx.env.https && !strcmp(ctx.env.https, "on")) + return "https://"; + else + return "http://"; +} - 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; +char *cgit_hosturl() +{ + 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() @@@ -455,11 -456,6 +455,11 @@@ void cgit_print_age(time_t t, time_t ma void cgit_print_http_headers(struct cgit_context *ctx) { + 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); if (ctx->page.mimetype && ctx->page.charset) htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, ctx->page.charset); @@@ -472,21 -468,11 +472,21 @@@ ctx->page.filename); htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); htmlf("Expires: %s\n", http_date(ctx->page.expires)); + if (ctx->page.etag) + htmlf("ETag: \"%s\"\n", ctx->page.etag); html("\n"); + 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"); @@@ -506,15 -492,12 +506,15 @@@ html("'/>\n"); } if (host && ctx->repo) { - html(""); + html("' type='application/atom+xml'/>\n"); } + if (ctx->cfg.head_include) + html_include(ctx->cfg.head_include); html("\n"); html("\n"); if (ctx->cfg.header) @@@ -523,13 -506,7 +523,13 @@@ 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 { @@@ -538,7 -515,6 +538,7 @@@ cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); html("\n"); } + html(" \n"); html("\n\n"); } @@@ -626,18 -602,26 +626,21 @@@ char *hc(struct cgit_cmd *cmd, const ch 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) {