1 files changed, 129 insertions, 108 deletions

diff --git a/ui-shared.c b/ui-shared.c
index 60aa2e3..aa65988 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -8,4 +8,5 @@
 
 #include "cgit.h"
+#include "html.h"
 
 const char cgit_doctype[] =
@@ -26,12 +27,4 @@ static char *http_date(time_t t)
 }
 
-static long ttl_seconds(long ttl)
-{
-        if (ttl<0)
-                return 60 * 60 * 24 * 365;
-        else
-                return ttl * 60;
-}
-
 void cgit_print_error(char *msg)
 {
@@ -43,14 +36,14 @@ void cgit_print_error(char *msg)
 char *cgit_rooturl()
 {
-        if (cgit_virtual_root)
-                return fmt("%s/", cgit_virtual_root);
+        if (ctx.cfg.virtual_root)
+                return fmt("%s/", ctx.cfg.virtual_root);
         else
-                return cgit_script_name;
+                return ctx.cfg.script_name;
 }
 
 char *cgit_repourl(const char *reponame)
 {
-        if (cgit_virtual_root) {
-                return fmt("%s/%s/", cgit_virtual_root, reponame);
+        if (ctx.cfg.virtual_root) {
+                return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
         } else {
                 return fmt("?r=%s", reponame);
@@ -64,6 +57,6 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
         char *delim;
 
-        if (cgit_virtual_root) {
-                tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame,
+        if (ctx.cfg.virtual_root) {
+                tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
                           pagename, (filename ? filename:""));
                 delim = "?";
@@ -111,12 +104,12 @@ const char *cgit_repobasename(const char *reponame)
 char *cgit_currurl()
 {
-        if (!cgit_virtual_root)
-                return cgit_script_name;
-        else if (cgit_query_page)
-                return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
-        else if (cgit_query_repo)
-                return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
+        if (!ctx.cfg.virtual_root)
+                return ctx.cfg.script_name;
+        else if (ctx.qry.page)
+                return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
+        else if (ctx.qry.repo)
+                return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
         else
-                return fmt("%s/", cgit_virtual_root);
+                return fmt("%s/", ctx.cfg.virtual_root);
 }
 
@@ -138,10 +131,10 @@ static char *repolink(char *title, char *class, char *page, char *head,
         }
         html(" href='");
-        if (cgit_virtual_root) {
-                html_attr(cgit_virtual_root);
-                if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/')
+        if (ctx.cfg.virtual_root) {
+                html_attr(ctx.cfg.virtual_root);
+                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                         html("/");
-                html_attr(cgit_repo->url);
-                if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+                html_attr(ctx.repo->url);
+                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                         html("/");
                 if (page) {
@@ -152,8 +145,8 @@ static char *repolink(char *title, char *class, char *page, char *head,
                 }
         } else {
-                html(cgit_script_name);
+                html(ctx.cfg.script_name);
                 html("?url=");
-                html_attr(cgit_repo->url);
-                if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+                html_attr(ctx.repo->url);
+                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                         html("/");
                 if (page) {
@@ -165,5 +158,5 @@ static char *repolink(char *title, char *class, char *page, char *head,
                 delim = "&amp;";
         }
-        if (head && strcmp(head, cgit_repo->defbranch)) {
+        if (head && strcmp(head, ctx.repo->defbranch)) {
                 html(delim);
                 html("h=");
@@ -180,5 +173,5 @@ static void reporevlink(char *page, char *name, char *title, char *class,
 
         delim = repolink(title, class, page, head, path);
-        if (rev && strcmp(rev, cgit_query_head)) {
+        if (rev && strcmp(rev, ctx.qry.head)) {
                 html(delim);
                 html("id=");
@@ -202,5 +195,5 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 
         delim = repolink(title, class, "log", head, path);
-        if (rev && strcmp(rev, cgit_query_head)) {
+        if (rev && strcmp(rev, ctx.qry.head)) {
                 html(delim);
                 html("id=");
@@ -230,9 +223,9 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
                       char *rev)
 {
-        if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
-                name[cgit_max_msg_len] = '\0';
-                name[cgit_max_msg_len - 1] = '.';
-                name[cgit_max_msg_len - 2] = '.';
-                name[cgit_max_msg_len - 3] = '.';
+        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
+                name[ctx.cfg.max_msg_len] = '\0';
+                name[ctx.cfg.max_msg_len - 1] = '.';
+                name[ctx.cfg.max_msg_len - 2] = '.';
+                name[ctx.cfg.max_msg_len - 3] = '.';
         }
         reporevlink("commit", name, title, class, head, rev, NULL);
@@ -257,5 +250,5 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
 
         delim = repolink(title, class, "diff", head, path);
-        if (new_rev && strcmp(new_rev, cgit_query_head)) {
+        if (new_rev && strcmp(new_rev, ctx.qry.head)) {
                 html(delim);
                 html("id=");
@@ -285,5 +278,5 @@ void cgit_object_link(struct object *obj)
         if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
-                                 cgit_query_head, sha1_to_hex(obj->sha1));
+                                 ctx.qry.head, sha1_to_hex(obj->sha1));
                 return;
         } else if (obj->type == OBJ_TREE) {
@@ -298,5 +291,5 @@ void cgit_object_link(struct object *obj)
         }
 
-        url = cgit_pageurl(cgit_query_repo, page,
+        url = cgit_pageurl(ctx.qry.repo, page,
                            fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
         html_link_open(url, NULL, NULL);
@@ -361,22 +354,32 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 }
 
-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");
-        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)));
+        if (ctx->page.mimetype && ctx->page.charset)
+                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
+                      ctx->page.charset);
+        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 (cgit_robots && *cgit_robots)
-                htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);
+        if (ctx->cfg.robots && *ctx->cfg.robots)
+                htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
         html("<link rel='stylesheet' type='text/css' href='");
-        html_attr(cgit_css);
+        html_attr(ctx->cfg.css);
         html("'/>\n");
         html("</head>\n");
@@ -393,5 +396,5 @@ int print_branch_option(const char *refname, const unsigned char *sha1,
 {
         char *name = (char *)refname;
-        html_option(name, name, cgit_query_head);
+        html_option(name, name, ctx.qry.head);
         return 0;
 }
@@ -427,5 +430,5 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
                 *header = 1;
         }
-        url = cgit_pageurl(cgit_query_repo, "blob",
+        url = cgit_pageurl(ctx.qry.repo, "blob",
                            fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                                buf));
@@ -440,28 +443,28 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
         char *url;
 
-        if (!cgit_virtual_root) {
-                url = fmt("%s/%s", cgit_query_repo, page);
-                if (cgit_query_path)
-                        url = fmt("%s/%s", url, cgit_query_path);
+        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(cgit_query_head, cgit_repo->defbranch))
-                html_hidden("h", cgit_query_head);
+        if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
+                html_hidden("h", ctx.qry.head);
 
-        if (cgit_query_sha1)
-                html_hidden("id", cgit_query_sha1);
-        if (cgit_query_sha2)
-                html_hidden("id2", cgit_query_sha2);
+        if (ctx.qry.sha1)
+                html_hidden("id", ctx.qry.sha1);
+        if (ctx.qry.sha2)
+                html_hidden("id2", ctx.qry.sha2);
 
         if (incl_search) {
-                if (cgit_query_grep)
-                        html_hidden("qt", cgit_query_grep);
-                if (cgit_query_search)
-                        html_hidden("q", cgit_query_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";
@@ -475,38 +478,38 @@ void cgit_print_pageheader(char *title, int show_search)
         html_attr(cgit_rooturl());
         htmlf("'><img src='%s' alt='cgit'/></a>\n",
-              cgit_logo);
+              ctx->cfg.logo);
         html("</td></tr>\n<tr><td class='sidebar'>\n");
-        if (cgit_query_repo) {
+        if (ctx->repo) {
                 html("<h1 class='first'>");
-                html_txt(strrpart(cgit_repo->name, 20));
+                html_txt(strrpart(ctx->repo->name, 20));
                 html("</h1>\n");
-                html_txt(cgit_repo->desc);
-                if (cgit_repo->owner) {
+                html_txt(ctx->repo->desc);
+                if (ctx->repo->owner) {
                         html("<h1>owner</h1>\n");
-                        html_txt(cgit_repo->owner);
+                        html_txt(ctx->repo->owner);
                 }
                 html("<h1>navigate</h1>\n");
-                reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
+                reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,
                             NULL, NULL);
-                cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,
+                cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,
                               0, NULL, NULL);
-                cgit_tree_link("tree", NULL, "menu", cgit_query_head,
-                               cgit_query_sha1, NULL);
-                cgit_commit_link("commit", NULL, "menu", cgit_query_head,
-                              cgit_query_sha1);
-                cgit_diff_link("diff", NULL, "menu", cgit_query_head,
-                               cgit_query_sha1, cgit_query_sha2, NULL);
-                cgit_patch_link("patch", NULL, "menu", cgit_query_head,
-                                cgit_query_sha1);
+                cgit_tree_link("tree", NULL, "menu", ctx->qry.head,
+                               ctx->qry.sha1, NULL);
+                cgit_commit_link("commit", NULL, "menu", ctx->qry.head,
+                              ctx->qry.sha1);
+                cgit_diff_link("diff", NULL, "menu", ctx->qry.head,
+                               ctx->qry.sha1, ctx->qry.sha2, NULL);
+                cgit_patch_link("patch", NULL, "menu", ctx->qry.head,
+                                ctx->qry.sha1);
 
                 for_each_ref(print_archive_ref, &header);
 
-                if (cgit_repo->clone_url || cgit_clone_prefix) {
+                if (ctx->repo->clone_url || ctx->cfg.clone_prefix) {
                         html("<h1>clone</h1>\n");
-                        if (cgit_repo->clone_url)
-                                url = cgit_repo->clone_url;
+                        if (ctx->repo->clone_url)
+                                url = ctx->repo->clone_url;
                         else
-                                url = fmt("%s%s", cgit_clone_prefix,
-                                          cgit_repo->url);
+                                url = fmt("%s%s", ctx->cfg.clone_prefix,
+                                          ctx->repo->url);
                         html("<a class='menu' href='");
                         html_attr(url);
@@ -520,8 +523,8 @@ void cgit_print_pageheader(char *title, int show_search)
                 html("<h1>branch</h1>\n");
                 html("<form method='get' action=''>\n");
-                add_hidden_formfields(0, 1, cgit_query_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, cgit_query_head);
+                for_each_branch_ref(print_branch_option, ctx->qry.head);
                 html("</select>\n");
         //      html("</td><td>");
@@ -532,20 +535,20 @@ void cgit_print_pageheader(char *title, int show_search)
                 html("<h1>search</h1>\n");
                 html("<form method='get' action='");
-                if (cgit_virtual_root)
-                        html_attr(cgit_fileurl(cgit_query_repo, "log",
-                                               cgit_query_path, NULL));
+                if (ctx->cfg.virtual_root)
+                        html_attr(cgit_fileurl(ctx->qry.repo, "log",
+                                               ctx->qry.path, NULL));
                 html("'>\n");
                 add_hidden_formfields(1, 0, "log");
                 html("<select name='qt'>\n");
-                html_option("grep", "log msg", cgit_query_grep);
-                html_option("author", "author", cgit_query_grep);
-                html_option("committer", "committer", cgit_query_grep);
+                html_option("grep", "log msg", ctx->qry.grep);
+                html_option("author", "author", ctx->qry.grep);
+                html_option("committer", "committer", ctx->qry.grep);
                 html("</select>\n");
                 html("<input class='txt' type='text' name='q' value='");
-                html_attr(cgit_query_search);
+                html_attr(ctx->qry.search);
                 html("'/>\n");
                 html("</form>\n");
         } else {
-                if (!cgit_index_info || html_include(cgit_index_info))
+                if (!ctx->cfg.index_info || html_include(ctx->cfg.index_info))
                         html(default_info);
         }
@@ -556,15 +559,33 @@ void cgit_print_pageheader(char *title, int show_search)
 }
 
-
-void cgit_print_snapshot_start(const char *mimetype, const char *filename,
-                               struct cacheitem *item)
+void cgit_print_filemode(unsigned short mode)
 {
-        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");
+        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: */
+void cgit_print_snapshot_links(const char *repo, const char *head,
+                               const char *hex, int snapshots)
+{
+        const struct cgit_snapshot_format* f;
+            char *filename;
+
+        for (f = cgit_snapshot_formats; f->suffix; f++) {
+                if (!(snapshots & f->bit))
+                        continue;
+                filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
+                               f->suffix);
+                cgit_snapshot_link(filename, NULL, NULL, (char *)head,
+                                   (char *)hex, filename);
+                html("<br/>");
+        }
+}