summaryrefslogtreecommitdiffabout
authorAaron Griffin <agriffin@datalogics.com>2010-09-15 15:16:33 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-09-19 18:57:30 (UTC)
commitaaa3f7854232726d5530f66b9459e036bbba15cb (patch) (unidiff)
tree12cb29a95172cb641dbebf4586930efcad4dca25
parentba1769cb6438f3a08da8cf1308eb8efad3ce573b (diff)
downloadcgit-aaa3f7854232726d5530f66b9459e036bbba15cb.zip
cgit-aaa3f7854232726d5530f66b9459e036bbba15cb.tar.gz
cgit-aaa3f7854232726d5530f66b9459e036bbba15cb.tar.bz2
RSS items should always use UTC times
The format uses a 'Z' suffix, which indicates no TZ offset. Thus we should not respect the local-time config setting here. Signed-off-by: Aaron Griffin <agriffin@datalogics.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-atom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-atom.c b/ui-atom.c
index 808b2d0..881872c 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -1,131 +1,131 @@
1/* ui-atom.c: functions for atom feeds 1/* ui-atom.c: functions for atom feeds
2 * 2 *
3 * Copyright (C) 2008 Lars Hjemli 3 * Copyright (C) 2008 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 "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13void add_entry(struct commit *commit, char *host) 13void add_entry(struct commit *commit, char *host)
14{ 14{
15 char delim = '&'; 15 char delim = '&';
16 char *hex; 16 char *hex;
17 char *mail, *t, *t2; 17 char *mail, *t, *t2;
18 struct commitinfo *info; 18 struct commitinfo *info;
19 19
20 info = cgit_parse_commit(commit); 20 info = cgit_parse_commit(commit);
21 hex = sha1_to_hex(commit->object.sha1); 21 hex = sha1_to_hex(commit->object.sha1);
22 html("<entry>\n"); 22 html("<entry>\n");
23 html("<title>"); 23 html("<title>");
24 html_txt(info->subject); 24 html_txt(info->subject);
25 html("</title>\n"); 25 html("</title>\n");
26 html("<updated>"); 26 html("<updated>");
27 cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time); 27 cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
28 html("</updated>\n"); 28 html("</updated>\n");
29 html("<author>\n"); 29 html("<author>\n");
30 if (info->author) { 30 if (info->author) {
31 html("<name>"); 31 html("<name>");
32 html_txt(info->author); 32 html_txt(info->author);
33 html("</name>\n"); 33 html("</name>\n");
34 } 34 }
35 if (info->author_email && !ctx.cfg.noplainemail) { 35 if (info->author_email && !ctx.cfg.noplainemail) {
36 mail = xstrdup(info->author_email); 36 mail = xstrdup(info->author_email);
37 t = strchr(mail, '<'); 37 t = strchr(mail, '<');
38 if (t) 38 if (t)
39 t++; 39 t++;
40 else 40 else
41 t = mail; 41 t = mail;
42 t2 = strchr(t, '>'); 42 t2 = strchr(t, '>');
43 if (t2) 43 if (t2)
44 *t2 = '\0'; 44 *t2 = '\0';
45 html("<email>"); 45 html("<email>");
46 html_txt(t); 46 html_txt(t);
47 html("</email>\n"); 47 html("</email>\n");
48 free(mail); 48 free(mail);
49 } 49 }
50 html("</author>\n"); 50 html("</author>\n");
51 html("<published>"); 51 html("<published>");
52 cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time); 52 cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
53 html("</published>\n"); 53 html("</published>\n");
54 if (host) { 54 if (host) {
55 html("<link rel='alternate' type='text/html' href='"); 55 html("<link rel='alternate' type='text/html' href='");
56 html(cgit_httpscheme()); 56 html(cgit_httpscheme());
57 html_attr(host); 57 html_attr(host);
58 html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL)); 58 html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
59 if (ctx.cfg.virtual_root) 59 if (ctx.cfg.virtual_root)
60 delim = '?'; 60 delim = '?';
61 htmlf("%cid=%s", delim, hex); 61 htmlf("%cid=%s", delim, hex);
62 html("'/>\n"); 62 html("'/>\n");
63 } 63 }
64 htmlf("<id>%s</id>\n", hex); 64 htmlf("<id>%s</id>\n", hex);
65 html("<content type='text'>\n"); 65 html("<content type='text'>\n");
66 html_txt(info->msg); 66 html_txt(info->msg);
67 html("</content>\n"); 67 html("</content>\n");
68 html("<content type='xhtml'>\n"); 68 html("<content type='xhtml'>\n");
69 html("<div xmlns='http://www.w3.org/1999/xhtml'>\n"); 69 html("<div xmlns='http://www.w3.org/1999/xhtml'>\n");
70 html("<pre>\n"); 70 html("<pre>\n");
71 html_txt(info->msg); 71 html_txt(info->msg);
72 html("</pre>\n"); 72 html("</pre>\n");
73 html("</div>\n"); 73 html("</div>\n");
74 html("</content>\n"); 74 html("</content>\n");
75 html("</entry>\n"); 75 html("</entry>\n");
76 cgit_free_commitinfo(info); 76 cgit_free_commitinfo(info);
77} 77}
78 78
79 79
80void cgit_print_atom(char *tip, char *path, int max_count) 80void cgit_print_atom(char *tip, char *path, int max_count)
81{ 81{
82 char *host; 82 char *host;
83 const char *argv[] = {NULL, tip, NULL, NULL, NULL}; 83 const char *argv[] = {NULL, tip, NULL, NULL, NULL};
84 struct commit *commit; 84 struct commit *commit;
85 struct rev_info rev; 85 struct rev_info rev;
86 int argc = 2; 86 int argc = 2;
87 87
88 if (!tip) 88 if (!tip)
89 argv[1] = ctx.qry.head; 89 argv[1] = ctx.qry.head;
90 90
91 if (path) { 91 if (path) {
92 argv[argc++] = "--"; 92 argv[argc++] = "--";
93 argv[argc++] = path; 93 argv[argc++] = path;
94 } 94 }
95 95
96 init_revisions(&rev, NULL); 96 init_revisions(&rev, NULL);
97 rev.abbrev = DEFAULT_ABBREV; 97 rev.abbrev = DEFAULT_ABBREV;
98 rev.commit_format = CMIT_FMT_DEFAULT; 98 rev.commit_format = CMIT_FMT_DEFAULT;
99 rev.verbose_header = 1; 99 rev.verbose_header = 1;
100 rev.show_root_diff = 0; 100 rev.show_root_diff = 0;
101 rev.max_count = max_count; 101 rev.max_count = max_count;
102 setup_revisions(argc, argv, &rev, NULL); 102 setup_revisions(argc, argv, &rev, NULL);
103 prepare_revision_walk(&rev); 103 prepare_revision_walk(&rev);
104 104
105 host = cgit_hosturl(); 105 host = cgit_hosturl();
106 ctx.page.mimetype = "text/xml"; 106 ctx.page.mimetype = "text/xml";
107 ctx.page.charset = "utf-8"; 107 ctx.page.charset = "utf-8";
108 cgit_print_http_headers(&ctx); 108 cgit_print_http_headers(&ctx);
109 html("<feed xmlns='http://www.w3.org/2005/Atom'>\n"); 109 html("<feed xmlns='http://www.w3.org/2005/Atom'>\n");
110 html("<title>"); 110 html("<title>");
111 html_txt(ctx.repo->name); 111 html_txt(ctx.repo->name);
112 html("</title>\n"); 112 html("</title>\n");
113 html("<subtitle>"); 113 html("<subtitle>");
114 html_txt(ctx.repo->desc); 114 html_txt(ctx.repo->desc);
115 html("</subtitle>\n"); 115 html("</subtitle>\n");
116 if (host) { 116 if (host) {
117 html("<link rel='alternate' type='text/html' href='"); 117 html("<link rel='alternate' type='text/html' href='");
118 html(cgit_httpscheme()); 118 html(cgit_httpscheme());
119 html_attr(host); 119 html_attr(host);
120 html_attr(cgit_repourl(ctx.repo->url)); 120 html_attr(cgit_repourl(ctx.repo->url));
121 html("'/>\n"); 121 html("'/>\n");
122 } 122 }
123 while ((commit = get_revision(&rev)) != NULL) { 123 while ((commit = get_revision(&rev)) != NULL) {
124 add_entry(commit, host); 124 add_entry(commit, host);
125 free(commit->buffer); 125 free(commit->buffer);
126 commit->buffer = NULL; 126 commit->buffer = NULL;
127 free_commit_list(commit->parents); 127 free_commit_list(commit->parents);
128 commit->parents = NULL; 128 commit->parents = NULL;
129 } 129 }
130 html("</feed>\n"); 130 html("</feed>\n");
131} 131}