-rw-r--r-- | ui-shared.c | 81 |
1 files changed, 56 insertions, 25 deletions
diff --git a/ui-shared.c b/ui-shared.c index 40060ba..07d5dd4 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -21,50 +21,49 @@ static char *http_date(time_t t) | |||
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_hosturl() | 37 | char *cgit_httpscheme() |
38 | { | 38 | { |
39 | char *host, *port; | 39 | if (ctx.env.https && !strcmp(ctx.env.https, "on")) |
40 | return "https://"; | ||
41 | else | ||
42 | return "http://"; | ||
43 | } | ||
40 | 44 | ||
41 | host = getenv("HTTP_HOST"); | 45 | char *cgit_hosturl() |
42 | if (host) { | 46 | { |
43 | host = xstrdup(host); | 47 | if (ctx.env.http_host) |
44 | } else { | 48 | return ctx.env.http_host; |
45 | host = getenv("SERVER_NAME"); | 49 | if (!ctx.env.server_name) |
46 | if (!host) | 50 | return NULL; |
47 | return NULL; | 51 | if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80) |
48 | port = getenv("SERVER_PORT"); | 52 | return ctx.env.server_name; |
49 | if (port && atoi(port) != 80) | 53 | return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); |
50 | host = xstrdup(fmt("%s:%d", host, atoi(port))); | ||
51 | else | ||
52 | host = xstrdup(host); | ||
53 | } | ||
54 | return host; | ||
55 | } | 54 | } |
56 | 55 | ||
57 | char *cgit_rooturl() | 56 | char *cgit_rooturl() |
58 | { | 57 | { |
59 | if (ctx.cfg.virtual_root) | 58 | if (ctx.cfg.virtual_root) |
60 | return fmt("%s/", ctx.cfg.virtual_root); | 59 | return fmt("%s/", ctx.cfg.virtual_root); |
61 | else | 60 | else |
62 | return ctx.cfg.script_name; | 61 | return ctx.cfg.script_name; |
63 | } | 62 | } |
64 | 63 | ||
65 | char *cgit_repourl(const char *reponame) | 64 | char *cgit_repourl(const char *reponame) |
66 | { | 65 | { |
67 | if (ctx.cfg.virtual_root) { | 66 | if (ctx.cfg.virtual_root) { |
68 | return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); | 67 | return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); |
69 | } else { | 68 | } else { |
70 | return fmt("?r=%s", reponame); | 69 | return fmt("?r=%s", reponame); |
@@ -443,91 +442,116 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
443 | if (secs < TM_MONTH * 2) { | 442 | if (secs < TM_MONTH * 2) { |
444 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 443 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
445 | secs * 1.0 / TM_WEEK); | 444 | secs * 1.0 / TM_WEEK); |
446 | return; | 445 | return; |
447 | } | 446 | } |
448 | if (secs < TM_YEAR * 2) { | 447 | if (secs < TM_YEAR * 2) { |
449 | htmlf("<span class='age-months'>%.0f months</span>", | 448 | htmlf("<span class='age-months'>%.0f months</span>", |
450 | secs * 1.0 / TM_MONTH); | 449 | secs * 1.0 / TM_MONTH); |
451 | return; | 450 | return; |
452 | } | 451 | } |
453 | htmlf("<span class='age-years'>%.0f years</span>", | 452 | htmlf("<span class='age-years'>%.0f years</span>", |
454 | secs * 1.0 / TM_YEAR); | 453 | secs * 1.0 / TM_YEAR); |
455 | } | 454 | } |
456 | 455 | ||
457 | void cgit_print_http_headers(struct cgit_context *ctx) | 456 | 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) |
460 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 464 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
461 | ctx->page.charset); | 465 | ctx->page.charset); |
462 | else if (ctx->page.mimetype) | 466 | else if (ctx->page.mimetype) |
463 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 467 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
464 | if (ctx->page.size) | 468 | if (ctx->page.size) |
465 | htmlf("Content-Length: %ld\n", ctx->page.size); | 469 | htmlf("Content-Length: %ld\n", ctx->page.size); |
466 | if (ctx->page.filename) | 470 | if (ctx->page.filename) |
467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 471 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
468 | ctx->page.filename); | 472 | ctx->page.filename); |
469 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 473 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
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 | } |
473 | 481 | ||
474 | void cgit_print_docstart(struct cgit_context *ctx) | 482 | 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(); |
477 | html(cgit_doctype); | 491 | html(cgit_doctype); |
478 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 492 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
479 | html("<head>\n"); | 493 | html("<head>\n"); |
480 | html("<title>"); | 494 | html("<title>"); |
481 | html_txt(ctx->page.title); | 495 | html_txt(ctx->page.title); |
482 | html("</title>\n"); | 496 | html("</title>\n"); |
483 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 497 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
484 | if (ctx->cfg.robots && *ctx->cfg.robots) | 498 | if (ctx->cfg.robots && *ctx->cfg.robots) |
485 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 499 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
486 | html("<link rel='stylesheet' type='text/css' href='"); | 500 | html("<link rel='stylesheet' type='text/css' href='"); |
487 | html_attr(ctx->cfg.css); | 501 | html_attr(ctx->cfg.css); |
488 | html("'/>\n"); | 502 | html("'/>\n"); |
489 | if (ctx->cfg.favicon) { | 503 | if (ctx->cfg.favicon) { |
490 | html("<link rel='shortcut icon' href='"); | 504 | html("<link rel='shortcut icon' href='"); |
491 | html_attr(ctx->cfg.favicon); | 505 | html_attr(ctx->cfg.favicon); |
492 | html("'/>\n"); | 506 | html("'/>\n"); |
493 | } | 507 | } |
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()); |
497 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 512 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
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"); |
502 | html("<body>\n"); | 519 | html("<body>\n"); |
503 | if (ctx->cfg.header) | 520 | if (ctx->cfg.header) |
504 | html_include(ctx->cfg.header); | 521 | html_include(ctx->cfg.header); |
505 | } | 522 | } |
506 | 523 | ||
507 | void cgit_print_docend() | 524 | 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) |
511 | html_include(ctx.cfg.footer); | 534 | html_include(ctx.cfg.footer); |
512 | else { | 535 | else { |
513 | htmlf("<div class='footer'>generated by cgit %s at ", | 536 | htmlf("<div class='footer'>generated by cgit %s at ", |
514 | cgit_version); | 537 | cgit_version); |
515 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 538 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
516 | html("</div>\n"); | 539 | html("</div>\n"); |
517 | } | 540 | } |
541 | html("</div> <!-- id=cgit -->\n"); | ||
518 | html("</body>\n</html>\n"); | 542 | html("</body>\n</html>\n"); |
519 | } | 543 | } |
520 | 544 | ||
521 | int print_branch_option(const char *refname, const unsigned char *sha1, | 545 | int print_branch_option(const char *refname, const unsigned char *sha1, |
522 | int flags, void *cb_data) | 546 | int flags, void *cb_data) |
523 | { | 547 | { |
524 | char *name = (char *)refname; | 548 | char *name = (char *)refname; |
525 | html_option(name, name, ctx.qry.head); | 549 | html_option(name, name, ctx.qry.head); |
526 | return 0; | 550 | return 0; |
527 | } | 551 | } |
528 | 552 | ||
529 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 553 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
530 | int flags, void *cb_data) | 554 | int flags, void *cb_data) |
531 | { | 555 | { |
532 | struct tag *tag; | 556 | struct tag *tag; |
533 | struct taginfo *info; | 557 | struct taginfo *info; |
@@ -589,39 +613,34 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
589 | 613 | ||
590 | if (incl_search) { | 614 | if (incl_search) { |
591 | if (ctx.qry.grep) | 615 | if (ctx.qry.grep) |
592 | html_hidden("qt", ctx.qry.grep); | 616 | html_hidden("qt", ctx.qry.grep); |
593 | if (ctx.qry.search) | 617 | if (ctx.qry.search) |
594 | html_hidden("q", ctx.qry.search); | 618 | html_hidden("q", ctx.qry.search); |
595 | } | 619 | } |
596 | } | 620 | } |
597 | 621 | ||
598 | const char *fallback_cmd = "repolist"; | 622 | const char *fallback_cmd = "repolist"; |
599 | 623 | ||
600 | char *hc(struct cgit_cmd *cmd, const char *page) | 624 | char *hc(struct cgit_cmd *cmd, const char *page) |
601 | { | 625 | { |
602 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); | 626 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); |
603 | } | 627 | } |
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"); |
613 | html("<tr>\n"); | 632 | html("<tr>\n"); |
614 | 633 | ||
615 | if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { | 634 | if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { |
616 | html("<td class='logo' rowspan='2'><a href='"); | 635 | html("<td class='logo' rowspan='2'><a href='"); |
617 | if (ctx->cfg.logo_link) | 636 | if (ctx->cfg.logo_link) |
618 | html_attr(ctx->cfg.logo_link); | 637 | html_attr(ctx->cfg.logo_link); |
619 | else | 638 | else |
620 | html_attr(cgit_rooturl()); | 639 | html_attr(cgit_rooturl()); |
621 | html("'><img src='"); | 640 | html("'><img src='"); |
622 | html_attr(ctx->cfg.logo); | 641 | html_attr(ctx->cfg.logo); |
623 | html("' alt='cgit logo'/></a></td>\n"); | 642 | html("' alt='cgit logo'/></a></td>\n"); |
624 | } | 643 | } |
625 | 644 | ||
626 | html("<td class='main'>"); | 645 | html("<td class='main'>"); |
627 | if (ctx->repo) { | 646 | if (ctx->repo) { |
@@ -639,32 +658,44 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
639 | } else | 658 | } else |
640 | html_txt(ctx->cfg.root_title); | 659 | html_txt(ctx->cfg.root_title); |
641 | html("</td></tr>\n"); | 660 | html("</td></tr>\n"); |
642 | 661 | ||
643 | html("<tr><td class='sub'>"); | 662 | html("<tr><td class='sub'>"); |
644 | if (ctx->repo) { | 663 | if (ctx->repo) { |
645 | html_txt(ctx->repo->desc); | 664 | html_txt(ctx->repo->desc); |
646 | html("</td><td class='sub right'>"); | 665 | html("</td><td class='sub right'>"); |
647 | html_txt(ctx->repo->owner); | 666 | html_txt(ctx->repo->owner); |
648 | } else { | 667 | } else { |
649 | if (ctx->cfg.root_desc) | 668 | if (ctx->cfg.root_desc) |
650 | html_txt(ctx->cfg.root_desc); | 669 | html_txt(ctx->cfg.root_desc); |
651 | else if (ctx->cfg.index_info) | 670 | else if (ctx->cfg.index_info) |
652 | html_include(ctx->cfg.index_info); | 671 | html_include(ctx->cfg.index_info); |
653 | } | 672 | } |
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 | ||
656 | html("<table class='tabs'><tr><td>\n"); | 687 | html("<table class='tabs'><tr><td>\n"); |
657 | if (ctx->repo) { | 688 | if (ctx->repo) { |
658 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 689 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
659 | ctx->qry.head); | 690 | ctx->qry.head); |
660 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 691 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
661 | ctx->qry.sha1, NULL); | 692 | ctx->qry.sha1, NULL); |
662 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 693 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
663 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 694 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
664 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 695 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
665 | ctx->qry.sha1, NULL); | 696 | ctx->qry.sha1, NULL); |
666 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 697 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
667 | ctx->qry.head, ctx->qry.sha1); | 698 | ctx->qry.head, ctx->qry.sha1); |
668 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 699 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
669 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 700 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
670 | if (ctx->repo->max_stats) | 701 | if (ctx->repo->max_stats) |