| @@ -134,11 +134,11 class AccountController < ApplicationController | |||||
| 134 |
|
134 | |||
| 135 | # Token based account activation |
|
135 | # Token based account activation | |
| 136 | def activate |
|
136 | def activate | |
| 137 |
redirect_to(home_url) |
|
137 | (redirect_to(home_url); return) unless Setting.self_registration? && params[:token].present? | |
| 138 | token = Token.find_by_action_and_value('register', params[:token].to_s) |
|
138 | token = Token.find_by_action_and_value('register', params[:token].to_s) | |
| 139 |
redirect_to(home_url) |
|
139 | (redirect_to(home_url); return) unless token and !token.expired? | |
| 140 | user = token.user |
|
140 | user = token.user | |
| 141 |
redirect_to(home_url) |
|
141 | (redirect_to(home_url); return) unless user.registered? | |
| 142 | user.activate |
|
142 | user.activate | |
| 143 | if user.save |
|
143 | if user.save | |
| 144 | token.destroy |
|
144 | token.destroy | |
General Comments 0
You need to be logged in to leave comments.
Login now