internal controller added
This commit is contained in:
parent
86e1817e29
commit
f81c1d69c5
15 changed files with 140 additions and 7 deletions
|
@ -15,7 +15,7 @@ class ApplicationController < ActionController::Base
|
|||
if @current_user.nil?
|
||||
$defaults['theme']
|
||||
else
|
||||
@current_user.prefs.theme
|
||||
@current_user.prefs.theme || $defaults['theme']
|
||||
end
|
||||
end
|
||||
|
||||
|
|
12
app/controllers/internal_controller.rb
Normal file
12
app/controllers/internal_controller.rb
Normal file
|
@ -0,0 +1,12 @@
|
|||
class InternalController < ApplicationController
|
||||
|
||||
theme :theme_resolver
|
||||
layout "simple"
|
||||
|
||||
def error
|
||||
@title = t(:general_error)
|
||||
@error = params[:error] || t(:unspecified_error)
|
||||
logger.error @error
|
||||
end
|
||||
|
||||
end
|
|
@ -1,10 +1,14 @@
|
|||
require 'imap_utils'
|
||||
|
||||
class MessagesController < ApplicationController
|
||||
|
||||
before_filter :check_current_user
|
||||
include ImapUtils
|
||||
|
||||
before_filter :check_current_user, :info
|
||||
theme :theme_resolver
|
||||
|
||||
def index
|
||||
|
||||
logger.info "YYYYYYYYYYYYY #{@m.inspect}"
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -13,19 +13,23 @@ class UserController < ApplicationController
|
|||
end
|
||||
|
||||
def authenticate
|
||||
user = User.find_by_email(params["user"]["email"])
|
||||
user = User.find_by_email(params[:user][:email])
|
||||
if user.nil?
|
||||
redirect_to :action => 'unknown'
|
||||
else
|
||||
auten = true
|
||||
if auten == true
|
||||
session[:user_id] = user.id
|
||||
if session["return_to"]
|
||||
session[:user_id] = user.id
|
||||
user.set_cached_password(session,params[:user][:password])
|
||||
|
||||
if session["return_to"]
|
||||
redirect_to(session["return_to"])
|
||||
session["return_to"] = nil
|
||||
else
|
||||
redirect_to :controller=> "messages",:action=>"index"
|
||||
redirect_to :controller=> "messages", :action=>"index"
|
||||
end
|
||||
|
||||
|
||||
else
|
||||
flash[:error] = t(:login_failure)
|
||||
redirect_to :action => 'login'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue