github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3034 from fantasticfears/filter_system_user

Browse Source 
disable sending email or show presence when forgot system user password
This commit is contained in:
Robin Ward
2014-12-19 16:52:01 -05:00
parent eb445ca2fc ceca85c9eb
commit 9bb2ab6265
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/session_controller.rb
View File

@ -153,14 +153,15 @@ class SessionController < ApplicationController
RateLimiter.new(nil, "forgot-password-min-#{request.remote_ip}", 3, 1.minute).performed!
user = User.find_by_username_or_email(params[:login])
if user.present?
user_presence = user.present? && user.id != Discourse::SYSTEM_USER_ID
if user_presence
email_token = user.email_tokens.create(email: user.email)
Jobs.enqueue(:user_email, type: :forgot_password, user_id: user.id, email_token: email_token.token)
end
json = { result: "ok" }
unless SiteSetting.forgot_password_strict
json[:user_found] = user.present?
json[:user_found] = user_presence
end
render json: json