1 files changed, 51 insertions, 61 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 2eff79d..2596023 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,84 +1,76 @@
 /* ui-shared.c: common web output functions
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 #include "html.h"
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
 static char *http_date(time_t t)
 {
        static char day[][4] =
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
-static long ttl_seconds(long ttl)
-{
-        if (ttl<0)
-                return 60 * 60 * 24 * 365;
-        else
-                return ttl * 60;
-}
 void cgit_print_error(char *msg)
 {
        html("<div class='error'>");
        html_txt(msg);
        html("</div>\n");
 }
 char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)
                return fmt("%s/", ctx.cfg.virtual_root);
        else
                return ctx.cfg.script_name;
 }
 char *cgit_repourl(const char *reponame)
 {
        if (ctx.cfg.virtual_root) {
                return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
        } else {
                return fmt("?r=%s", reponame);
        }
 }
 char *cgit_fileurl(const char *reponame, const char *pagename,
                   const char *filename, const char *query)
 {
        char *tmp;
        char *delim;
        if (ctx.cfg.virtual_root) {
                tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
                          pagename, (filename ? filename:""));
                delim = "?";
        } else {
                tmp = fmt("?url=%s/%s/%s", reponame, pagename,
                          (filename ? filename : ""));
                delim = "&";
        }
        if (query)
                tmp = fmt("%s%s%s", tmp, delim, query);
        return tmp;
 }
 char *cgit_pageurl(const char *reponame, const char *pagename,
                   const char *query)
 {
        return cgit_fileurl(reponame,pagename,0,query);
@@ -316,271 +308,269 @@ void cgit_print_date(time_t secs, char *format)
        time = gmtime(&secs);
        strftime(buf, sizeof(buf)-1, format, time);
        html_txt(buf);
 }
 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;
        if (secs > max_relative && max_relative >= 0) {
                cgit_print_date(t, format);
                return;
        }
        if (secs < TM_HOUR * 2) {
                htmlf("<span class='age-mins'>%.0f min.</span>",
                      secs * 1.0 / TM_MIN);
                return;
        }
        if (secs < TM_DAY * 2) {
                htmlf("<span class='age-hours'>%.0f hours</span>",
                      secs * 1.0 / TM_HOUR);
                return;
        }
        if (secs < TM_WEEK * 2) {
                htmlf("<span class='age-days'>%.0f days</span>",
                      secs * 1.0 / TM_DAY);
                return;
        }
        if (secs < TM_MONTH * 2) {
                htmlf("<span class='age-weeks'>%.0f weeks</span>",
                      secs * 1.0 / TM_WEEK);
                return;
        }
        if (secs < TM_YEAR * 2) {
                htmlf("<span class='age-months'>%.0f months</span>",
                      secs * 1.0 / TM_MONTH);
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
-void cgit_print_docstart(char *title, struct cacheitem *item)
+void cgit_print_http_headers(struct cgit_context *ctx)
 {
-        html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
+        if (ctx->page.mimetype && ctx->page.charset)
-        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
+                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
-        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
+                      ctx->page.charset);
-                                         ttl_seconds(item->ttl)));
+        else if (ctx->page.mimetype)
+                htmlf("Content-Type: %s\n", ctx->page.mimetype);
+        if (ctx->page.filename)
+                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
+                      ctx->page.filename);
+        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
+        htmlf("Expires: %s\n", http_date(ctx->page.expires));
        html("\n");
+}
+void cgit_print_docstart(struct cgit_context *ctx)
+{
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html("<title>");
-        html_txt(title);
+        html_txt(ctx->page.title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
-        if (ctx.cfg.robots && *ctx.cfg.robots)
+        if (ctx->cfg.robots && *ctx->cfg.robots)
-                htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots);
+                htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
        html("<link rel='stylesheet' type='text/css' href='");
-        html_attr(ctx.cfg.css);
+        html_attr(ctx->cfg.css);
        html("'/>\n");
        html("</head>\n");
        html("<body>\n");
 }
 void cgit_print_docend()
 {
        html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
 }
 int print_branch_option(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data)
 {
        char *name = (char *)refname;
        html_option(name, name, ctx.qry.head);
        return 0;
 }
 int print_archive_ref(const char *refname, const unsigned char *sha1,
                       int flags, void *cb_data)
 {
        struct tag *tag;
        struct taginfo *info;
        struct object *obj;
        char buf[256], *url;
        unsigned char fileid[20];
        int *header = (int *)cb_data;
        if (prefixcmp(refname, "refs/archives"))
                return 0;
        strncpy(buf, refname+14, sizeof(buf));
        obj = parse_object(sha1);
        if (!obj)
                return 1;
        if (obj->type == OBJ_TAG) {
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 0;
                hashcpy(fileid, tag->tagged->sha1);
        } else if (obj->type != OBJ_BLOB) {
                return 0;
        } else {
                hashcpy(fileid, sha1);
        }
        if (!*header) {
                html("<h1>download</h1>\n");
                *header = 1;
        }
        url = cgit_pageurl(ctx.qry.repo, "blob",
                           fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, "menu");
        html_txt(strlpart(buf, 20));
        html_link_close();
        return 0;
 }
 void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
        char *url;
        if (!ctx.cfg.virtual_root) {
                url = fmt("%s/%s", ctx.qry.repo, page);
                if (ctx.qry.path)
                        url = fmt("%s/%s", url, ctx.qry.path);
                html_hidden("url", url);
        }
        if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
                html_hidden("h", ctx.qry.head);
        if (ctx.qry.sha1)
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
        if (incl_search) {
                if (ctx.qry.grep)
                        html_hidden("qt", ctx.qry.grep);
                if (ctx.qry.search)
                        html_hidden("q", ctx.qry.search);
        }
 }
-void cgit_print_pageheader(char *title, int show_search)
+void cgit_print_pageheader(struct cgit_context *ctx)
 {
        static const char *default_info = "This is cgit, a fast webinterface for git repositories";
        int header = 0;
        char *url;
        html("<table id='layout' summary=''>\n");
        html("<tr><td id='sidebar'>\n");
        html("<table class='sidebar' cellspacing='0' summary=''>\n");
        html("<tr><td class='sidebar'>\n<a href='");
        html_attr(cgit_rooturl());
        htmlf("'><img src='%s' alt='cgit'/></a>\n",
-              ctx.cfg.logo);
+              ctx->cfg.logo);
        html("</td></tr>\n<tr><td class='sidebar'>\n");
-        if (ctx.repo) {
+        if (ctx->repo) {
                html("<h1 class='first'>");
-                html_txt(strrpart(ctx.repo->name, 20));
+                html_txt(strrpart(ctx->repo->name, 20));
                html("</h1>\n");
-                html_txt(ctx.repo->desc);
+                html_txt(ctx->repo->desc);
-                if (ctx.repo->owner) {
+                if (ctx->repo->owner) {
                        html("<h1>owner</h1>\n");
-                        html_txt(ctx.repo->owner);
+                        html_txt(ctx->repo->owner);
                }
                html("<h1>navigate</h1>\n");
-                reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head,
+                reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,
                            NULL, NULL);
-                cgit_log_link("log", NULL, "menu", ctx.qry.head, NULL, NULL,
+                cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,
                              0, NULL, NULL);
-                cgit_tree_link("tree", NULL, "menu", ctx.qry.head,
+                cgit_tree_link("tree", NULL, "menu", ctx->qry.head,
-                               ctx.qry.sha1, NULL);
+                               ctx->qry.sha1, NULL);
-                cgit_commit_link("commit", NULL, "menu", ctx.qry.head,
+                cgit_commit_link("commit", NULL, "menu", ctx->qry.head,
-                              ctx.qry.sha1);
+                              ctx->qry.sha1);
-                cgit_diff_link("diff", NULL, "menu", ctx.qry.head,
+                cgit_diff_link("diff", NULL, "menu", ctx->qry.head,
-                               ctx.qry.sha1, ctx.qry.sha2, NULL);
+                               ctx->qry.sha1, ctx->qry.sha2, NULL);
-                cgit_patch_link("patch", NULL, "menu", ctx.qry.head,
+                cgit_patch_link("patch", NULL, "menu", ctx->qry.head,
-                                ctx.qry.sha1);
+                                ctx->qry.sha1);
                for_each_ref(print_archive_ref, &header);
-                if (ctx.repo->clone_url || ctx.cfg.clone_prefix) {
+                if (ctx->repo->clone_url || ctx->cfg.clone_prefix) {
                        html("<h1>clone</h1>\n");
-                        if (ctx.repo->clone_url)
+                        if (ctx->repo->clone_url)
-                                url = ctx.repo->clone_url;
+                                url = ctx->repo->clone_url;
                        else
-                                url = fmt("%s%s", ctx.cfg.clone_prefix,
+                                url = fmt("%s%s", ctx->cfg.clone_prefix,
-                                          ctx.repo->url);
+                                          ctx->repo->url);
                        html("<a class='menu' href='");
                        html_attr(url);
                        html("' title='");
                        html_attr(url);
                        html("'>\n");
                        html_txt(strrpart(url, 20));
                        html("</a>\n");
                }
                html("<h1>branch</h1>\n");
                html("<form method='get' action=''>\n");
-                add_hidden_formfields(0, 1, ctx.qry.page);
+                add_hidden_formfields(0, 1, ctx->qry.page);
        //      html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
                html("<select name='h' onchange='this.form.submit();'>\n");
-                for_each_branch_ref(print_branch_option, ctx.qry.head);
+                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select>\n");
        //      html("</td><td>");
                html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
        //      html("</td></tr></table>");
                html("</form>\n");
                html("<h1>search</h1>\n");
                html("<form method='get' action='");
-                if (ctx.cfg.virtual_root)
+                if (ctx->cfg.virtual_root)
-                        html_attr(cgit_fileurl(ctx.qry.repo, "log",
+                        html_attr(cgit_fileurl(ctx->qry.repo, "log",
-                                               ctx.qry.path, NULL));
+                                               ctx->qry.path, NULL));
                html("'>\n");
                add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
-                html_option("grep", "log msg", ctx.qry.grep);
+                html_option("grep", "log msg", ctx->qry.grep);
-                html_option("author", "author", ctx.qry.grep);
+                html_option("author", "author", ctx->qry.grep);
-                html_option("committer", "committer", ctx.qry.grep);
+                html_option("committer", "committer", ctx->qry.grep);
                html("</select>\n");
                html("<input class='txt' type='text' name='q' value='");
-                html_attr(ctx.qry.search);
+                html_attr(ctx->qry.search);
                html("'/>\n");
                html("</form>\n");
        } else {
-                if (!ctx.cfg.index_info || html_include(ctx.cfg.index_info))
+                if (!ctx->cfg.index_info || html_include(ctx->cfg.index_info))
                        html(default_info);
        }
        html("</td></tr></table></td>\n");
        html("<td id='content'>\n");
 }
-void cgit_print_snapshot_start(const char *mimetype, const char *filename,
-                               struct cacheitem *item)
-{
-        htmlf("Content-Type: %s\n", mimetype);
-        htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
-        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");
-}
 void cgit_print_filemode(unsigned short mode)
 {
        if (S_ISDIR(mode))
                html("d");
        else if (S_ISLNK(mode))
                html("l");
        else if (S_ISGITLINK(mode))
                html("m");
        else
                html("-");
        html_fileperm(mode >> 6);
        html_fileperm(mode >> 3);
        html_fileperm(mode);
 }
 /* vim:set sw=8: */