X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/e352a013aed6e925a10a92916500c7deccf1410a..ad230267f8ecae6cb4f0da17d7a5f75ba38203e2:/ui-atom.c

diff --git a/ui-atom.c b/ui-atom.c
index a6ea3ee..b218456 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -24,7 +24,7 @@ void add_entry(struct commit *commit, char *host)
 	html_txt(info->subject);
 	html("</title>\n");
 	html("<updated>");
-	cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+	cgit_print_date(info->committer_date, FMT_ATOMDATE, 0);
 	html("</updated>\n");
 	html("<author>\n");
 	if (info->author) {
@@ -32,7 +32,7 @@ void add_entry(struct commit *commit, char *host)
 		html_txt(info->author);
 		html("</name>\n");
 	}
-	if (info->author_email) {
+	if (info->author_email && !ctx.cfg.noplainemail) {
 		mail = xstrdup(info->author_email);
 		t = strchr(mail, '<');
 		if (t)
@@ -49,10 +49,11 @@ void add_entry(struct commit *commit, char *host)
 	}
 	html("</author>\n");
 	html("<published>");
-	cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+	cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
 	html("</published>\n");
 	if (host) {
-		html("<link rel='alternate' type='text/html' href='http://");
+		html("<link rel='alternate' type='text/html' href='");
+		html(cgit_httpscheme());
 		html_attr(host);
 		html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
 		if (ctx.cfg.virtual_root)
@@ -84,7 +85,9 @@ void cgit_print_atom(char *tip, char *path, int max_count)
 	struct rev_info rev;
 	int argc = 2;
 
-	if (!tip)
+	if (ctx.qry.show_all)
+		argv[1] = "--all";
+	else if (!tip)
 		argv[1] = ctx.qry.head;
 
 	if (path) {
@@ -108,12 +111,21 @@ void cgit_print_atom(char *tip, char *path, int max_count)
 	html("<feed xmlns='http://www.w3.org/2005/Atom'>\n");
 	html("<title>");
 	html_txt(ctx.repo->name);
+	if (path) {
+		html("/");
+		html_txt(path);
+	}
+	if (tip && !ctx.qry.show_all) {
+		html(", branch ");
+		html_txt(tip);
+	}
 	html("</title>\n");
 	html("<subtitle>");
 	html_txt(ctx.repo->desc);
 	html("</subtitle>\n");
 	if (host) {
-		html("<link rel='alternate' type='text/html' href='http://");
+		html("<link rel='alternate' type='text/html' href='");
+		html(cgit_httpscheme());
 		html_attr(host);
 		html_attr(cgit_repourl(ctx.repo->url));
 		html("'/>\n");