Browse Source

Merge pull request '电子邮件注册白名单' (#1443) from support_edu into V20220125

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1443
Reviewed-by: ychao_1983 <ychao_1983@sina.com>
tags/v1.22.1.3
ychao_1983 3 years ago
parent
commit
5e1332238a
3 changed files with 7 additions and 2 deletions
  1. +5
    -0
      modules/auth/user_form.go
  2. +1
    -1
      options/locale/locale_en-US.ini
  3. +1
    -1
      options/locale/locale_zh-CN.ini

+ 5
- 0
modules/auth/user_form.go View File

@@ -105,6 +105,11 @@ func (f RegisterForm) IsEmailDomainWhitelisted() bool {
} }


domain := strings.ToLower(f.Email[n+1:]) domain := strings.ToLower(f.Email[n+1:])
//support edu.cn
if strings.HasSuffix(domain, "edu.cn") {
return true
}


for _, v := range setting.Service.EmailDomainWhitelist { for _, v := range setting.Service.EmailDomainWhitelist {
if strings.ToLower(v) == domain { if strings.ToLower(v) == domain {


+ 1
- 1
options/locale/locale_en-US.ini View File

@@ -323,7 +323,7 @@ openid_register_title = Create new account
openid_register_desc = The chosen OpenID URI is unknown. Associate it with a new account here. openid_register_desc = The chosen OpenID URI is unknown. Associate it with a new account here.
openid_signin_desc = Enter your OpenID URI. For example: https://anne.me, bob.openid.org.cn or gnusocial.net/carry. openid_signin_desc = Enter your OpenID URI. For example: https://anne.me, bob.openid.org.cn or gnusocial.net/carry.
disable_forgot_password_mail = Account recovery is disabled. Please contact your site administrator. disable_forgot_password_mail = Account recovery is disabled. Please contact your site administrator.
email_domain_blacklisted = You cannot register with your email address.
email_domain_blacklisted = You cannot register with this kind of email address.
authorize_application = Authorize Application authorize_application = Authorize Application
authorize_redirect_notice = You will be redirected to %s if you authorize this application. authorize_redirect_notice = You will be redirected to %s if you authorize this application.
authorize_application_created_by = This application was created by %s. authorize_application_created_by = This application was created by %s.


+ 1
- 1
options/locale/locale_zh-CN.ini View File

@@ -325,7 +325,7 @@ openid_register_title=创建新帐户
openid_register_desc=所选的 OpenID URI 未知。在这里关联一个新帐户。 openid_register_desc=所选的 OpenID URI 未知。在这里关联一个新帐户。
openid_signin_desc=输入您的 OpenID URI。例如: https://anne.me、bob.openid.org.cn 或 gnusocial.net/carry。 openid_signin_desc=输入您的 OpenID URI。例如: https://anne.me、bob.openid.org.cn 或 gnusocial.net/carry。
disable_forgot_password_mail=帐户恢复功能已被禁用。请与网站管理员联系。 disable_forgot_password_mail=帐户恢复功能已被禁用。请与网站管理员联系。
email_domain_blacklisted=您不能使用您的电子邮件地址注册。
email_domain_blacklisted=暂不支持此类电子邮件地址注册。
authorize_application=应用授权 authorize_application=应用授权
authorize_redirect_notice=如果您授权此应用,您将会被重定向到 %s。 authorize_redirect_notice=如果您授权此应用,您将会被重定向到 %s。
authorize_application_created_by=此应用由%s创建。 authorize_application_created_by=此应用由%s创建。


Loading…
Cancel
Save