X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/88297a682cd76ab9290cd8bf278424bf5c8458e5..a6f61bd18aebe24d7488447b18d49158b15a71fa:/app/controllers/user_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 7a0c8b3d7..3012765d2 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,11 +2,31 @@ class UserController < ApplicationController
 
   def save
     @user = User.new(params[:user])
-#    @user.save
-    #Notifier::deliver_confirm_signup(user)
+    @user.set_defaults
+
+    if @user.save
+      flash[:notice] = 'Users was successfully created.'
+      Notifier::deliver_signup_confirm(@user)
+      redirect_to :action => 'login'
+    else
+      render :action => 'new'
+    end
   end
-  
+
   def new
 
   end
+
+  def confirm
+    @user = User.find_by_token(params[:confirm_string])
+    if @user && @user.active == 0
+      @user.active = true
+      @user.save
+      flash[:notice] = 'Confirmed your account'
+      redirect_to :action => 'login'
+    else
+      flash[:notice] = 'Something went wrong confirming that user'
+    end
+  end
+
 end