/* ui-shared.c: common web output functions
*
- * 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)
/* strip trailing slashes */
while (p && rvbuf[p] == '/') rvbuf[p--] = 0;
/* strip trailing .git */
- if (p >= 3 && !strncmp(&rvbuf[p-3], ".git", 4)) {
+ if (p >= 3 && !prefixcmp(&rvbuf[p-3], ".git")) {
p -= 3; rvbuf[p--] = 0;
}
/* strip more trailing slashes if any */
if (ctx.cfg.virtual_root)
html_attr(ctx.cfg.virtual_root);
else
- html(ctx.cfg.script_name);
+ html_url_path(ctx.cfg.script_name);
if (page) {
htmlf("?p=%s", page);
html_url_path(path);
}
} else {
- html(ctx.cfg.script_name);
+ html_url_path(ctx.cfg.script_name);
html("?url=");
html_url_arg(ctx.repo->url);
if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
if (ctx->page.filename)
htmlf("Content-Disposition: inline; filename=\"%s\"\n",
ctx->page.filename);
+ if (!ctx->env.authenticated)
+ html("Cache-Control: no-cache, no-store\n");
htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
htmlf("Expires: %s\n", http_date(ctx->page.expires));
if (ctx->page.etag)
cgit_index_link("index", NULL, NULL, NULL, NULL, 0);
html(" : ");
cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
- html("</td><td class='form'>");
- html("<form method='get' action=''>\n");
- cgit_add_hidden_formfields(0, 1, ctx->qry.page);
- html("<select name='h' onchange='this.form.submit();'>\n");
- for_each_branch_ref(print_branch_option, ctx->qry.head);
- html("</select> ");
- html("<input type='submit' name='' value='switch'/>");
- html("</form>");
+ if (ctx->env.authenticated) {
+ html("</td><td class='form'>");
+ html("<form method='get' action=''>\n");
+ cgit_add_hidden_formfields(0, 1, ctx->qry.page);
+ html("<select name='h' onchange='this.form.submit();'>\n");
+ for_each_branch_ref(print_branch_option, ctx->qry.head);
+ html("</select> ");
+ html("<input type='submit' name='' value='switch'/>");
+ html("</form>");
+ }
} else
html_txt(ctx->cfg.root_title);
html("</td></tr>\n");
void cgit_print_pageheader(struct cgit_context *ctx)
{
html("<div id='cgit'>");
- if (!ctx->cfg.noheader)
+ if (!ctx->env.authenticated || !ctx->cfg.noheader)
print_header(ctx);
html("<table class='tabs'><tr><td>\n");
- if (ctx->repo) {
+ if (ctx->env.authenticated && ctx->repo) {
cgit_summary_link("summary", NULL, hc(ctx, "summary"),
ctx->qry.head);
cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
html("'/>\n");
html("<input type='submit' value='search'/>\n");
html("</form>\n");
- } else {
+ } else if (ctx->env.authenticated) {
site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, NULL, 0);
if (ctx->cfg.root_readme)
site_link("about", "about", NULL, hc(ctx, "about"),
html("</form>");
}
html("</td></tr></table>\n");
- if (ctx->qry.vpath) {
+ if (ctx->env.authenticated && ctx->qry.vpath) {
html("<div class='path'>");
html("path: ");
cgit_print_path_crumbs(ctx, ctx->qry.vpath);
}
strbuf_release(&filename);
}
-
-static void print_line_raw(char *line, int len)
-{
- char c = line[len-1];
-
- line[len-1] = '\0';
- htmlf("%s\n", line);
- line[len-1] = c;
-}
-
-static void header_raw(unsigned char *sha1, char *path1, int mode1,
- unsigned char *sha2, char *path2, int mode2)
-{
- char *abbrev1, *abbrev2;
- int subproject;
-
- subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
- htmlf("diff --git a/%s b/%s\n", path1, path2);
-
- if (mode1 == 0)
- htmlf("new file mode %.6o\n", mode2);
-
- if (mode2 == 0)
- htmlf("deleted file mode %.6o\n", mode1);
-
- if (!subproject) {
- abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
- abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
- htmlf("index %s..%s", abbrev1, abbrev2);
- free(abbrev1);
- free(abbrev2);
- if (mode1 != 0 && mode2 != 0) {
- htmlf(" %.6o", mode1);
- if (mode2 != mode1)
- htmlf("..%.6o", mode2);
- }
-
- if (is_null_sha1(sha1)) {
- path1 = "dev/null";
- htmlf("\n--- /%s\n", path1);
- } else
- htmlf("\n--- a/%s\n", path1);
-
- if (is_null_sha1(sha2)) {
- path2 = "dev/null";
- htmlf("+++ /%s\n", path2);
- } else
- htmlf("+++ b/%s\n", path2);
- }
-}
-
-void filepair_cb_raw(struct diff_filepair *pair)
-{
- unsigned long old_size = 0;
- unsigned long new_size = 0;
- int binary = 0;
-
- header_raw(pair->one->sha1, pair->one->path, pair->one->mode,
- pair->two->sha1, pair->two->path, pair->two->mode);
- if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
- if (S_ISGITLINK(pair->one->mode))
- print_line_raw(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
- if (S_ISGITLINK(pair->two->mode))
- print_line_raw(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
- return;
- }
- if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
- &new_size, &binary, 0, 0, print_line_raw))
- html("Error running diff");
- if (binary)
- html("Binary files differ\n");
-}
projects / ps-cgit / blobdiff