X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/905dbaef5aa33ea11d385b82de0188fee73dd655..49ecbbddf0659c6409befcfe8989f92196133cda:/ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index d08ede9..1fc5c09 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,6 +34,26 @@ void cgit_print_error(char *msg)
 	html("</div>\n");
 }
 
+char *cgit_hosturl()
+{
+	char *host, *port;
+
+	host = getenv("HTTP_HOST");
+	if (host) {
+		host = xstrdup(host);
+	} else {
+		host = getenv("SERVER_NAME");
+		if (!host)
+			return NULL;
+		port = getenv("SERVER_PORT");
+		if (port && atoi(port) != 80)
+			host = xstrdup(fmt("%s:%d", host, atoi(port)));
+		else
+			host = xstrdup(host);
+	}
+	return host;
+}
+
 char *cgit_rooturl()
 {
 	if (ctx.cfg.virtual_root)
@@ -114,7 +134,7 @@ char *cgit_currurl()
 		return fmt("%s/", ctx.cfg.virtual_root);
 }
 
-static void site_url(char *page, char *search)
+static void site_url(char *page, char *search, int ofs)
 {
 	char *delim = "?";
 
@@ -133,11 +153,16 @@ static void site_url(char *page, char *search)
 		html(delim);
 		html("q=");
 		html_attr(search);
+		delim = "&";
+	}
+	if (ofs) {
+		html(delim);
+		htmlf("ofs=%d", ofs);
 	}
 }
 
 static void site_link(char *page, char *name, char *title, char *class,
-		       char *search)
+		      char *search, int ofs)
 {
 	html("<a");
 	if (title) {
@@ -151,12 +176,18 @@ static void site_link(char *page, char *name, char *title, char *class,
 		html("'");
 	}
 	html(" href='");
-	site_url(page, search);
+	site_url(page, search, ofs);
 	html("'>");
 	html_txt(name);
 	html("</a>");
 }
 
+void cgit_index_link(char *name, char *title, char *class, char *pattern,
+		     int ofs)
+{
+	site_link(NULL, name, title, class, pattern, ofs);
+}
+
 static char *repolink(char *title, char *class, char *page, char *head,
 		      char *path)
 {
@@ -175,36 +206,36 @@ static char *repolink(char *title, char *class, char *page, char *head,
 	}
 	html(" href='");
 	if (ctx.cfg.virtual_root) {
-		html_attr(ctx.cfg.virtual_root);
+		html_url_path(ctx.cfg.virtual_root);
 		if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
 			html("/");
-		html_attr(ctx.repo->url);
+		html_url_path(ctx.repo->url);
 		if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
 			html("/");
 		if (page) {
-			html(page);
+			html_url_path(page);
 			html("/");
 			if (path)
-				html_attr(path);
+				html_url_path(path);
 		}
 	} else {
 		html(ctx.cfg.script_name);
 		html("?url=");
-		html_attr(ctx.repo->url);
+		html_url_arg(ctx.repo->url);
 		if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
 			html("/");
 		if (page) {
-			html(page);
+			html_url_arg(page);
 			html("/");
 			if (path)
-				html_attr(path);
+				html_url_arg(path);
 		}
 		delim = "&amp;";
 	}
 	if (head && strcmp(head, ctx.repo->defbranch)) {
 		html(delim);
 		html("h=");
-		html_attr(head);
+		html_url_arg(head);
 		delim = "&amp;";
 	}
 	return fmt("%s", delim);
@@ -219,19 +250,30 @@ static void reporevlink(char *page, char *name, char *title, char *class,
 	if (rev && strcmp(rev, ctx.qry.head)) {
 		html(delim);
 		html("id=");
-		html_attr(rev);
+		html_url_arg(rev);
 	}
 	html("'>");
 	html_txt(name);
 	html("</a>");
 }
 
+void cgit_summary_link(char *name, char *title, char *class, char *head)
+{
+	reporevlink(NULL, name, title, class, head, NULL, NULL);
+}
+
 void cgit_tree_link(char *name, char *title, char *class, char *head,
 		    char *rev, char *path)
 {
 	reporevlink("tree", name, title, class, head, rev, path);
 }
 
+void cgit_plain_link(char *name, char *title, char *class, char *head,
+		     char *rev, char *path)
+{
+	reporevlink("plain", name, title, class, head, rev, path);
+}
+
 void cgit_log_link(char *name, char *title, char *class, char *head,
 		   char *rev, char *path, int ofs, char *grep, char *pattern)
 {
@@ -241,17 +283,17 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 	if (rev && strcmp(rev, ctx.qry.head)) {
 		html(delim);
 		html("id=");
-		html_attr(rev);
+		html_url_arg(rev);
 		delim = "&";
 	}
 	if (grep && pattern) {
 		html(delim);
 		html("qt=");
-		html_attr(grep);
+		html_url_arg(grep);
 		delim = "&";
 		html(delim);
 		html("q=");
-		html_attr(pattern);
+		html_url_arg(pattern);
 	}
 	if (ofs > 0) {
 		html(delim);
@@ -296,13 +338,13 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
 	if (new_rev && strcmp(new_rev, ctx.qry.head)) {
 		html(delim);
 		html("id=");
-		html_attr(new_rev);
+		html_url_arg(new_rev);
 		delim = "&amp;";
 	}
 	if (old_rev) {
 		html(delim);
 		html("id2=");
-		html_attr(old_rev);
+		html_url_arg(old_rev);
 	}
 	html("'>");
 	html_txt(name);
@@ -342,14 +384,17 @@ void cgit_object_link(struct object *obj)
 	html_link_close();
 }
 
-void cgit_print_date(time_t secs, char *format)
+void cgit_print_date(time_t secs, char *format, int local_time)
 {
 	char buf[64];
 	struct tm *time;
 
 	if (!secs)
 		return;
-	time = gmtime(&secs);
+	if(local_time)
+		time = localtime(&secs);
+	else
+		time = gmtime(&secs);
 	strftime(buf, sizeof(buf)-1, format, time);
 	html_txt(buf);
 }
@@ -364,7 +409,7 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 	secs = now - t;
 
 	if (secs > max_relative && max_relative >= 0) {
-		cgit_print_date(t, format);
+		cgit_print_date(t, format, ctx.cfg.local_time);
 		return;
 	}
 
@@ -404,6 +449,8 @@ void cgit_print_http_headers(struct cgit_context *ctx)
 		      ctx->page.charset);
 	else if (ctx->page.mimetype)
 		htmlf("Content-Type: %s\n", ctx->page.mimetype);
+	if (ctx->page.size)
+		htmlf("Content-Length: %ld\n", ctx->page.size);
 	if (ctx->page.filename)
 		htmlf("Content-Disposition: inline; filename=\"%s\"\n",
 		      ctx->page.filename);
@@ -414,6 +461,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {
+	char *host = cgit_hosturl();
 	html(cgit_doctype);
 	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
 	html("<head>\n");
@@ -426,13 +474,34 @@ void cgit_print_docstart(struct cgit_context *ctx)
 	html("<link rel='stylesheet' type='text/css' href='");
 	html_attr(ctx->cfg.css);
 	html("'/>\n");
+	if (ctx->cfg.favicon) {
+		html("<link rel='shortcut icon' href='");
+		html_attr(ctx->cfg.favicon);
+		html("'/>\n");
+	}
+	if (host && ctx->repo) {
+		html("<link rel='alternate' title='Atom feed' href='http://");
+		html_attr(cgit_hosturl());
+		html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
+				       fmt("h=%s", ctx->qry.head)));
+		html("' type='application/atom+xml'/>");
+	}
 	html("</head>\n");
 	html("<body>\n");
 }
 
 void cgit_print_docend()
 {
-	html("</div>\n</body>\n</html>\n");
+	html("</div>");
+	if (ctx.cfg.footer)
+		html_include(ctx.cfg.footer);
+	else {
+		html("<div class='footer'>generated ");
+		cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
+		htmlf(" by cgit %s", cgit_version);
+		html("</div>\n");
+	}
+	html("</body>\n</html>\n");
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
@@ -493,7 +562,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 		html_hidden("url", url);
 	}
 
