7 files changed, 22 insertions, 7 deletions

diff --git a/cgit.c b/cgit.c
index 2039ab1..f6bb0c7 100644
--- a/cgit.c
+++ b/cgit.c
@@ -6,96 +6,98 @@
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "cache.h"
 #include "cmd.h"
 #include "configfile.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-stats.h"
 #include "scan-tree.h"
 
 const char *cgit_version = CGIT_VERSION;
 
 void config_cb(const char *name, const char *value)
 {
         if (!strcmp(name, "root-title"))
                 ctx.cfg.root_title = xstrdup(value);
         else if (!strcmp(name, "root-desc"))
                 ctx.cfg.root_desc = xstrdup(value);
         else if (!strcmp(name, "root-readme"))
                 ctx.cfg.root_readme = xstrdup(value);
         else if (!strcmp(name, "css"))
                 ctx.cfg.css = xstrdup(value);
         else if (!strcmp(name, "favicon"))
                 ctx.cfg.favicon = xstrdup(value);
         else if (!strcmp(name, "footer"))
                 ctx.cfg.footer = xstrdup(value);
         else if (!strcmp(name, "head-include"))
                 ctx.cfg.head_include = xstrdup(value);
         else if (!strcmp(name, "header"))
                 ctx.cfg.header = xstrdup(value);
         else if (!strcmp(name, "logo"))
                 ctx.cfg.logo = xstrdup(value);
         else if (!strcmp(name, "index-header"))
                 ctx.cfg.index_header = xstrdup(value);
         else if (!strcmp(name, "index-info"))
                 ctx.cfg.index_info = xstrdup(value);
         else if (!strcmp(name, "logo-link"))
                 ctx.cfg.logo_link = xstrdup(value);
         else if (!strcmp(name, "module-link"))
                 ctx.cfg.module_link = xstrdup(value);
         else if (!strcmp(name, "virtual-root")) {
                 ctx.cfg.virtual_root = trim_end(value, '/');
                 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
                         ctx.cfg.virtual_root = "";
         } else if (!strcmp(name, "nocache"))
                 ctx.cfg.nocache = atoi(value);
+        else if (!strcmp(name, "noplainemail"))
+                ctx.cfg.noplainemail = atoi(value);
         else if (!strcmp(name, "noheader"))
                 ctx.cfg.noheader = atoi(value);
         else if (!strcmp(name, "snapshots"))
                 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
         else if (!strcmp(name, "enable-index-links"))
                 ctx.cfg.enable_index_links = atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 ctx.cfg.enable_log_filecount = atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 ctx.cfg.enable_log_linecount = atoi(value);
         else if (!strcmp(name, "max-stats"))
                 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
         else if (!strcmp(name, "cache-size"))
                 ctx.cfg.cache_size = atoi(value);
         else if (!strcmp(name, "cache-root"))
                 ctx.cfg.cache_root = xstrdup(value);
         else if (!strcmp(name, "cache-root-ttl"))
                 ctx.cfg.cache_root_ttl = atoi(value);
         else if (!strcmp(name, "cache-repo-ttl"))
                 ctx.cfg.cache_repo_ttl = atoi(value);
         else if (!strcmp(name, "cache-static-ttl"))
                 ctx.cfg.cache_static_ttl = atoi(value);
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 ctx.cfg.cache_dynamic_ttl = atoi(value);
         else if (!strcmp(name, "embedded"))
                 ctx.cfg.embedded = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 ctx.cfg.max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
                 ctx.cfg.max_repodesc_len = atoi(value);
         else if (!strcmp(name, "max-repo-count"))
                 ctx.cfg.max_repo_count = atoi(value);
         else if (!strcmp(name, "max-commit-count"))
                 ctx.cfg.max_commit_count = atoi(value);
         else if (!strcmp(name, "summary-log"))
                 ctx.cfg.summary_log = atoi(value);
         else if (!strcmp(name, "summary-branches"))
                 ctx.cfg.summary_branches = atoi(value);
         else if (!strcmp(name, "summary-tags"))
                 ctx.cfg.summary_tags = atoi(value);
         else if (!strcmp(name, "agefile"))
                 ctx.cfg.agefile = xstrdup(value);
         else if (!strcmp(name, "renamelimit"))
                 ctx.cfg.renamelimit = atoi(value);
         else if (!strcmp(name, "robots"))
                 ctx.cfg.robots = xstrdup(value);
         else if (!strcmp(name, "clone-prefix"))
                 ctx.cfg.clone_prefix = xstrdup(value);
diff --git a/cgit.h b/cgit.h
index 8c64efe..acb5e8f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -123,96 +123,97 @@ struct cgit_query {
         char *mimetype;
         char *url;
         char *period;
         int   ofs;
         int nohead;
         char *sort;
         int showmsg;
 };
 
 struct cgit_config {
         char *agefile;
         char *cache_root;
         char *clone_prefix;
         char *css;
         char *favicon;
         char *footer;
         char *head_include;
         char *header;
         char *index_header;
         char *index_info;
         char *logo;
         char *logo_link;
         char *module_link;
         char *repo_group;
         char *robots;
         char *root_title;
         char *root_desc;
         char *root_readme;
         char *script_name;
         char *virtual_root;
         int cache_size;
         int cache_dynamic_ttl;
         int cache_max_create_time;
         int cache_repo_ttl;
         int cache_root_ttl;
         int cache_static_ttl;
         int embedded;
         int enable_index_links;
         int enable_log_filecount;
         int enable_log_linecount;
         int local_time;
         int max_repo_count;
         int max_commit_count;
         int max_lock_attempts;
         int max_msg_len;
         int max_repodesc_len;
         int max_stats;
         int nocache;
+        int noplainemail;
         int noheader;
         int renamelimit;
         int snapshots;
         int summary_branches;
         int summary_log;
         int summary_tags;
 };
 
 struct cgit_page {
         time_t modified;
         time_t expires;
         size_t size;
         char *mimetype;
         char *charset;
         char *filename;
         char *etag;
         char *title;
         int status;
         char *statusmsg;
 };
 
 struct cgit_context {
         struct cgit_query qry;
         struct cgit_config cfg;
         struct cgit_repo *repo;
         struct cgit_page page;
 };
 
 struct cgit_snapshot_format {
         const char *suffix;
         const char *mimetype;
         write_archive_fn_t write_func;
         int bit;
 };
 
 extern const char *cgit_version;
 
 extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
 extern const struct cgit_snapshot_format cgit_snapshot_formats[];
 
 extern struct cgit_repo *cgit_add_repo(const char *url);
 extern struct cgit_repo *cgit_get_repoinfo(const char *url);
 extern void cgit_repo_config_cb(const char *name, const char *value);
 
 extern int chk_zero(int result, char *msg);
 extern int chk_positive(int result, char *msg);
 extern int chk_non_negative(int result, char *msg);
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index a207fe0..7754923 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -113,96 +113,100 @@ index-info::
         is deprecated, and will not be supported by cgit-1.0 (use root-desc
         instead). Default value: none.
 
 local-time::
         Flag which, if set to "1", makes cgit print commit and tag times in the
         servers timezone. Default value: "0".
 
 logo::
         Url which specifies the source of an image which will be used as a logo
         on all cgit pages.
 
 logo-link::
         Url loaded when clicking on the cgit logo image. If unspecified the
         calculated url of the repository index page will be used. Default
         value: none.
 
 max-commit-count::
         Specifies the number of entries to list per page in "log" view. Default
         value: "50".
 
 max-message-length::
         Specifies the maximum number of commit message characters to display in
         "log" view. Default value: "80".
 
 max-repo-count::
                 Specifies the number of entries to list per page on therepository
         index page. Default value: "50".
 
 max-repodesc-length::
         Specifies the maximum number of repo description characters to display
         on the repository index page. Default value: "80".
 
 max-stats::
         Set the default maximum statistics period. Valid values are "week",
         "month", "quarter" and "year". If unspecified, statistics are
         disabled. Default value: none. See also: "repo.max-stats".
 
 module-link::
         Text which will be used as the formatstring for a hyperlink when a
         submodule is printed in a directory listing. The arguments for the
         formatstring are the path and SHA1 of the submodule commit. Default
         value: "./?repo=%s&page=commit&id=%s"
 
 nocache::
         If set to the value "1" caching will be disabled. This settings is
         deprecated, and will not be honored starting with cgit-1.0. Default
         value: "0".
 
+noplainemail::
+        If set to "1" showing full author email adresses will be disabled.
+        Default value: "0".
+
 noheader::
         Flag which, when set to "1", will make cgit omit the standard header
         on all pages. Default value: none. See also: "embedded".
 
 renamelimit::
         Maximum number of files to consider when detecting renames. The value
          "-1" uses the compiletime value in git (for further info, look at
           `man git-diff`). Default value: "-1".
 
 repo.group::
         A value for the current repository group, which all repositories
         specified after this setting will inherit. Default value: none.
 
 robots::
         Text used as content for the "robots" meta-tag. Default value:
         "index, nofollow".
 
 root-desc::
         Text printed below the heading on the repository index page. Default
         value: "a fast webinterface for the git dscm".
 
 root-readme::
         The content of the file specified with this option will be included
         verbatim below the "about" link on the repository index page. Default
         value: none.
 
 root-title::
         Text printed as heading on the repository index page. Default value:
         "Git Repository Browser".
 
 snapshots::
         Text which specifies the default (and allowed) set of snapshot formats
         supported by cgit. The value is a space-separated list of zero or more
         of the following values:
                         "tar"   uncompressed tar-file
                         "tar.gz"gzip-compressed tar-file
                         "tar.bz2"bzip-compressed tar-file
                         "zip"   zip-file
         Default value: none.
 
 summary-branches::
         Specifies the number of branches to display in the repository "summary"
         view. Default value: "10".
 
 summary-log::
         Specifies the number of log entries to display in the repository
         "summary" view. Default value: "10".
 
diff --git a/ui-atom.c b/ui-atom.c
index e5c31d9..808b2d0 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -1,83 +1,83 @@
 /* ui-atom.c: functions for atom feeds
  *
  * Copyright (C) 2008 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 void add_entry(struct commit *commit, char *host)
 {
         char delim = '&';
         char *hex;
         char *mail, *t, *t2;
         struct commitinfo *info;
 
         info = cgit_parse_commit(commit);
         hex = sha1_to_hex(commit->object.sha1);
         html("<entry>\n");
         html("<title>");
         html_txt(info->subject);
         html("</title>\n");
         html("<updated>");
         cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
         html("</updated>\n");
         html("<author>\n");
         if (info->author) {
                 html("<name>");
                 html_txt(info->author);
                 html("</name>\n");
         }
-        if (info->author_email) {
+        if (info->author_email && !ctx.cfg.noplainemail) {
                 mail = xstrdup(info->author_email);
                 t = strchr(mail, '<');
                 if (t)
                         t++;
                 else
                         t = mail;
                 t2 = strchr(t, '>');
                 if (t2)
                         *t2 = '\0';
                 html("<email>");
                 html_txt(t);
                 html("</email>\n");
                 free(mail);
         }
         html("</author>\n");
         html("<published>");
         cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
         html("</published>\n");
         if (host) {
                 html("<link rel='alternate' type='text/html' href='");
                 html(cgit_httpscheme());
                 html_attr(host);
                 html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
                 if (ctx.cfg.virtual_root)
                         delim = '?';
                 htmlf("%cid=%s", delim, hex);
                 html("'/>\n");
         }
         htmlf("<id>%s</id>\n", hex);
         html("<content type='text'>\n");
         html_txt(info->msg);
         html("</content>\n");
         html("<content type='xhtml'>\n");
         html("<div xmlns='http://www.w3.org/1999/xhtml'>\n");
         html("<pre>\n");
         html_txt(info->msg);
         html("</pre>\n");
         html("</div>\n");
         html("</content>\n");
         html("</entry>\n");
         cgit_free_commitinfo(info);
 }
 
 
 void cgit_print_atom(char *tip, char *path, int max_count)
 {
         char *host;
         const char *argv[] = {NULL, tip, NULL, NULL, NULL};
diff --git a/ui-commit.c b/ui-commit.c
index 41ce70e..9fdb8ee 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,99 +1,103 @@
 /* ui-commit.c: generate commit view
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
 #include "ui-log.h"
 
 void cgit_print_commit(char *hex)
 {
         struct commit *commit, *parent;
         struct commitinfo *info;
         struct commit_list *p;
         unsigned char sha1[20];
         char *tmp;
         int parents = 0;
 
         if (!hex)
                 hex = ctx.qry.head;
 
         if (get_sha1(hex, sha1)) {
                 cgit_print_error(fmt("Bad object id: %s", hex));
                 return;
         }
         commit = lookup_commit_reference(sha1);
         if (!commit) {
                 cgit_print_error(fmt("Bad commit reference: %s", hex));
                 return;
         }
         info = cgit_parse_commit(commit);
 
         load_ref_decorations();
 
         html("<table summary='commit info' class='commit-info'>\n");
         html("<tr><th>author</th><td>");
         html_txt(info->author);
-        html(" ");
-        html_txt(info->author_email);
+        if (!ctx.cfg.noplainemail) {
+                html(" ");
+                html_txt(info->author_email);
+        }
         html("</td><td class='right'>");
         cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
         html("</td></tr>\n");
         html("<tr><th>committer</th><td>");
         html_txt(info->committer);
-        html(" ");
-        html_txt(info->committer_email);
+        if (!ctx.cfg.noplainemail) {
+                html(" ");
+                html_txt(info->committer_email);
+        }
         html("</td><td class='right'>");
         cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
         html("</td></tr>\n");
         html("<tr><th>commit</th><td colspan='2' class='sha1'>");
         tmp = sha1_to_hex(commit->object.sha1);
         cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
         html(" (");
         cgit_patch_link("patch", NULL, NULL, NULL, tmp);
         html(")</td></tr>\n");
         html("<tr><th>tree</th><td colspan='2' class='sha1'>");
         tmp = xstrdup(hex);
         cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
                        ctx.qry.head, tmp, NULL);
         html("</td></tr>\n");
               for (p = commit->parents; p ; p = p->next) {
                 parent = lookup_commit_reference(p->item->object.sha1);
                 if (!parent) {
                         html("<tr><td colspan='3'>");
                         cgit_print_error("Error reading parent commit");
                         html("</td></tr>");
                         continue;
                 }
                 html("<tr><th>parent</th>"
                      "<td colspan='2' class='sha1'>");
                 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
                                  ctx.qry.head, sha1_to_hex(p->item->object.sha1));
                 html(" (");
                 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                                sha1_to_hex(p->item->object.sha1), NULL);
                 html(")</td></tr>");
                 parents++;
         }
         if (ctx.repo->snapshots) {
                 html("<tr><th>download</th><td colspan='2' class='sha1'>");
                 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
                                           hex, ctx.repo->snapshots);
                 html("</td></tr>");
         }
         html("</table>\n");
         html("<div class='commit-subject'>");
         html_txt(info->subject);
         show_commit_decorations(commit);
         html("</div>");
         html("<div class='commit-msg'>");
         html_txt(info->msg);
         html("</div>");
         if (parents < 3) {
                 if (parents)
diff --git a/ui-patch.c b/ui-patch.c
index 5d665d3..2a8f7a5 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -63,63 +63,67 @@ static void filepair_cb(struct diff_filepair *pair)
 
         header(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(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
                 if (S_ISGITLINK(pair->two->mode))
                         print_line(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, print_line))
                 html("Error running diff");
         if (binary)
                 html("Binary files differ\n");
 }
 
 void cgit_print_patch(char *hex)
 {
         struct commit *commit;
         struct commitinfo *info;
         unsigned char sha1[20], old_sha1[20];
         char *patchname;
 
         if (!hex)
                 hex = ctx.qry.head;
 
         if (get_sha1(hex, sha1)) {
                 cgit_print_error(fmt("Bad object id: %s", hex));
                 return;
         }
         commit = lookup_commit_reference(sha1);
         if (!commit) {
                 cgit_print_error(fmt("Bad commit reference: %s", hex));
                 return;
         }
         info = cgit_parse_commit(commit);
 
         if (commit->parents && commit->parents->item)
                 hashcpy(old_sha1, commit->parents->item->object.sha1);
         else
                 hashclr(old_sha1);
 
         patchname = fmt("%s.patch", sha1_to_hex(sha1));
         ctx.page.mimetype = "text/plain";
         ctx.page.filename = patchname;
         cgit_print_http_headers(&ctx);
         htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
-        htmlf("From: %s %s\n", info->author, info->author_email);
+        htmlf("From: %s", info->author);
+        if (!ctx.cfg.noplainemail) {
+                htmlf(" %s", info->author_email);
+        }
+        html("\n");
         html("Date: ");
         cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);
         htmlf("Subject: %s\n\n", info->subject);
         if (info->msg && *info->msg) {
                 htmlf("%s", info->msg);
                 if (info->msg[strlen(info->msg) - 1] != '\n')
                         html("\n");
         }
         html("---\n");
         cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
         html("--\n");
         htmlf("cgit %s\n", CGIT_VERSION);
         cgit_free_commitinfo(info);
 }
diff --git a/ui-tag.c b/ui-tag.c
index 0e056e0..a9c8670 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -19,71 +19,71 @@ static void print_tag_content(char *buf)
 
         html("<div class='commit-subject'>");
         p = strchr(buf, '\n');
         if (p)
                 *p = '\0';
         html_txt(buf);
         html("</div>");
         if (p) {
                 html("<div class='commit-msg'>");
                 html_txt(++p);
                 html("</div>");
         }
 }
 
 void cgit_print_tag(char *revname)
 {
         unsigned char sha1[20];
         struct object *obj;
         struct tag *tag;
         struct taginfo *info;
 
         if (get_sha1(revname, sha1)) {
                 cgit_print_error(fmt("Bad tag reference: %s", revname));
                 return;
         }
         obj = parse_object(sha1);
         if (!obj) {
                 cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1)));
                 return;
         }
         if (obj->type == OBJ_TAG) {
                 tag = lookup_tag(sha1);
                 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
                         cgit_print_error(fmt("Bad tag object: %s", revname));
                         return;
                 }
                 html("<table class='commit-info'>\n");
                 htmlf("<tr><td>Tag name</td><td>");
                 html_txt(revname);
                 htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1));
                 if (info->tagger_date > 0) {
                         html("<tr><td>Tag date</td><td>");
                         cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time);
                         html("</td></tr>\n");
                 }
                 if (info->tagger) {
                         html("<tr><td>Tagged by</td><td>");
                         html_txt(info->tagger);
-                        if (info->tagger_email) {
+                        if (info->tagger_email && !ctx.cfg.noplainemail) {
                                 html(" ");
                                 html_txt(info->tagger_email);
                         }
                         html("</td></tr>\n");
                 }
                 html("<tr><td>Tagged object</td><td>");
                 cgit_object_link(tag->tagged);
                 html("</td></tr>\n");
                 html("</table>\n");
                 print_tag_content(info->msg);
         } else {
                 html("<table class='commit-info'>\n");
                 htmlf("<tr><td>Tag name</td><td>");
                 html_txt(revname);
                 html("</td></tr>\n");
                 html("<tr><td>Tagged object</td><td>");
                 cgit_object_link(obj);
                 html("</td></tr>\n");
                 html("</table>\n");
         }
         return;
 }