X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/e3d3fffdd447cdb4551549faae65bae5353a2cab..0393102249c30f62c8f061062bc4a9ba962b6910:/ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index 6d3cfa9..1292ac9 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -11,7 +11,7 @@
#include "cmd.h"
#include "html.h"
-const char cgit_doctype[] =
+static const char cgit_doctype[] =
"\n";
@@ -69,7 +69,11 @@ const char *cgit_currenturl(void)
{
if (!ctx.qry.url)
return cgit_rooturl();
- return ctx.qry.url;
+ const char *root = cgit_rooturl();
+ size_t len = strlen(root);
+ if (len && root[len - 1] == '/')
+ return fmtalloc("%s%s", root, ctx.qry.url);
+ return fmtalloc("%s/%s", root, ctx.qry.url);
}
const char *cgit_rooturl(void)
@@ -82,7 +86,7 @@ const char *cgit_rooturl(void)
const char *cgit_loginurl(void)
{
- static const char *login_url = 0;
+ static const char *login_url;
if (!login_url)
login_url = fmtalloc("%s?p=login", cgit_rooturl());
return login_url;
@@ -119,7 +123,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
char *cgit_pageurl(const char *reponame, const char *pagename,
const char *query)
{
- return cgit_fileurl(reponame, pagename, 0, query);
+ return cgit_fileurl(reponame, pagename, NULL, query);
}
const char *cgit_repobasename(const char *reponame)
@@ -299,7 +303,8 @@ void cgit_plain_link(const char *name, const char *title, const char *class,
void cgit_log_link(const char *name, const char *title, const char *class,
const char *head, const char *rev, const char *path,
- int ofs, const char *grep, const char *pattern, int showmsg)
+ int ofs, const char *grep, const char *pattern, int showmsg,
+ int follow)
{
char *delim;
@@ -328,6 +333,11 @@ void cgit_log_link(const char *name, const char *title, const char *class,
if (showmsg) {
html(delim);
html("showmsg=1");
+ delim = "&";
+ }
+ if (follow) {
+ html(delim);
+ html("follow=1");
}
html("'>");
html_txt(name);
@@ -369,6 +379,10 @@ void cgit_commit_link(char *name, const char *title, const char *class,
html("ignorews=1");
delim = "&";
}
+ if (ctx.qry.follow) {
+ html(delim);
+ html("follow=1");
+ }
html("'>");
if (name[0] != '\0')
html_txt(name);
@@ -425,6 +439,10 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
html("ignorews=1");
delim = "&";
}
+ if (ctx.qry.follow) {
+ html(delim);
+ html("follow=1");
+ }
html("'>");
html_txt(name);
html("");
@@ -465,7 +483,7 @@ static void cgit_self_link(char *name, const char *title, const char *class)
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
ctx.qry.path, ctx.qry.ofs,
ctx.qry.grep, ctx.qry.search,
- ctx.qry.showmsg);
+ ctx.qry.showmsg, ctx.qry.follow);
else if (!strcmp(ctx.qry.page, "commit"))
cgit_commit_link(name, title, class, ctx.qry.head,
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
@@ -555,25 +573,32 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
item = lookup_path(list, path);
}
}
- html("module_link, dir, rev);
+ if (item || ctx.repo->module_link) {
+ html("module_link, dir, rev);
+ }
+ html("'>");
+ html_txt(path);
+ html("");
} else {
- html("#");
+ html("");
+ html_txt(path);
+ html("");
}
- html("'>");
- html_txt(path);
- html("");
html_txtf(" @ %.7s", rev);
if (item && tail)
path[len - 1] = tail;
@@ -678,6 +703,13 @@ void cgit_print_http_headers(void)
exit(0);
}
+void cgit_redirect(const char *url, bool permanent)
+{
+ htmlf("Status: %d %s\n", permanent ? 301 : 302, permanent ? "Moved" : "Found");
+ htmlf("Location: %s\n\n", url);
+ exit(0);
+}
+
static void print_rel_vcs_link(const char *url)
{
html("\n");
for_each_branch_ref(print_branch_option, ctx.qry.head);
+ if (ctx.repo->enable_remote_branches)
+ for_each_remote_ref(print_branch_option, ctx.qry.head);
html(" ");
html("");
html("");
@@ -924,7 +958,7 @@ void cgit_print_pageheader(void)
ctx.qry.sha1, NULL);
cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
NULL, ctx.qry.vpath, 0, NULL, NULL,
- ctx.qry.showmsg);
+ ctx.qry.showmsg, ctx.qry.follow);
cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
ctx.qry.sha1, ctx.qry.vpath);
cgit_commit_link("commit", NULL, hc("commit"),
@@ -972,6 +1006,14 @@ void cgit_print_pageheader(void)
html("");
html("path: ");
cgit_print_path_crumbs(ctx.qry.vpath);
+ if (ctx.cfg.enable_follow_links && !strcmp(ctx.qry.page, "log")) {
+ html(" (");
+ ctx.qry.follow = !ctx.qry.follow;
+ cgit_self_link(ctx.qry.follow ? "follow" : "unfollow",
+ NULL, NULL);
+ ctx.qry.follow = !ctx.qry.follow;
+ html(")");
+ }
html("
");
}
html("");