ui-shared: Add current url helper function.

diff --git a/ui-repolist.c b/ui-repolist.c
index 4b16b6e34225ca383c53503ed7b153becea01861..12ac1fc1303a3fa3209c6428cfdf686933a1f0a2 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -108,7 +108,7 @@ static int is_in_url(struct cgit_repo *repo)
 static void print_sort_header(const char *title, const char *sort)
 {
        html("<th class='left'><a href='");
 static void print_sort_header(const char *title, const char *sort)
 {
        html("<th class='left'><a href='");

-       html_attr(ctx.qry.url);
+       html_attr(cgit_currenturl());

        htmlf("?s=%s", sort);
        if (ctx.qry.search) {
                html("&amp;q=");
        htmlf("?s=%s", sort);
        if (ctx.qry.search) {
                html("&amp;q=");


@@ -315,7 +315,7 @@ void cgit_print_repolist()
                                cgit_close_filter(ctx.repo->owner_filter);
                        } else {
                                html("<a href='");
                                cgit_close_filter(ctx.repo->owner_filter);
                        } else {
                                html("<a href='");

-                               html_attr(ctx.qry.url);
+                               html_attr(cgit_currenturl());

                                html("?q=");
                                html_url_arg(ctx.repo->owner);
                                html("'>");
                                html("?q=");
                                html_url_arg(ctx.repo->owner);
                                html("'>");

diff --git a/ui-shared.c b/ui-shared.c
index f8e5bef75852e44b380b0a7a416605d7a7102504..838437c46e07b1b632ceb6a915760c07d755f8c0 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -65,6 +65,13 @@ const char *cgit_hosturl()
        return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 
        return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 

+const char *cgit_currenturl()
+{
+       if (!ctx.qry.url)
+               return cgit_rooturl();
+       return ctx.qry.url;
+}
+

 const char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)
 const char *cgit_rooturl()
 {
        if (ctx.cfg.virtual_root)


@@ -145,7 +152,7 @@ static void site_url(const char *page, const char *search, const char *sort, int
        char *delim = "?";
 
        if (!page)
        char *delim = "?";
 
        if (!page)

-               html_attr(ctx.qry.url);
+               html_attr(cgit_currenturl());

        else
                html_attr(cgit_rooturl());
 
        else
                html_attr(cgit_rooturl());
 


@@ -952,7 +959,7 @@ void cgit_print_pageheader(void)
                                  NULL, NULL, 0);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                                  NULL, NULL, 0);
                html("</td><td class='form'>");
                html("<form method='get' action='");

-               html_attr(ctx.qry.url);
+               html_attr(cgit_currenturl());

                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                html_attr(ctx.qry.search);
                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                html_attr(ctx.qry.search);

diff --git a/ui-shared.h b/ui-shared.h
index 021fe4e6a6d1fbd5598553e9759241923e419a53..af78a132c801cd23a4df59e7fd23830e78e77fda 100644 (file)
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -4,6 +4,7 @@
 extern const char *cgit_httpscheme();
 extern const char *cgit_hosturl();
 extern const char *cgit_rooturl();
 extern const char *cgit_httpscheme();
 extern const char *cgit_hosturl();
 extern const char *cgit_rooturl();

+extern const char *cgit_currenturl();

 extern const char *cgit_loginurl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
 extern const char *cgit_loginurl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,