ui-shared: use show_date for footer timestamp

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index c04f380be52defbcfb2afb9187b61529c24e68ed..eaa45fb402f21aefcff21afe53e2bacae1ec0534 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -525,7 +525,7 @@ void cgit_object_link(struct object *obj)
 {
        char *page, *shortrev, *fullrev, *name;
 
 {
        char *page, *shortrev, *fullrev, *name;
 

-       fullrev = sha1_to_hex(obj->sha1);
+       fullrev = oid_to_hex(&obj->oid);

        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {
        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {


@@ -627,15 +627,24 @@ void cgit_print_date(time_t secs, const char *format, int local_time)
        html_txt(fmt_date(secs, format, local_time));
 }
 
        html_txt(fmt_date(secs, format, local_time));
 }
 

-static void print_rel_date(time_t t, double value,
+const struct date_mode *cgit_date_mode(const char *format)
+{
+       static struct date_mode mode;
+       mode.type = DATE_STRFTIME;
+       mode.strftime_fmt = format;
+       mode.local = ctx.cfg.local_time;
+       return &mode;
+}
+
+static void print_rel_date(time_t t, int tz, double value,

        const char *class, const char *suffix)
 {
        htmlf("<span class='%s' title='", class);
        const char *class, const char *suffix)
 {
        htmlf("<span class='%s' title='", class);

-       html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));
+       html_attr(show_date(t, tz, cgit_date_mode(FMT_LONGDATE)));

        htmlf("'>%.0f %s</span>", value, suffix);
 }
 
        htmlf("'>%.0f %s</span>", value, suffix);
 }
 

-void cgit_print_age(time_t t, time_t max_relative, const char *format)
+void cgit_print_age(time_t t, int tz, time_t max_relative)

 {
        time_t now, secs;
 
 {
        time_t now, secs;
 


@@ -648,34 +657,34 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
 
        if (secs > max_relative && max_relative >= 0) {
                html("<span title='");
 
        if (secs > max_relative && max_relative >= 0) {
                html("<span title='");

-               html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));
+               html_attr(show_date(t, tz, cgit_date_mode(FMT_LONGDATE)));

                html("'>");
                html("'>");

-               cgit_print_date(t, format, ctx.cfg.local_time);
+               html_txt(show_date(t, tz, cgit_date_mode(FMT_SHORTDATE)));

                html("</span>");
                return;
        }
 
        if (secs < TM_HOUR * 2) {
                html("</span>");
                return;
        }
 
        if (secs < TM_HOUR * 2) {

-               print_rel_date(t, secs * 1.0 / TM_MIN, "age-mins", "min.");
+               print_rel_date(t, tz, secs * 1.0 / TM_MIN, "age-mins", "min.");

                return;
        }
        if (secs < TM_DAY * 2) {
                return;
        }
        if (secs < TM_DAY * 2) {

-               print_rel_date(t, secs * 1.0 / TM_HOUR, "age-hours", "hours");
+               print_rel_date(t, tz, secs * 1.0 / TM_HOUR, "age-hours", "hours");

                return;
        }
        if (secs < TM_WEEK * 2) {
                return;
        }
        if (secs < TM_WEEK * 2) {

-               print_rel_date(t, secs * 1.0 / TM_DAY, "age-days", "days");
+               print_rel_date(t, tz, secs * 1.0 / TM_DAY, "age-days", "days");

                return;
        }
        if (secs < TM_MONTH * 2) {
                return;
        }
        if (secs < TM_MONTH * 2) {

-               print_rel_date(t, secs * 1.0 / TM_WEEK, "age-weeks", "weeks");
+               print_rel_date(t, tz, secs * 1.0 / TM_WEEK, "age-weeks", "weeks");

                return;
        }
        if (secs < TM_YEAR * 2) {
                return;
        }
        if (secs < TM_YEAR * 2) {

-               print_rel_date(t, secs * 1.0 / TM_MONTH, "age-months", "months");
+               print_rel_date(t, tz, secs * 1.0 / TM_MONTH, "age-months", "months");

                return;
        }
                return;
        }

-       print_rel_date(t, secs * 1.0 / TM_YEAR, "age-years", "years");
+       print_rel_date(t, tz, secs * 1.0 / TM_YEAR, "age-years", "years");

 }
 
 void cgit_print_http_headers(void)
 }
 
 void cgit_print_http_headers(void)


@@ -692,9 +701,11 @@ void cgit_print_http_headers(void)
                htmlf("Content-Type: %s\n", ctx.page.mimetype);
        if (ctx.page.size)
                htmlf("Content-Length: %zd\n", ctx.page.size);
                htmlf("Content-Type: %s\n", ctx.page.mimetype);
        if (ctx.page.size)
                htmlf("Content-Length: %zd\n", ctx.page.size);

-       if (ctx.page.filename)
-               htmlf("Content-Disposition: inline; filename=\"%s\"\n",
-                     ctx.page.filename);
+       if (ctx.page.filename) {
+               html("Content-Disposition: inline; filename=\"");
+               html_header_arg_in_quotes(ctx.page.filename);
+               html("\"\n");
+       }

        if (!ctx.env.authenticated)
                html("Cache-Control: no-cache, no-store\n");
        htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));
        if (!ctx.env.authenticated)
                html("Cache-Control: no-cache, no-store\n");
        htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));


@@ -709,7 +720,9 @@ void cgit_print_http_headers(void)
 void cgit_redirect(const char *url, bool permanent)
 {
        htmlf("Status: %d %s\n", permanent ? 301 : 302, permanent ? "Moved" : "Found");
 void cgit_redirect(const char *url, bool permanent)
 {
        htmlf("Status: %d %s\n", permanent ? 301 : 302, permanent ? "Moved" : "Found");

-       htmlf("Location: %s\n\n", url);
+       html("Location: ");
+       html_url_path(url);
+       html("\n\n");

        exit(0);
 }
 
        exit(0);
 }
 


@@ -788,7 +801,7 @@ void cgit_print_docend(void)
        else {
                htmlf("<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit %s</a> at ",
                        cgit_version);
        else {
                htmlf("<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit %s</a> at ",
                        cgit_version);

-               cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
+               html_txt(show_date(time(NULL), 0, cgit_date_mode(FMT_LONGDATE)));

                html("</div>\n");
        }
        html("</div> <!-- id=cgit -->\n");
                html("</div>\n");
        }
        html("</div> <!-- id=cgit -->\n");


@@ -889,6 +902,9 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
 
 static const char *hc(const char *page)
 {
 
 static const char *hc(const char *page)
 {

+       if (!ctx.qry.page)
+               return NULL;
+

        return strcmp(ctx.qry.page, page) ? NULL : "active";
 }
 
        return strcmp(ctx.qry.page, page) ? NULL : "active";
 }