slippy map alpha

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 42460b4e0d15872a1569f7d1529601ccea93e5b6..3012765d2a24732b85b4d01c5e379f49b3f3fb1d 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,11 +1,32 @@
 class UserController < ApplicationController
 
-  def create
-    # do some checks, find the user then send the mail
-    Notifier::deliver_confirm_signup(user)
+  def save
+    @user = User.new(params[: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