log: move layout into page function

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 5be2545c398ca7f7ac715991e58b90b52f32e636..cd1fef554eb8833cf7acfdd7ae689a46be6b8fe3 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,124 +1,135 @@
 /* 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) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * 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 "ui-blob.h"
 #include "html.h"
 #include "ui-log.h"
 #include "ui-refs.h"
 #include "ui-blob.h"

+#include "ui-shared.h"

 
 

-int urls = 0;
+static int urls;

 
 

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

 {
 {

-       if (!base || !*base)
-               return;
+       int columns = 3;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
+

        if (urls++ == 0) {
        if (urls++ == 0) {

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

        }
        }

-       if (suffix && *suffix)
-               base = fmt("%s/%s", base, suffix);
-       html("<tr><td colspan='4'><a href='");
-       html_url_path(base);
-       html("'>");
-       html_txt(base);
+
+       htmlf("<tr><td colspan='%d'><a rel='vcs-git' href='", columns);
+       html_url_path(url);
+       html("' title='");
+       html_attr(ctx.repo->name);
+       html(" Git repository'>");
+       html_txt(url);

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

-static void print_urls(char *txt, char *suffix)
+void cgit_print_summary(void)

 {
 {

-       char *h = txt, *t, c;
-
-       while (h && *h) {
-               while (h && *h == ' ')
-                       h++;
-               t = h;
-               while (t && *t && *t != ' ')
-                       t++;
-               c = *t;
-               *t = 0;
-               print_url(h, suffix);
-               *t = c;
-               h = t;
-       }
-}
+       int columns = 3;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;

 
 

-void cgit_print_summary()
-{

        html("<table summary='repository info' class='list nowrap'>");
        cgit_print_branches(ctx.cfg.summary_branches);
        html("<table summary='repository info' class='list nowrap'>");
        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);
        if (ctx.cfg.summary_log > 0) {
        cgit_print_tags(ctx.cfg.summary_tags);
        if (ctx.cfg.summary_log > 0) {

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

                cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
                cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,

-                              NULL, NULL, 0, 0);
+                              NULL, NULL, 0, 0, 0);

        }
        }

-       if (ctx.repo->clone_url)
-               print_urls(ctx.repo->clone_url, NULL);
-       else if (ctx.cfg.clone_prefix)
-               print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
+       urls = 0;
+       cgit_add_clone_urls(print_url);

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

-void cgit_print_repo_readme(char *path)
+/* The caller must free the return value. */
+static char* append_readme_path(const char *filename, const char *ref, const char *path)

 {
 {

-       char *slash, *tmp, *colon, *ref;
-
-       if (!ctx.repo->readme || !(*ctx.repo->readme))
-               return;
+       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. */

 
 

-       ref = NULL;
+       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);

 
 

-       /* Check if the readme is tracked in the git repo. */
-       colon = strchr(ctx.repo->readme, ':');
-       if (colon && strlen(colon) > 1) {
-               *colon = '\0';
-               ref = ctx.repo->readme;
-               ctx.repo->readme = colon + 1;
-               if (!(*ctx.repo->readme))
-                       return;
+       if (!ref) {
+               resolved_base = realpath(base_dir, NULL);
+               resolved_full = realpath(full_path, NULL);
+               if (!resolved_base || !resolved_full || !starts_with(resolved_full, resolved_base)) {
+                       free(full_path);
+                       full_path = NULL;
+               }

        }
 
        }
 

-       /* Prepend repo path to relative readme path unless tracked. */
-       if (!ref && *ctx.repo->readme != '/')
-               ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
-                                              ctx.repo->readme));
+       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;
+
+       cgit_print_layout_start();
+       if (ctx.repo->readme.nr == 0)
+               goto done;
+
+       filename = ctx.repo->readme.items[0].string;
+       ref = ctx.repo->readme.items[0].util;

 
 

-       /* If a subpath is specified for the about page, make it relative
-        * to the directory containing the configured readme.
-        */

        if (path) {
        if (path) {

-               slash = strrchr(ctx.repo->readme, '/');
-               if (!slash) {
-                       if (!colon)
-                               return;
-                       slash = colon;
-               }
-               tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
-               strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
-               strcpy(tmp + (slash - ctx.repo->readme + 1), path);
-       } else
-               tmp = ctx.repo->readme;
+               free_filename = 1;
+               filename = append_readme_path(filename, ref, path);
+               if (!filename)
+                       goto done;
+       }

 
        /* Print the calculated readme, either from the git repo or from the
         * filesystem, while applying the about-filter.
         */
        html("<div id='summary'>");
 
        /* Print the calculated readme, either from the git repo or from the
         * filesystem, while applying the about-filter.
         */
        html("<div id='summary'>");

-       if (ctx.repo->about_filter)
-               cgit_open_filter(ctx.repo->about_filter);
+       cgit_open_filter(ctx.repo->about_filter, filename);

        if (ref)
        if (ref)

-               cgit_print_file(tmp, ref);
+               cgit_print_file(filename, ref, 1);

        else
        else

-               html_include(tmp);
-       if (ctx.repo->about_filter)
-               cgit_close_filter(ctx.repo->about_filter);
+               html_include(filename);
+       cgit_close_filter(ctx.repo->about_filter);
+

        html("</div>");
        html("</div>");

+       if (free_filename)
+               free(filename);
+
+done:
+       cgit_print_layout_end();

 }
 }