use cgit_httpscheme() for atom feed

[cgit.git] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index a5eb25fbafd42189830df97add07a16170dfee77..5ce2bc5d43987cec93bd2e68c5b21e7479cdf93a 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,6 +34,17 @@ void cgit_print_error(char *msg)
        html("</div>\n");
 }
 
        html("</div>\n");
 }
 

+char *cgit_httpscheme()
+{
+       char *https;
+
+       https = getenv("HTTPS");
+       if (https != NULL && strcmp(https, "on") == 0)
+               return "https://";
+       else
+               return "http://";
+}
+

 char *cgit_hosturl()
 {
        char *host, *port;
 char *cgit_hosturl()
 {
        char *host, *port;


@@ -281,7 +292,8 @@ void cgit_plain_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,

-                  char *rev, char *path, int ofs, char *grep, char *pattern)
+                  char *rev, char *path, int ofs, char *grep, char *pattern,
+                  int showmsg)

 {
        char *delim;
 
 {
        char *delim;
 


@@ -305,6 +317,11 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);

+               delim = "&";
+       }
+       if (showmsg) {
+               html(delim);
+               html("showmsg=1");

        }
        html("'>");
        html_txt(name);
        }
        html("'>");
        html_txt(name);


@@ -371,11 +388,14 @@ void cgit_stats_link(char *name, char *title, char *class, char *head,
 
 void cgit_object_link(struct object *obj)
 {
 
 void cgit_object_link(struct object *obj)
 {

-       char *page, *rev, *name;
+       char *page, *shortrev, *fullrev, *name;

 
 

+       fullrev = sha1_to_hex(obj->sha1);
+       shortrev = xstrdup(fullrev);
+       shortrev[10] = '\0';

        if (obj->type == OBJ_COMMIT) {
        if (obj->type == OBJ_COMMIT) {

-                cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
-                                ctx.qry.head, sha1_to_hex(obj->sha1));
+                cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
+                                ctx.qry.head, fullrev);

                return;
        } else if (obj->type == OBJ_TREE)
                page = "tree";
                return;
        } else if (obj->type == OBJ_TREE)
                page = "tree";


@@ -383,9 +403,8 @@ void cgit_object_link(struct object *obj)
                page = "tag";
        else
                page = "blob";
                page = "tag";
        else
                page = "blob";

-       rev = sha1_to_hex(obj->sha1);
-       name = fmt("%s %s", typename(obj->type), rev);
-       reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL);
+       name = fmt("%s %s...", typename(obj->type), shortrev);
+       reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);

 }
 
 void cgit_print_date(time_t secs, char *format, int local_time)
 }
 
 void cgit_print_date(time_t secs, char *format, int local_time)


@@ -484,7 +503,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
                html("'/>\n");
        }
        if (host && ctx->repo) {
                html("'/>\n");
        }
        if (host && ctx->repo) {

-               html("<link rel='alternate' title='Atom feed' href='http://");
+               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,
                                       fmt("h=%s", ctx->qry.head)));
                html_attr(cgit_hosturl());
                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                       fmt("h=%s", ctx->qry.head)));


@@ -492,6 +512,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
        }
        html("</head>\n");
        html("<body>\n");
        }
        html("</head>\n");
        html("<body>\n");

+       if (ctx->cfg.header)
+               html_include(ctx->cfg.header);

 }
 
 void cgit_print_docend()
 }
 
 void cgit_print_docend()


@@ -555,7 +577,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
        return 0;
 }
 

-void add_hidden_formfields(int incl_head, int incl_search, char *page)
+void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)

 {
        char *url;
 
 {
        char *url;
 


@@ -574,6 +596,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
                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)
 
        if (incl_search) {
                if (ctx.qry.grep)


@@ -583,15 +607,20 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
        }
 }
 
        }
 }
 

+const char *fallback_cmd = "repolist";
+

 char *hc(struct cgit_cmd *cmd, const char *page)
 {
 char *hc(struct cgit_cmd *cmd, const char *page)
 {

-       return (strcmp(cmd->name, page) ? NULL : "active");
+       return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");

 }
 
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
 
 }
 
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
 

+       if (!cmd && ctx->repo)
+               fallback_cmd = "summary";
+

        html("<table id='header'>\n");
        html("<tr>\n");
        html("<td class='logo' rowspan='2'><a href='");
        html("<table id='header'>\n");
        html("<tr>\n");
        html("<td class='logo' rowspan='2'><a href='");


@@ -610,7 +639,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                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);
+               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("<select name='h' onchange='this.form.submit();'>\n");
                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select> ");


@@ -640,7 +669,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                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,
                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);
+                             NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);

                cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(cmd, "commit"),
                cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(cmd, "commit"),


@@ -660,7 +689,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                   ctx->qry.path, NULL));
                html("'>\n");
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                   ctx->qry.path, NULL));
                html("'>\n");

-               add_hidden_formfields(1, 0, "log");
+               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("<select name='qt'>\n");
                html_option("grep", "log msg", ctx->qry.grep);
                html_option("author", "author", ctx->qry.grep);


@@ -716,8 +745,7 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
                        continue;
                filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
                               f->suffix);
                        continue;
                filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
                               f->suffix);

-               cgit_snapshot_link(filename, NULL, NULL, (char *)head,
-                                  (char *)hex, filename);
+               cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);

                html("<br/>");
        }
 }
                html("<br/>");
        }
 }