1 files changed, 30 insertions, 30 deletions

diff --git a/ui-shared.c b/ui-shared.c
index 6a41fb0..b96237d 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -33,47 +33,47 @@ static long ttl_seconds(long ttl)
                 return ttl * 60;
 }
 
 void cgit_print_error(char *msg)
 {
         html("<div class='error'>");
         html_txt(msg);
         html("</div>\n");
 }
 
 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);
         }
 }
 
 char *cgit_fileurl(const char *reponame, const char *pagename,
                    const char *filename, const char *query)
 {
         char *tmp;
         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 = "?";
         } else {
                 tmp = fmt("?url=%s/%s/%s", reponame, pagename,
                           (filename ? filename : ""));
                 delim = "&";
         }
         if (query)
                 tmp = fmt("%s%s%s", tmp, delim, query);
         return tmp;
 }
 
@@ -101,66 +101,66 @@ const char *cgit_repobasename(const char *reponame)
         }
         /* strip more trailing slashes if any */
         while( p && rvbuf[p]=='/') rvbuf[p--]=0;
         /* find last slash in the remaining string */
         rv = strrchr(rvbuf,'/');
         if(rv)
                 return ++rv;
         return rvbuf;
 }
 
 char *cgit_currurl()
 {
-        if (!cgit_virtual_root)
-                return cgit_script_name;
+        if (!ctx.cfg.virtual_root)
+                return ctx.cfg.script_name;
         else if (ctx.qry.page)
-                return fmt("%s/%s/%s/", cgit_virtual_root, ctx.qry.repo, 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/", cgit_virtual_root, 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);
 }
 
 static char *repolink(char *title, char *class, char *page, char *head,
                       char *path)
 {
         char *delim = "?";
 
         html("<a");
         if (title) {
                 html(" title='");
                 html_attr(title);
                 html("'");
         }
         if (class) {
                 html(" class='");
                 html_attr(class);
                 html("'");
         }
         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("/");
                 if (page) {
                         html(page);
                         html("/");
                         if (path)
                                 html_attr(path);
                 }
         } 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("/");
                 if (page) {
                         html(page);
                         html("/");
                         if (path)
                                 html_attr(path);
                 }
                 delim = "&amp;";
         }
@@ -220,29 +220,29 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
                 html(delim);
                 html("ofs=");
                 htmlf("%d", ofs);
         }
         html("'>");
         html_txt(name);
         html("</a>");
 }
 
 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);
 }
 
 void cgit_refs_link(char *name, char *title, char *class, char *head,
                     char *rev, char *path)
 {
         reporevlink("refs", name, title, class, head, rev, path);
 }
 
 void cgit_snapshot_link(char *name, char *title, char *class, char *head,
                         char *rev, char *archivename)
@@ -365,28 +365,28 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
         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)));
         html("\n");
         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("</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");
         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)
@@ -430,25 +430,25 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
                            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 (!cgit_virtual_root) {
+        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, cgit_repo->defbranch))
                 html_hidden("h", ctx.qry.head);
 
         if (ctx.qry.sha1)
                 html_hidden("id", ctx.qry.sha1);
         if (ctx.qry.sha2)
@@ -465,25 +465,25 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 void cgit_print_pageheader(char *title, int show_search)
 {
         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",
-              cgit_logo);
+              ctx.cfg.logo);
         html("</td></tr>\n<tr><td class='sidebar'>\n");
         if (ctx.qry.repo) {
                 html("<h1 class='first'>");
                 html_txt(strrpart(cgit_repo->name, 20));
                 html("</h1>\n");
                 html_txt(cgit_repo->desc);
                 if (cgit_repo->owner) {
                         html("<h1>owner</h1>\n");
                         html_txt(cgit_repo->owner);
                 }
                 html("<h1>navigate</h1>\n");
                 reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head,
@@ -492,70 +492,70 @@ void cgit_print_pageheader(char *title, int show_search)
                               0, NULL, NULL);
                 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 (cgit_repo->clone_url || ctx.cfg.clone_prefix) {
                         html("<h1>clone</h1>\n");
                         if (cgit_repo->clone_url)
                                 url = cgit_repo->clone_url;
                         else
-                                url = fmt("%s%s", cgit_clone_prefix,
+                                url = fmt("%s%s", ctx.cfg.clone_prefix,
                                           cgit_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);
         //      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);
                 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 (cgit_virtual_root)
+                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", 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(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);
         }
 
         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)
 {