Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

bugfixes, added redstoner env

Browse Source
This commit is contained in:
jomo
2014-04-20 20:03:45 +02:00
parent c0a57f1554
commit f5fa193e0d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/users_controller.rb
View File

@@ -85,13 +85,16 @@ class UsersController < ApplicationController
if user_profile
@user.uuid = user_profile["id"]
@user.ign = user_profile["name"] # correct case
if validate_token(@user.uuid, @user.email, params[:registration_token])
# TODO: uncomment when MC part works
if true # validate_token(@user.uuid, @user.email, params[:registration_token])
@user.last_ip = request.remote_ip # showing in mail
if @user.save
session[:user_id] = @user.id
if @user.uses_mc_password?(params[:user][:password])
is_idiot = true
flash[:alert] = "Really? That's your Minecraft password!"
else
is_idiot = false
end
begin
RedstonerMailer.register_mail(@user, is_idiot).deliver
@@ -116,7 +119,7 @@ class UsersController < ApplicationController
end
else
flash[:alert] = "Error. Your username is not correct or Mojang's servers are down."
render action: new
render action: "new"
return
end
end