ui-shared: Replace ctx.qry.path with ctx.qry.vpath

In all cases where ui-shared uses ctx.qry.path, it is done so in the context of a in-project path, and not in the context in which the 'refs' page or the 'clone'-related functionality uses ctx.qry.path. Make this explicit by using ctx.qry.vpath instead. This path introduces no fundamental difference in functionality except for fixing some minor bugs, for example the Atom feed reference from a "$repo/refs/heads/" page. Note that the usage of ctx.qry.path in the other ui-<page>.c files is ok, since that code presumably is only executed in the context of its own <page>, so the correct interpretation of ctx.qry.path is never in question. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
author: Johan Herland <johan@herland.net> 2010-06-09 23:09:27 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2010-06-19 08:40:22 (UTC)
commit: c8e3295469bd3b8e38a9ea4478d517d3861e6c93 (patch) (unidiff)
tree: 0dc6078a7a2a9a5706b9ed11c4083682ccb0ffca
parent: 0ff143df7043b7dd87c31c50fa875bc96d1a7779 (diff)
download: cgit-c8e3295469bd3b8e38a9ea4478d517d3861e6c93.zip
cgit-c8e3295469bd3b8e38a9ea4478d517d3861e6c93.tar.gz
cgit-c8e3295469bd3b8e38a9ea4478d517d3861e6c93.tar.bz2
1 files changed, 4 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 137e469..3d5030b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -441,357 +441,357 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
        if (!t)
                return;
        time(&now);
        secs = now - t;
        if (secs > max_relative && max_relative >= 0) {
                cgit_print_date(t, format, ctx.cfg.local_time);
                return;
        }
        if (secs < TM_HOUR * 2) {
                htmlf("<span class='age-mins'>%.0f min.</span>",
                      secs * 1.0 / TM_MIN);
                return;
        }
        if (secs < TM_DAY * 2) {
                htmlf("<span class='age-hours'>%.0f hours</span>",
                      secs * 1.0 / TM_HOUR);
                return;
        }
        if (secs < TM_WEEK * 2) {
                htmlf("<span class='age-days'>%.0f days</span>",
                      secs * 1.0 / TM_DAY);
                return;
        }
        if (secs < TM_MONTH * 2) {
                htmlf("<span class='age-weeks'>%.0f weeks</span>",
                      secs * 1.0 / TM_WEEK);
                return;
        }
        if (secs < TM_YEAR * 2) {
                htmlf("<span class='age-months'>%.0f months</span>",
                      secs * 1.0 / TM_MONTH);
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
        if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
                return;
        if (ctx->page.status)
                htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
        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));
        if (ctx->page.etag)
                htmlf("ETag: \"%s\"\n", ctx->page.etag);
        html("\n");
        if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
                exit(0);
 }
 void cgit_print_docstart(struct cgit_context *ctx)
 {
        if (ctx->cfg.embedded) {
                if (ctx->cfg.header)
                        html_include(ctx->cfg.header);
                return;
        }
        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(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);
        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='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());
-                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
+                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
                                       fmt("h=%s", ctx->qry.head)));
                html("' type='application/atom+xml'/>\n");
        }
        if (ctx->cfg.head_include)
                html_include(ctx->cfg.head_include);
        html("</head>\n");
        html("<body>\n");
        if (ctx->cfg.header)
                html_include(ctx->cfg.header);
 }
 void cgit_print_docend()
 {
        html("</div> <!-- class=content -->\n");
        if (ctx.cfg.embedded) {
                html("</div> <!-- id=cgit -->\n");
                if (ctx.cfg.footer)
                        html_include(ctx.cfg.footer);
                return;
        }
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
                htmlf("<div class='footer'>generated  by cgit %s at ",
                        cgit_version);
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                html("</div>\n");
        }
        html("</div> <!-- id=cgit -->\n");
        html("</body>\n</html>\n");
 }
 int print_branch_option(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data)
 {
        char *name = (char *)refname;
        html_option(name, name, ctx.qry.head);
        return 0;
 }
 int print_archive_ref(const char *refname, const unsigned char *sha1,
                       int flags, void *cb_data)
 {
        struct tag *tag;
        struct taginfo *info;
        struct object *obj;
        char buf[256], *url;
        unsigned char fileid[20];
        int *header = (int *)cb_data;
        if (prefixcmp(refname, "refs/archives"))
                return 0;
        strncpy(buf, refname+14, sizeof(buf));
        obj = parse_object(sha1);
        if (!obj)
                return 1;
        if (obj->type == OBJ_TAG) {
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 0;
                hashcpy(fileid, tag->tagged->sha1);
        } else if (obj->type != OBJ_BLOB) {
                return 0;
        } else {
                hashcpy(fileid, sha1);
        }
        if (!*header) {
                html("<h1>download</h1>\n");
                *header = 1;
        }
        url = cgit_pageurl(ctx.qry.repo, "blob",
                           fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, "menu");
        html_txt(strlpart(buf, 20));
        html_link_close();
        return 0;
 }
 void cgit_add_hidden_formfields(int incl_head, int incl_search,
                                const char *page)
 {
        char *url;
        if (!ctx.cfg.virtual_root) {
                url = fmt("%s/%s", ctx.qry.repo, page);
-                if (ctx.qry.path)
+                if (ctx.qry.vpath)
-                        url = fmt("%s/%s", url, ctx.qry.path);
+                        url = fmt("%s/%s", url, ctx.qry.vpath);
                html_hidden("url", url);
        }
        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)
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
        if (ctx.qry.showmsg)
                html_hidden("showmsg", "1");
        if (incl_search) {
                if (ctx.qry.grep)
                        html_hidden("qt", ctx.qry.grep);
                if (ctx.qry.search)
                        html_hidden("q", ctx.qry.search);
        }
 }
 static const char *hc(struct cgit_context *ctx, const char *page)
 {
        return strcmp(ctx->qry.page, page) ? NULL : "active";
 }
 static void print_header(struct cgit_context *ctx)
 {
        html("<table id='header'>\n");
        html("<tr>\n");
        if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
                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");
                cgit_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> ");
                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");
 }
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
        html("<div id='cgit'>");
        if (!ctx->cfg.noheader)
                print_header(ctx);
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
                cgit_summary_link("summary", NULL, hc(ctx, "summary"),
                                  ctx->qry.head);
                cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
                              NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
                cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(ctx, "commit"),
                                 ctx->qry.head, ctx->qry.sha1, 0);
                cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
                               ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
                if (ctx->repo->max_stats)
                        cgit_stats_link("stats", NULL, hc(ctx, "stats"),
                                        ctx->qry.head, NULL);
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
                                    hc(ctx, "about"), ctx->qry.head, NULL,
                                    NULL);
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                if (ctx->cfg.virtual_root)
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
-                                                   ctx->qry.path, NULL));
+                                                   ctx->qry.vpath, NULL));
                html("'>\n");
                cgit_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("</select>\n");
                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 {
                site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
                if (ctx->cfg.root_readme)
                        site_link("about", "about", NULL, hc(ctx, "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>\n");
        html("<div class='content'>");
 }
 void cgit_print_filemode(unsigned short mode)
 {
        if (S_ISDIR(mode))
                html("d");
        else if (S_ISLNK(mode))
                html("l");
        else if (S_ISGITLINK(mode))
                html("m");
        else
                html("-");
        html_fileperm(mode >> 6);
        html_fileperm(mode >> 3);
        html_fileperm(mode);
 }
 void cgit_print_snapshot_links(const char *repo, const char *head,
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;
        char *prefix;
            char *filename;
        unsigned char sha1[20];
        if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
            (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
                hex++;
        prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
                        continue;
                filename = fmt("%s%s", prefix, f->suffix);
                cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                html("<br/>");
        }
 }
author	Johan Herland <johan@herland.net>	2010-06-09 23:09:27 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2010-06-19 08:40:22 (UTC)
commit	c8e3295469bd3b8e38a9ea4478d517d3861e6c93 (patch) (unidiff)
tree	0dc6078a7a2a9a5706b9ed11c4083682ccb0ffca
parent	0ff143df7043b7dd87c31c50fa875bc96d1a7779 (diff)
download	cgit-c8e3295469bd3b8e38a9ea4478d517d3861e6c93.zip cgit-c8e3295469bd3b8e38a9ea4478d517d3861e6c93.tar.gz cgit-c8e3295469bd3b8e38a9ea4478d517d3861e6c93.tar.bz2

diff --git a/ui-shared.c b/ui-shared.c index 137e469..3d5030b 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -441,357 +441,357 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
441		441
442	if (!t)	442	if (!t)
443	return;	443	return;
444	time(&now);	444	time(&now);
445	secs = now - t;	445	secs = now - t;
446		446
447	if (secs > max_relative && max_relative >= 0) {	447	if (secs > max_relative && max_relative >= 0) {
448	cgit_print_date(t, format, ctx.cfg.local_time);	448	cgit_print_date(t, format, ctx.cfg.local_time);
449	return;	449	return;
450	}	450	}
451		451
452	if (secs < TM_HOUR * 2) {	452	if (secs < TM_HOUR * 2) {
453	htmlf("<span class='age-mins'>%.0f min.</span>",	453	htmlf("<span class='age-mins'>%.0f min.</span>",
454	secs * 1.0 / TM_MIN);	454	secs * 1.0 / TM_MIN);
455	return;	455	return;
456	}	456	}
457	if (secs < TM_DAY * 2) {	457	if (secs < TM_DAY * 2) {
458	htmlf("<span class='age-hours'>%.0f hours</span>",	458	htmlf("<span class='age-hours'>%.0f hours</span>",
459	secs * 1.0 / TM_HOUR);	459	secs * 1.0 / TM_HOUR);
460	return;	460	return;
461	}	461	}
462	if (secs < TM_WEEK * 2) {	462	if (secs < TM_WEEK * 2) {
463	htmlf("<span class='age-days'>%.0f days</span>",	463	htmlf("<span class='age-days'>%.0f days</span>",
464	secs * 1.0 / TM_DAY);	464	secs * 1.0 / TM_DAY);
465	return;	465	return;
466	}	466	}
467	if (secs < TM_MONTH * 2) {	467	if (secs < TM_MONTH * 2) {
468	htmlf("<span class='age-weeks'>%.0f weeks</span>",	468	htmlf("<span class='age-weeks'>%.0f weeks</span>",
469	secs * 1.0 / TM_WEEK);	469	secs * 1.0 / TM_WEEK);
470	return;	470	return;
471	}	471	}
472	if (secs < TM_YEAR * 2) {	472	if (secs < TM_YEAR * 2) {
473	htmlf("<span class='age-months'>%.0f months</span>",	473	htmlf("<span class='age-months'>%.0f months</span>",
474	secs * 1.0 / TM_MONTH);	474	secs * 1.0 / TM_MONTH);
475	return;	475	return;
476	}	476	}
477	htmlf("<span class='age-years'>%.0f years</span>",	477	htmlf("<span class='age-years'>%.0f years</span>",
478	secs * 1.0 / TM_YEAR);	478	secs * 1.0 / TM_YEAR);
479	}	479	}
480		480
481	void cgit_print_http_headers(struct cgit_context *ctx)	481	void cgit_print_http_headers(struct cgit_context *ctx)
482	{	482	{
483	if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))	483	if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
484	return;	484	return;
485		485
486	if (ctx->page.status)	486	if (ctx->page.status)
487	htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);	487	htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
488	if (ctx->page.mimetype && ctx->page.charset)	488	if (ctx->page.mimetype && ctx->page.charset)
489	htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,	489	htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
490	ctx->page.charset);	490	ctx->page.charset);
491	else if (ctx->page.mimetype)	491	else if (ctx->page.mimetype)
492	htmlf("Content-Type: %s\n", ctx->page.mimetype);	492	htmlf("Content-Type: %s\n", ctx->page.mimetype);
493	if (ctx->page.size)	493	if (ctx->page.size)
494	htmlf("Content-Length: %ld\n", ctx->page.size);	494	htmlf("Content-Length: %ld\n", ctx->page.size);
495	if (ctx->page.filename)	495	if (ctx->page.filename)
496	htmlf("Content-Disposition: inline; filename=\"%s\"\n",	496	htmlf("Content-Disposition: inline; filename=\"%s\"\n",
497	ctx->page.filename);	497	ctx->page.filename);
498	htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));	498	htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
499	htmlf("Expires: %s\n", http_date(ctx->page.expires));	499	htmlf("Expires: %s\n", http_date(ctx->page.expires));
500	if (ctx->page.etag)	500	if (ctx->page.etag)
501	htmlf("ETag: \"%s\"\n", ctx->page.etag);	501	htmlf("ETag: \"%s\"\n", ctx->page.etag);
502	html("\n");	502	html("\n");
503	if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))	503	if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
504	exit(0);	504	exit(0);
505	}	505	}
506		506
507	void cgit_print_docstart(struct cgit_context *ctx)	507	void cgit_print_docstart(struct cgit_context *ctx)
508	{	508	{
509	if (ctx->cfg.embedded) {	509	if (ctx->cfg.embedded) {
510	if (ctx->cfg.header)	510	if (ctx->cfg.header)
511	html_include(ctx->cfg.header);	511	html_include(ctx->cfg.header);
512	return;	512	return;
513	}	513	}
514		514
515	char *host = cgit_hosturl();	515	char *host = cgit_hosturl();
516	html(cgit_doctype);	516	html(cgit_doctype);
517	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");	517	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
518	html("<head>\n");	518	html("<head>\n");
519	html("<title>");	519	html("<title>");
520	html_txt(ctx->page.title);	520	html_txt(ctx->page.title);
521	html("</title>\n");	521	html("</title>\n");
522	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);	522	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
523	if (ctx->cfg.robots && *ctx->cfg.robots)	523	if (ctx->cfg.robots && *ctx->cfg.robots)
524	htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);	524	htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
525	html("<link rel='stylesheet' type='text/css' href='");	525	html("<link rel='stylesheet' type='text/css' href='");
526	html_attr(ctx->cfg.css);	526	html_attr(ctx->cfg.css);
527	html("'/>\n");	527	html("'/>\n");
528	if (ctx->cfg.favicon) {	528	if (ctx->cfg.favicon) {
529	html("<link rel='shortcut icon' href='");	529	html("<link rel='shortcut icon' href='");
530	html_attr(ctx->cfg.favicon);	530	html_attr(ctx->cfg.favicon);
531	html("'/>\n");	531	html("'/>\n");
532	}	532	}
533	if (host && ctx->repo) {	533	if (host && ctx->repo) {
534	html("<link rel='alternate' title='Atom feed' href='");	534	html("<link rel='alternate' title='Atom feed' href='");
535	html(cgit_httpscheme());	535	html(cgit_httpscheme());
536	html_attr(cgit_hosturl());	536	html_attr(cgit_hosturl());
537	html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,	537	html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
538	fmt("h=%s", ctx->qry.head)));	538	fmt("h=%s", ctx->qry.head)));
539	html("' type='application/atom+xml'/>\n");	539	html("' type='application/atom+xml'/>\n");
540	}	540	}
541	if (ctx->cfg.head_include)	541	if (ctx->cfg.head_include)
542	html_include(ctx->cfg.head_include);	542	html_include(ctx->cfg.head_include);
543	html("</head>\n");	543	html("</head>\n");
544	html("<body>\n");	544	html("<body>\n");
545	if (ctx->cfg.header)	545	if (ctx->cfg.header)
546	html_include(ctx->cfg.header);	546	html_include(ctx->cfg.header);
547	}	547	}
548		548
549	void cgit_print_docend()	549	void cgit_print_docend()
550	{	550	{
551	html("</div> <!-- class=content -->\n");	551	html("</div> <!-- class=content -->\n");
552	if (ctx.cfg.embedded) {	552	if (ctx.cfg.embedded) {
553	html("</div> <!-- id=cgit -->\n");	553	html("</div> <!-- id=cgit -->\n");
554	if (ctx.cfg.footer)	554	if (ctx.cfg.footer)
555	html_include(ctx.cfg.footer);	555	html_include(ctx.cfg.footer);
556	return;	556	return;
557	}	557	}
558	if (ctx.cfg.footer)	558	if (ctx.cfg.footer)
559	html_include(ctx.cfg.footer);	559	html_include(ctx.cfg.footer);
560	else {	560	else {
561	htmlf("<div class='footer'>generated by cgit %s at ",	561	htmlf("<div class='footer'>generated by cgit %s at ",
562	cgit_version);	562	cgit_version);
563	cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);	563	cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
564	html("</div>\n");	564	html("</div>\n");
565	}	565	}
566	html("</div> <!-- id=cgit -->\n");	566	html("</div> <!-- id=cgit -->\n");
567	html("</body>\n</html>\n");	567	html("</body>\n</html>\n");
568	}	568	}
569		569
570	int print_branch_option(const char refname, const unsigned char sha1,	570	int print_branch_option(const char refname, const unsigned char sha1,
571	int flags, void *cb_data)	571	int flags, void *cb_data)
572	{	572	{
573	char name = (char )refname;	573	char name = (char )refname;
574	html_option(name, name, ctx.qry.head);	574	html_option(name, name, ctx.qry.head);
575	return 0;	575	return 0;
576	}	576	}
577		577
578	int print_archive_ref(const char refname, const unsigned char sha1,	578	int print_archive_ref(const char refname, const unsigned char sha1,
579	int flags, void *cb_data)	579	int flags, void *cb_data)
580	{	580	{
581	struct tag *tag;	581	struct tag *tag;
582	struct taginfo *info;	582	struct taginfo *info;
583	struct object *obj;	583	struct object *obj;
584	char buf[256], *url;	584	char buf[256], *url;
585	unsigned char fileid[20];	585	unsigned char fileid[20];
586	int header = (int )cb_data;	586	int header = (int )cb_data;
587		587
588	if (prefixcmp(refname, "refs/archives"))	588	if (prefixcmp(refname, "refs/archives"))
589	return 0;	589	return 0;
590	strncpy(buf, refname+14, sizeof(buf));	590	strncpy(buf, refname+14, sizeof(buf));
591	obj = parse_object(sha1);	591	obj = parse_object(sha1);
592	if (!obj)	592	if (!obj)
593	return 1;	593	return 1;
594	if (obj->type == OBJ_TAG) {	594	if (obj->type == OBJ_TAG) {
595	tag = lookup_tag(sha1);	595	tag = lookup_tag(sha1);
596	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))	596	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))
597	return 0;	597	return 0;
598	hashcpy(fileid, tag->tagged->sha1);	598	hashcpy(fileid, tag->tagged->sha1);
599	} else if (obj->type != OBJ_BLOB) {	599	} else if (obj->type != OBJ_BLOB) {
600	return 0;	600	return 0;
601	} else {	601	} else {
602	hashcpy(fileid, sha1);	602	hashcpy(fileid, sha1);
603	}	603	}
604	if (!*header) {	604	if (!*header) {
605	html("<h1>download</h1>\n");	605	html("<h1>download</h1>\n");
606	*header = 1;	606	*header = 1;
607	}	607	}
608	url = cgit_pageurl(ctx.qry.repo, "blob",	608	url = cgit_pageurl(ctx.qry.repo, "blob",
609	fmt("id=%s&path=%s", sha1_to_hex(fileid),	609	fmt("id=%s&path=%s", sha1_to_hex(fileid),
610	buf));	610	buf));
611	html_link_open(url, NULL, "menu");	611	html_link_open(url, NULL, "menu");
612	html_txt(strlpart(buf, 20));	612	html_txt(strlpart(buf, 20));
613	html_link_close();	613	html_link_close();
614	return 0;	614	return 0;
615	}	615	}
616		616
617	void cgit_add_hidden_formfields(int incl_head, int incl_search,	617	void cgit_add_hidden_formfields(int incl_head, int incl_search,
618	const char *page)	618	const char *page)
619	{	619	{
620	char *url;	620	char *url;
621		621
622	if (!ctx.cfg.virtual_root) {	622	if (!ctx.cfg.virtual_root) {
623	url = fmt("%s/%s", ctx.qry.repo, page);	623	url = fmt("%s/%s", ctx.qry.repo, page);
624	if (ctx.qry.path)	624	if (ctx.qry.vpath)
625	url = fmt("%s/%s", url, ctx.qry.path);	625	url = fmt("%s/%s", url, ctx.qry.vpath);
626	html_hidden("url", url);	626	html_hidden("url", url);
627	}	627	}
628		628
629	if (incl_head && ctx.qry.head && ctx.repo->defbranch &&	629	if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
630	strcmp(ctx.qry.head, ctx.repo->defbranch))	630	strcmp(ctx.qry.head, ctx.repo->defbranch))
631	html_hidden("h", ctx.qry.head);	631	html_hidden("h", ctx.qry.head);
632		632
633	if (ctx.qry.sha1)	633	if (ctx.qry.sha1)
634	html_hidden("id", ctx.qry.sha1);	634	html_hidden("id", ctx.qry.sha1);
635	if (ctx.qry.sha2)	635	if (ctx.qry.sha2)
636	html_hidden("id2", ctx.qry.sha2);	636	html_hidden("id2", ctx.qry.sha2);
637	if (ctx.qry.showmsg)	637	if (ctx.qry.showmsg)
638	html_hidden("showmsg", "1");	638	html_hidden("showmsg", "1");
639		639
640	if (incl_search) {	640	if (incl_search) {
641	if (ctx.qry.grep)	641	if (ctx.qry.grep)
642	html_hidden("qt", ctx.qry.grep);	642	html_hidden("qt", ctx.qry.grep);
643	if (ctx.qry.search)	643	if (ctx.qry.search)
644	html_hidden("q", ctx.qry.search);	644	html_hidden("q", ctx.qry.search);
645	}	645	}
646	}	646	}
647		647
648	static const char hc(struct cgit_context ctx, const char *page)	648	static const char hc(struct cgit_context ctx, const char *page)
649	{	649	{
650	return strcmp(ctx->qry.page, page) ? NULL : "active";	650	return strcmp(ctx->qry.page, page) ? NULL : "active";
651	}	651	}
652		652
653	static void print_header(struct cgit_context *ctx)	653	static void print_header(struct cgit_context *ctx)
654	{	654	{
655	html("<table id='header'>\n");	655	html("<table id='header'>\n");
656	html("<tr>\n");	656	html("<tr>\n");
657		657
658	if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {	658	if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
659	html("<td class='logo' rowspan='2'><a href='");	659	html("<td class='logo' rowspan='2'><a href='");
660	if (ctx->cfg.logo_link)	660	if (ctx->cfg.logo_link)
661	html_attr(ctx->cfg.logo_link);	661	html_attr(ctx->cfg.logo_link);
662	else	662	else
663	html_attr(cgit_rooturl());	663	html_attr(cgit_rooturl());
664	html("'><img src='");	664	html("'><img src='");
665	html_attr(ctx->cfg.logo);	665	html_attr(ctx->cfg.logo);
666	html("' alt='cgit logo'/></a></td>\n");	666	html("' alt='cgit logo'/></a></td>\n");
667	}	667	}
668		668
669	html("<td class='main'>");	669	html("<td class='main'>");
670	if (ctx->repo) {	670	if (ctx->repo) {
671	cgit_index_link("index", NULL, NULL, NULL, 0);	671	cgit_index_link("index", NULL, NULL, NULL, 0);
672	html(" : ");	672	html(" : ");
673	cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);	673	cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
674	html("</td><td class='form'>");	674	html("</td><td class='form'>");
675	html("<form method='get' action=''>\n");	675	html("<form method='get' action=''>\n");
676	cgit_add_hidden_formfields(0, 1, ctx->qry.page);	676	cgit_add_hidden_formfields(0, 1, ctx->qry.page);
677	html("<select name='h' onchange='this.form.submit();'>\n");	677	html("<select name='h' onchange='this.form.submit();'>\n");
678	for_each_branch_ref(print_branch_option, ctx->qry.head);	678	for_each_branch_ref(print_branch_option, ctx->qry.head);
679	html("</select> ");	679	html("</select> ");
680	html("<input type='submit' name='' value='switch'/>");	680	html("<input type='submit' name='' value='switch'/>");
681	html("</form>");	681	html("</form>");
682	} else	682	} else
683	html_txt(ctx->cfg.root_title);	683	html_txt(ctx->cfg.root_title);
684	html("</td></tr>\n");	684	html("</td></tr>\n");
685		685
686	html("<tr><td class='sub'>");	686	html("<tr><td class='sub'>");
687	if (ctx->repo) {	687	if (ctx->repo) {
688	html_txt(ctx->repo->desc);	688	html_txt(ctx->repo->desc);
689	html("</td><td class='sub right'>");	689	html("</td><td class='sub right'>");
690	html_txt(ctx->repo->owner);	690	html_txt(ctx->repo->owner);
691	} else {	691	} else {
692	if (ctx->cfg.root_desc)	692	if (ctx->cfg.root_desc)
693	html_txt(ctx->cfg.root_desc);	693	html_txt(ctx->cfg.root_desc);
694	else if (ctx->cfg.index_info)	694	else if (ctx->cfg.index_info)
695	html_include(ctx->cfg.index_info);	695	html_include(ctx->cfg.index_info);
696	}	696	}
697	html("</td></tr></table>\n");	697	html("</td></tr></table>\n");
698	}	698	}
699		699
700	void cgit_print_pageheader(struct cgit_context *ctx)	700	void cgit_print_pageheader(struct cgit_context *ctx)
701	{	701	{
702	html("<div id='cgit'>");	702	html("<div id='cgit'>");
703	if (!ctx->cfg.noheader)	703	if (!ctx->cfg.noheader)
704	print_header(ctx);	704	print_header(ctx);
705		705
706	html("<table class='tabs'><tr><td>\n");	706	html("<table class='tabs'><tr><td>\n");
707	if (ctx->repo) {	707	if (ctx->repo) {
708	cgit_summary_link("summary", NULL, hc(ctx, "summary"),	708	cgit_summary_link("summary", NULL, hc(ctx, "summary"),
709	ctx->qry.head);	709	ctx->qry.head);
710	cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,	710	cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
711	ctx->qry.sha1, NULL);	711	ctx->qry.sha1, NULL);
712	cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,	712	cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
713	NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);	713	NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
714	cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,	714	cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
715	ctx->qry.sha1, NULL);	715	ctx->qry.sha1, NULL);
716	cgit_commit_link("commit", NULL, hc(ctx, "commit"),	716	cgit_commit_link("commit", NULL, hc(ctx, "commit"),
717	ctx->qry.head, ctx->qry.sha1, 0);	717	ctx->qry.head, ctx->qry.sha1, 0);
718	cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,	718	cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
719	ctx->qry.sha1, ctx->qry.sha2, NULL, 0);	719	ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
720	if (ctx->repo->max_stats)	720	if (ctx->repo->max_stats)
721	cgit_stats_link("stats", NULL, hc(ctx, "stats"),	721	cgit_stats_link("stats", NULL, hc(ctx, "stats"),
722	ctx->qry.head, NULL);	722	ctx->qry.head, NULL);
723	if (ctx->repo->readme)	723	if (ctx->repo->readme)
724	reporevlink("about", "about", NULL,	724	reporevlink("about", "about", NULL,
725	hc(ctx, "about"), ctx->qry.head, NULL,	725	hc(ctx, "about"), ctx->qry.head, NULL,
726	NULL);	726	NULL);
727	html("</td><td class='form'>");	727	html("</td><td class='form'>");
728	html("<form class='right' method='get' action='");	728	html("<form class='right' method='get' action='");
729	if (ctx->cfg.virtual_root)	729	if (ctx->cfg.virtual_root)
730	html_url_path(cgit_fileurl(ctx->qry.repo, "log",	730	html_url_path(cgit_fileurl(ctx->qry.repo, "log",
731	ctx->qry.path, NULL));	731	ctx->qry.vpath, NULL));
732	html("'>\n");	732	html("'>\n");
733	cgit_add_hidden_formfields(1, 0, "log");	733	cgit_add_hidden_formfields(1, 0, "log");
734	html("<select name='qt'>\n");	734	html("<select name='qt'>\n");
735	html_option("grep", "log msg", ctx->qry.grep);	735	html_option("grep", "log msg", ctx->qry.grep);
736	html_option("author", "author", ctx->qry.grep);	736	html_option("author", "author", ctx->qry.grep);
737	html_option("committer", "committer", ctx->qry.grep);	737	html_option("committer", "committer", ctx->qry.grep);
738	html("</select>\n");	738	html("</select>\n");
739	html("<input class='txt' type='text' size='10' name='q' value='");	739	html("<input class='txt' type='text' size='10' name='q' value='");
740	html_attr(ctx->qry.search);	740	html_attr(ctx->qry.search);
741	html("'/>\n");	741	html("'/>\n");
742	html("<input type='submit' value='search'/>\n");	742	html("<input type='submit' value='search'/>\n");
743	html("</form>\n");	743	html("</form>\n");
744	} else {	744	} else {
745	site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);	745	site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
746	if (ctx->cfg.root_readme)	746	if (ctx->cfg.root_readme)
747	site_link("about", "about", NULL, hc(ctx, "about"),	747	site_link("about", "about", NULL, hc(ctx, "about"),
748	NULL, 0);	748	NULL, 0);
749	html("</td><td class='form'>");	749	html("</td><td class='form'>");
750	html("<form method='get' action='");	750	html("<form method='get' action='");
751	html_attr(cgit_rooturl());	751	html_attr(cgit_rooturl());
752	html("'>\n");	752	html("'>\n");
753	html("<input type='text' name='q' size='10' value='");	753	html("<input type='text' name='q' size='10' value='");
754	html_attr(ctx->qry.search);	754	html_attr(ctx->qry.search);
755	html("'/>\n");	755	html("'/>\n");
756	html("<input type='submit' value='search'/>\n");	756	html("<input type='submit' value='search'/>\n");
757	html("</form>");	757	html("</form>");
758	}	758	}
759	html("</td></tr></table>\n");	759	html("</td></tr></table>\n");
760	html("<div class='content'>");	760	html("<div class='content'>");
761	}	761	}
762		762
763	void cgit_print_filemode(unsigned short mode)	763	void cgit_print_filemode(unsigned short mode)
764	{	764	{
765	if (S_ISDIR(mode))	765	if (S_ISDIR(mode))
766	html("d");	766	html("d");
767	else if (S_ISLNK(mode))	767	else if (S_ISLNK(mode))
768	html("l");	768	html("l");
769	else if (S_ISGITLINK(mode))	769	else if (S_ISGITLINK(mode))
770	html("m");	770	html("m");
771	else	771	else
772	html("-");	772	html("-");
773	html_fileperm(mode >> 6);	773	html_fileperm(mode >> 6);
774	html_fileperm(mode >> 3);	774	html_fileperm(mode >> 3);
775	html_fileperm(mode);	775	html_fileperm(mode);
776	}	776	}
777		777
778	void cgit_print_snapshot_links(const char repo, const char head,	778	void cgit_print_snapshot_links(const char repo, const char head,
779	const char *hex, int snapshots)	779	const char *hex, int snapshots)
780	{	780	{
781	const struct cgit_snapshot_format* f;	781	const struct cgit_snapshot_format* f;
782	char *prefix;	782	char *prefix;
783	char *filename;	783	char *filename;
784	unsigned char sha1[20];	784	unsigned char sha1[20];
785		785
786	if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&	786	if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
787	(hex[0] == 'v' \|\| hex[0] == 'V') && isdigit(hex[1]))	787	(hex[0] == 'v' \|\| hex[0] == 'V') && isdigit(hex[1]))
788	hex++;	788	hex++;
789	prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));	789	prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
790	for (f = cgit_snapshot_formats; f->suffix; f++) {	790	for (f = cgit_snapshot_formats; f->suffix; f++) {
791	if (!(snapshots & f->bit))	791	if (!(snapshots & f->bit))
792	continue;	792	continue;
793	filename = fmt("%s%s", prefix, f->suffix);	793	filename = fmt("%s%s", prefix, f->suffix);
794	cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);	794	cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
795	html("<br/>");	795	html("<br/>");
796	}	796	}
797	}	797	}