use Host: header to generate cgit_hosturl

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

index 209af6ee3acabfc77abc11dd641f2e5d09047ce7..c23bc7540b9862bb200afba1bd46b7af7a119896 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,6 +34,26 @@ void cgit_print_error(char *msg)
         html("</div>\n");
  }
  
+char *cgit_hosturl()
+{
+       char *host, *port;
+
+       host = getenv("HTTP_HOST");
+       if (host) {
+               host = xstrdup(host);
+       } else {
+               host = getenv("SERVER_NAME");
+               if (!host)
+                       return NULL;
+               port = getenv("SERVER_PORT");
+               if (port && atoi(port) != 80)
+                       host = xstrdup(fmt("%s:%d", host, atoi(port)));
+               else
+                       host = xstrdup(host);
+       }
+       return host;
+}
+
  char *cgit_rooturl()
  {
         if (ctx.cfg.virtual_root)
@@ -243,6 +263,12 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
         reporevlink("tree", name, title, class, head, rev, path);
  }
  
+void cgit_plain_link(char *name, char *title, char *class, char *head,
+                    char *rev, char *path)
+{
+       reporevlink("plain", name, title, class, head, rev, path);
+}
+
  void cgit_log_link(char *name, char *title, char *class, char *head,
                    char *rev, char *path, int ofs, char *grep, char *pattern)
  {
@@ -353,14 +379,17 @@ void cgit_object_link(struct object *obj)
         html_link_close();
  }
  
-void cgit_print_date(time_t secs, char *format)
+void cgit_print_date(time_t secs, char *format, int local_time)
  {
         char buf[64];
         struct tm *time;
  
         if (!secs)
                 return;
-       time = gmtime(&secs);
+       if(local_time)
+               time = localtime(&secs);
+       else
+               time = gmtime(&secs);
         strftime(buf, sizeof(buf)-1, format, time);
         html_txt(buf);
  }
@@ -375,7 +404,7 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
         secs = now - t;
  
         if (secs > max_relative && max_relative >= 0) {
-               cgit_print_date(t, format);
+               cgit_print_date(t, format, ctx.cfg.local_time);
                 return;
         }
  
@@ -415,6 +444,8 @@ void cgit_print_http_headers(struct cgit_context *ctx)
                       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);
@@ -425,6 +456,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
  
  void cgit_print_docstart(struct cgit_context *ctx)
  {
+       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");
@@ -442,6 +474,13 @@ void cgit_print_docstart(struct cgit_context *ctx)
                 html_attr(ctx->cfg.favicon);
                 html("'/>\n");
         }
+       if (host && ctx->repo) {
+               html("<link rel='alternate' title='Atom feed' href='http://");
+               html_attr(cgit_hosturl());
+               html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
+                                      fmt("h=%s", ctx->qry.head)));
+               html("' type='application/atom+xml'/>");
+       }
         html("</head>\n");
         html("<body>\n");
  }
@@ -453,7 +492,7 @@ void cgit_print_docend()
                 html_include(ctx.cfg.footer);
         else {
                 html("<div class='footer'>generated ");
-               cgit_print_date(time(NULL), FMT_LONGDATE);
+               cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                 htmlf(" by cgit %s", cgit_version);
                 html("</div>\n");
         }
@@ -518,7 +557,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                 html_hidden("url", url);
         }
  
-       if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
+       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)