| author | Lars Hjemli <hjemli@gmail.com> | 2008-08-06 07:50:10 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2008-08-06 07:50:10 (UTC) |
| commit | e352a013aed6e925a10a92916500c7deccf1410a (patch) (unidiff) | |
| tree | 7c49bf453bee4f624025d62bae92b4926bf83bfe /ui-shared.c | |
| parent | 3c71f597cc932992d5c44196e90f4675a1d54e77 (diff) | |
| parent | b2a3d31e8839b53a623b4c99124c2c637d0e3cbb (diff) | |
| download | cgit-e352a013aed6e925a10a92916500c7deccf1410a.zip cgit-e352a013aed6e925a10a92916500c7deccf1410a.tar.gz cgit-e352a013aed6e925a10a92916500c7deccf1410a.tar.bz2 | |
Merge branch 'lh/atom'
| -rw-r--r-- | ui-shared.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index 197ee37..37c60b2 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -33,8 +33,23 @@ void cgit_print_error(char *msg) | |||
| 33 | html_txt(msg); | 33 | html_txt(msg); |
| 34 | html("</div>\n"); | 34 | html("</div>\n"); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | char *cgit_hosturl() | ||
| 38 | { | ||
| 39 | char *host, *port; | ||
| 40 | |||
| 41 | host = getenv("SERVER_NAME"); | ||
| 42 | if (!host) | ||
| 43 | return NULL; | ||
| 44 | port = getenv("SERVER_PORT"); | ||
| 45 | if (port && atoi(port) != 80) | ||
| 46 | host = xstrdup(fmt("%s:%d", host, atoi(port))); | ||
| 47 | else | ||
| 48 | host = xstrdup(host); | ||
| 49 | return host; | ||
| 50 | } | ||
| 51 | |||
| 37 | char *cgit_rooturl() | 52 | char *cgit_rooturl() |
| 38 | { | 53 | { |
| 39 | if (ctx.cfg.virtual_root) | 54 | if (ctx.cfg.virtual_root) |
| 40 | return fmt("%s/", ctx.cfg.virtual_root); | 55 | return fmt("%s/", ctx.cfg.virtual_root); |
| @@ -427,8 +442,9 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
| 427 | } | 442 | } |
| 428 | 443 | ||
| 429 | void cgit_print_docstart(struct cgit_context *ctx) | 444 | void cgit_print_docstart(struct cgit_context *ctx) |
| 430 | { | 445 | { |
| 446 | char *host = cgit_hosturl(); | ||
| 431 | html(cgit_doctype); | 447 | html(cgit_doctype); |
| 432 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 448 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
| 433 | html("<head>\n"); | 449 | html("<head>\n"); |
| 434 | html("<title>"); | 450 | html("<title>"); |
| @@ -444,8 +460,15 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
| 444 | html("<link rel='shortcut icon' href='"); | 460 | html("<link rel='shortcut icon' href='"); |
| 445 | html_attr(ctx->cfg.favicon); | 461 | html_attr(ctx->cfg.favicon); |
| 446 | html("'/>\n"); | 462 | html("'/>\n"); |
| 447 | } | 463 | } |
| 464 | if (host && ctx->repo) { | ||
| 465 | html("<link rel='alternate' title='Atom feed' href='http://"); | ||
| 466 | html_attr(cgit_hosturl()); | ||
| 467 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | ||
| 468 | fmt("h=%s", ctx->qry.head))); | ||
| 469 | html("' type='application/atom+xml'/>"); | ||
| 470 | } | ||
| 448 | html("</head>\n"); | 471 | html("</head>\n"); |
| 449 | html("<body>\n"); | 472 | html("<body>\n"); |
| 450 | } | 473 | } |
| 451 | 474 | ||