X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/37bd2971b49da9364fe5dd25415e97e38b34abd7..7c1b6e850d4a177776aaaabcd8b2343790024004:/app/controllers/user_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index b982a93c9..d61455bf1 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -11,11 +11,41 @@ class UserController < ApplicationController
     else
       render :action => 'new'
     end
-
   end
 
   def new
+    render :layout => 'site'
+  end
 
+  def login
+    if params[:user]
+      email = params[:user][:email]
+      pass = params[:user][:password]
+      u = User.authenticate(email, pass)
+      if u
+        u.token = User.make_token
+        u.timeout = 1.day.from_now
+        u.save
+        session[:token] = u.token
+        redirect_to :controller => 'site', :action => 'index'
+        return
+      end
+    end
+
+    render :layout => 'site'
+  end
+
+  def logout
+    if session[:token]
+      u = User.find_by_token(session[:token])
+      if u
+        u.token = User.make_token
+        u.timeout = Time.now
+        u.save
+      end
+    end
+    session[:token] = nil
+    redirect_to :controller => 'site', :action => 'index'
   end
 
   def confirm
@@ -24,6 +54,9 @@ class UserController < ApplicationController
       @user.active = true
       @user.save
       flash[:notice] = 'Confirmed your account'
+
+      #FIXME: login the person magically
+
       redirect_to :action => 'login'
     else
       flash[:notice] = 'Something went wrong confirming that user'