#3320 code cleanup

modules/base/tool.go

@@ -204,26 +204,23 @@ func HashEmail(email string) string {
 	return hex.EncodeToString(h.Sum(nil))
 }
 
-// AvatarLink returns avatar link by given email.
+// AvatarLink returns relative avatar link to the site domain by given email,
+// which includes app sub-url as prefix. However, it is possible
+// to return full URL if user enables Gravatar-like service.
 func AvatarLink(email string) (url string) {
-
-	if !setting.OfflineMode {
-		if setting.EnableFederatedAvatar && setting.LibravatarService != nil {
-			var err error
-			url, err = setting.LibravatarService.FromEmail(email)
-			if err != nil {
-				log.Error(1, "LibravatarService.FromEmail:: %v", err)
-			}
-		}
-		if len(url) == 0 && !setting.DisableGravatar {
-			url = setting.GravatarSource + HashEmail(email)
+	if setting.EnableFederatedAvatar && setting.LibravatarService != nil {
+		var err error
+		url, err = setting.LibravatarService.FromEmail(email)
+		if err != nil {
+			log.Error(1, "LibravatarService.FromEmail: %v", err)
 		}
 	}
-
+	if len(url) == 0 && !setting.DisableGravatar {
+		url = setting.GravatarSource + HashEmail(email)
+	}
 	if len(url) == 0 {
 		url = setting.AppSubUrl + "/img/avatar_default.png"
 	}
-
 	return url
 }
 

modules/setting/setting.go

@@ -20,8 +20,8 @@ import (
 	_ "github.com/go-macaron/cache/redis"
 	"github.com/go-macaron/session"
 	_ "github.com/go-macaron/session/redis"
-	"gopkg.in/ini.v1"
 	"github.com/strk/go-libravatar"
+	"gopkg.in/ini.v1"
 
 	"github.com/gogits/gogs/modules/bindata"
 	"github.com/gogits/gogs/modules/log"
@@ -141,11 +141,11 @@ var (
 	}
 
 	// Picture settings
-	AvatarUploadPath  string
-	GravatarSource    string
-	DisableGravatar   bool
-	EnableFederatedAvatar   bool
-	LibravatarService *libravatar.Libravatar
+	AvatarUploadPath      string
+	GravatarSource        string
+	DisableGravatar       bool
+	EnableFederatedAvatar bool
+	LibravatarService     *libravatar.Libravatar
 
 	// Log settings
 	LogRootPath string
@@ -470,8 +470,11 @@ func NewContext() {
 		DisableGravatar = true
 		EnableFederatedAvatar = false
 	}
+	if DisableGravatar {
+		EnableFederatedAvatar = false
+	}
 
-	if !DisableGravatar && EnableFederatedAvatar {
+	if EnableFederatedAvatar {
 		LibravatarService = libravatar.New()
 		parts := strings.Split(GravatarSource, "/")
 		if len(parts) >= 3 {