UI config to toggle whether user email shows up in Explore Users (#336)

* UI config to toggle whether user email shows up in Explore Users

* Recommendation made by @tboerger
66a1c59#r94122732

* fixed typo, rename ShowUserEmailInExplore to ShowUserEmail

* Fixed typo merged conflict

* Hide email in the user profile page

if you are active ShowUserEmail
ref #336 (comment)

* Please replace MustBool() with MustBool(true)

Author: Thiago Avelino

conf/app.ini

@@ -57,6 +57,8 @@ FEED_MAX_COMMIT_NUM = 5
 THEME_COLOR_META_TAG = `#6cc644`
 ; Max size of files to be displayed (defaults is 8MiB)
 MAX_DISPLAY_FILE_SIZE = 8388608
+; Whether show the user email in the Explore Users page
+SHOW_USER_EMAIL = true
 
 [ui.admin]
 ; Number of users that are showed in one page

modules/setting/setting.go

@@ -203,6 +203,7 @@ var (
 		FeedMaxCommitNum   int
 		ThemeColorMetaTag  string
 		MaxDisplayFileSize int64
+		ShowUserEmail      bool
 
 		Admin struct {
 			UserPagingNum   int
@@ -820,6 +821,8 @@ please consider changing to GITEA_CUSTOM`)
 	ShowFooterVersion = Cfg.Section("other").Key("SHOW_FOOTER_VERSION").MustBool(true)
 	ShowFooterTemplateLoadTime = Cfg.Section("other").Key("SHOW_FOOTER_TEMPLATE_LOAD_TIME").MustBool(true)
 
+	UI.ShowUserEmail = Cfg.Section("ui").Key("SHOW_USER_EMAIL").MustBool(true)
+
 	HasRobotsTxt = com.IsFile(path.Join(CustomPath, "robots.txt"))
 }
 

routers/home.go

@@ -229,6 +229,7 @@ func RenderUserSearch(ctx *context.Context, opts *UserSearchOptions) {
 	ctx.Data["Total"] = count
 	ctx.Data["Page"] = paginater.New(int(count), opts.PageSize, page, 5)
 	ctx.Data["Users"] = users
+	ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail
 
 	ctx.HTML(200, opts.TplName)
 }

templates/explore/users.tmpl

@@ -16,7 +16,7 @@
 									{{if .Location}}
 										<i class="octicon octicon-location"></i> {{.Location}}
 									{{end}}
-									{{if and .Email $.IsSigned}}
+									{{if and $.ShowUserEmail .Email $.IsSigned}}
 										<i class="octicon octicon-mail"></i>
 										<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
 									{{end}}

templates/user/profile.tmpl

@@ -22,7 +22,7 @@
 							{{if .Owner.Location}}
 								<li><i class="octicon octicon-location"></i> {{.Owner.Location}}</li>
 							{{end}}
-							{{if and .Owner.Email .IsSigned}}
+							{{if and $.ShowUserEmail .Owner.Email .IsSigned}}
 								<li>
 									<i class="octicon octicon-mail"></i>
 									<a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a>