-rw-r--r-- | ui-shared.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ui-shared.c b/ui-shared.c index bca50aa..6f5cf2b 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -9,19 +9,19 @@ | |||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | const char cgit_doctype[] = | 11 | const char cgit_doctype[] = |
12 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" | 12 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" |
13 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; | 13 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; |
14 | 14 | ||
15 | static char *http_date(time_t t) | 15 | static char *http_date(time_t t) |
16 | { | 16 | { |
17 | static char day[][4] = | 17 | static char day[][4] = |
18 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; | 18 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; |
19 | static char month[][4] = | 19 | static char month[][4] = |
20 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", | 20 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", |
21 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; | 21 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; |
22 | struct tm *tm = gmtime(&t); | 22 | struct tm *tm = gmtime(&t); |
23 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], | 23 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], |
24 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, | 24 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, |
25 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 25 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
26 | } | 26 | } |
27 | 27 | ||
@@ -52,21 +52,21 @@ char *cgit_repourl(const char *reponame) | |||
52 | { | 52 | { |
53 | if (cgit_virtual_root) { | 53 | if (cgit_virtual_root) { |
54 | return fmt("%s/%s/", cgit_virtual_root, reponame); | 54 | return fmt("%s/%s/", cgit_virtual_root, reponame); |
55 | } else { | 55 | } else { |
56 | return fmt("?r=%s", reponame); | 56 | return fmt("?r=%s", reponame); |
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | char *cgit_pageurl(const char *reponame, const char *pagename, | 60 | char *cgit_pageurl(const char *reponame, const char *pagename, |
61 | const char *query) | 61 | const char *query) |
62 | { | 62 | { |
63 | if (cgit_virtual_root) { | 63 | if (cgit_virtual_root) { |
64 | return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, | 64 | return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, |
65 | pagename, query); | 65 | pagename, query); |
66 | } else { | 66 | } else { |
67 | return fmt("?r=%s&p=%s&%s", reponame, pagename, query); | 67 | return fmt("?r=%s&p=%s&%s", reponame, pagename, query); |
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | char *cgit_currurl() | 71 | char *cgit_currurl() |
72 | { | 72 | { |
@@ -84,17 +84,16 @@ char *cgit_currurl() | |||
84 | void cgit_print_date(unsigned long secs) | 84 | void cgit_print_date(unsigned long secs) |
85 | { | 85 | { |
86 | char buf[32]; | 86 | char buf[32]; |
87 | struct tm *time; | 87 | struct tm *time; |
88 | 88 | ||
89 | time = gmtime(&secs); | 89 | time = gmtime(&secs); |
90 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); | 90 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); |
91 | html_txt(buf); | 91 | html_txt(buf); |
92 | |||
93 | } | 92 | } |
94 | 93 | ||
95 | void cgit_print_docstart(char *title, struct cacheitem *item) | 94 | void cgit_print_docstart(char *title, struct cacheitem *item) |
96 | { | 95 | { |
97 | html("Content-Type: text/html; charset=utf-8\n"); | 96 | html("Content-Type: text/html; charset=utf-8\n"); |
98 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 97 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
99 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 98 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
100 | ttl_seconds(item->ttl))); | 99 | ttl_seconds(item->ttl))); |
@@ -157,17 +156,17 @@ void cgit_print_pageheader(char *title, int show_search) | |||
157 | html("<input type='text' name='q' value='"); | 156 | html("<input type='text' name='q' value='"); |
158 | html_attr(cgit_query_search); | 157 | html_attr(cgit_query_search); |
159 | html("'/></form>"); | 158 | html("'/></form>"); |
160 | } | 159 | } |
161 | html("</td></tr>"); | 160 | html("</td></tr>"); |
162 | html("<tr><td id='content' colspan='2'>"); | 161 | html("<tr><td id='content' colspan='2'>"); |
163 | } | 162 | } |
164 | 163 | ||
165 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, | 164 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, |
166 | struct cacheitem *item) | 165 | struct cacheitem *item) |
167 | { | 166 | { |
168 | htmlf("Content-Type: %s\n", mimetype); | 167 | htmlf("Content-Type: %s\n", mimetype); |
169 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); | 168 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); |
170 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 169 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
171 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 170 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
172 | ttl_seconds(item->ttl))); | 171 | ttl_seconds(item->ttl))); |
173 | html("\n"); | 172 | html("\n"); |