summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-06-26 11:53:30 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-06-26 11:53:30 (UTC)
commitde5e9281719809c5b07051faa88e95bd16e8d485 (patch) (unidiff)
tree30c6f6bc74c067ebad78e45e5602011006332f8b
parent29b37e9781ce1bb04e558c7490d2c29eb1a477e5 (diff)
downloadcgit-de5e9281719809c5b07051faa88e95bd16e8d485.zip
cgit-de5e9281719809c5b07051faa88e95bd16e8d485.tar.gz
cgit-de5e9281719809c5b07051faa88e95bd16e8d485.tar.bz2
Add support for including a footer on all pages
The new cgitrc option `footer` can be used to include a html-file which replaces the standard 'generated by cgit' message at the bottom of each page. Suggested-by: Peter Danenberg <pcd@wikitex.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--ui-shared.c14
3 files changed, 13 insertions, 4 deletions
diff --git a/cgit.c b/cgit.c
index 0deae12..8f154c9 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,75 +1,77 @@
1/* cgit.c: cgi for the git scm 1/* cgit.c: cgi for the git scm
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "cache.h" 10#include "cache.h"
11#include "cmd.h" 11#include "cmd.h"
12#include "configfile.h" 12#include "configfile.h"
13#include "html.h" 13#include "html.h"
14#include "ui-shared.h" 14#include "ui-shared.h"
15 15
16const char *cgit_version = CGIT_VERSION; 16const char *cgit_version = CGIT_VERSION;
17 17
18void config_cb(const char *name, const char *value) 18void config_cb(const char *name, const char *value)
19{ 19{
20 if (!strcmp(name, "root-title")) 20 if (!strcmp(name, "root-title"))
21 ctx.cfg.root_title = xstrdup(value); 21 ctx.cfg.root_title = xstrdup(value);
22 else if (!strcmp(name, "root-desc")) 22 else if (!strcmp(name, "root-desc"))
23 ctx.cfg.root_desc = xstrdup(value); 23 ctx.cfg.root_desc = xstrdup(value);
24 else if (!strcmp(name, "root-readme")) 24 else if (!strcmp(name, "root-readme"))
25 ctx.cfg.root_readme = xstrdup(value); 25 ctx.cfg.root_readme = xstrdup(value);
26 else if (!strcmp(name, "css")) 26 else if (!strcmp(name, "css"))
27 ctx.cfg.css = xstrdup(value); 27 ctx.cfg.css = xstrdup(value);
28 else if (!strcmp(name, "footer"))
29 ctx.cfg.footer = xstrdup(value);
28 else if (!strcmp(name, "logo")) 30 else if (!strcmp(name, "logo"))
29 ctx.cfg.logo = xstrdup(value); 31 ctx.cfg.logo = xstrdup(value);
30 else if (!strcmp(name, "index-header")) 32 else if (!strcmp(name, "index-header"))
31 ctx.cfg.index_header = xstrdup(value); 33 ctx.cfg.index_header = xstrdup(value);
32 else if (!strcmp(name, "index-info")) 34 else if (!strcmp(name, "index-info"))
33 ctx.cfg.index_info = xstrdup(value); 35 ctx.cfg.index_info = xstrdup(value);
34 else if (!strcmp(name, "logo-link")) 36 else if (!strcmp(name, "logo-link"))
35 ctx.cfg.logo_link = xstrdup(value); 37 ctx.cfg.logo_link = xstrdup(value);
36 else if (!strcmp(name, "module-link")) 38 else if (!strcmp(name, "module-link"))
37 ctx.cfg.module_link = xstrdup(value); 39 ctx.cfg.module_link = xstrdup(value);
38 else if (!strcmp(name, "virtual-root")) { 40 else if (!strcmp(name, "virtual-root")) {
39 ctx.cfg.virtual_root = trim_end(value, '/'); 41 ctx.cfg.virtual_root = trim_end(value, '/');
40 if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) 42 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
41 ctx.cfg.virtual_root = ""; 43 ctx.cfg.virtual_root = "";
42 } else if (!strcmp(name, "nocache")) 44 } else if (!strcmp(name, "nocache"))
43 ctx.cfg.nocache = atoi(value); 45 ctx.cfg.nocache = atoi(value);
44 else if (!strcmp(name, "snapshots")) 46 else if (!strcmp(name, "snapshots"))
45 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); 47 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
46 else if (!strcmp(name, "enable-index-links")) 48 else if (!strcmp(name, "enable-index-links"))
47 ctx.cfg.enable_index_links = atoi(value); 49 ctx.cfg.enable_index_links = atoi(value);
48 else if (!strcmp(name, "enable-log-filecount")) 50 else if (!strcmp(name, "enable-log-filecount"))
49 ctx.cfg.enable_log_filecount = atoi(value); 51 ctx.cfg.enable_log_filecount = atoi(value);
50 else if (!strcmp(name, "enable-log-linecount")) 52 else if (!strcmp(name, "enable-log-linecount"))
51 ctx.cfg.enable_log_linecount = atoi(value); 53 ctx.cfg.enable_log_linecount = atoi(value);
52 else if (!strcmp(name, "cache-size")) 54 else if (!strcmp(name, "cache-size"))
53 ctx.cfg.cache_size = atoi(value); 55 ctx.cfg.cache_size = atoi(value);
54 else if (!strcmp(name, "cache-root")) 56 else if (!strcmp(name, "cache-root"))
55 ctx.cfg.cache_root = xstrdup(value); 57 ctx.cfg.cache_root = xstrdup(value);
56 else if (!strcmp(name, "cache-root-ttl")) 58 else if (!strcmp(name, "cache-root-ttl"))
57 ctx.cfg.cache_root_ttl = atoi(value); 59 ctx.cfg.cache_root_ttl = atoi(value);
58 else if (!strcmp(name, "cache-repo-ttl")) 60 else if (!strcmp(name, "cache-repo-ttl"))
59 ctx.cfg.cache_repo_ttl = atoi(value); 61 ctx.cfg.cache_repo_ttl = atoi(value);
60 else if (!strcmp(name, "cache-static-ttl")) 62 else if (!strcmp(name, "cache-static-ttl"))
61 ctx.cfg.cache_static_ttl = atoi(value); 63 ctx.cfg.cache_static_ttl = atoi(value);
62 else if (!strcmp(name, "cache-dynamic-ttl")) 64 else if (!strcmp(name, "cache-dynamic-ttl"))
63 ctx.cfg.cache_dynamic_ttl = atoi(value); 65 ctx.cfg.cache_dynamic_ttl = atoi(value);
64 else if (!strcmp(name, "max-message-length")) 66 else if (!strcmp(name, "max-message-length"))
65 ctx.cfg.max_msg_len = atoi(value); 67 ctx.cfg.max_msg_len = atoi(value);
66 else if (!strcmp(name, "max-repodesc-length")) 68 else if (!strcmp(name, "max-repodesc-length"))
67 ctx.cfg.max_repodesc_len = atoi(value); 69 ctx.cfg.max_repodesc_len = atoi(value);
68 else if (!strcmp(name, "max-repo-count")) 70 else if (!strcmp(name, "max-repo-count"))
69 ctx.cfg.max_repo_count = atoi(value); 71 ctx.cfg.max_repo_count = atoi(value);
70 else if (!strcmp(name, "max-commit-count")) 72 else if (!strcmp(name, "max-commit-count"))
71 ctx.cfg.max_commit_count = atoi(value); 73 ctx.cfg.max_commit_count = atoi(value);
72 else if (!strcmp(name, "summary-log")) 74 else if (!strcmp(name, "summary-log"))
73 ctx.cfg.summary_log = atoi(value); 75 ctx.cfg.summary_log = atoi(value);
74 else if (!strcmp(name, "summary-branches")) 76 else if (!strcmp(name, "summary-branches"))
75 ctx.cfg.summary_branches = atoi(value); 77 ctx.cfg.summary_branches = atoi(value);
diff --git a/cgit.h b/cgit.h
index 1972d75..d18d9ca 100644
--- a/cgit.h
+++ b/cgit.h
@@ -80,96 +80,97 @@ struct commitinfo {
80 char *msg; 80 char *msg;
81 char *msg_encoding; 81 char *msg_encoding;
82}; 82};
83 83
84struct taginfo { 84struct taginfo {
85 char *tagger; 85 char *tagger;
86 char *tagger_email; 86 char *tagger_email;
87 int tagger_date; 87 int tagger_date;
88 char *msg; 88 char *msg;
89}; 89};
90 90
91struct refinfo { 91struct refinfo {
92 const char *refname; 92 const char *refname;
93 struct object *object; 93 struct object *object;
94 union { 94 union {
95 struct taginfo *tag; 95 struct taginfo *tag;
96 struct commitinfo *commit; 96 struct commitinfo *commit;
97 }; 97 };
98}; 98};
99 99
100struct reflist { 100struct reflist {
101 struct refinfo **refs; 101 struct refinfo **refs;
102 int alloc; 102 int alloc;
103 int count; 103 int count;
104}; 104};
105 105
106struct cgit_query { 106struct cgit_query {
107 int has_symref; 107 int has_symref;
108 int has_sha1; 108 int has_sha1;
109 char *raw; 109 char *raw;
110 char *repo; 110 char *repo;
111 char *page; 111 char *page;
112 char *search; 112 char *search;
113 char *grep; 113 char *grep;
114 char *head; 114 char *head;
115 char *sha1; 115 char *sha1;
116 char *sha2; 116 char *sha2;
117 char *path; 117 char *path;
118 char *name; 118 char *name;
119 char *mimetype; 119 char *mimetype;
120 int ofs; 120 int ofs;
121}; 121};
122 122
123struct cgit_config { 123struct cgit_config {
124 char *agefile; 124 char *agefile;
125 char *cache_root; 125 char *cache_root;
126 char *clone_prefix; 126 char *clone_prefix;
127 char *css; 127 char *css;
128 char *footer;
128 char *index_header; 129 char *index_header;
129 char *index_info; 130 char *index_info;
130 char *logo; 131 char *logo;
131 char *logo_link; 132 char *logo_link;
132 char *module_link; 133 char *module_link;
133 char *repo_group; 134 char *repo_group;
134 char *robots; 135 char *robots;
135 char *root_title; 136 char *root_title;
136 char *root_desc; 137 char *root_desc;
137 char *root_readme; 138 char *root_readme;
138 char *script_name; 139 char *script_name;
139 char *virtual_root; 140 char *virtual_root;
140 int cache_size; 141 int cache_size;
141 int cache_dynamic_ttl; 142 int cache_dynamic_ttl;
142 int cache_max_create_time; 143 int cache_max_create_time;
143 int cache_repo_ttl; 144 int cache_repo_ttl;
144 int cache_root_ttl; 145 int cache_root_ttl;
145 int cache_static_ttl; 146 int cache_static_ttl;
146 int enable_index_links; 147 int enable_index_links;
147 int enable_log_filecount; 148 int enable_log_filecount;
148 int enable_log_linecount; 149 int enable_log_linecount;
149 int max_repo_count; 150 int max_repo_count;
150 int max_commit_count; 151 int max_commit_count;
151 int max_lock_attempts; 152 int max_lock_attempts;
152 int max_msg_len; 153 int max_msg_len;
153 int max_repodesc_len; 154 int max_repodesc_len;
154 int nocache; 155 int nocache;
155 int renamelimit; 156 int renamelimit;
156 int snapshots; 157 int snapshots;
157 int summary_branches; 158 int summary_branches;
158 int summary_log; 159 int summary_log;
159 int summary_tags; 160 int summary_tags;
160}; 161};
161 162
162struct cgit_page { 163struct cgit_page {
163 time_t modified; 164 time_t modified;
164 time_t expires; 165 time_t expires;
165 char *mimetype; 166 char *mimetype;
166 char *charset; 167 char *charset;
167 char *filename; 168 char *filename;
168 char *title; 169 char *title;
169}; 170};
170 171
171struct cgit_context { 172struct cgit_context {
172 struct cgit_query qry; 173 struct cgit_query qry;
173 struct cgit_config cfg; 174 struct cgit_config cfg;
174 struct cgit_repo *repo; 175 struct cgit_repo *repo;
175 struct cgit_page page; 176 struct cgit_page page;
diff --git a/ui-shared.c b/ui-shared.c
index cd98387..8a00099 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -398,100 +398,106 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
398 htmlf("<span class='age-weeks'>%.0f weeks</span>", 398 htmlf("<span class='age-weeks'>%.0f weeks</span>",
399 secs * 1.0 / TM_WEEK); 399 secs * 1.0 / TM_WEEK);
400 return; 400 return;
401 } 401 }
402 if (secs < TM_YEAR * 2) { 402 if (secs < TM_YEAR * 2) {
403 htmlf("<span class='age-months'>%.0f months</span>", 403 htmlf("<span class='age-months'>%.0f months</span>",
404 secs * 1.0 / TM_MONTH); 404 secs * 1.0 / TM_MONTH);
405 return; 405 return;
406 } 406 }
407 htmlf("<span class='age-years'>%.0f years</span>", 407 htmlf("<span class='age-years'>%.0f years</span>",
408 secs * 1.0 / TM_YEAR); 408 secs * 1.0 / TM_YEAR);
409} 409}
410 410
411void cgit_print_http_headers(struct cgit_context *ctx) 411void cgit_print_http_headers(struct cgit_context *ctx)
412{ 412{
413 if (ctx->page.mimetype && ctx->page.charset) 413 if (ctx->page.mimetype && ctx->page.charset)
414 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 414 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
415 ctx->page.charset); 415 ctx->page.charset);
416 else if (ctx->page.mimetype) 416 else if (ctx->page.mimetype)
417 htmlf("Content-Type: %s\n", ctx->page.mimetype); 417 htmlf("Content-Type: %s\n", ctx->page.mimetype);
418 if (ctx->page.filename) 418 if (ctx->page.filename)
419 htmlf("Content-Disposition: inline; filename=\"%s\"\n", 419 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
420 ctx->page.filename); 420 ctx->page.filename);
421 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 421 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
422 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 422 htmlf("Expires: %s\n", http_date(ctx->page.expires));
423 html("\n"); 423 html("\n");
424} 424}
425 425
426void cgit_print_docstart(struct cgit_context *ctx) 426void cgit_print_docstart(struct cgit_context *ctx)
427{ 427{
428 html(cgit_doctype); 428 html(cgit_doctype);
429 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 429 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
430 html("<head>\n"); 430 html("<head>\n");
431 html("<title>"); 431 html("<title>");
432 html_txt(ctx->page.title); 432 html_txt(ctx->page.title);
433 html("</title>\n"); 433 html("</title>\n");
434 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 434 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
435 if (ctx->cfg.robots && *ctx->cfg.robots) 435 if (ctx->cfg.robots && *ctx->cfg.robots)
436 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 436 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
437 html("<link rel='stylesheet' type='text/css' href='"); 437 html("<link rel='stylesheet' type='text/css' href='");
438 html_attr(ctx->cfg.css); 438 html_attr(ctx->cfg.css);
439 html("'/>\n"); 439 html("'/>\n");
440 html("</head>\n"); 440 html("</head>\n");
441 html("<body>\n"); 441 html("<body>\n");
442} 442}
443 443
444void cgit_print_docend() 444void cgit_print_docend()
445{ 445{
446 html("</div><div class='footer'>generated "); 446 html("</div>");
447 cgit_print_date(time(NULL), FMT_LONGDATE); 447 if (ctx.cfg.footer)
448 htmlf(" by cgit %s", cgit_version); 448 html_include(ctx.cfg.footer);
449 html("</div>\n</body>\n</html>\n"); 449 else {
450 html("<div class='footer'>generated ");
451 cgit_print_date(time(NULL), FMT_LONGDATE);
452 htmlf(" by cgit %s", cgit_version);
453 html("</div>\n");
454 }
455 html("</body>\n</html>\n");
450} 456}
451 457
452int print_branch_option(const char *refname, const unsigned char *sha1, 458int print_branch_option(const char *refname, const unsigned char *sha1,
453 int flags, void *cb_data) 459 int flags, void *cb_data)
454{ 460{
455 char *name = (char *)refname; 461 char *name = (char *)refname;
456 html_option(name, name, ctx.qry.head); 462 html_option(name, name, ctx.qry.head);
457 return 0; 463 return 0;
458} 464}
459 465
460int print_archive_ref(const char *refname, const unsigned char *sha1, 466int print_archive_ref(const char *refname, const unsigned char *sha1,
461 int flags, void *cb_data) 467 int flags, void *cb_data)
462{ 468{
463 struct tag *tag; 469 struct tag *tag;
464 struct taginfo *info; 470 struct taginfo *info;
465 struct object *obj; 471 struct object *obj;
466 char buf[256], *url; 472 char buf[256], *url;
467 unsigned char fileid[20]; 473 unsigned char fileid[20];
468 int *header = (int *)cb_data; 474 int *header = (int *)cb_data;
469 475
470 if (prefixcmp(refname, "refs/archives")) 476 if (prefixcmp(refname, "refs/archives"))
471 return 0; 477 return 0;
472 strncpy(buf, refname+14, sizeof(buf)); 478 strncpy(buf, refname+14, sizeof(buf));
473 obj = parse_object(sha1); 479 obj = parse_object(sha1);
474 if (!obj) 480 if (!obj)
475 return 1; 481 return 1;
476 if (obj->type == OBJ_TAG) { 482 if (obj->type == OBJ_TAG) {
477 tag = lookup_tag(sha1); 483 tag = lookup_tag(sha1);
478 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 484 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
479 return 0; 485 return 0;
480 hashcpy(fileid, tag->tagged->sha1); 486 hashcpy(fileid, tag->tagged->sha1);
481 } else if (obj->type != OBJ_BLOB) { 487 } else if (obj->type != OBJ_BLOB) {
482 return 0; 488 return 0;
483 } else { 489 } else {
484 hashcpy(fileid, sha1); 490 hashcpy(fileid, sha1);
485 } 491 }
486 if (!*header) { 492 if (!*header) {
487 html("<h1>download</h1>\n"); 493 html("<h1>download</h1>\n");
488 *header = 1; 494 *header = 1;
489 } 495 }
490 url = cgit_pageurl(ctx.qry.repo, "blob", 496 url = cgit_pageurl(ctx.qry.repo, "blob",
491 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 497 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
492 buf)); 498 buf));
493 html_link_open(url, NULL, "menu"); 499 html_link_open(url, NULL, "menu");
494 html_txt(strlpart(buf, 20)); 500 html_txt(strlpart(buf, 20));
495 html_link_close(); 501 html_link_close();
496 return 0; 502 return 0;
497} 503}