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

diff --git a/ui-shared.c b/ui-shared.c
index 2eff79d..1fc5c09 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include "cmd.h"
 #include "html.h"
 
 const char cgit_doctype[] =
@@ -26,14 +27,6 @@ static char *http_date(time_t t)
 		   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
-static long ttl_seconds(long ttl)
-{
-	if (ttl<0)
-		return 60 * 60 * 24 * 365;
-	else
-		return ttl * 60;
-}
-
 void cgit_print_error(char *msg)
 {
 	html("<div class='error'>");
@@ -41,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)
@@ -121,6 +134,60 @@ char *cgit_currurl()
 		return fmt("%s/", ctx.cfg.virtual_root);
 }
 
+static void site_url(char *page, char *search, int ofs)
+{
+	char *delim = "?";
+
+	if (ctx.cfg.virtual_root) {
+		html_attr(ctx.cfg.virtual_root);
+		if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
+			html("/");
+	} else
+		html(ctx.cfg.script_name);
+
+	if (page) {
+		htmlf("?p=%s", page);
+		delim = "&";
+	}
+	if (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, int ofs)
+{
+	html("<a");
+	if (title) {
+		html(" title='");
+		html_attr(title);
+		html("'");
+	}
+	if (class) {
+		html(" class='");
+		html_attr(class);
+		html("'");
+	}
+	html(" href='");
+	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)
 {
@@ -139,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);
@@ -183,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)
 {
@@ -205,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);
@@ -260,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);
@@ -306,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);
 }
@@ -328,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;
 	}
 
@@ -361,32 +442,66 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 	      secs * 1.0 / TM_YEAR);
 }
 
-void cgit_print_docstart(char *title, struct cacheitem *item)
+void cgit_print_http_headers(struct cgit_context *ctx)
 {
-	html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
-	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
-	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
-					 ttl_seconds(item->ttl)));
+	if (ctx->page.mimetype && ctx->page.charset)
+		htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
+		      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);
+	htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
+	htmlf("Expires: %s\n", http_date(ctx->page.expires));
 	html("\n");
+}
+
+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");
 	html("<title>");
-	html_txt(title);
+	html_txt(ctx->page.title);
 	html("</title>\n");
 	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
-	if (ctx.cfg.robots && *ctx.cfg.robots)
-		htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots);
+	if (ctx->cfg.robots && *ctx->cfg.robots)
+		htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
 	html("<link rel='stylesheet' type='text/css' href='");
-	html_attr(ctx.cfg.css);
+	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("</td>\n</tr>\n</table>\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,
@@ -447,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)
@@ -463,109 +579,108 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 	}
 }
 
-void cgit_print_pageheader(char *title, int show_search)
+char *hc(struct cgit_cmd *cmd, const char *page)
 {
-	static const char *default_info = "This is cgit, a fast webinterface for git repositories";
-	int header = 0;
-	char *url;
+	return (strcmp(cmd->name, page) ? NULL : "active");
+}
 
