author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:19:31 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:19:31 (UTC) |
commit | ef0c6aadf70e33ef63f0a68ca16338a49d0a3f1f (patch) (unidiff) | |
tree | 4115c32dc27aa18840dda2c940ca10b4a7d0cf86 /cgit.c | |
parent | 0cbb50841ac82e08e715bbff614f96c7d5ba22fa (diff) | |
download | cgit-ef0c6aadf70e33ef63f0a68ca16338a49d0a3f1f.zip cgit-ef0c6aadf70e33ef63f0a68ca16338a49d0a3f1f.tar.gz cgit-ef0c6aadf70e33ef63f0a68ca16338a49d0a3f1f.tar.bz2 |
Add support for 'noheader' option
This option can be used to disable the standard cgit page header, which
might be useful in combination with the 'embedded' option.
Suggested-by: Mark Constable <markc@renta.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,179 +1,181 @@ | |||
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 | #include "ui-stats.h" | 15 | #include "ui-stats.h" |
16 | #include "scan-tree.h" | 16 | #include "scan-tree.h" |
17 | 17 | ||
18 | const char *cgit_version = CGIT_VERSION; | 18 | const char *cgit_version = CGIT_VERSION; |
19 | 19 | ||
20 | void config_cb(const char *name, const char *value) | 20 | void config_cb(const char *name, const char *value) |
21 | { | 21 | { |
22 | if (!strcmp(name, "root-title")) | 22 | if (!strcmp(name, "root-title")) |
23 | ctx.cfg.root_title = xstrdup(value); | 23 | ctx.cfg.root_title = xstrdup(value); |
24 | else if (!strcmp(name, "root-desc")) | 24 | else if (!strcmp(name, "root-desc")) |
25 | ctx.cfg.root_desc = xstrdup(value); | 25 | ctx.cfg.root_desc = xstrdup(value); |
26 | else if (!strcmp(name, "root-readme")) | 26 | else if (!strcmp(name, "root-readme")) |
27 | ctx.cfg.root_readme = xstrdup(value); | 27 | ctx.cfg.root_readme = xstrdup(value); |
28 | else if (!strcmp(name, "css")) | 28 | else if (!strcmp(name, "css")) |
29 | ctx.cfg.css = xstrdup(value); | 29 | ctx.cfg.css = xstrdup(value); |
30 | else if (!strcmp(name, "favicon")) | 30 | else if (!strcmp(name, "favicon")) |
31 | ctx.cfg.favicon = xstrdup(value); | 31 | ctx.cfg.favicon = xstrdup(value); |
32 | else if (!strcmp(name, "footer")) | 32 | else if (!strcmp(name, "footer")) |
33 | ctx.cfg.footer = xstrdup(value); | 33 | ctx.cfg.footer = xstrdup(value); |
34 | else if (!strcmp(name, "header")) | 34 | else if (!strcmp(name, "header")) |
35 | ctx.cfg.header = xstrdup(value); | 35 | ctx.cfg.header = xstrdup(value); |
36 | else if (!strcmp(name, "logo")) | 36 | else if (!strcmp(name, "logo")) |
37 | ctx.cfg.logo = xstrdup(value); | 37 | ctx.cfg.logo = xstrdup(value); |
38 | else if (!strcmp(name, "index-header")) | 38 | else if (!strcmp(name, "index-header")) |
39 | ctx.cfg.index_header = xstrdup(value); | 39 | ctx.cfg.index_header = xstrdup(value); |
40 | else if (!strcmp(name, "index-info")) | 40 | else if (!strcmp(name, "index-info")) |
41 | ctx.cfg.index_info = xstrdup(value); | 41 | ctx.cfg.index_info = xstrdup(value); |
42 | else if (!strcmp(name, "logo-link")) | 42 | else if (!strcmp(name, "logo-link")) |
43 | ctx.cfg.logo_link = xstrdup(value); | 43 | ctx.cfg.logo_link = xstrdup(value); |
44 | else if (!strcmp(name, "module-link")) | 44 | else if (!strcmp(name, "module-link")) |
45 | ctx.cfg.module_link = xstrdup(value); | 45 | ctx.cfg.module_link = xstrdup(value); |
46 | else if (!strcmp(name, "virtual-root")) { | 46 | else if (!strcmp(name, "virtual-root")) { |
47 | ctx.cfg.virtual_root = trim_end(value, '/'); | 47 | ctx.cfg.virtual_root = trim_end(value, '/'); |
48 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 48 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
49 | ctx.cfg.virtual_root = ""; | 49 | ctx.cfg.virtual_root = ""; |
50 | } else if (!strcmp(name, "nocache")) | 50 | } else if (!strcmp(name, "nocache")) |
51 | ctx.cfg.nocache = atoi(value); | 51 | ctx.cfg.nocache = atoi(value); |
52 | else if (!strcmp(name, "noheader")) | ||
53 | ctx.cfg.noheader = atoi(value); | ||
52 | else if (!strcmp(name, "snapshots")) | 54 | else if (!strcmp(name, "snapshots")) |
53 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 55 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
54 | else if (!strcmp(name, "enable-index-links")) | 56 | else if (!strcmp(name, "enable-index-links")) |
55 | ctx.cfg.enable_index_links = atoi(value); | 57 | ctx.cfg.enable_index_links = atoi(value); |
56 | else if (!strcmp(name, "enable-log-filecount")) | 58 | else if (!strcmp(name, "enable-log-filecount")) |
57 | ctx.cfg.enable_log_filecount = atoi(value); | 59 | ctx.cfg.enable_log_filecount = atoi(value); |
58 | else if (!strcmp(name, "enable-log-linecount")) | 60 | else if (!strcmp(name, "enable-log-linecount")) |
59 | ctx.cfg.enable_log_linecount = atoi(value); | 61 | ctx.cfg.enable_log_linecount = atoi(value); |
60 | else if (!strcmp(name, "max-stats")) | 62 | else if (!strcmp(name, "max-stats")) |
61 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 63 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
62 | else if (!strcmp(name, "cache-size")) | 64 | else if (!strcmp(name, "cache-size")) |
63 | ctx.cfg.cache_size = atoi(value); | 65 | ctx.cfg.cache_size = atoi(value); |
64 | else if (!strcmp(name, "cache-root")) | 66 | else if (!strcmp(name, "cache-root")) |
65 | ctx.cfg.cache_root = xstrdup(value); | 67 | ctx.cfg.cache_root = xstrdup(value); |
66 | else if (!strcmp(name, "cache-root-ttl")) | 68 | else if (!strcmp(name, "cache-root-ttl")) |
67 | ctx.cfg.cache_root_ttl = atoi(value); | 69 | ctx.cfg.cache_root_ttl = atoi(value); |
68 | else if (!strcmp(name, "cache-repo-ttl")) | 70 | else if (!strcmp(name, "cache-repo-ttl")) |
69 | ctx.cfg.cache_repo_ttl = atoi(value); | 71 | ctx.cfg.cache_repo_ttl = atoi(value); |
70 | else if (!strcmp(name, "cache-static-ttl")) | 72 | else if (!strcmp(name, "cache-static-ttl")) |
71 | ctx.cfg.cache_static_ttl = atoi(value); | 73 | ctx.cfg.cache_static_ttl = atoi(value); |
72 | else if (!strcmp(name, "cache-dynamic-ttl")) | 74 | else if (!strcmp(name, "cache-dynamic-ttl")) |
73 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 75 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
74 | else if (!strcmp(name, "embedded")) | 76 | else if (!strcmp(name, "embedded")) |
75 | ctx.cfg.embedded = atoi(value); | 77 | ctx.cfg.embedded = atoi(value); |
76 | else if (!strcmp(name, "max-message-length")) | 78 | else if (!strcmp(name, "max-message-length")) |
77 | ctx.cfg.max_msg_len = atoi(value); | 79 | ctx.cfg.max_msg_len = atoi(value); |
78 | else if (!strcmp(name, "max-repodesc-length")) | 80 | else if (!strcmp(name, "max-repodesc-length")) |
79 | ctx.cfg.max_repodesc_len = atoi(value); | 81 | ctx.cfg.max_repodesc_len = atoi(value); |
80 | else if (!strcmp(name, "max-repo-count")) | 82 | else if (!strcmp(name, "max-repo-count")) |
81 | ctx.cfg.max_repo_count = atoi(value); | 83 | ctx.cfg.max_repo_count = atoi(value); |
82 | else if (!strcmp(name, "max-commit-count")) | 84 | else if (!strcmp(name, "max-commit-count")) |
83 | ctx.cfg.max_commit_count = atoi(value); | 85 | ctx.cfg.max_commit_count = atoi(value); |
84 | else if (!strcmp(name, "summary-log")) | 86 | else if (!strcmp(name, "summary-log")) |
85 | ctx.cfg.summary_log = atoi(value); | 87 | ctx.cfg.summary_log = atoi(value); |
86 | else if (!strcmp(name, "summary-branches")) | 88 | else if (!strcmp(name, "summary-branches")) |
87 | ctx.cfg.summary_branches = atoi(value); | 89 | ctx.cfg.summary_branches = atoi(value); |
88 | else if (!strcmp(name, "summary-tags")) | 90 | else if (!strcmp(name, "summary-tags")) |
89 | ctx.cfg.summary_tags = atoi(value); | 91 | ctx.cfg.summary_tags = atoi(value); |
90 | else if (!strcmp(name, "agefile")) | 92 | else if (!strcmp(name, "agefile")) |
91 | ctx.cfg.agefile = xstrdup(value); | 93 | ctx.cfg.agefile = xstrdup(value); |
92 | else if (!strcmp(name, "renamelimit")) | 94 | else if (!strcmp(name, "renamelimit")) |
93 | ctx.cfg.renamelimit = atoi(value); | 95 | ctx.cfg.renamelimit = atoi(value); |
94 | else if (!strcmp(name, "robots")) | 96 | else if (!strcmp(name, "robots")) |
95 | ctx.cfg.robots = xstrdup(value); | 97 | ctx.cfg.robots = xstrdup(value); |
96 | else if (!strcmp(name, "clone-prefix")) | 98 | else if (!strcmp(name, "clone-prefix")) |
97 | ctx.cfg.clone_prefix = xstrdup(value); | 99 | ctx.cfg.clone_prefix = xstrdup(value); |
98 | else if (!strcmp(name, "local-time")) | 100 | else if (!strcmp(name, "local-time")) |
99 | ctx.cfg.local_time = atoi(value); | 101 | ctx.cfg.local_time = atoi(value); |
100 | else if (!strcmp(name, "repo.group")) | 102 | else if (!strcmp(name, "repo.group")) |
101 | ctx.cfg.repo_group = xstrdup(value); | 103 | ctx.cfg.repo_group = xstrdup(value); |
102 | else if (!strcmp(name, "repo.url")) | 104 | else if (!strcmp(name, "repo.url")) |
103 | ctx.repo = cgit_add_repo(value); | 105 | ctx.repo = cgit_add_repo(value); |
104 | else if (!strcmp(name, "repo.name")) | 106 | else if (!strcmp(name, "repo.name")) |
105 | ctx.repo->name = xstrdup(value); | 107 | ctx.repo->name = xstrdup(value); |
106 | else if (ctx.repo && !strcmp(name, "repo.path")) | 108 | else if (ctx.repo && !strcmp(name, "repo.path")) |
107 | ctx.repo->path = trim_end(value, '/'); | 109 | ctx.repo->path = trim_end(value, '/'); |
108 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 110 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
109 | ctx.repo->clone_url = xstrdup(value); | 111 | ctx.repo->clone_url = xstrdup(value); |
110 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 112 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
111 | ctx.repo->desc = xstrdup(value); | 113 | ctx.repo->desc = xstrdup(value); |
112 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 114 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
113 | ctx.repo->owner = xstrdup(value); | 115 | ctx.repo->owner = xstrdup(value); |
114 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 116 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
115 | ctx.repo->defbranch = xstrdup(value); | 117 | ctx.repo->defbranch = xstrdup(value); |
116 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 118 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
117 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 119 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
118 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 120 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
119 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 121 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
120 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 122 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
121 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 123 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
122 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | 124 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
123 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 125 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
124 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 126 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
125 | ctx.repo->module_link= xstrdup(value); | 127 | ctx.repo->module_link= xstrdup(value); |
126 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 128 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
127 | if (*value == '/') | 129 | if (*value == '/') |
128 | ctx.repo->readme = xstrdup(value); | 130 | ctx.repo->readme = xstrdup(value); |
129 | else | 131 | else |
130 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 132 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
131 | } else if (!strcmp(name, "include")) | 133 | } else if (!strcmp(name, "include")) |
132 | parse_configfile(value, config_cb); | 134 | parse_configfile(value, config_cb); |
133 | } | 135 | } |
134 | 136 | ||
135 | static void querystring_cb(const char *name, const char *value) | 137 | static void querystring_cb(const char *name, const char *value) |
136 | { | 138 | { |
137 | if (!strcmp(name,"r")) { | 139 | if (!strcmp(name,"r")) { |
138 | ctx.qry.repo = xstrdup(value); | 140 | ctx.qry.repo = xstrdup(value); |
139 | ctx.repo = cgit_get_repoinfo(value); | 141 | ctx.repo = cgit_get_repoinfo(value); |
140 | } else if (!strcmp(name, "p")) { | 142 | } else if (!strcmp(name, "p")) { |
141 | ctx.qry.page = xstrdup(value); | 143 | ctx.qry.page = xstrdup(value); |
142 | } else if (!strcmp(name, "url")) { | 144 | } else if (!strcmp(name, "url")) { |
143 | ctx.qry.url = xstrdup(value); | 145 | ctx.qry.url = xstrdup(value); |
144 | cgit_parse_url(value); | 146 | cgit_parse_url(value); |
145 | } else if (!strcmp(name, "qt")) { | 147 | } else if (!strcmp(name, "qt")) { |
146 | ctx.qry.grep = xstrdup(value); | 148 | ctx.qry.grep = xstrdup(value); |
147 | } else if (!strcmp(name, "q")) { | 149 | } else if (!strcmp(name, "q")) { |
148 | ctx.qry.search = xstrdup(value); | 150 | ctx.qry.search = xstrdup(value); |
149 | } else if (!strcmp(name, "h")) { | 151 | } else if (!strcmp(name, "h")) { |
150 | ctx.qry.head = xstrdup(value); | 152 | ctx.qry.head = xstrdup(value); |
151 | ctx.qry.has_symref = 1; | 153 | ctx.qry.has_symref = 1; |
152 | } else if (!strcmp(name, "id")) { | 154 | } else if (!strcmp(name, "id")) { |
153 | ctx.qry.sha1 = xstrdup(value); | 155 | ctx.qry.sha1 = xstrdup(value); |
154 | ctx.qry.has_sha1 = 1; | 156 | ctx.qry.has_sha1 = 1; |
155 | } else if (!strcmp(name, "id2")) { | 157 | } else if (!strcmp(name, "id2")) { |
156 | ctx.qry.sha2 = xstrdup(value); | 158 | ctx.qry.sha2 = xstrdup(value); |
157 | ctx.qry.has_sha1 = 1; | 159 | ctx.qry.has_sha1 = 1; |
158 | } else if (!strcmp(name, "ofs")) { | 160 | } else if (!strcmp(name, "ofs")) { |
159 | ctx.qry.ofs = atoi(value); | 161 | ctx.qry.ofs = atoi(value); |
160 | } else if (!strcmp(name, "path")) { | 162 | } else if (!strcmp(name, "path")) { |
161 | ctx.qry.path = trim_end(value, '/'); | 163 | ctx.qry.path = trim_end(value, '/'); |
162 | } else if (!strcmp(name, "name")) { | 164 | } else if (!strcmp(name, "name")) { |
163 | ctx.qry.name = xstrdup(value); | 165 | ctx.qry.name = xstrdup(value); |
164 | } else if (!strcmp(name, "mimetype")) { | 166 | } else if (!strcmp(name, "mimetype")) { |
165 | ctx.qry.mimetype = xstrdup(value); | 167 | ctx.qry.mimetype = xstrdup(value); |
166 | } else if (!strcmp(name, "s")){ | 168 | } else if (!strcmp(name, "s")){ |
167 | ctx.qry.sort = xstrdup(value); | 169 | ctx.qry.sort = xstrdup(value); |
168 | } else if (!strcmp(name, "showmsg")) { | 170 | } else if (!strcmp(name, "showmsg")) { |
169 | ctx.qry.showmsg = atoi(value); | 171 | ctx.qry.showmsg = atoi(value); |
170 | } else if (!strcmp(name, "period")) { | 172 | } else if (!strcmp(name, "period")) { |
171 | ctx.qry.period = xstrdup(value); | 173 | ctx.qry.period = xstrdup(value); |
172 | } | 174 | } |
173 | } | 175 | } |
174 | 176 | ||
175 | static void prepare_context(struct cgit_context *ctx) | 177 | static void prepare_context(struct cgit_context *ctx) |
176 | { | 178 | { |
177 | memset(ctx, 0, sizeof(ctx)); | 179 | memset(ctx, 0, sizeof(ctx)); |
178 | ctx->cfg.agefile = "info/web/last-modified"; | 180 | ctx->cfg.agefile = "info/web/last-modified"; |
179 | ctx->cfg.nocache = 0; | 181 | ctx->cfg.nocache = 0; |