author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 09:40:25 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 09:41:06 (UTC) |
commit | fbe091a716447be496519ce439451d36d5b9fc24 (patch) (unidiff) | |
tree | c6560c6f2ab6b4760ac6eaecda1759321da2746e /ui-shared.c | |
parent | e429fb0cca1e8c78da0ec38fe578bafdeec65534 (diff) | |
parent | 694dd43886f23723f415aed3afb62131cdbcaa51 (diff) | |
download | cgit-fbe091a716447be496519ce439451d36d5b9fc24.zip cgit-fbe091a716447be496519ce439451d36d5b9fc24.tar.gz cgit-fbe091a716447be496519ce439451d36d5b9fc24.tar.bz2 |
Merge branch 'do/https'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 2630f23..29036d0 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -13,48 +13,59 @@ | |||
13 | const char cgit_doctype[] = | 13 | const char cgit_doctype[] = |
14 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" | 14 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" |
15 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; | 15 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; |
16 | 16 | ||
17 | static char *http_date(time_t t) | 17 | static char *http_date(time_t t) |
18 | { | 18 | { |
19 | static char day[][4] = | 19 | static char day[][4] = |
20 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; | 20 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; |
21 | static char month[][4] = | 21 | static char month[][4] = |
22 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", | 22 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", |
23 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; | 23 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; |
24 | struct tm *tm = gmtime(&t); | 24 | struct tm *tm = gmtime(&t); |
25 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], | 25 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], |
26 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, | 26 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, |
27 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 27 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
28 | } | 28 | } |
29 | 29 | ||
30 | void cgit_print_error(char *msg) | 30 | void cgit_print_error(char *msg) |
31 | { | 31 | { |
32 | html("<div class='error'>"); | 32 | html("<div class='error'>"); |
33 | html_txt(msg); | 33 | html_txt(msg); |
34 | html("</div>\n"); | 34 | html("</div>\n"); |
35 | } | 35 | } |
36 | 36 | ||
37 | char *cgit_httpscheme() | ||
38 | { | ||
39 | char *https; | ||
40 | |||
41 | https = getenv("HTTPS"); | ||
42 | if (https != NULL && strcmp(https, "on") == 0) | ||
43 | return "https://"; | ||
44 | else | ||
45 | return "http://"; | ||
46 | } | ||
47 | |||
37 | char *cgit_hosturl() | 48 | char *cgit_hosturl() |
38 | { | 49 | { |
39 | char *host, *port; | 50 | char *host, *port; |
40 | 51 | ||
41 | host = getenv("HTTP_HOST"); | 52 | host = getenv("HTTP_HOST"); |
42 | if (host) { | 53 | if (host) { |
43 | host = xstrdup(host); | 54 | host = xstrdup(host); |
44 | } else { | 55 | } else { |
45 | host = getenv("SERVER_NAME"); | 56 | host = getenv("SERVER_NAME"); |
46 | if (!host) | 57 | if (!host) |
47 | return NULL; | 58 | return NULL; |
48 | port = getenv("SERVER_PORT"); | 59 | port = getenv("SERVER_PORT"); |
49 | if (port && atoi(port) != 80) | 60 | if (port && atoi(port) != 80) |
50 | host = xstrdup(fmt("%s:%d", host, atoi(port))); | 61 | host = xstrdup(fmt("%s:%d", host, atoi(port))); |
51 | else | 62 | else |
52 | host = xstrdup(host); | 63 | host = xstrdup(host); |
53 | } | 64 | } |
54 | return host; | 65 | return host; |
55 | } | 66 | } |
56 | 67 | ||
57 | char *cgit_rooturl() | 68 | char *cgit_rooturl() |
58 | { | 69 | { |
59 | if (ctx.cfg.virtual_root) | 70 | if (ctx.cfg.virtual_root) |
60 | return fmt("%s/", ctx.cfg.virtual_root); | 71 | return fmt("%s/", ctx.cfg.virtual_root); |
@@ -473,49 +484,50 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
473 | html("\n"); | 484 | html("\n"); |
474 | } | 485 | } |
475 | 486 | ||
476 | void cgit_print_docstart(struct cgit_context *ctx) | 487 | void cgit_print_docstart(struct cgit_context *ctx) |
477 | { | 488 | { |
478 | char *host = cgit_hosturl(); | 489 | char *host = cgit_hosturl(); |
479 | html(cgit_doctype); | 490 | html(cgit_doctype); |
480 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 491 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
481 | html("<head>\n"); | 492 | html("<head>\n"); |
482 | html("<title>"); | 493 | html("<title>"); |
483 | html_txt(ctx->page.title); | 494 | html_txt(ctx->page.title); |
484 | html("</title>\n"); | 495 | html("</title>\n"); |
485 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 496 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
486 | if (ctx->cfg.robots && *ctx->cfg.robots) | 497 | if (ctx->cfg.robots && *ctx->cfg.robots) |
487 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 498 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
488 | html("<link rel='stylesheet' type='text/css' href='"); | 499 | html("<link rel='stylesheet' type='text/css' href='"); |
489 | html_attr(ctx->cfg.css); | 500 | html_attr(ctx->cfg.css); |
490 | html("'/>\n"); | 501 | html("'/>\n"); |
491 | if (ctx->cfg.favicon) { | 502 | if (ctx->cfg.favicon) { |
492 | html("<link rel='shortcut icon' href='"); | 503 | html("<link rel='shortcut icon' href='"); |
493 | html_attr(ctx->cfg.favicon); | 504 | html_attr(ctx->cfg.favicon); |
494 | html("'/>\n"); | 505 | html("'/>\n"); |
495 | } | 506 | } |
496 | if (host && ctx->repo) { | 507 | if (host && ctx->repo) { |
497 | html("<link rel='alternate' title='Atom feed' href='http://"); | 508 | html("<link rel='alternate' title='Atom feed' href='"); |
509 | html(cgit_httpscheme()); | ||
498 | html_attr(cgit_hosturl()); | 510 | html_attr(cgit_hosturl()); |
499 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 511 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
500 | fmt("h=%s", ctx->qry.head))); | 512 | fmt("h=%s", ctx->qry.head))); |
501 | html("' type='application/atom+xml'/>"); | 513 | html("' type='application/atom+xml'/>"); |
502 | } | 514 | } |
503 | html("</head>\n"); | 515 | html("</head>\n"); |
504 | html("<body>\n"); | 516 | html("<body>\n"); |
505 | if (ctx->cfg.header) | 517 | if (ctx->cfg.header) |
506 | html_include(ctx->cfg.header); | 518 | html_include(ctx->cfg.header); |
507 | } | 519 | } |
508 | 520 | ||
509 | void cgit_print_docend() | 521 | void cgit_print_docend() |
510 | { | 522 | { |
511 | html("</div>"); | 523 | html("</div>"); |
512 | if (ctx.cfg.footer) | 524 | if (ctx.cfg.footer) |
513 | html_include(ctx.cfg.footer); | 525 | html_include(ctx.cfg.footer); |
514 | else { | 526 | else { |
515 | htmlf("<div class='footer'>generated by cgit %s at ", | 527 | htmlf("<div class='footer'>generated by cgit %s at ", |
516 | cgit_version); | 528 | cgit_version); |
517 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 529 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
518 | html("</div>\n"); | 530 | html("</div>\n"); |
519 | } | 531 | } |
520 | html("</body>\n</html>\n"); | 532 | html("</body>\n</html>\n"); |
521 | } | 533 | } |