X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/cda7194e300277fbad73595c70ecece02d772190..b1f9b9c1459cb9a30ebf80721aff6ef788d1f891:/ui-shared.c?ds=sidebyside
diff --git a/ui-shared.c b/ui-shared.c
index f9f02bc..2eff79d 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,6 +7,7 @@
*/
#include "cgit.h"
+#include "html.h"
const char cgit_doctype[] =
"url);
- if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+ html_attr(ctx.repo->url);
+ if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
html("/");
if (page) {
html(page);
@@ -151,10 +152,10 @@ static char *repolink(char *title, char *class, char *page, char *head,
html_attr(path);
}
} else {
- html(cgit_script_name);
+ html(ctx.cfg.script_name);
html("?url=");
- html_attr(cgit_repo->url);
- if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+ html_attr(ctx.repo->url);
+ if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
html("/");
if (page) {
html(page);
@@ -164,7 +165,7 @@ static char *repolink(char *title, char *class, char *page, char *head,
}
delim = "&";
}
- if (head && strcmp(head, cgit_repo->defbranch)) {
+ if (head && strcmp(head, ctx.repo->defbranch)) {
html(delim);
html("h=");
html_attr(head);
@@ -179,7 +180,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
char *delim;
delim = repolink(title, class, page, head, path);
- if (rev && strcmp(rev, cgit_query_head)) {
+ if (rev && strcmp(rev, ctx.qry.head)) {
html(delim);
html("id=");
html_attr(rev);
@@ -201,7 +202,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
char *delim;
delim = repolink(title, class, "log", head, path);
- if (rev && strcmp(rev, cgit_query_head)) {
+ if (rev && strcmp(rev, ctx.qry.head)) {
html(delim);
html("id=");
html_attr(rev);
@@ -229,11 +230,11 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
void cgit_commit_link(char *name, char *title, char *class, char *head,
char *rev)
{
- if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
- name[cgit_max_msg_len] = '\0';
- name[cgit_max_msg_len - 1] = '.';
- name[cgit_max_msg_len - 2] = '.';
- name[cgit_max_msg_len - 3] = '.';
+ if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
+ name[ctx.cfg.max_msg_len] = '\0';
+ name[ctx.cfg.max_msg_len - 1] = '.';
+ name[ctx.cfg.max_msg_len - 2] = '.';
+ name[ctx.cfg.max_msg_len - 3] = '.';
}
reporevlink("commit", name, title, class, head, rev, NULL);
}
@@ -256,7 +257,7 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
char *delim;
delim = repolink(title, class, "diff", head, path);
- if (new_rev && strcmp(new_rev, cgit_query_head)) {
+ if (new_rev && strcmp(new_rev, ctx.qry.head)) {
html(delim);
html("id=");
html_attr(new_rev);
@@ -272,13 +273,19 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
html("");
}
+void cgit_patch_link(char *name, char *title, char *class, char *head,
+ char *rev)
+{
+ reporevlink("patch", name, title, class, head, rev, NULL);
+}
+
void cgit_object_link(struct object *obj)
{
char *page, *arg, *url;
if (obj->type == OBJ_COMMIT) {
cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
- cgit_query_head, sha1_to_hex(obj->sha1));
+ ctx.qry.head, sha1_to_hex(obj->sha1));
return;
} else if (obj->type == OBJ_TREE) {
page = "tree";
@@ -291,7 +298,7 @@ void cgit_object_link(struct object *obj)
arg = "id";
}
- url = cgit_pageurl(cgit_query_repo, page,
+ url = cgit_pageurl(ctx.qry.repo, page,
fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
html_link_open(url, NULL, NULL);
htmlf("%s %s", typename(obj->type),
@@ -304,6 +311,8 @@ void cgit_print_date(time_t secs, char *format)
char buf[64];
struct tm *time;
+ if (!secs)
+ return;
time = gmtime(&secs);
strftime(buf, sizeof(buf)-1, format, time);
html_txt(buf);
@@ -313,6 +322,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
{
time_t now, secs;
+ if (!t)
+ return;
time(&now);
secs = now - t;
@@ -352,20 +363,22 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
void cgit_print_docstart(char *title, struct cacheitem *item)
{
- html("Content-Type: text/html; charset=utf-8\n");
+ 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)));
html("\n");
html(cgit_doctype);
- html("\n");
+ html("\n");
html("\n");
html("");
html_txt(title);
html("\n");
htmlf("\n", cgit_version);
+ if (ctx.cfg.robots && *ctx.cfg.robots)
+ htmlf("\n", ctx.cfg.robots);
html("\n");
html("\n");
html("\n");
@@ -373,14 +386,14 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
void cgit_print_docend()
{
- html("\n\n\n\n