-	if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
+	if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
+	    strcmp(ctx.qry.head, ctx.repo->defbranch))
 		html_hidden("h", ctx.qry.head);
 
 	if (ctx.qry.sha1)
@@ -531,10 +601,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 
 	html("<td class='main'>");
 	if (ctx->repo) {
-		reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
-			    ctx->qry.head, NULL, NULL);
+		cgit_index_link("index", NULL, NULL, NULL, 0);
 		html(" : ");
-		html_txt(ctx->qry.page);
+		cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
 		html("</td><td class='form'>");
 		html("<form method='get' action=''>\n");
 		add_hidden_formfields(0, 1, ctx->qry.page);
@@ -547,12 +616,12 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 		html_txt(ctx->cfg.root_title);
 	html("</td></tr>\n");
 
-	html("<tr><td class='sub'");
+	html("<tr><td class='sub'>");
 	if (ctx->repo) {
-		html(" colspan='2'>");
 		html_txt(ctx->repo->desc);
+		html("</td><td class='sub right'>");
+		html_txt(ctx->repo->owner);
 	} else {
-		html(">");
 		if (ctx->cfg.root_desc)
 			html_txt(ctx->cfg.root_desc);
 		else if (ctx->cfg.index_info)
@@ -562,8 +631,8 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 
 	html("<table class='tabs'><tr><td>\n");
 	if (ctx->repo) {
-		reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
-			    ctx->qry.head, NULL, NULL);
+		cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL,
+			ctx->qry.head);
 		cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
 			       ctx->qry.sha1, NULL);
 		cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
@@ -596,9 +665,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 		html("<input type='submit' value='search'/>\n");
 		html("</form>\n");
 	} else {
-		site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL);
+		site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
 		if (ctx->cfg.root_readme)
-			site_link("about", "about", NULL, hc(cmd, "about"), NULL);
+			site_link("about", "about", NULL, hc(cmd, "about"),
+				  NULL, 0);
 		html("</td><td class='form'>");
 		html("<form method='get' action='");
 		html_attr(cgit_rooturl());