Fix repolist search links with virtual root

Signed-off-by: Geoff Johnstone <geoff.johnstone@googlemail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 2 insertions, 1 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index 3ef2e99..0a0b6ca 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -49,97 +49,97 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
                 *mtime = read_agefile(path);
                 r->mtime = *mtime;
                 return 1;
         }
 
         path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
         if (stat(path, &s) == 0)
                 *mtime = s.st_mtime;
         else
                 *mtime = 0;
 
         r->mtime = *mtime;
         return (r->mtime != 0);
 }
 
 static void print_modtime(struct cgit_repo *repo)
 {
         time_t t;
         if (get_repo_modtime(repo, &t))
                 cgit_print_age(t, -1, NULL);
 }
 
 int is_match(struct cgit_repo *repo)
 {
         if (!ctx.qry.search)
                 return 1;
         if (repo->url && strcasestr(repo->url, ctx.qry.search))
                 return 1;
         if (repo->name && strcasestr(repo->name, ctx.qry.search))
                 return 1;
         if (repo->desc && strcasestr(repo->desc, ctx.qry.search))
                 return 1;
         if (repo->owner && strcasestr(repo->owner, ctx.qry.search))
                 return 1;
         return 0;
 }
 
 int is_in_url(struct cgit_repo *repo)
 {
         if (!ctx.qry.url)
                 return 1;
         if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
                 return 1;
         return 0;
 }
 
 void print_sort_header(const char *title, const char *sort)
 {
-        htmlf("<th class='left'><a href='./?s=%s", sort);
+        htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
         if (ctx.qry.search) {
                 html("&q=");
                 html_url_arg(ctx.qry.search);
         }
         htmlf("'>%s</a></th>", title);
 }
 
 void print_header(int columns)
 {
         html("<tr class='nohover'>");
         print_sort_header("Name", "name");
         print_sort_header("Description", "desc");
         print_sort_header("Owner", "owner");
         print_sort_header("Idle", "idle");
         if (ctx.cfg.enable_index_links)
                 html("<th class='left'>Links</th>");
         html("</tr>\n");
 }
 
 
 void print_pager(int items, int pagelen, char *search)
 {
         int i;
         html("<div class='pager'>");
         for(i = 0; i * pagelen < items; i++)
                 cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
                                 search, i * pagelen);
         html("</div>");
 }
 
 static int cmp(const char *s1, const char *s2)
 {
         if (s1 && s2)
                 return strcmp(s1, s2);
         if (s1 && !s2)
                 return -1;
         if (s2 && !s1)
                 return 1;
         return 0;
 }
 
 static int sort_section(const void *a, const void *b)
 {
         const struct cgit_repo *r1 = a;
         const struct cgit_repo *r2 = b;
         int result;
 
         result = cmp(r1->section, r2->section);
diff --git a/ui-shared.h b/ui-shared.h
index bff4826..b12aa89 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,50 +1,51 @@
 #ifndef UI_SHARED_H
 #define UI_SHARED_H
 
 extern char *cgit_httpscheme();
 extern char *cgit_hosturl();
+extern char *cgit_rooturl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
                           const char *filename, const char *query);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
                           const char *query);
 
 extern void cgit_index_link(char *name, char *title, char *class,
                             char *pattern, int ofs);
 extern void cgit_summary_link(char *name, char *title, char *class, char *head);
 extern void cgit_tag_link(char *name, char *title, char *class, char *head,
                           char *rev);
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_plain_link(char *name, char *title, char *class, char *head,
                             char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
                           char *rev, char *path, int ofs, char *grep,
                           char *pattern, int showmsg);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                              char *rev);
 extern void cgit_patch_link(char *name, char *title, char *class, char *head,
                             char *rev);
 extern void cgit_refs_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_snapshot_link(char *name, char *title, char *class,
                                char *head, char *rev, char *archivename);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
                            char *new_rev, char *old_rev, char *path);
 extern void cgit_stats_link(char *name, char *title, char *class, char *head,
                             char *path);
 extern void cgit_object_link(struct object *obj);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_date(time_t secs, char *format, int local_time);
 extern void cgit_print_age(time_t t, time_t max_relative, char *format);
 extern void cgit_print_http_headers(struct cgit_context *ctx);
 extern void cgit_print_docstart(struct cgit_context *ctx);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(struct cgit_context *ctx);
 extern void cgit_print_filemode(unsigned short mode);
 extern void cgit_print_snapshot_links(const char *repo, const char *head,
                                       const char *hex, int snapshots);
 extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
                                        char *page);
 #endif /* UI_SHARED_H */