filter: don't forget to reap the auth filter

[cgit.git] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 0b66b5289b54161b048b0d6b9144ed0794e00c37..ddd8f1b3392a329013cb7ee7d8c652e2847f4d22 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,31 +1,164 @@
 /* ui-summary.c: functions for generating repo summary page
  *
 /* ui-summary.c: functions for generating repo summary page
  *

- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"

+#include "ui-summary.h"

 #include "html.h"
 #include "ui-log.h"
 #include "ui-refs.h"
 #include "html.h"
 #include "ui-log.h"
 #include "ui-refs.h"

+#include "ui-blob.h"
+#include <libgen.h>

 
 

-void cgit_print_summary()
+static void print_url(char *base, char *suffix)

 {
 {

-       if (ctx.repo->readme) {
-               html("<div id='summary'>");
-               html_include(ctx.repo->readme);
-               html("</div>");
+       int columns = 3;
+       struct strbuf basebuf = STRBUF_INIT;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
+
+       if (!base || !*base)
+               return;
+       if (suffix && *suffix) {
+               strbuf_addf(&basebuf, "%s/%s", base, suffix);
+               base = basebuf.buf;

        }
        }

-       if (ctx.cfg.summary_log > 0)
-               cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
-                              NULL, NULL, 0);
+       htmlf("<tr><td colspan='%d'><a href='", columns);
+       html_url_path(base);
+       html("'>");
+       html_txt(base);
+       html("</a></td></tr>\n");
+       strbuf_release(&basebuf);
+}
+
+static void print_urls(char *txt, char *suffix)
+{
+       char *h = txt, *t, c;
+       int urls = 0;
+       int columns = 3;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
+
+
+       while (h && *h) {
+               while (h && *h == ' ')
+                       h++;
+               if (!*h)
+                       break;
+               t = h;
+               while (t && *t && *t != ' ')
+                       t++;
+               c = *t;
+               *t = 0;
+               if (urls++ == 0) {
+                       htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+                       htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
+               }
+               print_url(h, suffix);
+               *t = c;
+               h = t;
+       }
+}
+
+void cgit_print_summary()
+{
+       int columns = 3;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
+

        html("<table summary='repository info' class='list nowrap'>");
        html("<table summary='repository info' class='list nowrap'>");

-       if (ctx.cfg.summary_log > 0)
-               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");

        cgit_print_branches(ctx.cfg.summary_branches);
        cgit_print_branches(ctx.cfg.summary_branches);

-       html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+       htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);

        cgit_print_tags(ctx.cfg.summary_tags);
        cgit_print_tags(ctx.cfg.summary_tags);

+       if (ctx.cfg.summary_log > 0) {
+               htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+               cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
+                              NULL, NULL, 0, 0, 0);
+       }
+       if (ctx.repo->clone_url)
+               print_urls(expand_macros(ctx.repo->clone_url), NULL);
+       else if (ctx.cfg.clone_prefix)
+               print_urls(ctx.cfg.clone_prefix, ctx.repo->url);

        html("</table>");
 }
        html("</table>");
 }

+
+/* The caller must free the return value. */
+static char* append_readme_path(const char *filename, const char *ref, const char *path)
+{
+       char *file, *base_dir, *full_path, *resolved_base = NULL, *resolved_full = NULL;
+       /* If a subpath is specified for the about page, make it relative
+        * to the directory containing the configured readme. */
+
+       file = xstrdup(filename);
+       base_dir = dirname(file);
+       if (!strcmp(base_dir, ".") || !strcmp(base_dir, "..")) {
+               if (!ref) {
+                       free(file);
+                       return NULL;
+               }
+               full_path = xstrdup(path);
+       } else
+               full_path = fmtalloc("%s/%s", base_dir, path);
+       
+       if (!ref) {
+               resolved_base = realpath(base_dir, NULL);
+               resolved_full = realpath(full_path, NULL);
+               if (!resolved_base || !resolved_full || prefixcmp(resolved_full, resolved_base)) {
+                       free(full_path);
+                       full_path = NULL;
+               }
+       }
+
+       free(file);
+       free(resolved_base);
+       free(resolved_full);
+
+       return full_path;
+}
+
+void cgit_print_repo_readme(char *path)
+{
+       char *filename, *ref;
+       int free_filename = 0;
+
+       if (ctx.repo->readme.nr == 0)
+               return;
+       
+       filename = ctx.repo->readme.items[0].string;
+       ref = ctx.repo->readme.items[0].util;
+
+       if (path) {
+               free_filename = 1;
+               filename = append_readme_path(filename, ref, path);
+               if (!filename)
+                       return;
+       }
+
+       /* Print the calculated readme, either from the git repo or from the
+        * filesystem, while applying the about-filter.
+        */
+       html("<div id='summary'>");
+       cgit_open_filter(ctx.repo->about_filter, filename);
+       if (ref)
+               cgit_print_file(filename, ref, 1);
+       else
+               html_include(filename);
+       cgit_close_filter(ctx.repo->about_filter);
+
+       html("</div>");
+       if (free_filename)
+               free(filename);
+}