-	html("<table id='layout' summary=''>\n");
-	html("<tr><td id='sidebar'>\n");
-	html("<table class='sidebar' cellspacing='0' summary=''>\n");
-	html("<tr><td class='sidebar'>\n<a href='");
-	html_attr(cgit_rooturl());
-	htmlf("'><img src='%s' alt='cgit'/></a>\n",
-	      ctx.cfg.logo);
-	html("</td></tr>\n<tr><td class='sidebar'>\n");
-	if (ctx.repo) {
-		html("<h1 class='first'>");
-		html_txt(strrpart(ctx.repo->name, 20));
-		html("</h1>\n");
-		html_txt(ctx.repo->desc);
-		if (ctx.repo->owner) {
-			html("<h1>owner</h1>\n");
-			html_txt(ctx.repo->owner);
-		}
-		html("<h1>navigate</h1>\n");
-		reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head,
-			    NULL, NULL);
-		cgit_log_link("log", NULL, "menu", ctx.qry.head, NULL, NULL,
-			      0, NULL, NULL);
-		cgit_tree_link("tree", NULL, "menu", ctx.qry.head,
-			       ctx.qry.sha1, NULL);
-		cgit_commit_link("commit", NULL, "menu", ctx.qry.head,
-			      ctx.qry.sha1);
-		cgit_diff_link("diff", NULL, "menu", ctx.qry.head,
-			       ctx.qry.sha1, ctx.qry.sha2, NULL);
-		cgit_patch_link("patch", NULL, "menu", ctx.qry.head,
-				ctx.qry.sha1);
-
-		for_each_ref(print_archive_ref, &header);
-
-		if (ctx.repo->clone_url || ctx.cfg.clone_prefix) {
-			html("<h1>clone</h1>\n");
-			if (ctx.repo->clone_url)
-				url = ctx.repo->clone_url;
-			else
-				url = fmt("%s%s", ctx.cfg.clone_prefix,
-					  ctx.repo->url);
-			html("<a class='menu' href='");
-			html_attr(url);
-			html("' title='");
-			html_attr(url);
-			html("'>\n");
-			html_txt(strrpart(url, 20));
-			html("</a>\n");
-		}
+void cgit_print_pageheader(struct cgit_context *ctx)
+{
+	struct cgit_cmd *cmd = cgit_get_cmd(ctx);
 
-		html("<h1>branch</h1>\n");
+	html("<table id='header'>\n");
+	html("<tr>\n");
+	html("<td class='logo' rowspan='2'><a href='");
+	if (ctx->cfg.logo_link)
+		html_attr(ctx->cfg.logo_link);
+	else
+		html_attr(cgit_rooturl());
+	html("'><img src='");
+	html_attr(ctx->cfg.logo);
+	html("' alt='cgit logo'/></a></td>\n");
+
+	html("<td class='main'>");
+	if (ctx->repo) {
+		cgit_index_link("index", NULL, NULL, NULL, 0);
+		html(" : ");
+		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);
-//		html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
+		add_hidden_formfields(0, 1, ctx->qry.page);
 		html("<select name='h' onchange='this.form.submit();'>\n");
-		for_each_branch_ref(print_branch_option, ctx.qry.head);
-		html("</select>\n");
-//		html("</td><td>");
-		html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
-//		html("</td></tr></table>");
-		html("</form>\n");
-
-		html("<h1>search</h1>\n");
-		html("<form method='get' action='");
-		if (ctx.cfg.virtual_root)
-			html_attr(cgit_fileurl(ctx.qry.repo, "log",
-					       ctx.qry.path, NULL));
+		for_each_branch_ref(print_branch_option, ctx->qry.head);
+		html("</select> ");
+		html("<input type='submit' name='' value='switch'/>");
+		html("</form>");
+	} else
+		html_txt(ctx->cfg.root_title);
+	html("</td></tr>\n");
+
+	html("<tr><td class='sub'>");
+	if (ctx->repo) {
+		html_txt(ctx->repo->desc);
+		html("</td><td class='sub right'>");
+		html_txt(ctx->repo->owner);
+	} else {
+		if (ctx->cfg.root_desc)
+			html_txt(ctx->cfg.root_desc);
+		else if (ctx->cfg.index_info)
+			html_include(ctx->cfg.index_info);
+	}
+	html("</td></tr></table>\n");
+
+	html("<table class='tabs'><tr><td>\n");
+	if (ctx->repo) {
+		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,
+			      NULL, NULL, 0, NULL, NULL);
+		cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
+			       ctx->qry.sha1, NULL);
+		cgit_commit_link("commit", NULL, hc(cmd, "commit"),
+				 ctx->qry.head, ctx->qry.sha1);
+		cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
+			       ctx->qry.sha1, ctx->qry.sha2, NULL);
+		if (ctx->repo->readme)
+			reporevlink("about", "about", NULL,
+				    hc(cmd, "about"), ctx->qry.head, NULL,
+				    NULL);
+		html("</td><td class='form'>");
+		html("<form class='right' method='get' action='");
+		if (ctx->cfg.virtual_root)
+			html_attr(cgit_fileurl(ctx->qry.repo, "log",
+					       ctx->qry.path, NULL));
 		html("'>\n");
 		add_hidden_formfields(1, 0, "log");
 		html("<select name='qt'>\n");
-		html_option("grep", "log msg", ctx.qry.grep);
-		html_option("author", "author", ctx.qry.grep);
-		html_option("committer", "committer", ctx.qry.grep);
+		html_option("grep", "log msg", ctx->qry.grep);
+		html_option("author", "author", ctx->qry.grep);
+		html_option("committer", "committer", ctx->qry.grep);
 		html("</select>\n");
-		html("<input class='txt' type='text' name='q' value='");
-		html_attr(ctx.qry.search);
+		html("<input class='txt' type='text' size='10' name='q' value='");
+		html_attr(ctx->qry.search);
 		html("'/>\n");
+		html("<input type='submit' value='search'/>\n");
 		html("</form>\n");
 	} else {
-		if (!ctx.cfg.index_info || html_include(ctx.cfg.index_info))
-			html(default_info);
+		site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
+		if (ctx->cfg.root_readme)
+			site_link("about", "about", NULL, hc(cmd, "about"),
+				  NULL, 0);
+		html("</td><td class='form'>");
+		html("<form method='get' action='");
+		html_attr(cgit_rooturl());
+		html("'>\n");
+		html("<input type='text' name='q' size='10' value='");
+		html_attr(ctx->qry.search);
+		html("'/>\n");
+		html("<input type='submit' value='search'/>\n");
+		html("</form>");
 	}
-
-	html("</td></tr></table></td>\n");
-
-	html("<td id='content'>\n");
-}
-
-
-void cgit_print_snapshot_start(const char *mimetype, const char *filename,
-			       struct cacheitem *item)
-{
-	htmlf("Content-Type: %s\n", mimetype);
-	htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
-	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
-	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
-					 ttl_seconds(item->ttl)));
-	html("\n");
+	html("</td></tr></table>\n");
+	html("<div class='content'>");
 }
 
 void cgit_print_filemode(unsigned short mode)
@@ -583,4 +698,19 @@ void cgit_print_filemode(unsigned short mode)
 	html_fileperm(mode);
 }
 
-/* vim:set sw=8: */
+void cgit_print_snapshot_links(const char *repo, const char *head,
+			       const char *hex, int snapshots)
+{
+	const struct cgit_snapshot_format* f;
+    	char *filename;
+
+	for (f = cgit_snapshot_formats; f->suffix; f++) {
+		if (!(snapshots & f->bit))
+			continue;
+		filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
+			       f->suffix);
+		cgit_snapshot_link(filename, NULL, NULL, (char *)head,
+				   (char *)hex, filename);
+		html("<br/>");
+	}
+}