author | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 11:53:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 11:53:30 (UTC) |
commit | de5e9281719809c5b07051faa88e95bd16e8d485 (patch) (unidiff) | |
tree | 30c6f6bc74c067ebad78e45e5602011006332f8b | |
parent | 29b37e9781ce1bb04e558c7490d2c29eb1a477e5 (diff) | |
download | cgit-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>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-shared.c | 14 |
3 files changed, 13 insertions, 4 deletions
@@ -1,283 +1,285 @@ | |||
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 | ||
16 | const char *cgit_version = CGIT_VERSION; | 16 | const char *cgit_version = CGIT_VERSION; |
17 | 17 | ||
18 | void config_cb(const char *name, const char *value) | 18 | void 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); |
76 | else if (!strcmp(name, "summary-tags")) | 78 | else if (!strcmp(name, "summary-tags")) |
77 | ctx.cfg.summary_tags = atoi(value); | 79 | ctx.cfg.summary_tags = atoi(value); |
78 | else if (!strcmp(name, "agefile")) | 80 | else if (!strcmp(name, "agefile")) |
79 | ctx.cfg.agefile = xstrdup(value); | 81 | ctx.cfg.agefile = xstrdup(value); |
80 | else if (!strcmp(name, "renamelimit")) | 82 | else if (!strcmp(name, "renamelimit")) |
81 | ctx.cfg.renamelimit = atoi(value); | 83 | ctx.cfg.renamelimit = atoi(value); |
82 | else if (!strcmp(name, "robots")) | 84 | else if (!strcmp(name, "robots")) |
83 | ctx.cfg.robots = xstrdup(value); | 85 | ctx.cfg.robots = xstrdup(value); |
84 | else if (!strcmp(name, "clone-prefix")) | 86 | else if (!strcmp(name, "clone-prefix")) |
85 | ctx.cfg.clone_prefix = xstrdup(value); | 87 | ctx.cfg.clone_prefix = xstrdup(value); |
86 | else if (!strcmp(name, "repo.group")) | 88 | else if (!strcmp(name, "repo.group")) |
87 | ctx.cfg.repo_group = xstrdup(value); | 89 | ctx.cfg.repo_group = xstrdup(value); |
88 | else if (!strcmp(name, "repo.url")) | 90 | else if (!strcmp(name, "repo.url")) |
89 | ctx.repo = cgit_add_repo(value); | 91 | ctx.repo = cgit_add_repo(value); |
90 | else if (!strcmp(name, "repo.name")) | 92 | else if (!strcmp(name, "repo.name")) |
91 | ctx.repo->name = xstrdup(value); | 93 | ctx.repo->name = xstrdup(value); |
92 | else if (ctx.repo && !strcmp(name, "repo.path")) | 94 | else if (ctx.repo && !strcmp(name, "repo.path")) |
93 | ctx.repo->path = trim_end(value, '/'); | 95 | ctx.repo->path = trim_end(value, '/'); |
94 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 96 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
95 | ctx.repo->clone_url = xstrdup(value); | 97 | ctx.repo->clone_url = xstrdup(value); |
96 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 98 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
97 | ctx.repo->desc = xstrdup(value); | 99 | ctx.repo->desc = xstrdup(value); |
98 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 100 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
99 | ctx.repo->owner = xstrdup(value); | 101 | ctx.repo->owner = xstrdup(value); |
100 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 102 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
101 | ctx.repo->defbranch = xstrdup(value); | 103 | ctx.repo->defbranch = xstrdup(value); |
102 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 104 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
103 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 105 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
104 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 106 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
105 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 107 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
106 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 108 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
107 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 109 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
108 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 110 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
109 | ctx.repo->module_link= xstrdup(value); | 111 | ctx.repo->module_link= xstrdup(value); |
110 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 112 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
111 | if (*value == '/') | 113 | if (*value == '/') |
112 | ctx.repo->readme = xstrdup(value); | 114 | ctx.repo->readme = xstrdup(value); |
113 | else | 115 | else |
114 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 116 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
115 | } else if (!strcmp(name, "include")) | 117 | } else if (!strcmp(name, "include")) |
116 | parse_configfile(value, config_cb); | 118 | parse_configfile(value, config_cb); |
117 | } | 119 | } |
118 | 120 | ||
119 | static void querystring_cb(const char *name, const char *value) | 121 | static void querystring_cb(const char *name, const char *value) |
120 | { | 122 | { |
121 | if (!strcmp(name,"r")) { | 123 | if (!strcmp(name,"r")) { |
122 | ctx.qry.repo = xstrdup(value); | 124 | ctx.qry.repo = xstrdup(value); |
123 | ctx.repo = cgit_get_repoinfo(value); | 125 | ctx.repo = cgit_get_repoinfo(value); |
124 | } else if (!strcmp(name, "p")) { | 126 | } else if (!strcmp(name, "p")) { |
125 | ctx.qry.page = xstrdup(value); | 127 | ctx.qry.page = xstrdup(value); |
126 | } else if (!strcmp(name, "url")) { | 128 | } else if (!strcmp(name, "url")) { |
127 | cgit_parse_url(value); | 129 | cgit_parse_url(value); |
128 | } else if (!strcmp(name, "qt")) { | 130 | } else if (!strcmp(name, "qt")) { |
129 | ctx.qry.grep = xstrdup(value); | 131 | ctx.qry.grep = xstrdup(value); |
130 | } else if (!strcmp(name, "q")) { | 132 | } else if (!strcmp(name, "q")) { |
131 | ctx.qry.search = xstrdup(value); | 133 | ctx.qry.search = xstrdup(value); |
132 | } else if (!strcmp(name, "h")) { | 134 | } else if (!strcmp(name, "h")) { |
133 | ctx.qry.head = xstrdup(value); | 135 | ctx.qry.head = xstrdup(value); |
134 | ctx.qry.has_symref = 1; | 136 | ctx.qry.has_symref = 1; |
135 | } else if (!strcmp(name, "id")) { | 137 | } else if (!strcmp(name, "id")) { |
136 | ctx.qry.sha1 = xstrdup(value); | 138 | ctx.qry.sha1 = xstrdup(value); |
137 | ctx.qry.has_sha1 = 1; | 139 | ctx.qry.has_sha1 = 1; |
138 | } else if (!strcmp(name, "id2")) { | 140 | } else if (!strcmp(name, "id2")) { |
139 | ctx.qry.sha2 = xstrdup(value); | 141 | ctx.qry.sha2 = xstrdup(value); |
140 | ctx.qry.has_sha1 = 1; | 142 | ctx.qry.has_sha1 = 1; |
141 | } else if (!strcmp(name, "ofs")) { | 143 | } else if (!strcmp(name, "ofs")) { |
142 | ctx.qry.ofs = atoi(value); | 144 | ctx.qry.ofs = atoi(value); |
143 | } else if (!strcmp(name, "path")) { | 145 | } else if (!strcmp(name, "path")) { |
144 | ctx.qry.path = trim_end(value, '/'); | 146 | ctx.qry.path = trim_end(value, '/'); |
145 | } else if (!strcmp(name, "name")) { | 147 | } else if (!strcmp(name, "name")) { |
146 | ctx.qry.name = xstrdup(value); | 148 | ctx.qry.name = xstrdup(value); |
147 | } else if (!strcmp(name, "mimetype")) { | 149 | } else if (!strcmp(name, "mimetype")) { |
148 | ctx.qry.mimetype = xstrdup(value); | 150 | ctx.qry.mimetype = xstrdup(value); |
149 | } | 151 | } |
150 | } | 152 | } |
151 | 153 | ||
152 | static void prepare_context(struct cgit_context *ctx) | 154 | static void prepare_context(struct cgit_context *ctx) |
153 | { | 155 | { |
154 | memset(ctx, 0, sizeof(ctx)); | 156 | memset(ctx, 0, sizeof(ctx)); |
155 | ctx->cfg.agefile = "info/web/last-modified"; | 157 | ctx->cfg.agefile = "info/web/last-modified"; |
156 | ctx->cfg.nocache = 0; | 158 | ctx->cfg.nocache = 0; |
157 | ctx->cfg.cache_size = 0; | 159 | ctx->cfg.cache_size = 0; |
158 | ctx->cfg.cache_dynamic_ttl = 5; | 160 | ctx->cfg.cache_dynamic_ttl = 5; |
159 | ctx->cfg.cache_max_create_time = 5; | 161 | ctx->cfg.cache_max_create_time = 5; |
160 | ctx->cfg.cache_repo_ttl = 5; | 162 | ctx->cfg.cache_repo_ttl = 5; |
161 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 163 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
162 | ctx->cfg.cache_root_ttl = 5; | 164 | ctx->cfg.cache_root_ttl = 5; |
163 | ctx->cfg.cache_static_ttl = -1; | 165 | ctx->cfg.cache_static_ttl = -1; |
164 | ctx->cfg.css = "/cgit.css"; | 166 | ctx->cfg.css = "/cgit.css"; |
165 | ctx->cfg.logo = "/git-logo.png"; | 167 | ctx->cfg.logo = "/git-logo.png"; |
166 | ctx->cfg.max_repo_count = 50; | 168 | ctx->cfg.max_repo_count = 50; |
167 | ctx->cfg.max_commit_count = 50; | 169 | ctx->cfg.max_commit_count = 50; |
168 | ctx->cfg.max_lock_attempts = 5; | 170 | ctx->cfg.max_lock_attempts = 5; |
169 | ctx->cfg.max_msg_len = 60; | 171 | ctx->cfg.max_msg_len = 60; |
170 | ctx->cfg.max_repodesc_len = 60; | 172 | ctx->cfg.max_repodesc_len = 60; |
171 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 173 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
172 | ctx->cfg.renamelimit = -1; | 174 | ctx->cfg.renamelimit = -1; |
173 | ctx->cfg.robots = "index, nofollow"; | 175 | ctx->cfg.robots = "index, nofollow"; |
174 | ctx->cfg.root_title = "Git repository browser"; | 176 | ctx->cfg.root_title = "Git repository browser"; |
175 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 177 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
176 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 178 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
177 | ctx->page.mimetype = "text/html"; | 179 | ctx->page.mimetype = "text/html"; |
178 | ctx->page.charset = PAGE_ENCODING; | 180 | ctx->page.charset = PAGE_ENCODING; |
179 | ctx->page.filename = NULL; | 181 | ctx->page.filename = NULL; |
180 | ctx->page.modified = time(NULL); | 182 | ctx->page.modified = time(NULL); |
181 | ctx->page.expires = ctx->page.modified; | 183 | ctx->page.expires = ctx->page.modified; |
182 | } | 184 | } |
183 | 185 | ||
184 | struct refmatch { | 186 | struct refmatch { |
185 | char *req_ref; | 187 | char *req_ref; |
186 | char *first_ref; | 188 | char *first_ref; |
187 | int match; | 189 | int match; |
188 | }; | 190 | }; |
189 | 191 | ||
190 | int find_current_ref(const char *refname, const unsigned char *sha1, | 192 | int find_current_ref(const char *refname, const unsigned char *sha1, |
191 | int flags, void *cb_data) | 193 | int flags, void *cb_data) |
192 | { | 194 | { |
193 | struct refmatch *info; | 195 | struct refmatch *info; |
194 | 196 | ||
195 | info = (struct refmatch *)cb_data; | 197 | info = (struct refmatch *)cb_data; |
196 | if (!strcmp(refname, info->req_ref)) | 198 | if (!strcmp(refname, info->req_ref)) |
197 | info->match = 1; | 199 | info->match = 1; |
198 | if (!info->first_ref) | 200 | if (!info->first_ref) |
199 | info->first_ref = xstrdup(refname); | 201 | info->first_ref = xstrdup(refname); |
200 | return info->match; | 202 | return info->match; |
201 | } | 203 | } |
202 | 204 | ||
203 | char *find_default_branch(struct cgit_repo *repo) | 205 | char *find_default_branch(struct cgit_repo *repo) |
204 | { | 206 | { |
205 | struct refmatch info; | 207 | struct refmatch info; |
206 | 208 | ||
207 | info.req_ref = repo->defbranch; | 209 | info.req_ref = repo->defbranch; |
208 | info.first_ref = NULL; | 210 | info.first_ref = NULL; |
209 | info.match = 0; | 211 | info.match = 0; |
210 | for_each_branch_ref(find_current_ref, &info); | 212 | for_each_branch_ref(find_current_ref, &info); |
211 | if (info.match) | 213 | if (info.match) |
212 | return info.req_ref; | 214 | return info.req_ref; |
213 | else | 215 | else |
214 | return info.first_ref; | 216 | return info.first_ref; |
215 | } | 217 | } |
216 | 218 | ||
217 | static int prepare_repo_cmd(struct cgit_context *ctx) | 219 | static int prepare_repo_cmd(struct cgit_context *ctx) |
218 | { | 220 | { |
219 | char *tmp; | 221 | char *tmp; |
220 | unsigned char sha1[20]; | 222 | unsigned char sha1[20]; |
221 | int nongit = 0; | 223 | int nongit = 0; |
222 | 224 | ||
223 | setenv("GIT_DIR", ctx->repo->path, 1); | 225 | setenv("GIT_DIR", ctx->repo->path, 1); |
224 | setup_git_directory_gently(&nongit); | 226 | setup_git_directory_gently(&nongit); |
225 | if (nongit) { | 227 | if (nongit) { |
226 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, | 228 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
227 | "config error"); | 229 | "config error"); |
228 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); | 230 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
229 | ctx->repo = NULL; | 231 | ctx->repo = NULL; |
230 | cgit_print_http_headers(ctx); | 232 | cgit_print_http_headers(ctx); |
231 | cgit_print_docstart(ctx); | 233 | cgit_print_docstart(ctx); |
232 | cgit_print_pageheader(ctx); | 234 | cgit_print_pageheader(ctx); |
233 | cgit_print_error(tmp); | 235 | cgit_print_error(tmp); |
234 | cgit_print_docend(); | 236 | cgit_print_docend(); |
235 | return 1; | 237 | return 1; |
236 | } | 238 | } |
237 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); | 239 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
238 | 240 | ||
239 | if (!ctx->qry.head) { | 241 | if (!ctx->qry.head) { |
240 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); | 242 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); |
241 | ctx->repo->defbranch = ctx->qry.head; | 243 | ctx->repo->defbranch = ctx->qry.head; |
242 | } | 244 | } |
243 | 245 | ||
244 | if (!ctx->qry.head) { | 246 | if (!ctx->qry.head) { |
245 | cgit_print_http_headers(ctx); | 247 | cgit_print_http_headers(ctx); |
246 | cgit_print_docstart(ctx); | 248 | cgit_print_docstart(ctx); |
247 | cgit_print_pageheader(ctx); | 249 | cgit_print_pageheader(ctx); |
248 | cgit_print_error("Repository seems to be empty"); | 250 | cgit_print_error("Repository seems to be empty"); |
249 | cgit_print_docend(); | 251 | cgit_print_docend(); |
250 | return 1; | 252 | return 1; |
251 | } | 253 | } |
252 | 254 | ||
253 | if (get_sha1(ctx->qry.head, sha1)) { | 255 | if (get_sha1(ctx->qry.head, sha1)) { |
254 | tmp = xstrdup(ctx->qry.head); | 256 | tmp = xstrdup(ctx->qry.head); |
255 | ctx->qry.head = ctx->repo->defbranch; | 257 | ctx->qry.head = ctx->repo->defbranch; |
256 | cgit_print_http_headers(ctx); | 258 | cgit_print_http_headers(ctx); |
257 | cgit_print_docstart(ctx); | 259 | cgit_print_docstart(ctx); |
258 | cgit_print_pageheader(ctx); | 260 | cgit_print_pageheader(ctx); |
259 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | 261 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
260 | cgit_print_docend(); | 262 | cgit_print_docend(); |
261 | return 1; | 263 | return 1; |
262 | } | 264 | } |
263 | return 0; | 265 | return 0; |
264 | } | 266 | } |
265 | 267 | ||
266 | static void process_request(void *cbdata) | 268 | static void process_request(void *cbdata) |
267 | { | 269 | { |
268 | struct cgit_context *ctx = cbdata; | 270 | struct cgit_context *ctx = cbdata; |
269 | struct cgit_cmd *cmd; | 271 | struct cgit_cmd *cmd; |
270 | 272 | ||
271 | cmd = cgit_get_cmd(ctx); | 273 | cmd = cgit_get_cmd(ctx); |
272 | if (!cmd) { | 274 | if (!cmd) { |
273 | ctx->page.title = "cgit error"; | 275 | ctx->page.title = "cgit error"; |
274 | ctx->repo = NULL; | 276 | ctx->repo = NULL; |
275 | cgit_print_http_headers(ctx); | 277 | cgit_print_http_headers(ctx); |
276 | cgit_print_docstart(ctx); | 278 | cgit_print_docstart(ctx); |
277 | cgit_print_pageheader(ctx); | 279 | cgit_print_pageheader(ctx); |
278 | cgit_print_error("Invalid request"); | 280 | cgit_print_error("Invalid request"); |
279 | cgit_print_docend(); | 281 | cgit_print_docend(); |
280 | return; | 282 | return; |
281 | } | 283 | } |
282 | 284 | ||
283 | if (cmd->want_repo && !ctx->repo) { | 285 | if (cmd->want_repo && !ctx->repo) { |
@@ -1,236 +1,237 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | 19 | #include <utf8.h> |
20 | 20 | ||
21 | 21 | ||
22 | /* | 22 | /* |
23 | * Dateformats used on misc. pages | 23 | * Dateformats used on misc. pages |
24 | */ | 24 | */ |
25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" | 25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" |
26 | #define FMT_SHORTDATE "%Y-%m-%d" | 26 | #define FMT_SHORTDATE "%Y-%m-%d" |
27 | 27 | ||
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Limits used for relative dates | 30 | * Limits used for relative dates |
31 | */ | 31 | */ |
32 | #define TM_MIN 60 | 32 | #define TM_MIN 60 |
33 | #define TM_HOUR (TM_MIN * 60) | 33 | #define TM_HOUR (TM_MIN * 60) |
34 | #define TM_DAY (TM_HOUR * 24) | 34 | #define TM_DAY (TM_HOUR * 24) |
35 | #define TM_WEEK (TM_DAY * 7) | 35 | #define TM_WEEK (TM_DAY * 7) |
36 | #define TM_YEAR (TM_DAY * 365) | 36 | #define TM_YEAR (TM_DAY * 365) |
37 | #define TM_MONTH (TM_YEAR / 12.0) | 37 | #define TM_MONTH (TM_YEAR / 12.0) |
38 | 38 | ||
39 | 39 | ||
40 | /* | 40 | /* |
41 | * Default encoding | 41 | * Default encoding |
42 | */ | 42 | */ |
43 | #define PAGE_ENCODING "UTF-8" | 43 | #define PAGE_ENCODING "UTF-8" |
44 | 44 | ||
45 | typedef void (*configfn)(const char *name, const char *value); | 45 | typedef void (*configfn)(const char *name, const char *value); |
46 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 46 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
47 | typedef void (*linediff_fn)(char *line, int len); | 47 | typedef void (*linediff_fn)(char *line, int len); |
48 | 48 | ||
49 | struct cgit_repo { | 49 | struct cgit_repo { |
50 | char *url; | 50 | char *url; |
51 | char *name; | 51 | char *name; |
52 | char *path; | 52 | char *path; |
53 | char *desc; | 53 | char *desc; |
54 | char *owner; | 54 | char *owner; |
55 | char *defbranch; | 55 | char *defbranch; |
56 | char *group; | 56 | char *group; |
57 | char *module_link; | 57 | char *module_link; |
58 | char *readme; | 58 | char *readme; |
59 | char *clone_url; | 59 | char *clone_url; |
60 | int snapshots; | 60 | int snapshots; |
61 | int enable_log_filecount; | 61 | int enable_log_filecount; |
62 | int enable_log_linecount; | 62 | int enable_log_linecount; |
63 | }; | 63 | }; |
64 | 64 | ||
65 | struct cgit_repolist { | 65 | struct cgit_repolist { |
66 | int length; | 66 | int length; |
67 | int count; | 67 | int count; |
68 | struct cgit_repo *repos; | 68 | struct cgit_repo *repos; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | struct commitinfo { | 71 | struct commitinfo { |
72 | struct commit *commit; | 72 | struct commit *commit; |
73 | char *author; | 73 | char *author; |
74 | char *author_email; | 74 | char *author_email; |
75 | unsigned long author_date; | 75 | unsigned long author_date; |
76 | char *committer; | 76 | char *committer; |
77 | char *committer_email; | 77 | char *committer_email; |
78 | unsigned long committer_date; | 78 | unsigned long committer_date; |
79 | char *subject; | 79 | char *subject; |
80 | char *msg; | 80 | char *msg; |
81 | char *msg_encoding; | 81 | char *msg_encoding; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | struct taginfo { | 84 | struct 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 | ||
91 | struct refinfo { | 91 | struct 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 | ||
100 | struct reflist { | 100 | struct 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 | ||
106 | struct cgit_query { | 106 | struct 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 | ||
123 | struct cgit_config { | 123 | struct 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 | ||
162 | struct cgit_page { | 163 | struct 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 | ||
171 | struct cgit_context { | 172 | struct 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; |
176 | }; | 177 | }; |
177 | 178 | ||
178 | struct cgit_snapshot_format { | 179 | struct cgit_snapshot_format { |
179 | const char *suffix; | 180 | const char *suffix; |
180 | const char *mimetype; | 181 | const char *mimetype; |
181 | write_archive_fn_t write_func; | 182 | write_archive_fn_t write_func; |
182 | int bit; | 183 | int bit; |
183 | }; | 184 | }; |
184 | 185 | ||
185 | extern const char *cgit_version; | 186 | extern const char *cgit_version; |
186 | 187 | ||
187 | extern struct cgit_repolist cgit_repolist; | 188 | extern struct cgit_repolist cgit_repolist; |
188 | extern struct cgit_context ctx; | 189 | extern struct cgit_context ctx; |
189 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 190 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
190 | 191 | ||
191 | extern struct cgit_repo *cgit_add_repo(const char *url); | 192 | extern struct cgit_repo *cgit_add_repo(const char *url); |
192 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 193 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
193 | extern void cgit_repo_config_cb(const char *name, const char *value); | 194 | extern void cgit_repo_config_cb(const char *name, const char *value); |
194 | 195 | ||
195 | extern int chk_zero(int result, char *msg); | 196 | extern int chk_zero(int result, char *msg); |
196 | extern int chk_positive(int result, char *msg); | 197 | extern int chk_positive(int result, char *msg); |
197 | extern int chk_non_negative(int result, char *msg); | 198 | extern int chk_non_negative(int result, char *msg); |
198 | 199 | ||
199 | extern char *trim_end(const char *str, char c); | 200 | extern char *trim_end(const char *str, char c); |
200 | extern char *strlpart(char *txt, int maxlen); | 201 | extern char *strlpart(char *txt, int maxlen); |
201 | extern char *strrpart(char *txt, int maxlen); | 202 | extern char *strrpart(char *txt, int maxlen); |
202 | 203 | ||
203 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 204 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
204 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 205 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
205 | int flags, void *cb_data); | 206 | int flags, void *cb_data); |
206 | 207 | ||
207 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 208 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
208 | 209 | ||
209 | extern int cgit_diff_files(const unsigned char *old_sha1, | 210 | extern int cgit_diff_files(const unsigned char *old_sha1, |
210 | const unsigned char *new_sha1, | 211 | const unsigned char *new_sha1, |
211 | linediff_fn fn); | 212 | linediff_fn fn); |
212 | 213 | ||
213 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 214 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
214 | const unsigned char *new_sha1, | 215 | const unsigned char *new_sha1, |
215 | filepair_fn fn, const char *prefix); | 216 | filepair_fn fn, const char *prefix); |
216 | 217 | ||
217 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 218 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
218 | 219 | ||
219 | extern char *fmt(const char *format,...); | 220 | extern char *fmt(const char *format,...); |
220 | 221 | ||
221 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 222 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
222 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 223 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
223 | extern void cgit_parse_url(const char *url); | 224 | extern void cgit_parse_url(const char *url); |
224 | 225 | ||
225 | extern const char *cgit_repobasename(const char *reponame); | 226 | extern const char *cgit_repobasename(const char *reponame); |
226 | 227 | ||
227 | extern int cgit_parse_snapshots_mask(const char *str); | 228 | extern int cgit_parse_snapshots_mask(const char *str); |
228 | 229 | ||
229 | /* libgit.a either links against or compiles its own implementation of | 230 | /* libgit.a either links against or compiles its own implementation of |
230 | * strcasestr(), and we'd like to reuse it. Simply re-declaring it | 231 | * strcasestr(), and we'd like to reuse it. Simply re-declaring it |
231 | * seems to do the trick. | 232 | * seems to do the trick. |
232 | */ | 233 | */ |
233 | extern char *strcasestr(const char *haystack, const char *needle); | 234 | extern char *strcasestr(const char *haystack, const char *needle); |
234 | 235 | ||
235 | 236 | ||
236 | #endif /* CGIT_H */ | 237 | #endif /* CGIT_H */ |
diff --git a/ui-shared.c b/ui-shared.c index cd98387..8a00099 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -190,472 +190,478 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
190 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') | 190 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') |
191 | html("/"); | 191 | html("/"); |
192 | html_attr(ctx.repo->url); | 192 | html_attr(ctx.repo->url); |
193 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 193 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
194 | html("/"); | 194 | html("/"); |
195 | if (page) { | 195 | if (page) { |
196 | html(page); | 196 | html(page); |
197 | html("/"); | 197 | html("/"); |
198 | if (path) | 198 | if (path) |
199 | html_attr(path); | 199 | html_attr(path); |
200 | } | 200 | } |
201 | } else { | 201 | } else { |
202 | html(ctx.cfg.script_name); | 202 | html(ctx.cfg.script_name); |
203 | html("?url="); | 203 | html("?url="); |
204 | html_attr(ctx.repo->url); | 204 | html_attr(ctx.repo->url); |
205 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 205 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
206 | html("/"); | 206 | html("/"); |
207 | if (page) { | 207 | if (page) { |
208 | html(page); | 208 | html(page); |
209 | html("/"); | 209 | html("/"); |
210 | if (path) | 210 | if (path) |
211 | html_attr(path); | 211 | html_attr(path); |
212 | } | 212 | } |
213 | delim = "&"; | 213 | delim = "&"; |
214 | } | 214 | } |
215 | if (head && strcmp(head, ctx.repo->defbranch)) { | 215 | if (head && strcmp(head, ctx.repo->defbranch)) { |
216 | html(delim); | 216 | html(delim); |
217 | html("h="); | 217 | html("h="); |
218 | html_attr(head); | 218 | html_attr(head); |
219 | delim = "&"; | 219 | delim = "&"; |
220 | } | 220 | } |
221 | return fmt("%s", delim); | 221 | return fmt("%s", delim); |
222 | } | 222 | } |
223 | 223 | ||
224 | static void reporevlink(char *page, char *name, char *title, char *class, | 224 | static void reporevlink(char *page, char *name, char *title, char *class, |
225 | char *head, char *rev, char *path) | 225 | char *head, char *rev, char *path) |
226 | { | 226 | { |
227 | char *delim; | 227 | char *delim; |
228 | 228 | ||
229 | delim = repolink(title, class, page, head, path); | 229 | delim = repolink(title, class, page, head, path); |
230 | if (rev && strcmp(rev, ctx.qry.head)) { | 230 | if (rev && strcmp(rev, ctx.qry.head)) { |
231 | html(delim); | 231 | html(delim); |
232 | html("id="); | 232 | html("id="); |
233 | html_attr(rev); | 233 | html_attr(rev); |
234 | } | 234 | } |
235 | html("'>"); | 235 | html("'>"); |
236 | html_txt(name); | 236 | html_txt(name); |
237 | html("</a>"); | 237 | html("</a>"); |
238 | } | 238 | } |
239 | 239 | ||
240 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 240 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
241 | char *rev, char *path) | 241 | char *rev, char *path) |
242 | { | 242 | { |
243 | reporevlink("tree", name, title, class, head, rev, path); | 243 | reporevlink("tree", name, title, class, head, rev, path); |
244 | } | 244 | } |
245 | 245 | ||
246 | void cgit_log_link(char *name, char *title, char *class, char *head, | 246 | void cgit_log_link(char *name, char *title, char *class, char *head, |
247 | char *rev, char *path, int ofs, char *grep, char *pattern) | 247 | char *rev, char *path, int ofs, char *grep, char *pattern) |
248 | { | 248 | { |
249 | char *delim; | 249 | char *delim; |
250 | 250 | ||
251 | delim = repolink(title, class, "log", head, path); | 251 | delim = repolink(title, class, "log", head, path); |
252 | if (rev && strcmp(rev, ctx.qry.head)) { | 252 | if (rev && strcmp(rev, ctx.qry.head)) { |
253 | html(delim); | 253 | html(delim); |
254 | html("id="); | 254 | html("id="); |
255 | html_attr(rev); | 255 | html_attr(rev); |
256 | delim = "&"; | 256 | delim = "&"; |
257 | } | 257 | } |
258 | if (grep && pattern) { | 258 | if (grep && pattern) { |
259 | html(delim); | 259 | html(delim); |
260 | html("qt="); | 260 | html("qt="); |
261 | html_attr(grep); | 261 | html_attr(grep); |
262 | delim = "&"; | 262 | delim = "&"; |
263 | html(delim); | 263 | html(delim); |
264 | html("q="); | 264 | html("q="); |
265 | html_attr(pattern); | 265 | html_attr(pattern); |
266 | } | 266 | } |
267 | if (ofs > 0) { | 267 | if (ofs > 0) { |
268 | html(delim); | 268 | html(delim); |
269 | html("ofs="); | 269 | html("ofs="); |
270 | htmlf("%d", ofs); | 270 | htmlf("%d", ofs); |
271 | } | 271 | } |
272 | html("'>"); | 272 | html("'>"); |
273 | html_txt(name); | 273 | html_txt(name); |
274 | html("</a>"); | 274 | html("</a>"); |
275 | } | 275 | } |
276 | 276 | ||
277 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 277 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
278 | char *rev) | 278 | char *rev) |
279 | { | 279 | { |
280 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 280 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
281 | name[ctx.cfg.max_msg_len] = '\0'; | 281 | name[ctx.cfg.max_msg_len] = '\0'; |
282 | name[ctx.cfg.max_msg_len - 1] = '.'; | 282 | name[ctx.cfg.max_msg_len - 1] = '.'; |
283 | name[ctx.cfg.max_msg_len - 2] = '.'; | 283 | name[ctx.cfg.max_msg_len - 2] = '.'; |
284 | name[ctx.cfg.max_msg_len - 3] = '.'; | 284 | name[ctx.cfg.max_msg_len - 3] = '.'; |
285 | } | 285 | } |
286 | reporevlink("commit", name, title, class, head, rev, NULL); | 286 | reporevlink("commit", name, title, class, head, rev, NULL); |
287 | } | 287 | } |
288 | 288 | ||
289 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 289 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
290 | char *rev, char *path) | 290 | char *rev, char *path) |
291 | { | 291 | { |
292 | reporevlink("refs", name, title, class, head, rev, path); | 292 | reporevlink("refs", name, title, class, head, rev, path); |
293 | } | 293 | } |
294 | 294 | ||
295 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 295 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
296 | char *rev, char *archivename) | 296 | char *rev, char *archivename) |
297 | { | 297 | { |
298 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 298 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
299 | } | 299 | } |
300 | 300 | ||
301 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 301 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
302 | char *new_rev, char *old_rev, char *path) | 302 | char *new_rev, char *old_rev, char *path) |
303 | { | 303 | { |
304 | char *delim; | 304 | char *delim; |
305 | 305 | ||
306 | delim = repolink(title, class, "diff", head, path); | 306 | delim = repolink(title, class, "diff", head, path); |
307 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 307 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
308 | html(delim); | 308 | html(delim); |
309 | html("id="); | 309 | html("id="); |
310 | html_attr(new_rev); | 310 | html_attr(new_rev); |
311 | delim = "&"; | 311 | delim = "&"; |
312 | } | 312 | } |
313 | if (old_rev) { | 313 | if (old_rev) { |
314 | html(delim); | 314 | html(delim); |
315 | html("id2="); | 315 | html("id2="); |
316 | html_attr(old_rev); | 316 | html_attr(old_rev); |
317 | } | 317 | } |
318 | html("'>"); | 318 | html("'>"); |
319 | html_txt(name); | 319 | html_txt(name); |
320 | html("</a>"); | 320 | html("</a>"); |
321 | } | 321 | } |
322 | 322 | ||
323 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 323 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
324 | char *rev) | 324 | char *rev) |
325 | { | 325 | { |
326 | reporevlink("patch", name, title, class, head, rev, NULL); | 326 | reporevlink("patch", name, title, class, head, rev, NULL); |
327 | } | 327 | } |
328 | 328 | ||
329 | void cgit_object_link(struct object *obj) | 329 | void cgit_object_link(struct object *obj) |
330 | { | 330 | { |
331 | char *page, *arg, *url; | 331 | char *page, *arg, *url; |
332 | 332 | ||
333 | if (obj->type == OBJ_COMMIT) { | 333 | if (obj->type == OBJ_COMMIT) { |
334 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 334 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
335 | ctx.qry.head, sha1_to_hex(obj->sha1)); | 335 | ctx.qry.head, sha1_to_hex(obj->sha1)); |
336 | return; | 336 | return; |
337 | } else if (obj->type == OBJ_TREE) { | 337 | } else if (obj->type == OBJ_TREE) { |
338 | page = "tree"; | 338 | page = "tree"; |
339 | arg = "id"; | 339 | arg = "id"; |
340 | } else if (obj->type == OBJ_TAG) { | 340 | } else if (obj->type == OBJ_TAG) { |
341 | page = "tag"; | 341 | page = "tag"; |
342 | arg = "id"; | 342 | arg = "id"; |
343 | } else { | 343 | } else { |
344 | page = "blob"; | 344 | page = "blob"; |
345 | arg = "id"; | 345 | arg = "id"; |
346 | } | 346 | } |
347 | 347 | ||
348 | url = cgit_pageurl(ctx.qry.repo, page, | 348 | url = cgit_pageurl(ctx.qry.repo, page, |
349 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); | 349 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
350 | html_link_open(url, NULL, NULL); | 350 | html_link_open(url, NULL, NULL); |
351 | htmlf("%s %s", typename(obj->type), | 351 | htmlf("%s %s", typename(obj->type), |
352 | sha1_to_hex(obj->sha1)); | 352 | sha1_to_hex(obj->sha1)); |
353 | html_link_close(); | 353 | html_link_close(); |
354 | } | 354 | } |
355 | 355 | ||
356 | void cgit_print_date(time_t secs, char *format) | 356 | void cgit_print_date(time_t secs, char *format) |
357 | { | 357 | { |
358 | char buf[64]; | 358 | char buf[64]; |
359 | struct tm *time; | 359 | struct tm *time; |
360 | 360 | ||
361 | if (!secs) | 361 | if (!secs) |
362 | return; | 362 | return; |
363 | time = gmtime(&secs); | 363 | time = gmtime(&secs); |
364 | strftime(buf, sizeof(buf)-1, format, time); | 364 | strftime(buf, sizeof(buf)-1, format, time); |
365 | html_txt(buf); | 365 | html_txt(buf); |
366 | } | 366 | } |
367 | 367 | ||
368 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 368 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
369 | { | 369 | { |
370 | time_t now, secs; | 370 | time_t now, secs; |
371 | 371 | ||
372 | if (!t) | 372 | if (!t) |
373 | return; | 373 | return; |
374 | time(&now); | 374 | time(&now); |
375 | secs = now - t; | 375 | secs = now - t; |
376 | 376 | ||
377 | if (secs > max_relative && max_relative >= 0) { | 377 | if (secs > max_relative && max_relative >= 0) { |
378 | cgit_print_date(t, format); | 378 | cgit_print_date(t, format); |
379 | return; | 379 | return; |
380 | } | 380 | } |
381 | 381 | ||
382 | if (secs < TM_HOUR * 2) { | 382 | if (secs < TM_HOUR * 2) { |
383 | htmlf("<span class='age-mins'>%.0f min.</span>", | 383 | htmlf("<span class='age-mins'>%.0f min.</span>", |
384 | secs * 1.0 / TM_MIN); | 384 | secs * 1.0 / TM_MIN); |
385 | return; | 385 | return; |
386 | } | 386 | } |
387 | if (secs < TM_DAY * 2) { | 387 | if (secs < TM_DAY * 2) { |
388 | htmlf("<span class='age-hours'>%.0f hours</span>", | 388 | htmlf("<span class='age-hours'>%.0f hours</span>", |
389 | secs * 1.0 / TM_HOUR); | 389 | secs * 1.0 / TM_HOUR); |
390 | return; | 390 | return; |
391 | } | 391 | } |
392 | if (secs < TM_WEEK * 2) { | 392 | if (secs < TM_WEEK * 2) { |
393 | htmlf("<span class='age-days'>%.0f days</span>", | 393 | htmlf("<span class='age-days'>%.0f days</span>", |
394 | secs * 1.0 / TM_DAY); | 394 | secs * 1.0 / TM_DAY); |
395 | return; | 395 | return; |
396 | } | 396 | } |
397 | if (secs < TM_MONTH * 2) { | 397 | if (secs < TM_MONTH * 2) { |
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 | ||
411 | void cgit_print_http_headers(struct cgit_context *ctx) | 411 | void 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 | ||
426 | void cgit_print_docstart(struct cgit_context *ctx) | 426 | void 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 | ||
444 | void cgit_print_docend() | 444 | void 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 | ||
452 | int print_branch_option(const char *refname, const unsigned char *sha1, | 458 | int 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 | ||
460 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 466 | int 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&path=%s", sha1_to_hex(fileid), | 497 | fmt("id=%s&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 | } |
498 | 504 | ||
499 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 505 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
500 | { | 506 | { |
501 | char *url; | 507 | char *url; |
502 | 508 | ||
503 | if (!ctx.cfg.virtual_root) { | 509 | if (!ctx.cfg.virtual_root) { |
504 | url = fmt("%s/%s", ctx.qry.repo, page); | 510 | url = fmt("%s/%s", ctx.qry.repo, page); |
505 | if (ctx.qry.path) | 511 | if (ctx.qry.path) |
506 | url = fmt("%s/%s", url, ctx.qry.path); | 512 | url = fmt("%s/%s", url, ctx.qry.path); |
507 | html_hidden("url", url); | 513 | html_hidden("url", url); |
508 | } | 514 | } |
509 | 515 | ||
510 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) | 516 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) |
511 | html_hidden("h", ctx.qry.head); | 517 | html_hidden("h", ctx.qry.head); |
512 | 518 | ||
513 | if (ctx.qry.sha1) | 519 | if (ctx.qry.sha1) |
514 | html_hidden("id", ctx.qry.sha1); | 520 | html_hidden("id", ctx.qry.sha1); |
515 | if (ctx.qry.sha2) | 521 | if (ctx.qry.sha2) |
516 | html_hidden("id2", ctx.qry.sha2); | 522 | html_hidden("id2", ctx.qry.sha2); |
517 | 523 | ||
518 | if (incl_search) { | 524 | if (incl_search) { |
519 | if (ctx.qry.grep) | 525 | if (ctx.qry.grep) |
520 | html_hidden("qt", ctx.qry.grep); | 526 | html_hidden("qt", ctx.qry.grep); |
521 | if (ctx.qry.search) | 527 | if (ctx.qry.search) |
522 | html_hidden("q", ctx.qry.search); | 528 | html_hidden("q", ctx.qry.search); |
523 | } | 529 | } |
524 | } | 530 | } |
525 | 531 | ||
526 | char *hc(struct cgit_cmd *cmd, const char *page) | 532 | char *hc(struct cgit_cmd *cmd, const char *page) |
527 | { | 533 | { |
528 | return (strcmp(cmd->name, page) ? NULL : "active"); | 534 | return (strcmp(cmd->name, page) ? NULL : "active"); |
529 | } | 535 | } |
530 | 536 | ||
531 | void cgit_print_pageheader(struct cgit_context *ctx) | 537 | void cgit_print_pageheader(struct cgit_context *ctx) |
532 | { | 538 | { |
533 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 539 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
534 | 540 | ||
535 | html("<table id='header'>\n"); | 541 | html("<table id='header'>\n"); |
536 | html("<tr>\n"); | 542 | html("<tr>\n"); |
537 | html("<td class='logo' rowspan='2'><a href='"); | 543 | html("<td class='logo' rowspan='2'><a href='"); |
538 | if (ctx->cfg.logo_link) | 544 | if (ctx->cfg.logo_link) |
539 | html_attr(ctx->cfg.logo_link); | 545 | html_attr(ctx->cfg.logo_link); |
540 | else | 546 | else |
541 | html_attr(cgit_rooturl()); | 547 | html_attr(cgit_rooturl()); |
542 | html("'><img src='"); | 548 | html("'><img src='"); |
543 | html_attr(ctx->cfg.logo); | 549 | html_attr(ctx->cfg.logo); |
544 | html("' alt='cgit logo'/></a></td>\n"); | 550 | html("' alt='cgit logo'/></a></td>\n"); |
545 | 551 | ||
546 | html("<td class='main'>"); | 552 | html("<td class='main'>"); |
547 | if (ctx->repo) { | 553 | if (ctx->repo) { |
548 | cgit_index_link("index", NULL, NULL, NULL, 0); | 554 | cgit_index_link("index", NULL, NULL, NULL, 0); |
549 | html(" : "); | 555 | html(" : "); |
550 | reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), | 556 | reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"), |
551 | ctx->qry.head, NULL, NULL); | 557 | ctx->qry.head, NULL, NULL); |
552 | html("</td><td class='form'>"); | 558 | html("</td><td class='form'>"); |
553 | html("<form method='get' action=''>\n"); | 559 | html("<form method='get' action=''>\n"); |
554 | add_hidden_formfields(0, 1, ctx->qry.page); | 560 | add_hidden_formfields(0, 1, ctx->qry.page); |
555 | html("<select name='h' onchange='this.form.submit();'>\n"); | 561 | html("<select name='h' onchange='this.form.submit();'>\n"); |
556 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 562 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
557 | html("</select> "); | 563 | html("</select> "); |
558 | html("<input type='submit' name='' value='switch'/>"); | 564 | html("<input type='submit' name='' value='switch'/>"); |
559 | html("</form>"); | 565 | html("</form>"); |
560 | } else | 566 | } else |
561 | html_txt(ctx->cfg.root_title); | 567 | html_txt(ctx->cfg.root_title); |
562 | html("</td></tr>\n"); | 568 | html("</td></tr>\n"); |
563 | 569 | ||
564 | html("<tr><td class='sub'"); | 570 | html("<tr><td class='sub'"); |
565 | if (ctx->repo) { | 571 | if (ctx->repo) { |
566 | html(" colspan='2'>"); | 572 | html(" colspan='2'>"); |
567 | html_txt(ctx->repo->desc); | 573 | html_txt(ctx->repo->desc); |
568 | } else { | 574 | } else { |
569 | html(">"); | 575 | html(">"); |
570 | if (ctx->cfg.root_desc) | 576 | if (ctx->cfg.root_desc) |
571 | html_txt(ctx->cfg.root_desc); | 577 | html_txt(ctx->cfg.root_desc); |
572 | else if (ctx->cfg.index_info) | 578 | else if (ctx->cfg.index_info) |
573 | html_include(ctx->cfg.index_info); | 579 | html_include(ctx->cfg.index_info); |
574 | } | 580 | } |
575 | html("</td></tr></table>\n"); | 581 | html("</td></tr></table>\n"); |
576 | 582 | ||
577 | html("<table class='tabs'><tr><td>\n"); | 583 | html("<table class='tabs'><tr><td>\n"); |
578 | if (ctx->repo) { | 584 | if (ctx->repo) { |
579 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), | 585 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), |
580 | ctx->qry.head, NULL, NULL); | 586 | ctx->qry.head, NULL, NULL); |
581 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 587 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
582 | ctx->qry.sha1, NULL); | 588 | ctx->qry.sha1, NULL); |
583 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 589 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
584 | NULL, NULL, 0, NULL, NULL); | 590 | NULL, NULL, 0, NULL, NULL); |
585 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 591 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
586 | ctx->qry.sha1, NULL); | 592 | ctx->qry.sha1, NULL); |
587 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 593 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
588 | ctx->qry.head, ctx->qry.sha1); | 594 | ctx->qry.head, ctx->qry.sha1); |
589 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 595 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
590 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 596 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
591 | if (ctx->repo->readme) | 597 | if (ctx->repo->readme) |
592 | reporevlink("about", "about", NULL, | 598 | reporevlink("about", "about", NULL, |
593 | hc(cmd, "about"), ctx->qry.head, NULL, | 599 | hc(cmd, "about"), ctx->qry.head, NULL, |
594 | NULL); | 600 | NULL); |
595 | html("</td><td class='form'>"); | 601 | html("</td><td class='form'>"); |
596 | html("<form class='right' method='get' action='"); | 602 | html("<form class='right' method='get' action='"); |
597 | if (ctx->cfg.virtual_root) | 603 | if (ctx->cfg.virtual_root) |
598 | html_attr(cgit_fileurl(ctx->qry.repo, "log", | 604 | html_attr(cgit_fileurl(ctx->qry.repo, "log", |
599 | ctx->qry.path, NULL)); | 605 | ctx->qry.path, NULL)); |
600 | html("'>\n"); | 606 | html("'>\n"); |
601 | add_hidden_formfields(1, 0, "log"); | 607 | add_hidden_formfields(1, 0, "log"); |
602 | html("<select name='qt'>\n"); | 608 | html("<select name='qt'>\n"); |
603 | html_option("grep", "log msg", ctx->qry.grep); | 609 | html_option("grep", "log msg", ctx->qry.grep); |
604 | html_option("author", "author", ctx->qry.grep); | 610 | html_option("author", "author", ctx->qry.grep); |
605 | html_option("committer", "committer", ctx->qry.grep); | 611 | html_option("committer", "committer", ctx->qry.grep); |
606 | html("</select>\n"); | 612 | html("</select>\n"); |
607 | html("<input class='txt' type='text' size='10' name='q' value='"); | 613 | html("<input class='txt' type='text' size='10' name='q' value='"); |
608 | html_attr(ctx->qry.search); | 614 | html_attr(ctx->qry.search); |
609 | html("'/>\n"); | 615 | html("'/>\n"); |
610 | html("<input type='submit' value='search'/>\n"); | 616 | html("<input type='submit' value='search'/>\n"); |
611 | html("</form>\n"); | 617 | html("</form>\n"); |
612 | } else { | 618 | } else { |
613 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 619 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
614 | if (ctx->cfg.root_readme) | 620 | if (ctx->cfg.root_readme) |
615 | site_link("about", "about", NULL, hc(cmd, "about"), | 621 | site_link("about", "about", NULL, hc(cmd, "about"), |
616 | NULL, 0); | 622 | NULL, 0); |
617 | html("</td><td class='form'>"); | 623 | html("</td><td class='form'>"); |
618 | html("<form method='get' action='"); | 624 | html("<form method='get' action='"); |
619 | html_attr(cgit_rooturl()); | 625 | html_attr(cgit_rooturl()); |
620 | html("'>\n"); | 626 | html("'>\n"); |
621 | html("<input type='text' name='q' size='10' value='"); | 627 | html("<input type='text' name='q' size='10' value='"); |
622 | html_attr(ctx->qry.search); | 628 | html_attr(ctx->qry.search); |
623 | html("'/>\n"); | 629 | html("'/>\n"); |
624 | html("<input type='submit' value='search'/>\n"); | 630 | html("<input type='submit' value='search'/>\n"); |
625 | html("</form>"); | 631 | html("</form>"); |
626 | } | 632 | } |
627 | html("</td></tr></table>\n"); | 633 | html("</td></tr></table>\n"); |
628 | html("<div class='content'>"); | 634 | html("<div class='content'>"); |
629 | } | 635 | } |
630 | 636 | ||
631 | void cgit_print_filemode(unsigned short mode) | 637 | void cgit_print_filemode(unsigned short mode) |
632 | { | 638 | { |
633 | if (S_ISDIR(mode)) | 639 | if (S_ISDIR(mode)) |
634 | html("d"); | 640 | html("d"); |
635 | else if (S_ISLNK(mode)) | 641 | else if (S_ISLNK(mode)) |
636 | html("l"); | 642 | html("l"); |
637 | else if (S_ISGITLINK(mode)) | 643 | else if (S_ISGITLINK(mode)) |
638 | html("m"); | 644 | html("m"); |
639 | else | 645 | else |
640 | html("-"); | 646 | html("-"); |
641 | html_fileperm(mode >> 6); | 647 | html_fileperm(mode >> 6); |
642 | html_fileperm(mode >> 3); | 648 | html_fileperm(mode >> 3); |
643 | html_fileperm(mode); | 649 | html_fileperm(mode); |
644 | } | 650 | } |
645 | 651 | ||
646 | void cgit_print_snapshot_links(const char *repo, const char *head, | 652 | void cgit_print_snapshot_links(const char *repo, const char *head, |
647 | const char *hex, int snapshots) | 653 | const char *hex, int snapshots) |
648 | { | 654 | { |
649 | const struct cgit_snapshot_format* f; | 655 | const struct cgit_snapshot_format* f; |
650 | char *filename; | 656 | char *filename; |
651 | 657 | ||
652 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 658 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
653 | if (!(snapshots & f->bit)) | 659 | if (!(snapshots & f->bit)) |
654 | continue; | 660 | continue; |
655 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 661 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
656 | f->suffix); | 662 | f->suffix); |
657 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | 663 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, |
658 | (char *)hex, filename); | 664 | (char *)hex, filename); |
659 | html("<br/>"); | 665 | html("<br/>"); |
660 | } | 666 | } |
661 | } | 667 | } |