Merge branch 'do/https'

[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c

index 95dfeb443e7b41ad2bf438a93396bc90adebc38e..29036d0a92ba45643e7db53af2671113fcbff7be 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,6 +34,17 @@ void cgit_print_error(char *msg)
         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;
@@ -369,6 +380,12 @@ void cgit_patch_link(char *name, char *title, char *class, char *head,
         reporevlink("patch", name, title, class, head, rev, NULL);
  }
  
+void cgit_stats_link(char *name, char *title, char *class, char *head,
+                    char *path)
+{
+       reporevlink("stats", name, title, class, head, NULL, path);
+}
+
  void cgit_object_link(struct object *obj)
  {
         char *page, *shortrev, *fullrev, *name;
@@ -450,6 +467,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
  
  void cgit_print_http_headers(struct cgit_context *ctx)
  {
+       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);
@@ -486,7 +505,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
                 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)));
@@ -494,6 +514,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
         }
         html("</head>\n");
         html("<body>\n");
+       if (ctx->cfg.header)
+               html_include(ctx->cfg.header);
  }
  
  void cgit_print_docend()
@@ -557,7 +579,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
         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;
  
@@ -587,15 +609,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)
  {
-       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);
  
+       if (!cmd && ctx->repo)
+               fallback_cmd = "summary";
+
         html("<table id='header'>\n");
         html("<tr>\n");
         html("<td class='logo' rowspan='2'><a href='");
@@ -614,7 +641,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");
-               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> ");
@@ -651,6 +678,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                                  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->max_stats)
+                       cgit_stats_link("stats", NULL, hc(cmd, "stats"),
+                                       ctx->qry.head, NULL);
                 if (ctx->repo->readme)
                         reporevlink("about", "about", NULL,
                                     hc(cmd, "about"), ctx->qry.head, NULL,
@@ -661,7 +691,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                         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);