swap EnableCaptcha for RequireExternalRegistrationCaptcha for LinkedAccounts

AJ ONeal · AJ ONeal · commit ac5e5cae8698 · 2019-05-04T11:41:19.000-06:00
diff --git a/routers/user/auth.go b/routers/user/auth.go
@@ -815,13 +815,13 @@ func LinkAccountPostRegister(ctx *context.Context, cpt *captcha.Captcha, form au
 		return
 	}
 
-	if setting.Service.EnableCaptcha && setting.Service.CaptchaType == setting.ImageCaptcha && !cpt.VerifyReq(ctx.Req) {
+	if setting.Service.RequireExternalRegistrationCaptcha && setting.Service.CaptchaType == setting.ImageCaptcha && !cpt.VerifyReq(ctx.Req) {
 		ctx.Data["Err_Captcha"] = true
 		ctx.RenderWithErr(ctx.Tr("form.captcha_incorrect"), tplLinkAccount, &form)
 		return
 	}
 
-	if setting.Service.EnableCaptcha && setting.Service.CaptchaType == setting.ReCaptcha {
+	if setting.Service.RequireExternalRegistrationCaptcha && setting.Service.CaptchaType == setting.ReCaptcha {
 		valid, _ := recaptcha.Verify(form.GRecaptchaResponse)
 		if !valid {
 			ctx.Data["Err_Captcha"] = true

Original file line number	Diff line number	Diff line change
`@@ -815,13 +815,13 @@ func LinkAccountPostRegister(ctx context.Context, cpt captcha.Captcha, form au`
`815`	`815`	`return`
`816`	`816`	`}`
`817`	`817`
`818`		`- if setting.Service.EnableCaptcha && setting.Service.CaptchaType == setting.ImageCaptcha && !cpt.VerifyReq(ctx.Req) {`
	`818`	`+ if setting.Service.RequireExternalRegistrationCaptcha && setting.Service.CaptchaType == setting.ImageCaptcha && !cpt.VerifyReq(ctx.Req) {`
`819`	`819`	`ctx.Data["Err_Captcha"] = true`
`820`	`820`	`ctx.RenderWithErr(ctx.Tr("form.captcha_incorrect"), tplLinkAccount, &form)`
`821`	`821`	`return`
`822`	`822`	`}`
`823`	`823`
`824`		`- if setting.Service.EnableCaptcha && setting.Service.CaptchaType == setting.ReCaptcha {`
	`824`	`+ if setting.Service.RequireExternalRegistrationCaptcha && setting.Service.CaptchaType == setting.ReCaptcha {`
`825`	`825`	`valid, _ := recaptcha.Verify(form.GRecaptchaResponse)`
`826`	`826`	`if !valid {`
`827`	`827`	`ctx.Data["Err_Captcha"] = true`