USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix lin errors

dependabot/go_modules/modernc.org/sqlite-1.37.0
Joe Chen 2025-04-02 10:43:08 -04:00
parent 747a7b0ce8
commit dbdb99ae8c
4 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/route/home.go
View File

@ -30,7 +30,7 @@ func Home(c *context.Context) {
if c.IsLogged {
if !c.User.IsActive && conf.Auth.RequireEmailConfirmation {
c.Data["Title"] = c.Tr("auth.active_your_account")
c.Success(user.ACTIVATE)
c.Success(user.TmplUserAuthActivate)
} else {
user.Dashboard(c)
}

66
internal/route/user/auth.go
View File

@ -26,13 +26,13 @@ import (
)
const (
LOGIN = "user/auth/login"
TWO_FACTOR = "user/auth/two_factor"
TWO_FACTOR_RECOVERY_CODE = "user/auth/two_factor_recovery_code"
SIGNUP = "user/auth/signup"
ACTIVATE = "user/auth/activate"
FORGOT_PASSWORD = "user/auth/forgot_passwd"
RESET_PASSWORD = "user/auth/reset_passwd"
tmplUserAuthLogin = "user/auth/login"
tmplUserAuthTwoFactor = "user/auth/two_factor"
tmplUserAuthTwoFactorRecoveryCode = "user/auth/two_factor_recovery_code"
tmplUserAuthSignup = "user/auth/signup"
TmplUserAuthActivate = "user/auth/activate"
tmplUserAuthForgotPassword = "user/auth/forgot_passwd"
tmplUserAuthResetPassword = "user/auth/reset_passwd"
)
// AutoLogin reads cookie and try to auto-login.
@ -119,7 +119,7 @@ func Login(c *context.Context) {
break
}
}
c.Success(LOGIN)
c.Success(tmplUserAuthLogin)
}
func afterLogin(c *context.Context, u *database.User, remember bool) {
@ -161,7 +161,7 @@ func LoginPost(c *context.Context, f form.SignIn) {
c.Data["LoginSources"] = loginSources
if c.HasError() {
c.Success(LOGIN)
c.Success(tmplUserAuthLogin)
return
}
@ -170,10 +170,10 @@ func LoginPost(c *context.Context, f form.SignIn) {
switch {
case auth.IsErrBadCredentials(err):
c.FormErr("UserName", "Password")
c.RenderWithErr(c.Tr("form.username_password_incorrect"), LOGIN, &f)
c.RenderWithErr(c.Tr("form.username_password_incorrect"), tmplUserAuthLogin, &f)
case database.IsErrLoginSourceMismatch(err):
c.FormErr("LoginSource")
c.RenderWithErr(c.Tr("form.auth_source_mismatch"), LOGIN, &f)
c.RenderWithErr(c.Tr("form.auth_source_mismatch"), tmplUserAuthLogin, &f)
default:
c.Error(err, "authenticate user")
@ -204,7 +204,7 @@ func LoginTwoFactor(c *context.Context) {
return
}
c.Success(TWO_FACTOR)
c.Success(tmplUserAuthTwoFactor)
}
func LoginTwoFactorPost(c *context.Context) {
@ -257,7 +257,7 @@ func LoginTwoFactorRecoveryCode(c *context.Context) {
return
}
c.Success(TWO_FACTOR_RECOVERY_CODE)
c.Success(tmplUserAuthTwoFactorRecoveryCode)
}
func LoginTwoFactorRecoveryCodePost(c *context.Context) {
@ -301,11 +301,11 @@ func SignUp(c *context.Context) {
if conf.Auth.DisableRegistration {
c.Data["DisableRegistration"] = true
c.Success(SIGNUP)
c.Success(tmplUserAuthSignup)
return
}
c.Success(SIGNUP)
c.Success(tmplUserAuthSignup)
}
func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) {
@ -319,19 +319,19 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) {
}
if c.HasError() {
c.Success(SIGNUP)
c.Success(tmplUserAuthSignup)
return
}
if conf.Auth.EnableRegistrationCaptcha && !cpt.VerifyReq(c.Req) {
c.FormErr("Captcha")
c.RenderWithErr(c.Tr("form.captcha_incorrect"), SIGNUP, &f)
c.RenderWithErr(c.Tr("form.captcha_incorrect"), tmplUserAuthSignup, &f)
return
}
if f.Password != f.Retype {
c.FormErr("Password")
c.RenderWithErr(c.Tr("form.password_not_match"), SIGNUP, &f)
c.RenderWithErr(c.Tr("form.password_not_match"), tmplUserAuthSignup, &f)
return
}
@ -348,13 +348,13 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) {
switch {
case database.IsErrUserAlreadyExist(err):
c.FormErr("UserName")
c.RenderWithErr(c.Tr("form.username_been_taken"), SIGNUP, &f)
c.RenderWithErr(c.Tr("form.username_been_taken"), tmplUserAuthSignup, &f)
case database.IsErrEmailAlreadyUsed(err):
c.FormErr("Email")
c.RenderWithErr(c.Tr("form.email_been_used"), SIGNUP, &f)
c.RenderWithErr(c.Tr("form.email_been_used"), tmplUserAuthSignup, &f)
case database.IsErrNameNotAllowed(err):
c.FormErr("UserName")
c.RenderWithErr(c.Tr("user.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()), SIGNUP, &f)
c.RenderWithErr(c.Tr("user.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()), tmplUserAuthSignup, &f)
default:
c.Error(err, "create user")
}
@ -388,7 +388,7 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) {
c.Data["IsSendRegisterMail"] = true
c.Data["Email"] = user.Email
c.Data["Hours"] = conf.Auth.ActivateCodeLives / 60
c.Success(ACTIVATE)
c.Success(TmplUserAuthActivate)
if err := c.Cache.Put(userutil.MailResendCacheKey(user.ID), 1, 180); err != nil {
log.Error("Failed to put cache key 'mail resend': %v", err)
@ -477,7 +477,7 @@ func Activate(c *context.Context) {
} else {
c.Data["ServiceNotEnabled"] = true
}
c.Success(ACTIVATE)
c.Success(TmplUserAuthActivate)
return
}
@ -506,7 +506,7 @@ func Activate(c *context.Context) {
}
c.Data["IsActivateFailed"] = true
c.Success(ACTIVATE)
c.Success(TmplUserAuthActivate)
}
func ActivateEmail(c *context.Context) {
@ -533,12 +533,12 @@ func ForgotPasswd(c *context.Context) {
if !conf.Email.Enabled {
c.Data["IsResetDisable"] = true
c.Success(FORGOT_PASSWORD)
c.Success(tmplUserAuthForgotPassword)
return
}
c.Data["IsResetRequest"] = true
c.Success(FORGOT_PASSWORD)
c.Success(tmplUserAuthForgotPassword)
}
func ForgotPasswdPost(c *context.Context) {
@ -558,7 +558,7 @@ func ForgotPasswdPost(c *context.Context) {
if database.IsErrUserNotExist(err) {
c.Data["Hours"] = conf.Auth.ActivateCodeLives / 60
c.Data["IsResetSent"] = true
c.Success(FORGOT_PASSWORD)
c.Success(tmplUserAuthForgotPassword)
return
}
@ -568,13 +568,13 @@ func ForgotPasswdPost(c *context.Context) {
if !u.IsLocal() {
c.FormErr("Email")
c.RenderWithErr(c.Tr("auth.non_local_account"), FORGOT_PASSWORD, nil)
c.RenderWithErr(c.Tr("auth.non_local_account"), tmplUserAuthForgotPassword, nil)
return
}
if c.Cache.IsExist(userutil.MailResendCacheKey(u.ID)) {
c.Data["ResendLimited"] = true
c.Success(FORGOT_PASSWORD)
c.Success(tmplUserAuthForgotPassword)
return
}
@ -585,7 +585,7 @@ func ForgotPasswdPost(c *context.Context) {
c.Data["Hours"] = conf.Auth.ActivateCodeLives / 60
c.Data["IsResetSent"] = true
c.Success(FORGOT_PASSWORD)
c.Success(tmplUserAuthForgotPassword)
}
func ResetPasswd(c *context.Context) {
@ -598,7 +598,7 @@ func ResetPasswd(c *context.Context) {
}
c.Data["Code"] = code
c.Data["IsResetForm"] = true
c.Success(RESET_PASSWORD)
c.Success(tmplUserAuthResetPassword)
}
func ResetPasswdPost(c *context.Context) {
@ -617,7 +617,7 @@ func ResetPasswdPost(c *context.Context) {
if len(password) < 6 {
c.Data["IsResetForm"] = true
c.Data["Err_Password"] = true
c.RenderWithErr(c.Tr("auth.password_too_short"), RESET_PASSWORD, nil)
c.RenderWithErr(c.Tr("auth.password_too_short"), tmplUserAuthResetPassword, nil)
return
}
@ -633,5 +633,5 @@ func ResetPasswdPost(c *context.Context) {
}
c.Data["IsResetFailed"] = true
c.Success(RESET_PASSWORD)
c.Success(tmplUserAuthResetPassword)
}

7
internal/route/user/profile.go
View File

@ -22,13 +22,8 @@ const (
)
func Profile(c *context.Context, puser *context.ParamsUser) {
isShowKeys := false
if strings.HasSuffix(c.Params(":username"), ".keys") {
isShowKeys = true
}
// Show SSH keys.
if isShowKeys {
if strings.HasSuffix(c.Params(":username"), ".keys") {
ShowSSHKeys(c, puser.ID)
return
}

6
internal/tool/tool.go
View File

@ -235,11 +235,7 @@ func TimeSincePro(then time.Time) string {
}
var timeStr, diffStr string
for {
if diff == 0 {
break
}
for diff != 0 {
diff, diffStr = computeTimeDiff(diff)
timeStr += ", " + diffStr
}