|
diff --git a/ui-atom.c b/ui-atom.c index a6ea3ee..808b2d0 100644 --- a/ ui-atom.c+++ b/ ui-atom.c |
|
@@ -19,53 +19,54 @@ void add_entry(struct commit *commit, char *host) |
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, ctx.cfg.local_time); |
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) { |
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, ctx.cfg.local_time); |
53 | html("</published>\n"); |
53 | html("</published>\n"); |
54 | if (host) { |
54 | if (host) { |
55 | html("<link rel='alternate' type='text/html' href='http://"); |
55 | html("<link rel='alternate' type='text/html' href='"); |
| |
56 | html(cgit_httpscheme()); |
56 | html_attr(host); |
57 | html_attr(host); |
57 | html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL)); |
58 | html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL)); |
58 | if (ctx.cfg.virtual_root) |
59 | if (ctx.cfg.virtual_root) |
59 | delim = '?'; |
60 | delim = '?'; |
60 | htmlf("%cid=%s", delim, hex); |
61 | htmlf("%cid=%s", delim, hex); |
61 | html("'/>\n"); |
62 | html("'/>\n"); |
62 | } |
63 | } |
63 | htmlf("<id>%s</id>\n", hex); |
64 | htmlf("<id>%s</id>\n", hex); |
64 | html("<content type='text'>\n"); |
65 | html("<content type='text'>\n"); |
65 | html_txt(info->msg); |
66 | html_txt(info->msg); |
66 | html("</content>\n"); |
67 | html("</content>\n"); |
67 | html("<content type='xhtml'>\n"); |
68 | html("<content type='xhtml'>\n"); |
68 | html("<div xmlns='http://www.w3.org/1999/xhtml'>\n"); |
69 | html("<div xmlns='http://www.w3.org/1999/xhtml'>\n"); |
69 | html("<pre>\n"); |
70 | html("<pre>\n"); |
70 | html_txt(info->msg); |
71 | html_txt(info->msg); |
71 | html("</pre>\n"); |
72 | html("</pre>\n"); |
@@ -100,30 +101,31 @@ void cgit_print_atom(char *tip, char *path, int max_count) |
100 | rev.max_count = max_count; |
101 | rev.max_count = max_count; |
101 | setup_revisions(argc, argv, &rev, NULL); |
102 | setup_revisions(argc, argv, &rev, NULL); |
102 | prepare_revision_walk(&rev); |
103 | prepare_revision_walk(&rev); |
103 | |
104 | |
104 | host = cgit_hosturl(); |
105 | host = cgit_hosturl(); |
105 | ctx.page.mimetype = "text/xml"; |
106 | ctx.page.mimetype = "text/xml"; |
106 | ctx.page.charset = "utf-8"; |
107 | ctx.page.charset = "utf-8"; |
107 | cgit_print_http_headers(&ctx); |
108 | cgit_print_http_headers(&ctx); |
108 | html("<feed xmlns='http://www.w3.org/2005/Atom'>\n"); |
109 | html("<feed xmlns='http://www.w3.org/2005/Atom'>\n"); |
109 | html("<title>"); |
110 | html("<title>"); |
110 | html_txt(ctx.repo->name); |
111 | html_txt(ctx.repo->name); |
111 | html("</title>\n"); |
112 | html("</title>\n"); |
112 | html("<subtitle>"); |
113 | html("<subtitle>"); |
113 | html_txt(ctx.repo->desc); |
114 | html_txt(ctx.repo->desc); |
114 | html("</subtitle>\n"); |
115 | html("</subtitle>\n"); |
115 | if (host) { |
116 | if (host) { |
116 | html("<link rel='alternate' type='text/html' href='http://"); |
117 | html("<link rel='alternate' type='text/html' href='"); |
| |
118 | html(cgit_httpscheme()); |
117 | html_attr(host); |
119 | html_attr(host); |
118 | html_attr(cgit_repourl(ctx.repo->url)); |
120 | html_attr(cgit_repourl(ctx.repo->url)); |
119 | html("'/>\n"); |
121 | html("'/>\n"); |
120 | } |
122 | } |
121 | while ((commit = get_revision(&rev)) != NULL) { |
123 | while ((commit = get_revision(&rev)) != NULL) { |
122 | add_entry(commit, host); |
124 | add_entry(commit, host); |
123 | free(commit->buffer); |
125 | free(commit->buffer); |
124 | commit->buffer = NULL; |
126 | commit->buffer = NULL; |
125 | free_commit_list(commit->parents); |
127 | free_commit_list(commit->parents); |
126 | commit->parents = NULL; |
128 | commit->parents = NULL; |
127 | } |
129 | } |
128 | html("</feed>\n"); |
130 | html("</feed>\n"); |
129 | } |
131 | } |
|