clone: fix directory traversal

[cgit.git] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index d3d71dd0d9a6aa18c7ead4cdabcce672b606f310..2ec385854ef9a2396fc10881de5f46599464685e 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -63,7 +63,7 @@ static int print_branch(struct refinfo *ref)
                return 1;
        html("<tr><td>");
        cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
                return 1;
        html("<tr><td>");
        cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,

-                     ctx.qry.showmsg);
+                     ctx.qry.showmsg, 0);

        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {
        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {


@@ -73,7 +73,7 @@ static int print_branch(struct refinfo *ref)
                html_txt(info->author);
                cgit_close_filter(ctx.repo->email_filter);
                html("</td><td colspan='2'>");
                html_txt(info->author);
                cgit_close_filter(ctx.repo->email_filter);
                html("</td><td colspan='2'>");

-               cgit_print_age(info->commit->date, -1, NULL);
+               cgit_print_age(info->committer_date, info->committer_tz, -1);

        } else {
                html("</td><td></td><td>");
                cgit_object_link(ref->object);
        } else {
                html("</td><td></td><td>");
                cgit_object_link(ref->object);


@@ -90,40 +90,6 @@ static void print_tag_header(void)
             "<th class='left' colspan='2'>Age</th></tr>\n");
 }
 
             "<th class='left' colspan='2'>Age</th></tr>\n");
 }
 

-static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
-{
-       const struct cgit_snapshot_format* f;
-       struct strbuf filename = STRBUF_INIT;
-       const char *basename;
-       int free_ref = 0;
-
-       if (!ref || strlen(ref) < 1)
-               return;
-
-       basename = cgit_repobasename(repo->url);
-       if (!starts_with(ref, basename)) {
-               if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
-                       ref++;
-               if (isdigit(ref[0])) {
-                       ref = fmtalloc("%s-%s", basename, ref);
-                       free_ref = 1;
-               }
-       }
-
-       for (f = cgit_snapshot_formats; f->suffix; f++) {
-               if (!(repo->snapshots & f->bit))
-                       continue;
-               strbuf_reset(&filename);
-               strbuf_addf(&filename, "%s%s", ref, f->suffix);
-               cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf);
-               html("&nbsp;&nbsp;");
-       }
-
-       if (free_ref)
-               free((char *)ref);
-       strbuf_release(&filename);
-}
-

 static int print_tag(struct refinfo *ref)
 {
        struct tag *tag = NULL;
 static int print_tag(struct refinfo *ref)
 {
        struct tag *tag = NULL;


@@ -135,7 +101,7 @@ static int print_tag(struct refinfo *ref)
                tag = (struct tag *)obj;
                obj = tag->tagged;
                info = ref->tag;
                tag = (struct tag *)obj;
                obj = tag->tagged;
                info = ref->tag;

-               if (!tag || !info)
+               if (!info)

                        return 1;
        }
 
                        return 1;
        }
 


@@ -143,7 +109,7 @@ static int print_tag(struct refinfo *ref)
        cgit_tag_link(name, NULL, NULL, name);
        html("</td><td>");
        if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))
        cgit_tag_link(name, NULL, NULL, name);
        html("</td><td>");
        if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))

-               print_tag_downloads(ctx.repo, name);
+               cgit_print_snapshot_links(ctx.repo, name, "&nbsp;&nbsp;");

        else
                cgit_object_link(obj);
        html("</td><td>");
        else
                cgit_object_link(obj);
        html("</td><td>");


@@ -161,9 +127,9 @@ static int print_tag(struct refinfo *ref)
        html("</td><td colspan='2'>");
        if (info) {
                if (info->tagger_date > 0)
        html("</td><td colspan='2'>");
        if (info) {
                if (info->tagger_date > 0)

-                       cgit_print_age(info->tagger_date, -1, NULL);
+                       cgit_print_age(info->tagger_date, info->tagger_tz, -1);

        } else if (ref->object->type == OBJ_COMMIT) {
        } else if (ref->object->type == OBJ_COMMIT) {

-               cgit_print_age(ref->commit->commit->date, -1, NULL);
+               cgit_print_age(ref->commit->commit->date, 0, -1);

        }
        html("</td></tr>\n");
 
        }
        html("</td></tr>\n");
 


@@ -236,7 +202,7 @@ void cgit_print_tags(int maxcount)
 
 void cgit_print_refs(void)
 {
 
 void cgit_print_refs(void)
 {

-
+       cgit_print_layout_start();

        html("<table class='list nowrap'>");
 
        if (ctx.qry.path && starts_with(ctx.qry.path, "heads"))
        html("<table class='list nowrap'>");
 
        if (ctx.qry.path && starts_with(ctx.qry.path, "heads"))


@@ -249,4 +215,5 @@ void cgit_print_refs(void)
                cgit_print_tags(0);
        }
        html("</table>");
                cgit_print_tags(0);
        }
        html("</table>");

+       cgit_print_layout_end();

 }
 }