Fix search form action/hidden fields

The search form didn't properly honor the current path, so this commit
fixes cgit_fileurl() and add_hidden_formfields() to make the issue go
away.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 24 insertions, 18 deletions

diff --git a/ui-shared.c b/ui-shared.c
index a03661a..88dd6b8 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -15,109 +15,111 @@ const char cgit_doctype[] =
 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 (cgit_virtual_root)
                 return fmt("%s/", cgit_virtual_root);
         else
                 return cgit_script_name;
 }
 
 char *cgit_repourl(const char *reponame)
 {
         if (cgit_virtual_root) {
                 return fmt("%s/%s/", cgit_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) {
-                if (query)
-                        return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
-                                   pagename, filename?filename:"", query);
-                else
-                        return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
-                                   pagename);
+                tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame,
+                          pagename, (filename ? filename:""));
+                delim = "?";
         } else {
-                if (query)
-                        return fmt("?r=%s&amp;p=%s&amp;%s", reponame, pagename, query);
-                else
-                        return fmt("?r=%s&amp;p=%s", reponame, pagename);
+                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);
 }
 
 const char *cgit_repobasename(const char *reponame)
 {
         /* I assume we don't need to store more than one repo basename */
         static char rvbuf[1024];
         int p;
         const char *rv;
         strncpy(rvbuf,reponame,sizeof(rvbuf));
         if(rvbuf[sizeof(rvbuf)-1])
                 die("cgit_repobasename: truncated repository name '%s'", reponame);
         p = strlen(rvbuf)-1;
         /* strip trailing slashes */
         while(p && rvbuf[p]=='/') rvbuf[p--]=0;
         /* strip trailing .git */
         if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
                 p -= 3; rvbuf[p--] = 0;
         }
         /* 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;
         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);
         else
                 return fmt("%s/", cgit_virtual_root);
 }
 
 static char *repolink(char *title, char *class, char *page, char *head,
                       char *path)
 {
@@ -376,153 +378,157 @@ void cgit_print_docend()
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
                         int flags, void *cb_data)
 {
         char *name = (char *)refname;
         html_option(name, name, cgit_query_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("<p><h1>download</h1>");
                 *header = 1;
         }
         url = cgit_pageurl(cgit_query_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)
+void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
+        char *url;
+
         if (!cgit_virtual_root) {
-                if (cgit_query_repo)
-                        html_hidden("r", cgit_query_repo);
-                if (cgit_query_page)
-                        html_hidden("p", cgit_query_page);
+                url = fmt("%s/%s", cgit_query_repo, page);
+                if (cgit_query_path)
+                        url = fmt("%s/%s", url, cgit_query_path);
+                html_hidden("url", url);
         }
 
         if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
                 html_hidden("h", cgit_query_head);
 
         if (cgit_query_sha1)
                 html_hidden("id", cgit_query_sha1);
         if (cgit_query_sha2)
                 html_hidden("id2", cgit_query_sha2);
 
         if (incl_search) {
                 if (cgit_query_grep)
                         html_hidden("qt", cgit_query_grep);
                 if (cgit_query_search)
                         html_hidden("q", cgit_query_search);
         }
 }
 
 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;
 
         html("<div id='sidebar'>\n");
         html("<a href='");
         html_attr(cgit_rooturl());
         htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n",
               cgit_logo);
         html("<div class='infobox'>");
         if (cgit_query_repo) {
                 html("<h1>");
                 html_txt(strrpart(cgit_repo->name, 20));
                 html("</h1>\n");
                 html_txt(cgit_repo->desc);
                 if (cgit_repo->owner) {
                         html("<p>\n<h1>owner</h1>\n");
                         html_txt(cgit_repo->owner);
                 }
                 html("<p>\n<h1>navigate</h1>\n");
                 reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
                             NULL, NULL);
                 cgit_log_link("log", NULL, "menu", cgit_query_head,
                               cgit_query_sha1, cgit_query_path, 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,
                                cgit_query_path);
 
                 for_each_ref(print_archive_ref, &header);
 
                 html("<p>\n<h1>branch</h1>\n");
                 html("<form method='get' action=''>\n");
-                add_hidden_formfields(0, 1);
+                add_hidden_formfields(0, 1, cgit_query_page);
                 html("<select name='h' onchange='this.form.submit();'>\n");
                 for_each_branch_ref(print_branch_option, cgit_query_head);
                 html("</select>\n");
                 html("</form>\n");
 
                 html("<p>\n<h1>search</h1>\n");
                 html("<form method='get' action='");
-                html_attr(cgit_pageurl(cgit_query_repo, "log", NULL));
+                if (cgit_virtual_root)
+                        html_attr(cgit_fileurl(cgit_query_repo, "log",
+                                               cgit_query_path, NULL));
                 html("'>\n");
-                add_hidden_formfields(1, 0);
+                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("</select>\n");
                 html("<input class='txt' type='text' name='q' value='");
                 html_attr(cgit_query_search);
                 html("'/>\n");
                 html("</form>\n");
         } else {
                 if (!cgit_index_info || html_include(cgit_index_info))
                         html(default_info);
         }
 
         html("</div>\n");
 
         html("</div>\n<table class='grid'><tr><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");
 }
 
 /* vim:set sw=8: */