@@ -1,18 +1,15 @@

 class ApplicationController < ActionController::Base

-  #protect_from_forgery

 	before_filter :require_login

 	def require_login

-		#if controller_name == 'sessions' && action_name == 'new'

-		#	true

-		#end

-

 		if authenticated?

 			create_new_authentification()

 		else

-			#create_new_authentification()

-			#Redirect to login page

+			unless controller_name == 'sessions' && (action_name == 'new' || action_name == 'create')

+				flash.now[:error] = I18n.t 'login.access-denied'

+				render "sessions/new"

+			end

 		end

 	end

@@ -13,6 +13,7 @@ class SessionsController < ApplicationController

 			return render 'new'

 		end

+		create_new_authentification()

 		flash.now[:notice] = I18n.t 'login.success'

 		render 'new'

 	end

@@ -5,6 +5,7 @@ en:

   login:

     error: 'Invalid email/password combination'

     success: 'Successfully logged in'

+    access-denied: 'Access denied. Please, sign in first.'

   sessions:

     title: "Login"

@@ -1,5 +1,5 @@

 Xmpp::Application.routes.draw do

-	resources :sessions, only: [:new, :create, :destroy]

+	resources :sessions, only: [:create, :destroy]

   	root :to => 'sessions#new'