ui-shared.c: use html_url_arg()

[cgit.git] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 8a00099fdf10bc9871742c6eb561ab450c83a2b6..a2f636c73d9dfb6da5b3e091ba8acdcbe2d5823a 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)
@@ -201,21 +221,21 @@ static char *repolink(char *title, char *class, char *page, char *head,
        } else {
                html(ctx.cfg.script_name);
                html("?url=");
-               html_attr(ctx.repo->url);
+               html_url_arg(ctx.repo->url);
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
-                       html(page);
+                       html_url_arg(page);
                        html("/");
                        if (path)
-                               html_attr(path);
+                               html_url_arg(path);
                }
                delim = "&amp;";
        }
        if (head && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");
-               html_attr(head);
+               html_url_arg(head);
                delim = "&amp;";
        }
        return fmt("%s", delim);
@@ -230,7 +250,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
-               html_attr(rev);
+               html_url_arg(rev);
        }
        html("'>");
        html_txt(name);
@@ -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)
 {
@@ -252,17 +278,17 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
-               html_attr(rev);
+               html_url_arg(rev);
                delim = "&";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
-               html_attr(grep);
+               html_url_arg(grep);
                delim = "&";
                html(delim);
                html("q=");
-               html_attr(pattern);
+               html_url_arg(pattern);
        }
        if (ofs > 0) {
                html(delim);
@@ -307,13 +333,13 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        if (new_rev && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");
-               html_attr(new_rev);
+               html_url_arg(new_rev);
                delim = "&amp;";
        }
        if (old_rev) {
                html(delim);
                html("id2=");
-               html_attr(old_rev);
+               html_url_arg(old_rev);
        }
        html("'>");
        html_txt(name);
@@ -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");
@@ -437,6 +469,18 @@ void cgit_print_docstart(struct cgit_context *ctx)
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(ctx->cfg.css);
        html("'/>\n");
+       if (ctx->cfg.favicon) {
+               html("<link rel='shortcut icon' href='");
+               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");
 }
@@ -448,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");
        }
@@ -513,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)
@@ -567,12 +612,12 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html_txt(ctx->cfg.root_title);
        html("</td></tr>\n");
 
-       html("<tr><td class='sub'");
+       html("<tr><td class='sub'>");
        if (ctx->repo) {
-               html(" colspan='2'>");
                html_txt(ctx->repo->desc);
+               html("</td><td class='sub right'>");
+               html_txt(ctx->repo->owner);
        } else {
-               html(">");
                if (ctx->cfg.root_desc)
                        html_txt(ctx->cfg.root_desc);
                else if (ctx->cfg.index_info)